Switched to cosmic desktop

flake.lock

@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1754433428,
+        "lastModified": 1761656077,
-        "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
+        "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
+        "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5",
         "type": "github"
       },
       "original": {
@@ -23,6 +23,24 @@
         "type": "github"
       }
     },
+    "catppuccin": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1761553912,
+        "narHash": "sha256-3UOEQPBlZo9OixT9L1zoD67QheopTG8/EfRPGKyP9bg=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "7b42c91911c143ae3ea32a79cc8582b5920f24e3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -90,11 +108,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756770412,
+        "lastModified": 1759362264,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
+        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
         "type": "github"
       },
       "original": {
@@ -131,11 +149,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757698511,
+        "lastModified": 1761666354,
-        "narHash": "sha256-UqHHGydF/q3jfYXCpvYLA0TWtvByOp1NwOKCUjhYmPs=",
+        "narHash": "sha256-fHr+tIYBJccNF8QWqgowfRmEAtAMSt1deZIRNKL8A7c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a3fcc92180c7462082cd849498369591dfb20855",
+        "rev": "ca2ab1d877a24d5a437dad62f56b8b2c02e964e9",
         "type": "github"
       },
       "original": {
@@ -146,11 +164,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1756659871,
+        "lastModified": 1758834834,
-        "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=",
+        "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16",
+        "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
         "type": "github"
       },
       "original": {
@@ -161,11 +179,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1757103352,
+        "lastModified": 1761669189,
-        "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=",
+        "narHash": "sha256-INBZnPA9JzyDn+Fnni2250PbRzKx7Eafz0T2c7NhXiQ=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "11b2a10c7be726321bb854403fdeec391e798bf0",
+        "rev": "9c0ee5dfa186e10efe9b53505b65d22c81860fde",
         "type": "github"
       },
       "original": {
@@ -176,11 +194,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1757487488,
+        "lastModified": 1760524057,
-        "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=",
+        "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0",
+        "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1761373498,
+        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
         "type": "github"
       },
       "original": {
@@ -198,11 +232,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757705205,
+        "lastModified": 1761708580,
-        "narHash": "sha256-8xB4M6tCmaSaAAb72plJK3H8EH/yfOMnUWzIWKg521g=",
+        "narHash": "sha256-ZaB7Pc6Sjwm3uKewaI3H/CzWyZ+X50ZM0GgWPoyd04I=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "338f8cc3d30bb635459c5198e676eb123b1ff4fe",
+        "rev": "437ebfd3a33ec52228900e73e24ca4a8234ae267",
         "type": "github"
       },
       "original": {
@@ -222,11 +256,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1757397598,
+        "lastModified": 1761486540,
-        "narHash": "sha256-v/FANUOWyeWlWCD61HDLSNO9nHnQALAtvLf2VtE1+WU=",
+        "narHash": "sha256-O0VNqERaZ1H+4P3XwHNd8wVCqUcGtMPJT1z4cJodRFc=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "c7944a48a3c61cb3ca08ac2dc8b8de124d15dcb8",
+        "rev": "4b904de36157035fa3dddf0312a4242e5d0d9bd0",
         "type": "github"
       },
       "original": {
@@ -245,11 +279,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756632588,
+        "lastModified": 1761078382,
-        "narHash": "sha256-ydam6eggXf3ZwRutyCABwSbMAlX+5lW6w1SVZQ+kfSo=",
+        "narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "d47428e5390d6a5a8f764808a4db15929347cd77",
+        "rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c",
         "type": "github"
       },
       "original": {
@@ -261,9 +295,10 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
+        "catppuccin": "catppuccin",
         "home-manager": "home-manager_2",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nur": "nur",
         "nvf": "nvf",
         "plasma-manager": "plasma-manager"

flake.nix

@@ -31,21 +31,23 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
+
+    catppuccin.url = "github:catppuccin/nix";
   };
 
-  outputs = { nixpkgs, ... }@inputs:
+  outputs =
-  let
+    { nixpkgs, ... }@inputs:
-    system = "x86_64-linux";
+    {
-    host = "vanta";
+      nixosConfigurations.vanta = nixpkgs.lib.nixosSystem {
-  in
+        system = "x86_64-linux";
-  {
+        specialArgs = {
-    nixosConfigurations.${host} = nixpkgs.lib.nixosSystem {
+          inherit inputs;
-      inherit system;
+          host = "vanta";
-      specialArgs = { inherit inputs host; };
+        };
-      modules = [
+        modules = [
-        ./modules/system
+          ./modules/system
-        ./hosts/${host}
+          ./hosts/vanta
-      ];
+        ];
+      };
     };
-  };
 }

modules/home/alacritty.nix

@@ -0,0 +1,17 @@
+{
+  ...
+}:
+{
+  programs.alacritty = {
+    enable = true;
+    theme = "catppuccin_mocha";
+    settings = {
+      font = {
+        normal = {
+          family = "FiraCode Nerd Font";
+          style = "Regular";
+        };
+      };
+    };
+  };
+}

modules/home/catppuccin.nix

@@ -0,0 +1,14 @@
+{
+  inputs,
+  ...
+}:
+{
+  imports = [
+    inputs.catppuccin.homeModules.catppuccin
+  ];
+
+  catppuccin = {
+    accent = "flamingo";
+    flavor = "mocha";
+  };
+}

modules/home/default.nix

@@ -3,12 +3,16 @@
 }:
 {
   imports = [
+    ./alacritty.nix
+    # ./catppuccin.nix
     ./firefox.nix
     ./git.nix
     ./nvf.nix
     ./packages.nix
-    ./plasma.nix
+    # ./plasma.nix
+    ./ssh.nix
     ./vscode.nix
+    ./xdg.nix
     ./zsh.nix
   ];
 }

modules/home/firefox.nix

@@ -85,6 +85,7 @@
       };
       search = {
         default = "google";
+        force = true;
         engines = {
           nix-packages = {
             name = "Nix Packages";

modules/home/git.nix

@@ -1,18 +1,40 @@
 {
   pkgs,
+  config,
   ...
 }:
+let
+  name = "Eclypsed";
+  email = "Ec1ypsed@proton.me";
+  signingKey = "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIB2h6y1Al2OVotYIpwPZMjiBLAncAI2pAPgES2+gVbJqAAAABHNzaDo= ssh:";
+in
 {
-  programs.git = {
+  home.packages = with pkgs; [ git-ignore ];
-    enable = true;
+
-    userName = "Eclypsed";
+  xdg.configFile."git/allowed_signers".text = ''
-    userEmail = "Ec1ypsed@proton.me";
+    ${email} namespaces="git" ${signingKey}
-    extraConfig = {
+  '';
-      init = {
+
-        defaultBranch = "main";
+  programs = {
+    git = {
+      enable = true;
+      settings = {
+        user = { inherit name email; };
+        init = {
+          defaultBranch = "main";
+        };
+        gpg.ssh.allowedSignersFile = "${config.xdg.configHome}/git/allowed_signers";
+      };
+      signing = {
+        format = "ssh";
+        key = "${config.home.homeDirectory}/.ssh/id_ed25519_sk_rk.pub";
+        signByDefault = true;
       };
     };
+    lazygit = {
+      enable = true;
+      enableZshIntegration = true;
+      shellWrapperName = "lg";
+    };
   };
-
-  home.packages = with pkgs; [ git-ignore ];
 }

modules/home/nvf.nix

@@ -61,9 +61,6 @@
         # Formatting files
         formatter.conform-nvim = {
           enable = true;
-          setupOpts = {
-
-          };
         };
 
         binds = {
@@ -221,6 +218,17 @@
             treesitter.enable = true;
           };
 
+          rust = {
+            enable = true;
+            # crates = {
+            #   enable = true;
+            # };
+            dap.enable = true;
+            format.enable = true;
+            lsp.enable = true;
+            treesitter.enable = true;
+          };
+
           tailwind = {
             enable = true;
             lsp.enable = true;

modules/home/packages.nix

@@ -9,7 +9,6 @@
     discord
     sqlitebrowser
     drawio
-    bitwarden-desktop
 
     # Libre Office
     libreoffice-qt

modules/home/ssh.nix

@@ -0,0 +1,30 @@
+{
+  ...
+}:
+{
+  programs.ssh = {
+    enable = true;
+    enableDefaultConfig = false;
+    matchBlocks = {
+      "*" = {
+        addKeysToAgent = "yes";
+        identityFile = [ "~/.ssh/id_ed25519_sk_rk" ];
+      };
+      "stu" = {
+        hostname = "stu.cs.jmu.edu";
+        user = "tamassno";
+        localForwards = [
+          {
+            bind.port = 5432;
+            host = {
+              address = "data.cs.jmu.edu";
+              port = 5432;
+            };
+          }
+        ];
+        serverAliveCountMax = 5;
+        serverAliveInterval = 60;
+      };
+    };
+  };
+}

modules/home/vscode.nix

@@ -17,6 +17,7 @@
           aaron-bond.better-comments
           yzane.markdown-pdf
           mechatroner.rainbow-csv
+          catppuccin.catppuccin-vsc
 
           # Remote development
           ms-vscode-remote.remote-ssh
@@ -46,6 +47,14 @@
           # General
           "editor.formatOnSave" = true;
           "workbench.iconTheme" = "material-icon-theme";
+          "workbench.colorTheme" = "Catppuccin Mocha";
+          "catppuccin.accentColor" = "flamingo";
+
+          # Remote SSH
+          # VSCode attempts to write to ~/.ssh/config for remote ssh connections.
+          # Because ~/.ssh/config is managed with home-manager, it is not writeable.
+          # So we specify a custom ssh config path
+          "remote.SSH.configFile" = "/home/eclypse/.ssh/vscode-config";
 
           # Prettier
           "editor.defaultFormatter" = "esbenp.prettier-vscode";

modules/home/xdg.nix

@@ -0,0 +1,16 @@
+{
+  config,
+  ...
+}:
+{
+  xdg = {
+    enable = true;
+    userDirs = {
+      enable = true;
+      createDirectories = true;
+      extraConfig = {
+        XDG_DEV_DIR = "${config.home.homeDirectory}/Dev";
+      };
+    };
+  };
+}

modules/home/zsh.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   ...
 }:
 {
@@ -7,13 +8,79 @@
       enable = true;
       enableZshIntegration = true;
     };
+    starship = {
+      enable = true;
+      enableZshIntegration = true;
+      settings = {
+        add_newline = true;
+        format = pkgs.lib.concatStrings [
+          "[░▒▓](#f38ba8)"
+          "[ 󱄅 ](fg:#1e1e2e bg:#f38ba8)"
+          "[](fg:#f38ba8 bg:#fab387)"
+          "$directory"
+          "[](fg:#fab387 bg:#f9e2af)"
+          "$git_branch"
+          "$git_status"
+          "[](fg:#f9e2af bg:#a6e3a1)"
+          "$nodejs"
+          "$rust"
+          "$golang"
+          "$php"
+          "[](fg:#a6e3a1)"
+          "$line_break"
+          "$character"
+        ];
+        directory = {
+          style = "fg:#1e1e2e bg:#fab387";
+          format = "[ $path ]($style)";
+          truncation_length = 3;
+          truncation_symbol = "…/";
+          substitutions = {
+            "Documents" = "󰈙 ";
+            "Downloads" = " ";
+            "Music" = " ";
+            "Pictures" = " ";
+          };
+        };
+        git_branch = {
+          symbol = "";
+          style = "bg:#f9e2af";
+          format = "[[ $symbol $branch ](fg:#1e1e2e bg:#f9e2af)]($style)";
+        };
+        git_status = {
+          style = "bg:#f9e2af";
+          format = "[[($all_status$ahead_behind )](fg:#1e1e2e bg:#f9e2af)]($style)";
+        };
+        nodejs = {
+          symbol = "";
+          style = "bg:#a6e3a1";
+          format = "[[ $symbol ($version) ](fg:#1e1e2e bg:#a6e3a1)]($style)";
+        };
+        rust = {
+          symbol = "";
+          style = "bg:#a6e3a1";
+          format = ''[[ $symbol ($version) ](fg:#1e1e2e bg:#a6e3a1)]($style)'';
+        };
+        golang = {
+          symbol = "";
+          style = "bg:#a6e3a1";
+          format = "[[ $symbol ($version) ](fg:#1e1e2e bg#a6e3a1)]($style)";
+        };
+        php = {
+          symbol = "";
+          style = "bg:#a6e3a1";
+          format = "[[ $symbol ($version) ](fg:#1e1e2e bg:#a6e3a1)]($style)";
+        };
+        scan_timeout = 100;
+      };
+    };
     zsh = {
       enable = true;
       enableCompletion = true;
       autosuggestion.enable = true;
       syntaxHighlighting.enable = true;
-      sessionVariables = {
+      shellAliases = {
-        SSH_AUTH_SOCK = "/home/eclypse/.bitwarden-ssh-agent.sock";
+        stu = "ssh stu";
       };
     };
   };

modules/system/default.nix

@@ -14,6 +14,6 @@
     ./system.nix
     ./tailscale.nix
     ./user.nix
-    ./virtualisation.nix
+    # ./virtualisation.nix
   ];
 }

modules/system/packages.nix

@@ -6,6 +6,7 @@
 {
   imports = [
     inputs.nur.modules.nixos.default # Adds the NUR overlay
+    inputs.catppuccin.nixosModules.catppuccin
     ../overlays
   ];
 

modules/system/security.nix

@@ -2,7 +2,16 @@
   ...
 }:
 {
+  programs = {
+    yubikey-manager.enable = true;
+    yubikey-touch-detector.enable = true;
+  };
+
+  services = {
+    yubikey-agent.enable = true;
+  };
+
   security = {
     rtkit.enable = true;
   };
-}
+}

modules/system/services.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   ...
 }:
 {
@@ -19,11 +20,29 @@
     };
 
     # Enable the KDE Plasma Desktop Environment.
-    displayManager.sddm.enable = true;
+    # displayManager.sddm.enable = true;
-    desktopManager.plasma6.enable = true;
+    # desktopManager.plasma6.enable = true;
+
+    displayManager.cosmic-greeter.enable = true;
+    desktopManager.cosmic = {
+      enable = true;
+      xwayland.enable = true;
+    };
 
     # Enable CUPS to print documents.
-    printing.enable = true;
+    printing = {
+      enable = true;
+      drivers = with pkgs; [
+        gutenprint
+        cnijfilter2
+      ];
+    };
+
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
 
     # Enable sound with pipewire.
     pulseaudio.enable = false;
@@ -50,4 +69,14 @@
       };
     };
   };
+
+  hardware = {
+    bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+    };
+    sane = {
+      enable = true;
+    };
+  };
 }

modules/system/user.nix

@@ -23,7 +23,7 @@
       programs.home-manager.enable = true;
     };
 
-    backupFileExtension = "backup18";
+    backupFileExtension = "backup";
   };
 
   users.mutableUsers = false;
@@ -34,6 +34,8 @@
     extraGroups = [
       "networkmanager"
       "wheel"
+      "scanner"
+      "lp"
     ];
     hashedPasswordFile = config.age.secrets.eclypse-password.path;
     shell = pkgs.zsh;