From 1a5c9794aa61aea1d7795c4d94a64f4f41f28bed Mon Sep 17 00:00:00 2001 From: zack Date: Thu, 12 Sep 2024 19:29:12 -0400 Subject: [PATCH] feat: move to stable --- flake.lock | 74 ++++++++++++++-------- flake.nix | 15 +++-- homes/x86_64-linux/zoey@earth/default.nix | 2 +- lib/module/default.nix | 11 +++- modules/home/apps/helpers/ags/default.nix | 4 +- modules/home/apps/tools/neovim/default.nix | 4 +- modules/home/home/default.nix | 2 +- modules/home/rice/gtk/default.nix | 4 +- modules/home/wms/hyprland/default.nix | 2 +- modules/nixos/hardware/nvidia/default.nix | 3 +- systems/x86_64-linux/earth/default.nix | 4 +- 11 files changed, 81 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index 32514a7..85f27be 100644 --- a/flake.lock +++ b/flake.lock @@ -597,15 +597,16 @@ ] }, "locked": { - "lastModified": 1726036828, - "narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=", + "lastModified": 1725703823, + "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a1671642826633586d12ac3158e463c7a50a112", + "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -769,11 +770,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1726033247, - "narHash": "sha256-4sDJ53nfQzA425K/iBZIBwoIBJYqIWmIMV3rT6Mpzak=", + "lastModified": 1726113560, + "narHash": "sha256-6pXnXYAKIkAQWzfbSBMTDlw2moyvSqZiR6QltTCi4jw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "336d665707f30a42bd9b99f472d91a6aa286aca6", + "rev": "e2aaa29736ba7200012470f818f9111e41b77c1a", "type": "github" }, "original": { @@ -785,11 +786,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1726011067, - "narHash": "sha256-naWfBYC6bMs3fKvYQXQiBmk13NsPZDf3ZHLHmZjWn/g=", + "lastModified": 1726086728, + "narHash": "sha256-cW8RaE7XDx95GMhWF01fGe9j1thysEMiovnDGzCH7jk=", "owner": "neovim", "repo": "neovim", - "rev": "15bfdf73ea17e513edcec63be9ba27a5f4f12c7a", + "rev": "98ba65b8be8cb2dde839502357e70916c4a3e37a", "type": "github" }, "original": { @@ -864,11 +865,11 @@ ] }, "locked": { - "lastModified": 1725843519, - "narHash": "sha256-Z6DglUwgFDz6fIvQ89wx/uBVWrGvEGECq0Ypyk/eigE=", + "lastModified": 1726102718, + "narHash": "sha256-u89QyfjtXryLHrO3Wre4kuWK5KDKiXe8lgRi6+cUOEw=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "214efbd73241d72a8f48b8b9a73bb54895cd51a7", + "rev": "5ae384b83b91080f0fead6bc1add1cff8277cb3f", "type": "github" }, "original": { @@ -936,6 +937,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1726108120, + "narHash": "sha256-Ji5wO1lLG99grI0qCRb6FyRPpH9tfdfD1QP/r7IlgfM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "111ed8812c10d7dc3017de46cbf509600c93f551", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-wayland": { "inputs": { "flake-compat": "flake-compat_4", @@ -944,11 +961,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1726089853, - "narHash": "sha256-cpP8CDvELczaYLY0RIfYu0vLC8kU/PgM46AZRDAQEe8=", + "lastModified": 1726172433, + "narHash": "sha256-KJiZG+dmGgabNXhhmOa8xxYeSv9HZe26zMa3fa3aonI=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "ace4183b2665fa1b7acf1ce74a83519bbf828a58", + "rev": "5eedb68f568fde3614d3c83d38be9de6b9e0d3a3", "type": "github" }, "original": { @@ -1023,11 +1040,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1725910328, - "narHash": "sha256-n9pCtzGZ0httmTwMuEbi5E78UQ4ZbQMr1pzi5N0LAG8=", + "lastModified": 1726042813, + "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5775c2583f1801df7b790bf7f7d710a19bac66f4", + "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", "type": "github" }, "original": { @@ -1039,16 +1056,16 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1726033636, - "narHash": "sha256-U5BSY461QUg9x0fatmPSczjVpszOJTdJWQVmFTxt9LU=", + "lastModified": 1725930920, + "narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62f0186c41a3f1398e3e025f7dc0ccc603482d5a", + "rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable-small", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -1180,11 +1197,11 @@ "systems": "systems_11" }, "locked": { - "lastModified": 1726078997, - "narHash": "sha256-4doayTypvRH5aFSUpgyKnZXYxDuFYFTpYVc93vjV5J4=", + "lastModified": 1726174086, + "narHash": "sha256-ETu7qAx+msh7MCSeTR7mgtHL5kbEgyVbGK95HcJtoDY=", "owner": "raphamorim", "repo": "rio", - "rev": "f00b31624fd34d7df1f68fa1350c3e25b0230c41", + "rev": "0b0ab36427d7b6657f2fecc6f0c00c26b5674986", "type": "github" }, "original": { @@ -1207,6 +1224,7 @@ "neovim-nightly-overlay": "neovim-nightly-overlay", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_6", + "nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-wayland": "nixpkgs-wayland", "resume": "resume", "rio-term": "rio-term", @@ -1308,11 +1326,11 @@ ] }, "locked": { - "lastModified": 1726028305, - "narHash": "sha256-pKiu7tnsanAj7U6dRWzgRTfonsb3Ty3DHIR3K8tfXLQ=", + "lastModified": 1726114643, + "narHash": "sha256-ncXNIXY4YzKDUHKJap3wNQTwflF0nLKGdSRCkQbcwVM=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "28d73b741367fc51ea1b1a5a2252c8364d4134da", + "rev": "166bb6ee167695f17d80b4b6751a5be3facb919c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a7df575..3d70b5e 100644 --- a/flake.nix +++ b/flake.nix @@ -11,10 +11,11 @@ }; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -71,7 +72,7 @@ neovim-nightly-overlay = { url = "github:nix-community/neovim-nightly-overlay"; - # inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; rio-term = { @@ -96,12 +97,16 @@ }; }; - outputs = inputs: + outputs = inputs @ { + self, + nixpkgs-unstable, + ... + }: inputs.snowfall-lib.mkFlake { inherit inputs; src = ./.; - overlays = [inputs.neovim-nightly-overlay.overlays.default inputs.nixpkgs-wayland.overlay]; + overlays = [inputs.nixpkgs-wayland.overlay]; snowfall = { namespace = "custom"; diff --git a/homes/x86_64-linux/zoey@earth/default.nix b/homes/x86_64-linux/zoey@earth/default.nix index 6a033d6..16d5264 100644 --- a/homes/x86_64-linux/zoey@earth/default.nix +++ b/homes/x86_64-linux/zoey@earth/default.nix @@ -98,7 +98,7 @@ pkgs.parsec-bin pkgs.filezilla - pkgs.zed-editor + lib.custom.pkgs-unstable.zed-editor pkgs.openvpn pkgs.telegram-desktop pkgs.linux-manual diff --git a/lib/module/default.nix b/lib/module/default.nix index 7df9018..6597836 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -1,4 +1,8 @@ -{lib, ...}: +{ + lib, + inputs, + ... +}: with lib; rec { mkOpt = type: default: description: mkOption {inherit type default description;}; @@ -11,6 +15,11 @@ with lib; rec { mkBoolOpt' = mkOpt' types.bool; + pkgs-unstable = import inputs.nixpkgs-unstable { + system = "x86_64-linux"; + config.allowUnfree = true; + }; + enabled = {enable = true;}; disabled = {enable = false;}; diff --git a/modules/home/apps/helpers/ags/default.nix b/modules/home/apps/helpers/ags/default.nix index eedfc1e..1f23329 100644 --- a/modules/home/apps/helpers/ags/default.nix +++ b/modules/home/apps/helpers/ags/default.nix @@ -27,8 +27,8 @@ with lib.custom; let accountsservice swww gnome.gnome-control-center - nautilus - totem + gnome.nautilus + gnome.totem loupe ]; diff --git a/modules/home/apps/tools/neovim/default.nix b/modules/home/apps/tools/neovim/default.nix index 3fae7c5..3fef765 100644 --- a/modules/home/apps/tools/neovim/default.nix +++ b/modules/home/apps/tools/neovim/default.nix @@ -1,4 +1,5 @@ { + inputs, options, config, lib, @@ -37,6 +38,7 @@ in { catppuccin.enable = false; enable = true; defaultEditor = true; + package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default; extraPackages = with pkgs; [ # Formatters black # Python @@ -52,7 +54,7 @@ in { nodePackages.typescript-language-server tailwindcss-language-server clang - bash-language-server + pkgs-unstable.bash-language-server # Tools git diff --git a/modules/home/home/default.nix b/modules/home/home/default.nix index 9e8397d..f77f19c 100644 --- a/modules/home/home/default.nix +++ b/modules/home/home/default.nix @@ -3,5 +3,5 @@ namespace, ... }: { - home.stateVersion = "23.11"; + home.stateVersion = "24.05"; } diff --git a/modules/home/rice/gtk/default.nix b/modules/home/rice/gtk/default.nix index 02fbefb..cd4316e 100644 --- a/modules/home/rice/gtk/default.nix +++ b/modules/home/rice/gtk/default.nix @@ -27,12 +27,12 @@ in { theme = { name = "Tokyonight-Dark"; - package = pkgs.tokyonight-gtk-theme; + package = pkgs-unstable.tokyonight-gtk-theme; }; iconTheme = { name = "Papirus-Dark"; - package = pkgs.catppuccin-papirus-folders.override { + package = pkgs-unstable.catppuccin-papirus-folders.override { accent = ctp.accent; flavor = ctp.flavor; }; diff --git a/modules/home/wms/hyprland/default.nix b/modules/home/wms/hyprland/default.nix index f130caa..12e0c66 100644 --- a/modules/home/wms/hyprland/default.nix +++ b/modules/home/wms/hyprland/default.nix @@ -42,7 +42,7 @@ in { wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; - # package = inputs.hyprland.packages.${system}.default; + package = pkgs-unstable.hyprland; systemd = { enable = true; diff --git a/modules/nixos/hardware/nvidia/default.nix b/modules/nixos/hardware/nvidia/default.nix index c2079e1..f9a900f 100644 --- a/modules/nixos/hardware/nvidia/default.nix +++ b/modules/nixos/hardware/nvidia/default.nix @@ -1,4 +1,5 @@ { + inputs, lib, config, pkgs, @@ -43,7 +44,7 @@ in { nvidiaSettings = true; # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages.nvidiaPackages.beta; + package = pkgs-unstable.linuxPackages_zen.nvidiaPackages.latest; }; environment.variables = { diff --git a/systems/x86_64-linux/earth/default.nix b/systems/x86_64-linux/earth/default.nix index 2e88d51..14304d3 100644 --- a/systems/x86_64-linux/earth/default.nix +++ b/systems/x86_64-linux/earth/default.nix @@ -73,7 +73,7 @@ }; # networking.firewall.enable = false; - boot.kernelPackages = pkgs.linuxPackages_zen; + boot.kernelPackages = lib.custom.pkgs-unstable.linuxPackages_zen; boot.supportedFilesystems = ["ntfs"]; services.dlna.enable = true; @@ -118,4 +118,6 @@ virtualisation.docker.enable = true; virtualisation.libvirtd.enable = true; + + system.stateVersion = "24.05"; }