summaryrefslogtreecommitdiff
path: root/host
diff options
context:
space:
mode:
authorAdrian Kummerlaender2022-10-15 22:44:28 +0200
committerAdrian Kummerlaender2022-10-15 22:44:28 +0200
commitb6a13bc765523a71a3713b4ace54c09c4c05f61d (patch)
treeeddc53782aae9b3b9b2b16b0551f82de2da2961c /host
parent276ad1973e20c6af5d5ff13925342ac1f602c065 (diff)
downloadnixos_system-b6a13bc765523a71a3713b4ace54c09c4c05f61d.tar
nixos_system-b6a13bc765523a71a3713b4ace54c09c4c05f61d.tar.gz
nixos_system-b6a13bc765523a71a3713b4ace54c09c4c05f61d.tar.bz2
nixos_system-b6a13bc765523a71a3713b4ace54c09c4c05f61d.tar.lz
nixos_system-b6a13bc765523a71a3713b4ace54c09c4c05f61d.tar.xz
nixos_system-b6a13bc765523a71a3713b4ace54c09c4c05f61d.tar.zst
nixos_system-b6a13bc765523a71a3713b4ace54c09c4c05f61d.zip
Extract xterm desktop session, setup gnome for idefix
Diffstat (limited to 'host')
-rw-r--r--host/athena.nix1
-rw-r--r--host/hephaestus.nix1
-rw-r--r--host/idefix.nix26
-rw-r--r--host/majestix.nix1
-rw-r--r--host/software/desktop/default.nix4
-rw-r--r--host/software/desktop/xterm.nix8
6 files changed, 35 insertions, 6 deletions
diff --git a/host/athena.nix b/host/athena.nix
index 8f74c51..9b28e5c 100644
--- a/host/athena.nix
+++ b/host/athena.nix
@@ -4,6 +4,7 @@
imports = [
./hardware/athena.nix
./software/desktop
+ ./software/desktop/xterm.nix
];
boot = {
diff --git a/host/hephaestus.nix b/host/hephaestus.nix
index 6aca093..6a674bc 100644
--- a/host/hephaestus.nix
+++ b/host/hephaestus.nix
@@ -4,6 +4,7 @@
imports = [
./hardware/hephaestus.nix
./software/desktop
+ ./software/desktop/xterm.nix
./software/desktop/teensy.nix
];
diff --git a/host/idefix.nix b/host/idefix.nix
index 80711f2..017aa1d 100644
--- a/host/idefix.nix
+++ b/host/idefix.nix
@@ -4,7 +4,6 @@
imports = [
./hardware/idefix.nix
./software/desktop
- ./software/desktop/gnome.nix
];
console.keyMap = pkgs.lib.mkForce "us";
@@ -21,7 +20,6 @@
upower.enable = true;
acpid.enable = true;
blueman.enable = true;
- xserver.libinput.enable = true;
};
powerManagement.powertop.enable = true;
@@ -29,8 +27,32 @@
services.xserver = {
layout = pkgs.lib.mkForce "us";
xkbVariant = pkgs.lib.mkForce "";
+
+ libinput.enable = true;
+
+ displayManager.gdm.enable = true;
+ desktopManager.gnome.enable = true;
};
+ environment.gnome.excludePackages = (with pkgs; [
+ gnome-photos
+ gnome-tour
+ ]) ++ (with pkgs.gnome; [
+ cheese
+ gnome-music
+ simple-scan
+ geary
+ tali
+ iagno
+ hitori
+ atomix
+ ]);
+
+ environment.systemPackages = with pkgs.gnomeExtensions; [
+ gesture-improvements
+ pop-shell
+ ];
+
networking.wireguard.interfaces = {
wg0 = {
ips = [ "10.100.0.8/24" ];
diff --git a/host/majestix.nix b/host/majestix.nix
index ce839b1..b593687 100644
--- a/host/majestix.nix
+++ b/host/majestix.nix
@@ -4,6 +4,7 @@
imports = [
./hardware/majestix.nix
./software/desktop
+ ./software/desktop/xterm.nix
./software/server/runner.nix
];
diff --git a/host/software/desktop/default.nix b/host/software/desktop/default.nix
index 3bf68c1..da15c8f 100644
--- a/host/software/desktop/default.nix
+++ b/host/software/desktop/default.nix
@@ -37,11 +37,7 @@
enable = true;
user = "common";
};
-
- lightdm.enable = true;
};
-
- desktopManager.xterm.enable = true;
};
gvfs.enable = true;
diff --git a/host/software/desktop/xterm.nix b/host/software/desktop/xterm.nix
new file mode 100644
index 0000000..b5c012f
--- /dev/null
+++ b/host/software/desktop/xterm.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+
+{
+ services = {
+ xserver.lightdm.enable = true;
+ desktopManager.xterm.enable = true;
+ };
+}