From 239e65dab40cab445c8d35334b18f90c17548a1d Mon Sep 17 00:00:00 2001 From: rocketcamel Date: Fri, 18 Jul 2025 12:43:15 -0700 Subject: [PATCH] fix!: change to stable 25.05, add nvidia hardware config --- nix/flake.lock | 35 ++++++++++++++-------------- nix/flake.nix | 4 ++-- nix/hosts/kumatani/configuration.nix | 7 ++---- nix/hosts/usahara/configuration.nix | 6 +++-- nix/modules/commonPackages.nix | 1 - nix/modules/desktop.nix | 2 +- 6 files changed, 27 insertions(+), 28 deletions(-) diff --git a/nix/flake.lock b/nix/flake.lock index 2441a9f..8056122 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -83,15 +83,16 @@ ] }, "locked": { - "lastModified": 1750973805, - "narHash": "sha256-BZXgag7I0rnL/HMHAsBz3tQrfKAibpY2vovexl2lS+Y=", + "lastModified": 1752780124, + "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=", "owner": "nix-community", "repo": "home-manager", - "rev": "080e8b48b0318b38143d5865de9334f46d51fce3", + "rev": "c718918222bdb104397762dea67e6b397a7927fe", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -122,11 +123,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749574455, - "narHash": "sha256-fm2/8KPOYvvIAnNVtjDlTt/My00lIbZQ+LMrfQIWVzs=", + "lastModified": 1752682362, + "narHash": "sha256-ZNIpqCG/CfhmV+TgIeyO/XbhDjSWpwWokHM44j0Mn0w=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "917af390377c573932d84b5e31dd9f2c1b5c0f09", + "rev": "20001f9bf0aaf2b1c307e43a5eec8cf8f800fe14", "type": "github" }, "original": { @@ -138,32 +139,32 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749173751, - "narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "lastModified": 1752620740, + "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -228,11 +229,11 @@ ] }, "locked": { - "lastModified": 1750119275, - "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", + "lastModified": 1752544651, + "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2", + "rev": "2c8def626f54708a9c38a5861866660395bb3461", "type": "github" }, "original": { diff --git a/nix/flake.nix b/nix/flake.nix index 4690d22..00c5691 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -2,9 +2,9 @@ description = "Top level flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.05"; nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; - home-manager.url = "github:nix-community/home-manager"; + home-manager.url = "github:nix-community/home-manager?ref=release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; pesde.url = "github:rocketcamel/pesde-nix"; pesde.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nix/hosts/kumatani/configuration.nix b/nix/hosts/kumatani/configuration.nix index 0aa3872..4fc6c8e 100644 --- a/nix/hosts/kumatani/configuration.nix +++ b/nix/hosts/kumatani/configuration.nix @@ -26,11 +26,6 @@ networking.hostName = meta.hostname; networking.networkmanager.enable = true; hardware.bluetooth.enable = true; - hardware.nvidia = { - modesetting.enable = true; - open = true; - videoAcceleration = true; - }; swapDevices = [ { device = "/swapfile"; @@ -92,6 +87,8 @@ }; hardware.graphics.enable = true; + services.xserver.videoDrivers = [ "nvidia" ]; + hardware.nvidia.open = true; environment.sessionVariables = { WLR_NO_HARDWARE_CURSORS = "1"; NIXOS_OZONE_WL = "1"; diff --git a/nix/hosts/usahara/configuration.nix b/nix/hosts/usahara/configuration.nix index 958a0b6..0140c4b 100644 --- a/nix/hosts/usahara/configuration.nix +++ b/nix/hosts/usahara/configuration.nix @@ -62,6 +62,8 @@ openssh.authorizedKeys.keys = config.authorized_ssh; }; hardware.graphics.enable = true; + services.xserver.videoDrivers = [ "nvidia" ]; + hardware.nvidia.open = true; environment.sessionVariables = { WLR_NO_HARDWARE_CURSORS = "1"; NIXOS_OZONE_WL = "1"; @@ -76,7 +78,7 @@ { status = "enable"; criteria = "HDMI-A-1"; - position = "0,0"; + position = "1920,0"; mode = "1920x1080"; scale = 1.0; } @@ -84,7 +86,7 @@ status = "enable"; criteria = "DP-1"; - position = "1920,0"; + position = "0,0"; mode = "1920x1080@144Hz"; scale = 1.0; } diff --git a/nix/modules/commonPackages.nix b/nix/modules/commonPackages.nix index 450ef71..32b5144 100644 --- a/nix/modules/commonPackages.nix +++ b/nix/modules/commonPackages.nix @@ -37,7 +37,6 @@ asciiquarium wireguard-tools fzf - lune awscli2 # deno jq diff --git a/nix/modules/desktop.nix b/nix/modules/desktop.nix index fbd6a10..9b3d9e4 100644 --- a/nix/modules/desktop.nix +++ b/nix/modules/desktop.nix @@ -46,7 +46,7 @@ withUWSM = true; }; services.tumbler.enable = true; - services.displayManager.gdm = { + services.xserver.displayManager.gdm = { enable = true; wayland = true; };