1 files changed, 72 insertions, 60 deletions
diff --git a/hosts/common/optional/services/xorg.nix b/hosts/common/optional/services/xorg.nix
index 13d9144..e0150f4 100644
--- a/hosts/common/optional/services/xorg.nix
+++ b/hosts/common/optional/services/xorg.nix
@@ -1,47 +1,49 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
-  #environment.systemPackages = builtins.attrValues {
-  #  inherit (pkgs)
-  environment.systemPackages = with pkgs; [
-    evince
-    feh
-    gcr
-    geeqie
-    ghostty
-    gimp
-    #gimp-with-plugins
-    google-chrome
-    gv
-    inkscape
-    libreoffice
-    libva-utils
-    mesa-demos
-    mpv
-    polkit_gnome
-    rdesktop
-    read-edid
-    st
-    sxiv
-    tigervnc
-    turbovnc
-    vdpauinfo
-    vlc
-    vulkan-tools
-    wireshark
-    x11vnc
-    xclip
-    xdotool
-    xorg.appres
-    xorg.editres
-    xorg.xdpyinfo
-    xorg.xev
-    xscreensaver
-    xsnow
-    xterm#;
+  environment.systemPackages = [
+    pkgs.chafa
+    pkgs.evince
+    pkgs.feh
+    pkgs.gcr
+    pkgs.geeqie
+    pkgs.ghostty
+    pkgs.gimp
+    #pkgs.gimp-with-plugins
+    pkgs.google-chrome
+    pkgs.gv
+    pkgs.inkscape
+    pkgs.kdePackages.okular
+    pkgs.libreoffice
+    pkgs.libva-utils
+    pkgs.mesa-demos
+    pkgs.mpv
+    pkgs.polkit_gnome
+    pkgs.rdesktop
+    pkgs.read-edid
+    pkgs.st
+    pkgs.sxiv
+    pkgs.tigervnc
+    pkgs.turbovnc
+    pkgs.vdpauinfo
+    pkgs.vlc
+    pkgs.vulkan-tools
+    pkgs.wireshark
+    pkgs.x11vnc
+    pkgs.xclip
+    pkgs.xdotool
+    pkgs.xorg.appres
+    pkgs.xorg.editres
+    pkgs.xorg.xdpyinfo
+    pkgs.xorg.xev
+    pkgs.xscreensaver
+    pkgs.xsnow
+    pkgs.xterm
   ];
-  #};
 
-  programs.firefox.enable = true;
+  programs.firefox = {
+    enable = true;
+    package = pkgs.master.firefox;
+  };
 
   security.polkit = {
     enable = true;
@@ -63,27 +65,37 @@
     '';
   };
 
-  services.blueman.enable = true;
-  services.printing.enable = true;
-  services.displayManager.defaultSession = "xsession";
-  services.libinput.enable = true;
-  services.xserver = {
-    displayManager.lightdm = {
+  services = {
+    blueman.enable = true;
+    displayManager = lib.mkIf (config.networking.hostName != "fangorn") {
+      defaultSession = "xsession";
+    };
+    libinput.enable = true;
+    picom.enable = true;
+    printing.enable = true;
+    xserver = {
+      displayManager.lightdm = lib.mkMerge [
+        (lib.mkIf (config.networking.hostName == "fangorn") {
+          enable = true;
+        })
+        (lib.mkIf (config.networking.hostName != "fangorn") {
+          enable = true;
+          extraSeatDefaults = ''greeter-hide-users=true'';
+        })
+      ];
+  
+      displayManager.session = lib.mkIf (config.networking.hostName != "fangorn") [
+        {
+          manage = "desktop";
+          name = "xsession";
+          start = ''exec $HOME/.xsession'';
+        }
+      ];
+  
       enable = true;
-      extraSeatDefaults = ''greeter-hide-users=true'';
+      xkb.layout = "us";
+      xkb.options = "caps:super,compose:ralt";
     };
-
-    displayManager.session = [
-      {
-        manage = "desktop";
-        name = "xsession";
-        start = ''exec $HOME/.xsession'';
-      }
-    ];
-
-    enable = true;
-    xkb.layout = "us";
-    xkb.options = "caps:super,compose:ralt";
   };
 
   systemd = {