Switch back to NixOS unstable

flake.lock

@@ -24,27 +24,42 @@
         ]
       },
       "locked": {
-        "lastModified": 1704980875,
+        "lastModified": 1705169127,
-        "narHash": "sha256-IPZmMjk5f4TBbEpzUFBc3OC1W6OwDNEXk2w/0uVXX1o=",
+        "narHash": "sha256-j9OEtNxOIPWZWjbECVMkI1TO17SzlpHMm0LnVWKOR/g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5f0ab0eedc6ede69beb8f45561ffefa54edc6e65",
+        "rev": "f2942f3385f1b35cc8a1abb03a45e29c9cb4d3c8",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1704874635,
+        "lastModified": 1705133751,
-        "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
+        "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
+        "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-2311": {
+      "locked": {
+        "lastModified": 1705183652,
+        "narHash": "sha256-rnfkyUH0x72oHfiSDhuCHDHg3gFgF+lF8zkkg5Zihsw=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "428544ae95eec077c7f823b422afae5f174dee4b",
         "type": "github"
       },
       "original": {
@@ -72,28 +87,12 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1705133751,
-        "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs-2311": "nixpkgs-2311"
       }
     }
   },

flake.nix

@@ -1,9 +1,9 @@
 {
   inputs = {
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager.url = "github:nix-community/home-manager/release-23.11";
+    home-manager.url = "github:nix-community/home-manager";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-2311.url = "github:nixos/nixpkgs/nixos-23.11";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
   };
 
   outputs = inputs@{ flake-parts, self, ... }:

system/nixos/configuration.nix

@@ -1,7 +1,7 @@
 { inputs, desktop ? false, hostname, pkgs, system }:
 
 let
-  pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages."${system}";
+  pkgs-2311 = inputs.nixpkgs-2311.legacyPackages.${system};
 
   configure-gtk = pkgs.writeTextFile {
     name = "configure-gtk";
@@ -89,7 +89,7 @@ in
   console.keyMap = "uk";
 
   services.avahi.enable = true;
-  services.avahi.nssmdns = true;
+  services.avahi.nssmdns4 = true;
   services.avahi.openFirewall = true;
   services.printing.enable = true;
 
@@ -139,7 +139,7 @@ in
       libnotify
 
       # Games.
-      zeroad
+      pkgs-2311.zeroad
     ];
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -184,7 +184,7 @@ in
       };
     };
 
-    packages = with pkgsUnstable; [
+    packages = with pkgs; [
       (nerdfonts.override {
         fonts = [
           "AnonymousPro"

system/nixos/home-manager/modules/alacritty.nix

@@ -14,7 +14,6 @@
         size = 12.0;
 
         bold.style = "Regular";
-        bolditalic.style = "Italic";
         normal.family = "JetBrainsMono Nerd Font Mono";
         # fc-list : family | sort | grep "Nerd Font"
 

system/shared/home-manager-packages.nix

@@ -1,7 +1,4 @@
 { inputs, pkgs, ... }:
-let
-  pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}";
-in
 with pkgs; [
   awscli2
   bottom
@@ -9,6 +6,7 @@ with pkgs; [
   delta
   dog
   doppler
+  eza
   fd
   file
   fzf
@@ -24,10 +22,9 @@ with pkgs; [
   lua
   mysql
   neofetch
-  pkgsUnstable.eza
-  pkgsUnstable.rustywind
   pv
   ripgrep
+  rustywind
   tldr
   tree
   tree-sitter

system/shared/modules/neovim.nix

@@ -1,8 +1,6 @@
 { inputs, pkgs, self, ... }:
 
 let
-  pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}";
-
   customVim = with self; {
     toggle-checkbox-nvim = pkgs.vimUtils.buildVimPlugin {
       name = "toggle-checkbox-nvim";
@@ -10,7 +8,7 @@ let
         owner = "opdavies";
         repo = "toggle-checkbox.nvim";
         rev = "main";
-        sha256 = "1h9IGyMa80HWrtiPjruG4cYBqgTafNirW0Hwl/JO70A=";
+        sha256 = "4YSEagQnLK5MBl2z53e6sOBlCDm220GYVlc6A+HNywg=";
       };
     };
 
@@ -75,7 +73,7 @@ in
       customVim.vim-heritage
       customVim.vim-textobj-xmlattr
       customVim.vim-zoom
-      pkgsUnstable.vimPlugins.vim-astro
+      vimPlugins.vim-astro
       vimPlugins.vim-visual-star-search
 
       {
@@ -154,9 +152,9 @@ in
       vimPlugins.nvim-treesitter-textobjects
 
       # LSP, linting and formatting
-      pkgsUnstable.vimPlugins.conform-nvim
+      vimPlugins.conform-nvim
-      pkgsUnstable.vimPlugins.none-ls-nvim
       vimPlugins.lsp-status-nvim
+      vimPlugins.none-ls-nvim
       vimPlugins.nvim-lspconfig
 
       # Completion
@@ -224,6 +222,7 @@ in
       ansible-language-server
       gopls
       lua-language-server
+      nixd
       nodePackages.intelephense
       nodePackages."@astrojs/language-server"
       nodePackages."@tailwindcss/language-server"
@@ -236,14 +235,12 @@ in
       nodePackages.vue-language-server
       nodePackages.yaml-language-server
       phpactor
-      pkgsUnstable.nixd
       rnix-lsp
       terraform-ls
 
       # Formatters
       black
       nodePackages.prettier
-      rstfmt
       stylua
 
       # Tools