chore(systems): carbon: reinstall

gekoke · Dec 3, 2024 · 44286fa · 44286fa
1 parent d92780d
commit 44286fa
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 31 deletions.
diff --git a/modules/nixos/programs/git/default.nix b/modules/nixos/programs/git/default.nix
@@ -15,7 +15,7 @@ in
     enable = mkEnableOption "git version control";
     userName = mkOpt str user.accounts.fullName "The name to configure git with";
     userEmail = mkOpt str user.accounts.primaryEmailAddress "The email to configure git with";
-    signingKey = mkOpt (nullOr str) "D55B9940B30A04A2" "The key ID to sign commits with";
+    signingKey = mkOpt (nullOr str) "1E9AFDF3275F99EE" "The key ID to sign commits with";
     signByDefault = mkOpt bool true "Whether to sign Git commits using GPG";
     githubUsername = mkOpt str "gekoke" "The GitHub username to use";
   };

diff --git a/modules/nixos/programs/ssh/default.nix b/modules/nixos/programs/ssh/default.nix
@@ -11,16 +11,9 @@ in
   };
 
   config = mkIf cfg.enable {
-    age.secrets.privateSshConfig = lib.mkIf config.elementary.secrets.enable {
-      file = ./../../../../secrets/private-ssh-config.age;
-      owner = config.elementary.user.name;
-      mode = "700";
-    };
-
     elementary.home.services.ssh-agent = enabled;
     elementary.home.programs.ssh = {
       enable = true;
-      includes = lib.mkIf config.elementary.secrets.enable [ config.age.secrets.privateSshConfig.path ];
       extraConfig = ''
         Host *
           AddKeysToAgent yes

diff --git a/secrets/authinfo.age b/secrets/authinfo.age
diff --git a/secrets/private-ssh-config.age b/secrets/private-ssh-config.age
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
@@ -1,11 +1,10 @@
 let
   keys = {
-    carbon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHFnuZ4/euSxfZvqLPkhGsfUqLCPl5MXMtfAE9xeAmhP [email protected]";
+    carbon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDZjHdiGT2JDe/3tdEt5hNsOw6bOo0DEfGTkD4+7/ASs geko@carbon";
     silicon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOnuNZ0JfFZ4sHUgatHZ+hE0qA+U7XX6m7ztTfmIrIgQ nixos@nixos";
   };
   all = builtins.attrValues keys;
 in
 {
   "authinfo.age".publicKeys = all;
-  "private-ssh-config.age".publicKeys = all;
 }
diff --git a/systems/x86_64-linux/carbon/default.nix b/systems/x86_64-linux/carbon/default.nix
@@ -12,10 +12,6 @@
     ++ [ ./hardware-configuration.nix ];
 
   elementary = {
-    preferences = {
-      allowLongCompilationTimes = true;
-    };
-
     virtualisation.docker.enable = true;
     hardware.nvidia.enable = true;
     roles.workstation.enable = true;
@@ -37,5 +33,5 @@
     8080
   ];
 
-  system.stateVersion = "24.05";
+  system.stateVersion = "25.05";
 }
diff --git a/systems/x86_64-linux/carbon/hardware-configuration.nix b/systems/x86_64-linux/carbon/hardware-configuration.nix
@@ -5,25 +5,23 @@
 
 {
   imports =
-    [
-      (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/1f6e0121-eb5d-4f94-830b-4feb3a90b6bf";
+    { device = "/dev/disk/by-uuid/8da61131-aee0-4b1b-83e6-dda4d38b0314";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    {
-      device = "/dev/disk/by-uuid/3E97-689B";
+    { device = "/dev/disk/by-uuid/DDAA-4194";
       fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
     };
 
   swapDevices = [ ];
@@ -33,9 +31,9 @@
   # 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.enp7s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }