General update

flake.lock

@@ -137,11 +137,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701905325,
+        "lastModified": 1702479765,
-        "narHash": "sha256-lda63LmEIlDMeCgWfjr3/wb487XPllBByfrGRieyEk4=",
+        "narHash": "sha256-wjNYsFhciYoJkZ/FBKvFj55k+vkLbu6C2qYQ7K+s8pI=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "1144887c6f4d2dcbb2316a24364ef53e25b0fcfe",
+        "rev": "bd8fbc3f274288ac905bcea66bc2a5428abde458",
         "type": "github"
       },
       "original": {
@@ -166,6 +166,40 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -189,11 +223,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702203126,
+        "lastModified": 1702423270,
-        "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=",
+        "narHash": "sha256-3ZA5E+b2XBP+c9qGhWpRApzPq/PZtIPgkeEDpTBV4g8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883",
+        "rev": "d9297efd3a1c3ebb9027dc68f9da0ac002ae94db",
         "type": "github"
       },
       "original": {
@@ -223,13 +257,33 @@
         "type": "github"
       }
     },
+    "nix-vscode-extensions": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1702430416,
+        "narHash": "sha256-B5V52sULzppQwkFOYg3LAcKpRBQrEOjqWD96EkPY1vc=",
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "rev": "7cac6db467006533f4c151f0473498470f2e0bfd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1702336390,
+        "lastModified": 1702453208,
-        "narHash": "sha256-BRO8J8QbmyuS0XMh4UfY11akgTGZj1YhkqNvR83JrsI=",
+        "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "fef05bf9c8e818f4ca1425ef4c18e6680becd072",
+        "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
         "type": "github"
       },
       "original": {
@@ -240,11 +294,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1702151865,
+        "lastModified": 1684570954,
-        "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
+        "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1702312524,
+        "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
+        "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
         "type": "github"
       },
       "original": {
@@ -254,7 +324,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1700856099,
         "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=",
@@ -274,8 +344,9 @@
       "inputs": {
         "disko": "disko",
         "home-manager": "home-manager",
+        "nix-vscode-extensions": "nix-vscode-extensions",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "stylix": "stylix"
       }
     },
@@ -289,9 +360,9 @@
         "base16-kitty": "base16-kitty",
         "base16-tmux": "base16-tmux",
         "base16-vim": "base16-vim",
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
         "home-manager": "home-manager_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1702242258,
@@ -306,6 +377,21 @@
         "repo": "stylix",
         "type": "github"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -12,6 +12,9 @@
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
+    #VSCode Extensions
+    nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
+
     # Theming
     stylix.url = "github:danth/stylix";
   };
@@ -24,19 +27,23 @@
       nixosConfigurations = {
         Equinox = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
-          specialArgs = { inherit inputs; };
+          specialArgs = { inherit inputs; inherit system; };
           modules = [
             # Theme
             stylix.nixosModules.stylix
             ./themes/targets/all.nix
-            ./themes/spaceduck
+            ./themes/sandstone-forest
 
             ./hosts/Equinox
             home-manager.nixosModules.home-manager
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
-              home-manager.extraSpecialArgs = inputs;
+              home-manager.extraSpecialArgs =
+                {
+                  inherit inputs;
+                  inherit system;
+                };
 
               home-manager.users.panotaka = {
                 imports = [ ./home ./home/shell ./home/desktop ];
@@ -47,14 +54,18 @@
 
         Blackbird = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
-          specialArgs = { inherit inputs; };
+          specialArgs = { inherit inputs; inherit system; };
           modules = [
             ./hosts/Blackbird
             home-manager.nixosModules.home-manager
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
-              home-manager.extraSpecialArgs = inputs;
+              home-manager.extraSpecialArgs =
+                {
+                  inherit inputs;
+                  inherit system;
+                };
 
               home-manager.users.panotaka = {
                 imports = [ ./home ./home/shell ./home/desktop ];

home/desktop/default.nix

@@ -1,4 +1,6 @@
-{ config
+{ inputs
+, system
+, config
 , pkgs
 , ...
 }: {

home/desktop/vscode.nix

@@ -1,4 +1,6 @@
-{ config
+{ inputs
+, system
+, config
 , pkgs
 , home-manager
 , ...
@@ -8,19 +10,27 @@
   programs.vscode = {
     enable = true;
     package = pkgs.vscodium;
-    extensions = with pkgs.vscode-extensions; [
+    extensions = with inputs.nix-vscode-extensions.extensions.${system};
-      # Cosmetics
+      [
-      vscode-icons-team.vscode-icons
+        # Cosmetics
+        vscode-marketplace.vscode-icons-team.vscode-icons
 
-      # Copilot
+        # Copilot
-      github.copilot
+        vscode-marketplace.github.copilot
-      github.copilot-chat
+        vscode-marketplace.github.copilot-labs
+        vscode-marketplace.github.copilot-chat
 
-      # Git
+        # Git
-      mhutchie.git-graph
+        vscode-marketplace.mhutchie.git-graph
 
-      # Nix language extensions
+        # Just files
-      bbenoist.nix
+        vscode-marketplace.skellock.just
-    ];
+
+        # Nix language extensions
+        vscode-marketplace.bbenoist.nix
+
+        # Rust language extensions
+        vscode-marketplace.rust-lang.rust-analyzer
+      ];
   };
 }

home/shell/common.nix

@@ -7,6 +7,7 @@
   };
 
   home.packages = with pkgs; [
+    just
   ];
 
   programs.direnv = {

themes/sandstone-forest/default.nix

@@ -1,10 +1,22 @@
-{ config, pkgs, ... }:
+{ system, inputs, config, pkgs, ... }:
 
 {
   stylix.image = ./wallpaper.jpg;
-  stylix.polarity = "dark";
 
-  stylix.cursor.name = "breeze";
+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml";
+
+  home-manager.sharedModules = [
+    {
+      programs.vscode = {
+        extensions = with inputs.nix-vscode-extensions.extensions.${system}; [
+          vscode-marketplace.sainnhe.everforest
+        ];
+        userSettings = {
+          "workbench.colorTheme" = "Everforest Dark";
+        };
+      };
+    }
+  ];
 
   stylix.fonts = {
     serif = {