flake.lock

@@ -750,8 +750,7 @@
         "nixvim": "nixvim",
         "nur": "nur",
         "plasma-manager": "plasma-manager",
-        "sops-nix": "sops-nix",
+        "sops-nix": "sops-nix"
-        "staging-next": "staging-next"
       }
     },
     "rust-overlay": {
@@ -799,22 +798,6 @@
         "type": "github"
       }
     },
-    "staging-next": {
-      "locked": {
-        "lastModified": 1734177916,
-        "narHash": "sha256-LOFqi+fqyev139weR+0W8YW2wasWZSDXPuVFM4HmYyo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "145ffddb216135e76a32def79b19f46d1dcdbdc9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "staging-next",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,

flake.nix

@@ -2,7 +2,6 @@
   description = "System Configuration @ cswimr 2024";
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    staging-next.url = "github:NixOS/nixpkgs/staging-next";
     home-manager = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -58,10 +57,6 @@
         ];
         config.allowUnfree = true;
       };
-      stagingNextPkgs = import inputs.staging-next {
-        inherit system;
-        config.allowUnfree = true;
-      };
     in
     {
       nixosConfigurations = {
@@ -70,7 +65,6 @@
           specialArgs = {
             inherit inputs;
             inherit pkgs;
-            inherit stagingNextPkgs;
             system = system;
             hostname = "eclipse";
             user = user;
@@ -135,7 +129,6 @@
                 extraSpecialArgs = {
                   inherit inputs;
                   inherit pkgs;
-                  inherit stagingNextPkgs;
                   system = system;
                   hostname = "eclipse";
                   user = user;

home-manager/user.nix

@@ -48,9 +48,6 @@
     userName = user;
     userEmail = "seaswimmerthefsh@gmail.com";
     extraConfig = {
-      core = {
-        editor = "code -w";
-      };
       commit = {
         gpgsign = true;
       };

home-manager/vscode.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  stagingNextPkgs,
   config,
   system,
   inputs,
@@ -38,7 +37,7 @@ rec {
     enable = true;
     enableUpdateCheck = false;
     enableExtensionUpdateCheck = false;
-    package = stagingNextPkgs.vscode;
+    package = pkgs.vscode;
     # package = pkgs.vscode.fhsWithPackages (
     #   ps: with pkgs; [
     #     dotnetCorePackages.sdk_8_0
@@ -202,8 +201,7 @@ rec {
         d-koppenhagen.file-tree-to-text-generator
       ];
     userSettings = {
-      "DO-NOT-EDIT-1" =
+      "DO-NOT-EDIT-1" = "This file is managed by the Nix module located at `/etc/nixos/home-manager/vscode.nix`.";
-        "This file is managed by the Nix module located at `/etc/nixos/home-manager/vscode.nix`.";
       "DO-NOT-EDIT-2" = "Changes will be overwritten when VSCode is restarted.";
       "DO-NOT-EDIT-3" = "To persist changes, edit the module and run `upd` in your terminal.";
       "editor.tokenColorCustomizations" = {
@@ -319,8 +317,7 @@ rec {
       "vscord.status.image.large.debugging.key" = "https://vscord.catppuccin.com/mocha/debugging.webp";
       "vscord.status.image.large.editing.key" = "https://vscord.catppuccin.com/mocha/{lang}.webp";
       "vscord.status.image.large.idle.key" = "https://vscord.catppuccin.com/mocha/idle-{app_id}.webp";
-      "vscord.status.image.large.notInFile.key" =
+      "vscord.status.image.large.notInFile.key" = "https://vscord.catppuccin.com/mocha/idle-{app_id}.webp";
-        "https://vscord.catppuccin.com/mocha/idle-{app_id}.webp";
       "vscord.status.image.large.viewing.key" = "https://vscord.catppuccin.com/mocha/{lang}.webp";
       "vscord.status.image.small.debugging.key" = "https://vscord.catppuccin.com/mocha/debugging.webp";
       "vscord.status.image.small.editing.key" = "https://vscord.catppuccin.com/mocha/{app_id}.webp";
@@ -384,12 +381,9 @@ rec {
       "redhat.telemetry.enabled" = true;
       "editor.fontSize" = 14;
       "workbench.colorTheme" = "Catppuccin Mocha";
-      "editor.codeLensFontFamily" =
+      "editor.codeLensFontFamily" = "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
-        "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
+      "editor.inlayHints.fontFamily" = "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font', 'FiraCode Nerd Font Light'";
-      "editor.inlayHints.fontFamily" =
+      "editor.fontFamily" = "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
-        "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font', 'FiraCode Nerd Font Light'";
-      "editor.fontFamily" =
-        "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
       "explorer.confirmDelete" = false;
       "window.confirmSaveUntitledWorkspace" = false;
       "cwtools.cache.stellaris" = "/bulk/steam/steamapps/common/Stellaris";
@@ -438,8 +432,7 @@ rec {
         "eclipse" = "linux";
       };
       "terminal.integrated.fontWeightBold" = "bold";
-      "terminal.integrated.fontFamily" =
+      "terminal.integrated.fontFamily" = "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
-        "'ComicCodeLigatures Nerd Font', 'Comic Code Ligatures', 'FiraCode Nerd Font'";
       "[jsonc]" = {
         "editor.defaultFormatter" = "esbenp.prettier-vscode";
       };

scripts/nix/python.nix

@@ -10,6 +10,5 @@ pkgs.mkShell {
     python312
     python312Packages.requests
     python312Packages.pyperclip
-    python312Packages.pillow
   ];
 }