modules: move remaining fina-specific configuration to pc and laptop

5 files changed, 28 insertions, 30 deletions

diff --git a/hosts/fina/default.nix b/hosts/fina/default.nix
index 130397f..c50c5dd 100644
--- a/hosts/fina/default.nix
+++ b/hosts/fina/default.nix
@@ -6,6 +6,7 @@
   imports = [
     ./hardware-configuration.nix
     "${self}/modules/core"
+    "${self}/modules/laptop"
     "${self}/modules/options"
     "${self}/modules/pc"
   ];
@@ -14,25 +15,10 @@
     modules.nix.extend = false;
     system.stateVersion = "24.05";
     networking.hostName = "fina";
-    programs.mtr.enable = true;
 
-    services = {
-      desktopManager.plasma6.enable = true;
-
-      displayManager.sddm = {
-        enable = true;
-        wayland.enable = true;
-      };
-
-      xserver.xkb = {
-        layout = "us";
-        options = "caps:escape";
-      };
-
-      openssh = {
-        enable = true;
-        settings.PermitRootLogin = "yes";
-      };
+    services.openssh = {
+      enable = true;
+      settings.PermitRootLogin = "yes";
     };
   };
 }
diff --git a/modules/desktop/software/programs.nix b/modules/desktop/software/programs.nix
index 7ebc4a1..8166baf 100644
--- a/modules/desktop/software/programs.nix
+++ b/modules/desktop/software/programs.nix
@@ -1,17 +1,5 @@
 { pkgs, ... }:
 {
-  programs = {
-    fish.enable = true;
-    mtr.enable = true;
-    dconf.enable = true;
-    ccache.enable = true;
-    fuse.userAllowOther = true;
-
-    bash.interactiveShellInit = ''
-      export HISTFILE="$XDG_STATE_HOME/bash/history"
-    '';
-  };
-
   environment.systemPackages = with pkgs; [
     pinentry
     runc
diff --git a/modules/laptop/default.nix b/modules/laptop/default.nix
new file mode 100644
index 0000000..f8f6172
--- /dev/null
+++ b/modules/laptop/default.nix
@@ -0,0 +1,10 @@
+{
+  services = {
+    desktopManager.plasma6.enable = true;
+
+    displayManager.sddm = {
+      enable = true;
+      wayland.enable = true;
+    };
+  };
+}
diff --git a/modules/pc/software/default.nix b/modules/pc/software/default.nix
index 6f21743..0f432d7 100644
--- a/modules/pc/software/default.nix
+++ b/modules/pc/software/default.nix
@@ -8,6 +8,7 @@
     ./services
     ./encryption.nix
     ./input.nix
+    ./programs.nix
     ./shell.nix
     ./users.nix
   ];
diff --git a/modules/pc/software/programs.nix b/modules/pc/software/programs.nix
new file mode 100644
index 0000000..2868d9a
--- /dev/null
+++ b/modules/pc/software/programs.nix
@@ -0,0 +1,13 @@
+{
+  programs = {
+    fish.enable = true;
+    mtr.enable = true;
+    dconf.enable = true;
+    ccache.enable = true;
+    fuse.userAllowOther = true;
+
+    bash.interactiveShellInit = ''
+      export HISTFILE="$XDG_STATE_HOME/bash/history"
+    '';
+  };
+}