hosts: remove / clean code

There's a lot of commented stuff I don't need, and move things that are
configured in the host into modules, which will improve re-usability and
readability of this configuration.

3 files changed, 21 insertions, 44 deletions

diff --git a/hosts/carmel/configuration.nix b/hosts/carmel/configuration.nix
index 449564b..52680d7 100644
--- a/hosts/carmel/configuration.nix
+++ b/hosts/carmel/configuration.nix
@@ -17,54 +17,16 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.hostName = "carmel"; # Define your hostname.
-  networking.wireless.enable = false;  # Enables wireless support via wpa_supplicant.
-
-  # Set your time zone.
   time.timeZone = "America/Los_Angeles";
 
-  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
-  # Per-interface useDHCP will be mandatory in the future, so this generated config
-  # replicates the default behaviour.
-  networking.useDHCP = false;
+  networking.hostName = "carmel"; # Define your hostname.
+
+  networking.wireless.enable = false;
   networking.interfaces.enp9s0.useDHCP = true;
-  # TODO: if set to false, systemd hangs on boot, unclear why.
   networking.interfaces.wlp8s0.useDHCP = true;
+  # TODO: If set to false, systemd hangs on boot, unclear why.
 
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "us";
-  };
-
-  # Enable CUPS to print documents.
-  # Enable sound.
-  # sound.enable = true;
-  # hardware.pulseaudio.enable = true;
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # 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;
-  services.openssh.permitRootLogin = "yes";
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
+  services.xserver.dpi = 168;
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
@@ -73,6 +35,5 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "21.11"; # Did you read the comment?
-
 }
 
diff --git a/modules/desktop/xserver.nix b/modules/desktop/xserver.nix
index 894b39b..c19948f 100644
--- a/modules/desktop/xserver.nix
+++ b/modules/desktop/xserver.nix
@@ -21,6 +21,14 @@
     };
   };
 
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  environment.sessionVariables.TERMINAL = [ "alacritty" ];
+  environment.sessionVariables.TERM = [ "xterm-256color" ];
+
   services.gnome.gnome-keyring.enable = true;
   services.gvfs.enable = true;
 }
diff --git a/modules/systems/default.nix b/modules/systems/default.nix
index 3cbe456..d69e31a 100644
--- a/modules/systems/default.nix
+++ b/modules/systems/default.nix
@@ -2,5 +2,13 @@
   imports = [
     ./nix.nix
     ./software.nix
+    ./ssh.nix
   ];
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "us";
+  };
 }