From 63d15b50adcdf17ee2055eb22d06c1d03c6fecd9 Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Tue, 1 Oct 2024 06:09:02 -0700
Subject: modules: move remaining fina-specific configuration to pc and laptop

---
 modules/desktop/software/programs.nix | 12 ------------
 modules/laptop/default.nix            | 10 ++++++++++
 modules/pc/software/default.nix       |  1 +
 modules/pc/software/programs.nix      | 13 +++++++++++++
 4 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 modules/laptop/default.nix
 create mode 100644 modules/pc/software/programs.nix

(limited to 'modules')

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"
+    '';
+  };
+}
-- 
cgit v1.2.3