more of the same

hosts/deck/configuration.nix

@@ -14,18 +14,6 @@
     ./sops.nix
   ];
 
-  services = {
-    # Enable CUPS to print documents.
-    printing.enable = true;
-
-    xserver = {
-      enable = true;
-      desktopManager.gnome.enable = true;
-    };
-  };
-  
-  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
-
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users = {
     deck = {
@@ -50,41 +38,6 @@
     root.shell = pkgs.zsh;
   };
 
-  programs = {
-    zsh.enable = true;
-    nix-ld = {
-      enable = true;
-      libraries = with pkgs; [
-        bash
-        glib
-        gtk3
-        SDL2
-        libGL
-        openal
-
-        xorg.libX11
-        xorg.libICE
-        xorg.libSM
-        xorg.libXcursor
-        xorg.libXrandr
-        xorg.libXi
-
-        alsa-lib
-        libpulseaudio
-
-        zlib
-        libgdiplus
-        icu
-
-        fontconfig
-        freetype
-        expat
-
-        vulkan-loader
-      ];
-    };
-  };
-
   services = {
     btrfs = {
       autoScrub.enable = lib.mkDefault true;
@@ -103,6 +56,7 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment = {
+    xserver.displayManager.gdm.enable = lib.mkForce false;
     systemPackages = with pkgs; [
       fuse
       jq
@@ -118,18 +72,5 @@
       GDK_SCALE = "1";
     };
   };
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
 }
 

hosts/deck/home.nix

@@ -8,16 +8,6 @@ let
   };
 in
 {
-  imports = [
-    ../../share/home/defaults.nix
-    ../../share/home/git.nix
-    ../../share/home/gnome.nix
-    ../../share/home/librewolf.nix
-    ../../share/home/office.nix
-    ../../share/home/shell.nix
-    ../../share/home/vscode.nix
-  ];
-
   home.username = "deck";
 
   sops = {

hosts/desktop/configuration.nix

@@ -109,7 +109,6 @@ in
     ./users.nix
     ../default.nix
     ../../share/amd
-    # ../../modules/desktop-environments/cosmic/specialisation.nix
   ];
 
   chaotic.mesa-git.enable = true;
@@ -138,28 +137,6 @@ in
     };
   };
 
-  # Programs configuration
-  programs = {
-    nix-ld = {
-      enable = true;
-      libraries = with pkgs; [
-        bash
-        glib
-        libgcc
-        icu
-        zlib
-        fontconfig
-        xorg.libX11
-        xorg.libICE
-        xorg.libSM
-        xorg.libXcursor
-        xorg.libXrandr
-        xorg.libXi
-      ];
-    };
-    coolercontrol.enable = true;
-  };
-
   # Common Configuration
   share = {
     gaming.enable = true;

hosts/desktop/home.nix

@@ -8,16 +8,6 @@ let
   };
 in
 {
-  imports = [
-    ../../share/home/defaults.nix
-    ../../share/home/git.nix
-    ../../share/home/gnome.nix
-    ../../share/home/librewolf.nix
-    ../../share/home/office.nix
-    ../../share/home/shell.nix
-    ../../share/home/vscode.nix
-  ];
-
   home.username = "matt";
 
   sops = {

hosts/nas/home.nix

@@ -7,14 +7,6 @@ let
   };
 in
 {
-  imports = [
-    ../../share/home/defaults.nix
-    ../../share/home/git.nix
-    ../../share/home/librewolf.nix
-    ../../share/home/shell.nix
-    ../../share/home/vscode.nix
-  ];
-
   home.username = "admin";
 
   sops = {