From 3379be92aec3e4a3d813f90b0b670798b21a6dc4 Mon Sep 17 00:00:00 2001 From: elwrcl Date: Sun, 12 Apr 2026 23:45:22 +0300 Subject: [PATCH] more fixes --- flake.lock | 2 +- hardware.nix | 2 -- home/dots/fastfetch/config.jsonc | 2 +- home/dots/zsh/.zshrc | 2 +- home/hypr/hyprland/general.nix | 12 +++++----- home/hypr/hyprland/keybinds.nix | 17 +++++++------- home/hypr/hyprland/rules.nix | 2 +- nixos/boot/default.nix | 24 ++++++++++---------- nixos/desktop/audio/pipewire.nix | 4 ++-- nixos/desktop/display/default.nix | 18 +++++++-------- nixos/hardware/graphics/default.nix | 15 ++++++------ nixos/hardware/graphics/nvidia.nix | 2 +- nixos/hardware/graphics/prime.nix | 4 ++-- nixos/hardware/keyboard/default.nix | 5 +--- nixos/networking/network-manager/default.nix | 4 ++-- nixos/services/performance/default.nix | 4 ---- nixos/system/nix/default.nix | 2 +- nixos/users/default.nix | 16 +++++++------ 18 files changed, 66 insertions(+), 71 deletions(-) diff --git a/flake.lock b/flake.lock index f1c48f9..a9f3457 100644 --- a/flake.lock +++ b/flake.lock @@ -678,4 +678,4 @@ }, "root": "root", "version": 7 -} +} \ No newline at end of file diff --git a/hardware.nix b/hardware.nix index 5e9a3d9..9d6d3fc 100644 --- a/hardware.nix +++ b/hardware.nix @@ -25,8 +25,6 @@ }; swapDevices = [ ]; - networking.useDHCP = lib.mkDefault true; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/home/dots/fastfetch/config.jsonc b/home/dots/fastfetch/config.jsonc index a952b9f..dce8406 100644 --- a/home/dots/fastfetch/config.jsonc +++ b/home/dots/fastfetch/config.jsonc @@ -77,4 +77,4 @@ "format": "\u001b[33m󰮯 \u001b[32m󰊠 \u001b[34m󰊠 \u001b[31m󰊠 \u001b[36m󰊠 \u001b[35m󰊠 \u001b[37m󰊠 \u001b[97m󰊠" } ] -} +} \ No newline at end of file diff --git a/home/dots/zsh/.zshrc b/home/dots/zsh/.zshrc index ef74857..5975962 100644 --- a/home/dots/zsh/.zshrc +++ b/home/dots/zsh/.zshrc @@ -98,5 +98,5 @@ export PATH="$HOME/.local/bin:$PATH" #fetch copetch --ascii -#fastfetch fuck fastfetch i'm better +#fuckfastfetch i'm better! diff --git a/home/hypr/hyprland/general.nix b/home/hypr/hyprland/general.nix index 88a6639..b9079d9 100644 --- a/home/hypr/hyprland/general.nix +++ b/home/hypr/hyprland/general.nix @@ -94,11 +94,11 @@ ]; device = [ - { - name = "hp--inc-hyperx-cloud-alpha-s-consumer-control"; - enabled = false; - } - ]; - + { + name = "hp--inc-hyperx-cloud-alpha-s-consumer-control"; + enabled = false; + } + ]; + }; } diff --git a/home/hypr/hyprland/keybinds.nix b/home/hypr/hyprland/keybinds.nix index 1f0830d..523823c 100644 --- a/home/hypr/hyprland/keybinds.nix +++ b/home/hypr/hyprland/keybinds.nix @@ -2,7 +2,8 @@ let ipc = "noctalia-shell ipc call"; -in { +in +{ wayland.windowManager.hyprland.settings = { "$mainMod" = "SUPER"; @@ -17,8 +18,8 @@ in { # interface "$mainMod, Tab, exec, ${ipc} launcher windows" - "$mainMod, P, exec, ${ipc} bar toggle" - "CTRL ALT, Delete, exec, ${ipc} sessionMenu toggle" + "$mainMod, P, exec, ${ipc} bar toggle" + "CTRL ALT, Delete, exec, ${ipc} sessionMenu toggle" # plugins "$mainMod SHIFT, S, exec, ${ipc} plugin:screen-shot-and-record screenshot" "$mainMod SHIFT, Z, exec, ${ipc} plugin:screen-shot-and-record search" @@ -26,13 +27,13 @@ in { "$mainMod SHIFT, C, exec, ${ipc} plugin:music panel" # launchers "$mainMod, Return, exec, ghostty" - "$mainMod, W, exec, zen-beta" + "$mainMod, W, exec, zen-beta" "$mainMod, E, exec, nautilus" "$mainMod, Z, exec, code" - "$mainMod ALT, V, exec, pavucontrol" - "$mainMod SHIFT, V, exec, ${ipc} launcher clipboard" - "$mainMod SHIFT, L, exec, ${ipc} lockScreen lock" - "CTRL SHIFT, Escape, exec, ghostty -e btop" + "$mainMod ALT, V, exec, pavucontrol" + "$mainMod SHIFT, V, exec, ${ipc} launcher clipboard" + "$mainMod SHIFT, L, exec, ${ipc} lockScreen lock" + "CTRL SHIFT, Escape, exec, ghostty -e btop" # window management "$mainMod, Q, killactive" diff --git a/home/hypr/hyprland/rules.nix b/home/hypr/hyprland/rules.nix index eccd483..c86eb86 100644 --- a/home/hypr/hyprland/rules.nix +++ b/home/hypr/hyprland/rules.nix @@ -20,4 +20,4 @@ "float off, match:class ^(steam)$, match:title ^(Steam)$" ]; }; -} \ No newline at end of file +} diff --git a/nixos/boot/default.nix b/nixos/boot/default.nix index 74534ca..6958e29 100644 --- a/nixos/boot/default.nix +++ b/nixos/boot/default.nix @@ -2,26 +2,26 @@ { boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v2; - + boot.kernelParams = [ - "preempt=full" - "i915.enable_guc=2" - "i915.fastboot=1" - "mitigations=off" - "usbcore.autosuspend=-1" + "preempt=full" + "i915.enable_guc=2" + "i915.fastboot=1" + "mitigations=off" + "usbcore.autosuspend=-1" ]; - + boot.loader = { - timeout = 5; + timeout = 5; efi = { canTouchEfiVariables = true; efiSysMountPoint = "/boot"; }; systemd-boot = { enable = true; - configurationLimit = 15; - consoleMode = "max"; - editor = false; + configurationLimit = 15; + consoleMode = "max"; + editor = false; }; }; -} \ No newline at end of file +} diff --git a/nixos/desktop/audio/pipewire.nix b/nixos/desktop/audio/pipewire.nix index 3e1fa84..da7f21d 100644 --- a/nixos/desktop/audio/pipewire.nix +++ b/nixos/desktop/audio/pipewire.nix @@ -24,7 +24,7 @@ services.pipewire.wireplumber.extraConfig."51-no-mic-monitor" = { "monitor.alsa.rules" = [ { - matches = [ { "node.name" = "~alsa_input.*"; } ]; + matches = [{ "node.name" = "~alsa_input.*"; }]; actions = { "update-props" = { "stream.dont-remix" = true; @@ -33,4 +33,4 @@ } ]; }; -} \ No newline at end of file +} diff --git a/nixos/desktop/display/default.nix b/nixos/desktop/display/default.nix index ea7a639..ef5a641 100644 --- a/nixos/desktop/display/default.nix +++ b/nixos/desktop/display/default.nix @@ -5,18 +5,18 @@ enable = true; settings = { animation = "colormix"; - colormix_col1 = "0x00CC00FF"; # bright violet/purple - colormix_col2 = "0x000000EE"; # deep blue - colormix_col3 = "0x00880099"; # mid purple + colormix_col1 = "0x00CC00FF"; + colormix_col2 = "0x000000EE"; + colormix_col3 = "0x00880099"; bigclock = "en"; bigclock_12hr = false; - fg = "0x00FFFFFF"; - bg = "0x00000000"; - border_fg = "0x00FFFFFF"; - error_fg = "0x01FF0000"; - blank_box = true; + fg = "0x00FFFFFF"; + bg = "0x00000000"; + border_fg = "0x00FFFFFF"; + error_fg = "0x01FF0000"; + blank_box = true; hide_borders = false; margin_box_h = 2; @@ -27,4 +27,4 @@ layout = "tr"; variant = ""; }; -} \ No newline at end of file +} diff --git a/nixos/hardware/graphics/default.nix b/nixos/hardware/graphics/default.nix index c740a98..d841754 100644 --- a/nixos/hardware/graphics/default.nix +++ b/nixos/hardware/graphics/default.nix @@ -2,7 +2,8 @@ let driver = config.elars.hardware.graphics.driver; -in { +in +{ options.elars.hardware.graphics.driver = lib.mkOption { type = lib.types.enum [ "intel" "amd" "nvidia" "hybrid-amd-nvidia" ]; default = "intel"; @@ -16,13 +17,13 @@ in { }; } - (lib.mkIf (driver == "intel") (import ./intel.nix { inherit config lib pkgs; })) - (lib.mkIf (driver == "amd") (import ./amd.nix { inherit config lib pkgs; })) - (lib.mkIf (driver == "nvidia") (import ./nvidia.nix { inherit config lib pkgs; })) - (lib.mkIf (driver == "hybrid-amd-nvidia") (lib.mkMerge [ - (import ./amd.nix { inherit config lib pkgs; }) + (lib.mkIf (driver == "intel") (import ./intel.nix { inherit config lib pkgs; })) + (lib.mkIf (driver == "amd") (import ./amd.nix { inherit config lib pkgs; })) + (lib.mkIf (driver == "nvidia") (import ./nvidia.nix { inherit config lib pkgs; })) + (lib.mkIf (driver == "hybrid-amd-nvidia") (lib.mkMerge [ + (import ./amd.nix { inherit config lib pkgs; }) (import ./nvidia.nix { inherit config lib pkgs; }) - (import ./prime.nix { inherit config lib pkgs; }) + (import ./prime.nix { inherit config lib pkgs; }) ])) ]; } diff --git a/nixos/hardware/graphics/nvidia.nix b/nixos/hardware/graphics/nvidia.nix index 8920ce3..4d56d47 100644 --- a/nixos/hardware/graphics/nvidia.nix +++ b/nixos/hardware/graphics/nvidia.nix @@ -5,7 +5,7 @@ hardware.nvidia = { modesetting.enable = true; - open = false; # for 20xx series make true for 30xx and newer + open = false; # for 20xx series make true for 30xx and newer nvidiaSettings = true; package = config.boot.kernelPackages.nvidiaPackages.stable; }; diff --git a/nixos/hardware/graphics/prime.nix b/nixos/hardware/graphics/prime.nix index ea19745..f9808ff 100644 --- a/nixos/hardware/graphics/prime.nix +++ b/nixos/hardware/graphics/prime.nix @@ -3,7 +3,7 @@ { hardware.nvidia.prime = { offload.enable = true; - amdgpuBusId = "PCI:X:X:X"; # TODO - nvidiaBusId = "PCI:X:X:X"; # TODO + amdgpuBusId = "PCI:X:X:X"; # TODO + nvidiaBusId = "PCI:X:X:X"; # TODO }; } diff --git a/nixos/hardware/keyboard/default.nix b/nixos/hardware/keyboard/default.nix index 1e3c5a8..4619fe0 100644 --- a/nixos/hardware/keyboard/default.nix +++ b/nixos/hardware/keyboard/default.nix @@ -8,10 +8,7 @@ via vial ]; - - users.groups.plugdev = {}; - - + users.groups.plugdev = { }; environment.systemPackages = with pkgs; [ qmk via diff --git a/nixos/networking/network-manager/default.nix b/nixos/networking/network-manager/default.nix index e3ebc80..389bf0b 100644 --- a/nixos/networking/network-manager/default.nix +++ b/nixos/networking/network-manager/default.nix @@ -6,7 +6,7 @@ services.resolved = { enable = true; - + settings = { Resolve = { DNS = "1.1.1.1"; @@ -17,4 +17,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/nixos/services/performance/default.nix b/nixos/services/performance/default.nix index 38c9c74..aa8f154 100644 --- a/nixos/services/performance/default.nix +++ b/nixos/services/performance/default.nix @@ -5,10 +5,6 @@ enable = true; scheduler = "scx_lavd"; }; - services.ananicy = { - enable = false; - package = pkgs.ananicy-cpp; - }; services.irqbalance.enable = true; } diff --git a/nixos/system/nix/default.nix b/nixos/system/nix/default.nix index 528a698..b3f1765 100644 --- a/nixos/system/nix/default.nix +++ b/nixos/system/nix/default.nix @@ -11,7 +11,7 @@ "https://cache.nixos.org" "https://nix-community.cachix.org" "https://noctalia.cachix.org" - "https://nyx.chaotic.cx" + "https://nyx.chaotic.cx" "https://attic.xuyh0120.win/lantian" "https://cache.garnix.io" ]; diff --git a/nixos/users/default.nix b/nixos/users/default.nix index 8cb21e8..d4db55a 100644 --- a/nixos/users/default.nix +++ b/nixos/users/default.nix @@ -6,27 +6,29 @@ description = "elars"; initialPassword = "1111"; extraGroups = [ - "networkmanager" "wheel" "docker" "plugdev" - "video" "audio" "lp" "scanner" "libvirtd" + "networkmanager" + "wheel" + "docker" + "plugdev" + "video" + "audio" + "lp" + "scanner" + "libvirtd" ]; shell = pkgs.zsh; }; - programs.nh = { enable = true; clean.enable = true; clean.extraArgs = "--keep-since 4d --keep 3"; flake = "/home/elars/copland"; }; - programs.zsh = { enable = true; enableCompletion = true; autosuggestions.enable = true; syntaxHighlighting.enable = true; }; - programs.firefox.enable = true; - - # security.sudo.wheelNeedsPassword = false; }