diff --git a/flake.lock b/flake.lock index c4236fb..fa5f390 100644 --- a/flake.lock +++ b/flake.lock @@ -40,14 +40,15 @@ ], "nixpkgs": [ "nixpkgs" - ] + ], + "quickshell": "quickshell" }, "locked": { - "lastModified": 1765001413, - "narHash": "sha256-y5u9eN1qB/IWVqYhVm3qsH8FttoU40Ze3DPQLBXMRhg=", + "lastModified": 1765560618, + "narHash": "sha256-gZEYrkY/IJHQrackgNwpl0qFnRacBSpmvqa0ljkdieU=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "8ce78e71343b1769b4c87cac9eae3a45510a4c03", + "rev": "e95f7ce367470424e7636b40a0ba7af42ddcd94e", "type": "github" }, "original": { @@ -83,11 +84,11 @@ ] }, "locked": { - "lastModified": 1764627417, - "narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=", + "lastModified": 1765326679, + "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=", "owner": "nix-community", "repo": "disko", - "rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3", + "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e", "type": "github" }, "original": { @@ -99,11 +100,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -173,11 +174,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1764953050, - "narHash": "sha256-TkMjYCGm6FHflVQadN6mx1+3lWzY4wl+3U40lfvTroQ=", + "lastModified": 1765552198, + "narHash": "sha256-nxb1V0kW8NEWh6Pbe6jxOzCp9me5PxYt5e+uvgvoxLc=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "08c9661683edc1e9e63d8e6abd469a68faaee575", + "rev": "dd06d8a13b39af3239c9674188f27caaa3499c98", "type": "github" }, "original": { @@ -210,7 +211,7 @@ }, "grim-hyprland": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "systems": "systems_2" }, "locked": { @@ -234,11 +235,11 @@ ] }, "locked": { - "lastModified": 1764998300, - "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", + "lastModified": 1765480374, + "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=", "owner": "nix-community", "repo": "home-manager", - "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", + "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3", "type": "github" }, "original": { @@ -249,7 +250,7 @@ }, "hu-tao-cursor": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1758768962, @@ -342,11 +343,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1765024946, - "narHash": "sha256-GkPsL9anbbrmtWMP/O7W2+0WuktiK+4hOx5ziM+DQ3Y=", + "lastModified": 1765543676, + "narHash": "sha256-2qaLZ7kqerWXIZpICR/6lkR0J/EEwiS/uYkdhUXv8Sw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f8d5aad1a1f61e1b6443c27394a38c8c54d39e9e", + "rev": "69db0bcae640410b6c587cb0ffd0c89bc8166ff0", "type": "github" }, "original": { @@ -605,14 +606,14 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1764986018, - "narHash": "sha256-g0T9Jo24QTSdwSqxSCQcy0rpU6TujJsZdWrIeOOevYA=", + "lastModified": 1765505604, + "narHash": "sha256-ldyzNBEwP9qIXz087HGJ73OH8hp1YoPDgtK9aaii1PU=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "00e02d9896160f4ab9d9a2fe0ec7c009952d67ba", + "rev": "2597ac42bcf2b32253ab6acab70264fdbb2b102e", "type": "github" }, "original": { @@ -623,11 +624,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 315532800, - "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=", - "rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469", + "lastModified": 1763191728, + "narHash": "sha256-gI9PpaoX4/f28HkjcTbFVpFhtOxSDtOEdFaHZrdETe0=", + "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre877938.82c2e0d6dde5/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre896415.1d4c88323ac3/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -650,19 +651,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1758360447, - "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1727802920, "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", @@ -678,7 +666,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1758346548, "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", @@ -694,13 +682,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1764384123, - "narHash": "sha256-UoliURDJFaOolycBZYrjzd9Cc66zULEyHqGFH3QHEq0=", + "lastModified": 1764947035, + "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59b6c96beacc898566c9be1052ae806f3835f87d", + "rev": "a672be65651c80d3f592a89b3945466584a22069", "type": "github" }, "original": { @@ -710,13 +698,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { - "lastModified": 1764831616, - "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", + "lastModified": 1765311797, + "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", + "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", "type": "github" }, "original": { @@ -786,6 +774,28 @@ } }, "quickshell": { + "inputs": { + "nixpkgs": [ + "dankMaterialShell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1764663772, + "narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=", + "ref": "refs/heads/master", + "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460", + "revCount": 713, + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + }, + "original": { + "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460", + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + } + }, + "quickshell_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -805,22 +815,6 @@ "url": "https://git.outfoxxed.me/outfoxxed/quickshell" } }, - "rollback": { - "locked": { - "lastModified": 1764836381, - "narHash": "sha256-8jemYbbW9EBttQKHep7Rj8kzXaxsrk/lACdXA2DN5Xk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ff06bd3398fb1bea6c937039ece7e7c8aa396ebf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "dankMaterialShell": "dankMaterialShell", @@ -833,11 +827,10 @@ "hyprland": "hyprland", "hyprland-dots": "hyprland-dots", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nvim-dots": "nvim-dots", "pinix": "pinix", - "quickshell": "quickshell", - "rollback": "rollback", + "quickshell": "quickshell_2", "unstable": "unstable" } }, @@ -888,11 +881,11 @@ }, "unstable": { "locked": { - "lastModified": 1764947035, - "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", + "lastModified": 1765425892, + "narHash": "sha256-jlQpSkg2sK6IJVzTQBDyRxQZgKADC2HKMRfGCSgNMHo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a672be65651c80d3f592a89b3945466584a22069", + "rev": "5d6bdbddb4695a62f0d00a3620b37a15275a5093", "type": "github" }, "original": { @@ -959,11 +952,11 @@ ] }, "locked": { - "lastModified": 1760401936, - "narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=", + "lastModified": 1763295135, + "narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "365085b6652259753b598d43b723858184980bbe", + "rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a", "type": "github" }, "original": { @@ -974,7 +967,10 @@ }, "zon2nix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "ghostty", + "nixpkgs" + ] }, "locked": { "lastModified": 1758405547, diff --git a/flake.nix b/flake.nix index 2903bb9..3804af4 100644 --- a/flake.nix +++ b/flake.nix @@ -74,11 +74,6 @@ url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; - - # 25.11 ships with nvidia 580 as stable while 25.05 has 570 as stable. this rollback exists for this reason - rollback = { - url = "github:NixOS/nixpkgs/nixos-25.05"; - }; }; outputs = { @@ -139,7 +134,7 @@ hostPlatform = system; overlays = [ (final: prev: { - quickshell = unstablePkgs.quickshell; + quickshell = inputs.quickshell.packages.${system}.default; ghostty = inputs.ghostty.packages.${system}.default; hu-tao-animated-cursor = inputs.hu-tao-cursor.packages.${system}.default; grim-hyprland = inputs.grim-hyprland.packages.${system}.default; @@ -147,10 +142,6 @@ dmsCli = inputs.dankMaterialShell.packages.${system}.default; dankMaterialShell = inputs.dankMaterialShell.packages.${system}.dankMaterialShell; pinix = inputs.pinix.packages.${system}.default; - nvidiaRollback = import inputs.rollback { - inherit system; - config.allowUnfree = true; - }; }) (final: prev: { inherit diff --git a/home-manager/cobray.nix b/home-manager/cobray.nix index c5dbad3..aa5b749 100644 --- a/home-manager/cobray.nix +++ b/home-manager/cobray.nix @@ -29,6 +29,7 @@ ./modules/rgb.nix ./modules/imagemagick.nix inputs.dankMaterialShell.homeModules.dankMaterialShell.default + ./modules/viv.nix ]; home.username = "${config.theme.user}"; diff --git a/home-manager/modules/lazygit.nix b/home-manager/modules/lazygit.nix index 6236f48..8a55885 100644 --- a/home-manager/modules/lazygit.nix +++ b/home-manager/modules/lazygit.nix @@ -17,6 +17,8 @@ {path = "${config.home.homeDirectory}/nix/.secrets/.git-config";} ]; settings = { + user.name = "alsaiduq-lab"; + user.email = "riiidge.racer@gmail.com"; credential.helper = "store --file=${config.home.homeDirectory}/nix/.secrets/.git-credentials"; }; }; diff --git a/home-manager/modules/quickshell.nix b/home-manager/modules/quickshell.nix index 6a7509f..34fd77b 100644 --- a/home-manager/modules/quickshell.nix +++ b/home-manager/modules/quickshell.nix @@ -12,6 +12,4 @@ cliphist ]; home.sessionPath = ["${pkgs.quickshell}/bin"]; - - programs.dankMaterialShell.enable = true; } diff --git a/home-manager/modules/viv.nix b/home-manager/modules/viv.nix new file mode 100644 index 0000000..3bed8ca --- /dev/null +++ b/home-manager/modules/viv.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + home.packages = with pkgs; [ + vivify + ]; +} diff --git a/hosts/hardware-configuration.nix b/hosts/hardware-configuration.nix index 0d2d304..0638b00 100644 --- a/hosts/hardware-configuration.nix +++ b/hosts/hardware-configuration.nix @@ -8,24 +8,24 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "uas" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/569d5cab-49dd-4cdc-9307-972d2e48c90a"; + { device = "/dev/disk/by-uuid/2feb61a9-08b6-490d-a838-2259d7ddee4f"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/2534-C883"; + { device = "/dev/disk/by-uuid/DD80-2994"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = - [ { device = "/dev/disk/by-uuid/2b9fb15a-3902-456d-b111-71baaedf3d71"; } + [ { device = "/dev/disk/by-uuid/6a02b3ae-531f-4231-ad33-346740ae4b53"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/hosts/modules/nvidia.nix b/hosts/modules/nvidia.nix index 670e7d4..d71fa74 100644 --- a/hosts/modules/nvidia.nix +++ b/hosts/modules/nvidia.nix @@ -6,7 +6,7 @@ services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia = { - package = pkgs.nvidiaRollback.linuxPackages.nvidiaPackages.stable; + package = config.boot.kernelPackages.nvidiaPackages.beta; open = true; modesetting.enable = true; # must be true for Wayland powerManagement.enable = false;