hosts/subsurface/default.nix

@@ -8,13 +8,13 @@
   user = {
     packages = with pkgs; [
       curl
-      dolphin
+#      dolphin
-      discord
+#      discord
-      wl-clipboard
+#      wl-clipboard
-      firefox-wayland
+#      firefox-wayland
-      inkscape
+#      inkscape
-      blender
+#      blender
-      polymc
+#      polymc
     ];
   };
 
@@ -44,6 +44,7 @@
         enable = true;
         term = "alacritty";
       };
+/*
       apps = {
         mpc.enable = true;
         alacritty.enable = true;
@@ -53,26 +54,33 @@
           nwggrid.enable = true;
         };
       };
+*/
       editors = {
          neovim.enable = true;
          codium.enable = true;
       };
+/*
       gaming = {
         minecraft.enable = true;
       };
+*/
     };
+/*
     dev = {
       llvm.enable = true;
       haskell.enable = true;
       c.enable = true;
     };
+*/
     services = {
       ssh.enable = true;
+/*
       mpd = {
         enable = true;
         # TODO: Make this more dynamic?
         musicDir = "/home/aether/Music";
       };
+*/
     };
   };
 
@@ -82,22 +90,7 @@
   programs.ssh.startAgent = true;
   services.openssh.startWhenNeeded = true;
 
-  # Fuck sudo all my homies hate sudo
-  security.sudo.enable = false;
-  security.doas = {
-    enable = true;
-    extraRules = [
-      { users = [ "aether" ]; keepEnv = true; }
-    ];
-  };
-
-  # Weird hack to get GDM to not explode on startup
-  # TODO: This might not be needed anymore
-  systemd.services."getty@tty1".enable = false;
-  systemd.services."autovt@tty1".enable = false;
-
   networking = {
-    hostName = "subsurface";
     networkmanager.enable = true;
     useDHCP = false;
     interfaces.wlp1s0.useDHCP = true;

hosts/subsurface/hardware-configuration.nix

@@ -58,13 +58,23 @@
   # Filesystems
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-uuid/e1416adb-648e-4b34-b665-8305b7a765f8";
+      device = "/dev/disk/by-uuid/b892a566-b6d7-4f62-a384-71ccca4ff4d8";
       fsType = "f2fs";
       options = [ "defaults" "noatime" "nodiratime" ];
     };
 
     "/boot" = {
-      device = "/dev/disk/by-uuid/EB60-12E5";
+      device = "/dev/disk/by-uuid/C507-604E";
+      fsType = "vfat";
+    };
+
+    "/home" = {
+      device = "/dev/disk/by-uuid/f3a44427-a212-48c2-91e7-f40e82bbcc02";
+      fsType = "vfat";
+    };
+
+    "/etc/dotfiles" = {
+      device = "/dev/disk/by-uuid/2777d90a-20f0-4b35-88f1-653ba14114db";
       fsType = "vfat";
     };
 
@@ -72,12 +82,13 @@
       device = "none";
       fsType = "tmpfs";
     };
-
+/*
     "/run/media/aether/bf2d91f1-a6b3-4629-8755-76301b3f6f56" = {
       device = "/dev/disk/by-uuid/bf2d91f1-a6b3-4629-8755-76301b3f6f56";
       fsType = "f2fs";
       options = [ "defaults" "noatime" "nodiratime" "user" "nofail" ];
     };
+*/
 
 /*
     "/home/aether/Videos" = {
@@ -102,5 +113,5 @@
     };
   };
 
-  swapDevices = [{ device = "/dev/disk/by-uuid/537cffdc-a67d-4b25-a649-32455cec4661"; }];
+  swapDevices = [{ device = "/dev/disk/by-uuid/e4a7edca-2c4e-4979-8368-377bc067b8bd"; }];
 }

modules/agenix.nix

@@ -8,6 +8,7 @@ let
   secretsDir = "${toString ../hosts}/${config.networking.hostName}/secrets";
   secretsFile = "${secretsDir}/secrets.nix";
 in {
+/*
   imports = [ agenix.nixosModules.age ];
   environment.systemPackages = [ agenix.defaultPackage.x86_64-linux ];
 
@@ -21,4 +22,5 @@ in {
 #      ".ssh/id_rsa"
     ]);
   };
+*/
 }