diff --git a/configuration/main/hardware-configuration.nix b/configuration/main/hardware-configuration.nix index 66dfb14..dc8dc59 100644 --- a/configuration/main/hardware-configuration.nix +++ b/configuration/main/hardware-configuration.nix @@ -8,7 +8,7 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "ata_generic" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "uas" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "ata_generic" "ehci_pci" "ahci" "nvme" "usbhid" "uas" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; @@ -23,6 +23,16 @@ fsType = "ext4"; }; + fileSystems."/mnt/500G-disk" = + { device = "/dev/disk/by-uuid/1a899f03-4c6a-460a-9635-c4b208b29fba"; + fsType = "ext4"; + }; + + fileSystems."/mnt/verbatim" = + { device = "/dev/disk/by-uuid/2aa5f849-1df0-4f3a-b7db-ef64d06b16e4"; + fsType = "ext4"; + }; + swapDevices = [ ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/configuration/modules/system/graphics.nix b/configuration/modules/system/graphics.nix index 9e19633..4ad4b3a 100644 --- a/configuration/modules/system/graphics.nix +++ b/configuration/modules/system/graphics.nix @@ -13,6 +13,7 @@ modesetting.enable = true; powerManagement.enable = true; open = false; + nvidiaSettings = true; package = config.boot.kernelPackages.nvidiaPackages.production; }; }; diff --git a/flake.lock b/flake.lock index c2fec09..8d36a7e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,44 +1,6 @@ { "nodes": { - "awww": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1774191766, - "narHash": "sha256-bvO+gfuUOVUiBEwAJ5A2RjpysPzCfyXD+DM8piOa1+4=", - "ref": "refs/heads/main", - "rev": "7a8fc2e646b97e5ae508a44d3449e3b41345d456", - "revCount": 1336, - "type": "git", - "url": "https://codeberg.org/LGFae/awww" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/LGFae/awww" - } - }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1751685974, @@ -80,7 +42,7 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1772147792, @@ -92,7 +54,6 @@ "url": "https://git.stribrny.org/max_ag/floating-calculator" }, "original": { - "rev": "2abbacf66e99db523d624037f3e449aa40e8f366", "type": "git", "url": "https://git.stribrny.org/max_ag/floating-calculator" } @@ -104,11 +65,11 @@ ] }, "locked": { - "lastModified": 1774274572, - "narHash": "sha256-YtpNRYSv0CQn+MjhHHqFcIR5L0Urex2tTwS42kP6nuc=", + "lastModified": 1773810247, + "narHash": "sha256-6Vz1Thy/1s7z+Rq5OfkWOBAdV4eD+OrvDs10yH6xJzQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "90913f831383a599c556cba59eac8cae9b5195a9", + "rev": "d47357a4c806d18a3e853ad2699eaec3c01622e7", "type": "github" }, "original": { @@ -187,11 +148,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1774283383, - "narHash": "sha256-3aCfmL8hOcdIl783LTnK+lHcjMGCnc+2zQ98xUyefCU=", + "lastModified": 1773809319, + "narHash": "sha256-ZuMZEuxqWneGaK+HAXz50JyCmtFo0neo6mp6F2NWj24=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8a583029606cf072cc01c7e2f4298cc75a7ada28", + "rev": "c4ee62058cd37d7b842c3b081917f792efee9082", "type": "github" }, "original": { @@ -235,11 +196,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774106199, - "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "lastModified": 1773734432, + "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", "type": "github" }, "original": { @@ -251,11 +212,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1774244481, - "narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=", + "lastModified": 1773705440, + "narHash": "sha256-xB30bbAp0e7ogSEYyc126mAJMt4FRFh8wtm6ADE1xuM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4590696c8693fea477850fe379a01544293ca4e2", + "rev": "48652e9d5aea46e555b3df87354280d4f29cd3a3", "type": "github" }, "original": { @@ -267,7 +228,7 @@ }, "nvf": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "mnw": "mnw", "ndg": "ndg", @@ -293,37 +254,16 @@ }, "root": { "inputs": { - "awww": "awww", "floating-calc": "floating-calc", "home-manager": "home-manager", "niri-flake": "niri-flake", "nixpkgs": "nixpkgs", "nvf": "nvf", + "wayland-bar": "wayland-bar", "zen-browser": "zen-browser" } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "awww", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764038373, - "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": [ "floating-calc", @@ -344,6 +284,27 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "wayland-bar", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773630837, + "narHash": "sha256-zJhgAGnbVKeBMJOb9ctZm4BGS/Rnrz+5lfSXTVah4HQ=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "f600ea449c7b5bb596fa1cf21c871cc5b9e31316", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -359,6 +320,27 @@ "type": "github" } }, + "wayland-bar": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1773784783, + "narHash": "sha256-T3oP3c75kt0Ef+uO3D9qy85VucA4mzhuREWz3FZBTSg=", + "ref": "refs/heads/main", + "rev": "58166358ba26a277d59fafd852ca7b10f1dbd442", + "revCount": 7, + "type": "git", + "url": "https://git.stribrny.org/max_ag/wayland_panel" + }, + "original": { + "type": "git", + "url": "https://git.stribrny.org/max_ag/wayland_panel" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { @@ -400,11 +382,11 @@ ] }, "locked": { - "lastModified": 1774242250, - "narHash": "sha256-pchbnY7KVnH26g4O3LZO8vpshInqNj937gAqlPob1Mk=", + "lastModified": 1773737882, + "narHash": "sha256-P6k0BtT1/idYveVRdcwAZk8By9UjZW8XOMhSoS6wTBY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f19c3e6683c2d2f3fcfcb88fb691931a104bc47c", + "rev": "a7f1db35d74faf04e5189b3a32f890186ace5c28", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index 12c79bd..aa18a1c 100644 --- a/home/home.nix +++ b/home/home.nix @@ -37,7 +37,6 @@ pkgs.bspwm pkgs.sxhkd - pkgs.swww inputs.awww.packages.x86_64-linux.awww pkgs.feh pkgs.picom @@ -58,5 +57,6 @@ pkgs.heroic pkgs.prismlauncher pkgs.protonup-ng + pkgs.easyeffects ]; } diff --git a/home/modules/shells.nix b/home/modules/shells.nix index f6fa6d0..75e32df 100644 --- a/home/modules/shells.nix +++ b/home/modules/shells.nix @@ -70,7 +70,7 @@ } def --env fzf-cd [] { - let dir = (fd -H -t d -L . | fzf --reverse --height 40% --border rounded --preview=("eza --color=always --group-directories-first --icons --long {}") --preview-window=border-left) + let dir = (fd -t d -L . | fzf --reverse --height 40% --border rounded --preview=("eza --color=always --group-directories-first --icons --long {}") --preview-window=border-left) if $dir != null and $dir != "" { cd $dir @@ -78,7 +78,7 @@ } def --env fzf-nvim [] { - let file = (fd -H -t f -L . | fzf --reverse --height 40% --border rounded --preview=("bat -p -P --color always {}") --preview-window=border-left) + let file = (fd -t f -L . | fzf --reverse --height 40% --border rounded --preview=("bat -p -P --color always {}") --preview-window=border-left) if $file != null and $file != "" { nvim $file