use a previously unused with statement

.gitignore

@@ -0,0 +1 @@
+hosts/configuration.nix

flake.nix

@@ -21,10 +21,11 @@
           system = system;
           modules = [
             # imports
+            ./hosts/eclipse.nix
             ./nixos/configuration.nix
-            ./nixos/eclipse-hw-configuration.nix
             ./nixos/environment.nix
             ./nixos/git.nix
+            ./nixos/gui-pkgs.nix
             ./nixos/nvidia.nix
             ./nixos/nvim.nix
             ./nixos/pkg.nix

home-manager/home.nix

@@ -32,18 +32,22 @@
     userName = "cswimr";
     userEmail = "seaswimmerthefsh@gmail.com";
     extraConfig = {
-      signing = { signByDefault = true; };
+      user = { signingkey = "0EC431A8DA8F8087"; };
+      commit = { gpgsign = true; };
+      signing = { signByDefault = true; key = "0EC431A8DA8F8087"; };
       init = { defaultBranch = "master"; };
       safe = { directory = "/etc/nixos"; };
       url = {
-        "https://www.coastalcommits.com/" = {
+        "git@coastalcommits.com:" = {
           insteadOf = [
+            "https://www.coastalcommits.com/"
             "cc:"
             "coastalcommits:"
           ];
         };
-        "https://github.com/" = {
+        "git@github.com:" = {
           insteadOf = [
+            "https://github.com/"
             "gh:"
             "github:"
           ];

hosts/eclipse.nix

@@ -0,0 +1,48 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/f65ec459-c974-4032-8224-fa78c57527c2";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/484E-279A";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  fileSystems."/bulk" =
+    { device = "/dev/disk/by-uuid/3b8e0789-def6-45dd-8eff-7b55b74569ce";
+      fsType = "ext4";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/4eab8c8f-85c5-4a04-a03c-e111ada06ec0"; }
+    ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.docker0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

nixos/eclipse-hw-configuration.nix

@@ -1,48 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, modulesPath, ... }:
-
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usbhid"
-    "usb_storage"
-    "sd_mod"
-    "sr_mod"
-    "rtsx_usb_sdmmc"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/f65ec459-c974-4032-8224-fa78c57527c2";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/484E-279A";
-    fsType = "vfat";
-    options = [ "fmask=0077" "dmask=0077" ];
-  };
-
-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/4eab8c8f-85c5-4a04-a03c-e111ada06ec0"; }];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode =
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

nixos/gui-pkgs.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }: {
+  # kde stuff
+  environment.systemPackages = with pkgs; [
+    # catppuccin
+    (catppuccin-kde.override {
+      flavour = [ "mocha" "macchiato" "frappe" "latte" ];
+      accents = [ "blue" ];
+      winDecStyles = [ "classic" ];
+    })
+  ];
+
+  programs.partition-manager.enable = true;
+
+  fonts.packages = with pkgs;
+    [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
+}

nixos/pkg.nix

@@ -46,18 +46,8 @@
     # javascript stuff 🤮
     nodejs
     corepack
-
-    # catppuccin
-    (catppuccin-kde.override {
-      flavour = [ "mocha" "macchiato" "frappe" "latte" ];
-      accents = [ "blue" ];
-      winDecStyles = [ "classic" ];
-    })
   ];
 
-  fonts.packages = with pkgs;
-    [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
-
   # install docker
   virtualisation.docker = { enable = true; };
 

nixos/zsh.nix

@@ -38,7 +38,7 @@
       ls = "eza --icons";
       l = "eza -lhg --icons";
 
-      upd = "sudo nixos-rebuild switch";
+      upd = "sudo nixos-generate-config --dir /etc/nixos/hosts && sudo rm /etc/nixos/hosts/configuration.nix && sudo mv /etc/nixos/hosts/hardware-configuration.nix /etc/nixos/hosts/$(hostname).nix && git add /etc/nixos/hosts/$(hostname).nix && sudo nixos-rebuild switch";
 
       c = "clear";
       # alias sudo to itself so user aliases can be sudoed