From eb9f2047e0b52209b0cf59fd8fe69703b1afc4d5 Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Sat, 10 Aug 2024 13:24:49 -0600 Subject: [PATCH] flake update + linux downgrade + podmannvidia --- flake.lock | 58 ++++++++++---------- hosts/workstation/configuration.nix | 1 + hosts/workstation/hardware-configuration.nix | 3 +- modules/services/nvidia.nix | 1 + 4 files changed, 33 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index d7731de..69426f6 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -57,11 +57,11 @@ }, "master": { "locked": { - "lastModified": 1722014964, - "narHash": "sha256-il/dQA6JIUlh/KYuD5dA9G6ShAzOF6k932jHO287nmA=", + "lastModified": 1723314169, + "narHash": "sha256-XRn3/pL6tDAXUKBVz3YASTECnb4UzLdn+Hh5uxmsOB0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e97c8b67e3acca3133cce767c36a795dbfda3a99", + "rev": "6f1f93fe7f3699e151459b5da3d9199753128745", "type": "github" }, "original": { @@ -78,11 +78,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1721956892, - "narHash": "sha256-bjVE3UcI00MG/APNJVuxJanvWOt2Ya8UlwsJ5Fi4SfI=", + "lastModified": 1722734656, + "narHash": "sha256-3Fk8o9WR1oVroPx3hDhmLguzhaFz0OifsIpLXLbef/Q=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "408ece610424a74fca88fd0f11711345f75e314a", + "rev": "88aa6c5d59424d979741bc7fc817f02f5b200c08", "type": "github" }, "original": { @@ -93,11 +93,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721466660, - "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", + "lastModified": 1722640603, + "narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", + "rev": "81610abc161d4021b29199aa464d6a1a521e0cc9", "type": "github" }, "original": { @@ -109,14 +109,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, "nixpkgs-stable": { @@ -137,11 +137,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1721949857, - "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=", + "lastModified": 1722987190, + "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665", + "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1721688883, - "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=", + "lastModified": 1722897572, + "narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "aff2f88277dabe695de4773682842c34a0b7fd54", + "rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9", "type": "github" }, "original": { @@ -192,11 +192,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1721455769, - "narHash": "sha256-u95jjeLWk1S65fxIP+Y0iFR0WYVYwfg+PZNr6ZECiS8=", + "lastModified": 1722710858, + "narHash": "sha256-PzMKVcp5ffL4v8+ukuTZRp78DI3kmjUBJUo0Vz5OYC4=", "ref": "refs/heads/main", - "rev": "abbdeed18f1dc6b51a636e544e697a88d21a0ad5", - "revCount": 678, + "rev": "babc7214d9bc5007eb6c0d59a720dea59fa694ac", + "revCount": 696, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" @@ -210,11 +210,11 @@ }, "unstable": { "locked": { - "lastModified": 1721924956, - "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ad6a14c6bf098e98800b091668718c336effc95", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix index 43e6f5b..f11406b 100644 --- a/hosts/workstation/configuration.nix +++ b/hosts/workstation/configuration.nix @@ -77,6 +77,7 @@ groups.nixremote.gid = 555; users = { jawz.packages = with pkgs; [ + nvidia-podman # why not? i'll probably be dissapointed distrobox # install packages from other os gocryptfs # encrypted filesystem! shhh!!! torrenttools # create torrent files from the terminal! diff --git a/hosts/workstation/hardware-configuration.nix b/hosts/workstation/hardware-configuration.nix index fa2e9d1..7bfeba5 100644 --- a/hosts/workstation/hardware-configuration.nix +++ b/hosts/workstation/hardware-configuration.nix @@ -16,7 +16,8 @@ }; }; boot = { - kernelPackages = pkgs.linuxPackages_zen; + # kernelPackages = pkgs.linuxPackages_zen; + kernelPackages = pkgs.linuxPackages_6_9; kernel.sysctl = { "vm.swappiness" = 80; "net.ipv6.conf.all.disable_ipv6" = 0; diff --git a/modules/services/nvidia.nix b/modules/services/nvidia.nix index 4ce4e94..417c23b 100644 --- a/modules/services/nvidia.nix +++ b/modules/services/nvidia.nix @@ -14,6 +14,7 @@ ]; }; nvidia = { + package = config.boot.kernelPackages.nvidiaPackages.stable; modesetting.enable = true; powerManagement.enable = true; powerManagement.finegrained = false;