summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/desktop/software/programs.nix12
-rw-r--r--modules/laptop/default.nix10
-rw-r--r--modules/pc/software/default.nix1
-rw-r--r--modules/pc/software/programs.nix13
4 files changed, 24 insertions, 12 deletions
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"
+ '';
+ };
+}