ssh by default

configurations/nixos/aepplet/default.nix

@@ -10,50 +10,32 @@
   ];
 
   bosun = {
-    # quirks = ["avahi" "docker"];
-
     key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPjqieS4GkYAa1WRYZpxjgYsj7VGZ9U+rTFCkX8M0umD";
+
+    profiles = {
+      docker.enable = true;
+      work.enable = true;
+    };
   };
 
   system.stateVersion = "24.11";
 
-  # Enable nix flakes
-  nix = {
-    package = pkgs.nixVersions.stable;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-  };
-
-  services.openssh = {
-    enable = true;
-    settings = {
-      PasswordAuthentication = false;
-      AllowUsers = ["toph"];
-    };
-  };
-
   # Set the default drive, which in the case of Mercury is
   # a VirtualBox image.
   disko.devices.disk.main.device = "/dev/sda";
 
   boot.loader.grub.enable = true;
-  networking.hostName = "aepplet";
-  time.timeZone = "Europe/Berlin";
 
   environment.systemPackages = with pkgs; [
     inputs.docker-compose-1.legacyPackages."x86_64-linux".docker-compose
     gnumake
   ];
 
-  console = {
+  programs = {
-    font = "Lat2-Terminus16";
+    vim.enable = true;
-    keyMap = lib.mkForce "de";
+    git.enable = true;
   };
 
-  programs.vim.enable = true;
-  programs.git.enable = true;
-
   # Disable the firewall so that all traffic is allowed
   networking.firewall.enable = false;
 

configurations/nixos/endurance/default.nix

@@ -30,27 +30,19 @@
   };
 
   networking = {
-    hostName = "endurance";
     firewall.enable = false;
     interfaces.eno1.wakeOnLan.enable = true;
   };
 
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  console = {
-    font = "Lat2-Terminus16";
-    useXkbConfig = true; # use xkbOptions in tty.
-  };
-
-  xdg.portal = {
-    enable = true;
-    xdgOpenUsePortal = true;
-  };
-
   programs = {
     weylus.users = ["toph"];
 
+    gnupg.agent = {
+      enable = true;
+      pinentryPackage = pkgs.pinentry-gtk2;
+      enableSSHSupport = true;
+    };
+
     dconf.enable = true;
 
     steam = {
@@ -58,10 +50,7 @@
       protontricks.enable = true;
       remotePlay.openFirewall = true;
     };
-    # VR support
     envision.enable = true;
-
-    # For game-related system optimisations
     gamemode.enable = true;
 
     _1password.enable = true;
@@ -71,6 +60,20 @@
       # require enabling PolKit integration on some desktop environments (e.g. Plasma).
       polkitPolicyOwners = ["toph"];
     };
+
+    obs-studio = {
+      enable = true;
+      enableVirtualCamera = true;
+
+      plugins = with pkgs.obs-studio-plugins; [
+        wlrobs
+        obs-vaapi
+        obs-pipewire-audio-capture
+        obs-backgroundremoval
+        obs-move-transition
+        droidcam-obs
+      ];
+    };
   };
 
   services = {
@@ -83,9 +86,6 @@
       ];
     };
 
-    openssh.enable = true;
-    openssh.settings.PasswordAuthentication = false;
-
     hardware.openrgb.enable = true;
 
     # Bluetooth manager
@@ -118,13 +118,6 @@
     #   ];
     # };
 
-    pipewire = {
-      enable = lib.mkForce true;
-      alsa.enable = true;
-      jack.enable = true;
-      pulse.enable = true;
-    };
-
     usbmuxd = {
       enable = true;
       package = pkgs.usbmuxd2;
@@ -147,19 +140,6 @@
     pcscd.enable = true;
   };
 
-  programs = {
-    thunar.enable = true;
-    thunar.plugins = with pkgs.xfce; [
-      thunar-archive-plugin
-    ];
-
-    gnupg.agent = {
-      enable = true;
-      pinentryPackage = pkgs.pinentry-gtk2;
-      enableSSHSupport = true;
-    };
-  };
-
   environment = {
     # List packages installed in system profile. To search, run:
     # $ nix search wget
@@ -208,11 +188,6 @@
       overdrive.enable = true;
     };
 
-    bluetooth = {
-      enable = true;
-      powerOnBoot = true;
-    };
-
     graphics = {
       enable = true;
       enable32Bit = true;
@@ -221,6 +196,11 @@
       ];
     };
 
+    bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+    };
+
     # SANE scanner support
     sane = {
       enable = true;
@@ -237,10 +217,12 @@
     keyboard.zsa.enable = true;
   };
 
-  system.stateVersion = "23.05"; # Do not change this value!
+  # Do not change this value!
+  system.stateVersion = "23.05";
 
+  boot = {
     # Set up our bootloader
-  boot.loader = {
+    loader = {
       efi.canTouchEfiVariables = true;
       grub = {
         enable = true;
@@ -249,25 +231,13 @@
       };
     };
 
-  programs.obs-studio = {
+    extraModulePackages = with config.boot.kernelPackages; [
-    enable = true;
-    enableVirtualCamera = true;
-
-    plugins = with pkgs.obs-studio-plugins; [
-      wlrobs
-      obs-vaapi
-      obs-pipewire-audio-capture
-      obs-backgroundremoval
-      obs-move-transition
-      droidcam-obs
-    ];
-  };
-
-  boot.extraModulePackages = with config.boot.kernelPackages; [
       v4l2loopback
     ];
-  boot.kernelModules = ["v4l2loopback"];
+
-  boot.extraModprobeConfig = ''
+    kernelModules = ["v4l2loopback"];
+    extraModprobeConfig = ''
       options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
     '';
+  };
 }

modules/generic/default.nix

@@ -1,12 +1,26 @@
-{ pkgs, ... }: {
+{
+  pkgs,
+  hostname,
+  ...
+}: {
   # the `modules/generic` folder is generic only across nixos and darwin, not
   # across home manager. home modules are in `modules/home`
   imports = [
     ./nix.nix
     ./profiles.nix
     ./secrets.nix
+    ./ssh.nix
   ];
 
+  # TODO: Move all of these into their own modules?
+
+  console = {
+    font = "Lat2-Terminus16";
+    useXkbConfig = true; # use xkbOptions in tty.
+  };
+
+  networking.hostName = hostname;
+
   environment.systemPackages = with pkgs; [
     pre-commit
     git

modules/generic/nix.nix

@@ -7,6 +7,11 @@
   nix = {
     package = pkgs.lixPackageSets.stable.lix;
 
+    # TODO: Is this even needed with lix?
+    # extraOptions = ''
+    #   experimental-features = nix-command flakes
+    # '';
+
     # automatic cleanup
     gc = {
       automatic = true;

modules/generic/ssh.nix

@@ -0,0 +1,10 @@
+{...}: {
+  services.openssh = {
+    enable = true;
+    settings = {
+      PasswordAuthentication = false;
+      # TODO: Determine which user to allow!
+      AllowUsers = ["toph" "root"];
+    };
+  };
+}