Add idefix config, optional xmonad, deprecate hidpi option

16 files changed, 52 insertions, 66 deletions

diff --git a/custom.nix b/custom.nix
index 38a0046..fc4d5df 100644
--- a/custom.nix
+++ b/custom.nix
@@ -6,11 +6,6 @@ let
 
 in {
   options.custom = {
-    hidpi = mkOption {
-      type = types.bool;
-      description = "Configure UI for high DPI displays";
-    };
-
     tasks = mkOption {
       type = types.attrsOf (types.submodule {
         options = {
diff --git a/gui/apps/file.nix b/gui/apps/file.nix
index e72ee8f..8ff49e2 100644
--- a/gui/apps/file.nix
+++ b/gui/apps/file.nix
@@ -36,7 +36,14 @@
       XDG_TEMPLATES_DIR="$HOME/"
       XDG_DESKTOP_DIR="$HOME/"
       XDG_DOWNLOAD_DIR="$HOME/downloads/"
+      XDG_DOCUMENTS_DIR="$HOME/"
+      XDG_MUSIC_DIR="$HOME/"
+      XDG_PICTURES_DIR="$HOME/"
+      XDG_PUBLICSHARE_DIR="$HOME/"
+      XDG_TEMPLATES_DIR="$HOME/"
+      XDG_VIDEOS_DIR="$HOME/"
     '';
+    file.".config/user-dirs.dirs".force = true;
   };
 
   xdg.mimeApps.defaultApplications = {
diff --git a/gui/apps/web.nix b/gui/apps/web.nix
index dc051d7..f7dfcbd 100644
--- a/gui/apps/web.nix
+++ b/gui/apps/web.nix
@@ -20,8 +20,10 @@
     "x-scheme-handler/https" = [ "firefox.desktop" ];
   };
 
-  programs.firefox.enable = true;
-  programs.chromium.enable = true;
+  programs = {
+    firefox.enable = true;
+    chromium.enable = true;
+  };
 
   services.syncthing.enable = true;
 }
diff --git a/gui/default.nix b/gui/default.nix
index 9d3593e..b052fb7 100644
--- a/gui/default.nix
+++ b/gui/default.nix
@@ -1,17 +1,14 @@
 { config, pkgs, ... }:
 
-let
-  hidpi = config.custom.hidpi;
-
-in {
+{
   imports = [
-    ./xmonad.nix
     ./kitty.nix
     ./emacs.nix
     ./email.nix
     ./zathura.nix
     ./htop.nix
     ./pass.nix
+    ./rofi.nix
 
   # applications grouped by purpose
     ./apps/file.nix
@@ -20,15 +17,17 @@ in {
   ];
 
   fonts.fontconfig.enable = true;
+  home.packages = with pkgs; [
+    iosevka
+  ];
+
+  qt = {
+    enable = true;
+    platformTheme = "gtk";
+  };
+
+  home.sessionVariables = {
+    QT_AUTO_SCREEN_SCALE_FACTOR = 0;
+  };
 
-# hidpi specific xorg flags
-  xresources.extraConfig = pkgs.lib.mkIf hidpi ''
-    Xft.dpi: 160
-    Xft.autohint: 0
-    Xft.lcdfilter: lcddefault
-    Xft.hintstyle: hintfull
-    Xft.hinting: 1
-    Xft.antialias: 1
-    Xft.rgba: rgb
-  '';
 }
diff --git a/gui/gtk.nix b/gui/gtk.nix
index 06e76c1..150fab0 100644
--- a/gui/gtk.nix
+++ b/gui/gtk.nix
@@ -1,9 +1,6 @@
 { config, pkgs, pkgs-personal, ... }:
 
-let
-  hidpi = config.custom.hidpi;
-
-in {
+{
   gtk = {
     enable = true;
 
@@ -28,7 +25,7 @@ in {
         txt_fg     = "101010";
         gradient   = 0.0;
         roundness  = 0;
-        spacing    = if hidpi then 5 else 1;
+        spacing    = 1;
         wm_border_focus   = "909636";
         wm_border_unfocus = "909636";
         gtk3_generate_dark = false;
diff --git a/gui/pass.nix b/gui/pass.nix
index 3c8331d..2318077 100644
--- a/gui/pass.nix
+++ b/gui/pass.nix
@@ -4,7 +4,7 @@ let
   emumenu = pkgs.writeTextFile {
     name        = "emumenu";
     executable  = true;
-    destination = "/bin/dmenu";
+    destination = "/bin/dmenu-wl";
 
     text = ''
       #!/usr/bin/env bash
@@ -23,7 +23,7 @@ let
       ${pkgs.pass}/bin/.passmenu-wrapped
     '';
   };
-  
+
 in {
   home.packages = [
     pkgs.pass
diff --git a/gui/qtile.nix b/gui/qtile.nix
index edbfe80..3d40bc7 100644
--- a/gui/qtile.nix
+++ b/gui/qtile.nix
@@ -1,9 +1,6 @@
 { config, pkgs, pkgs-unstable, ... }:
 
-let
-  hidpi = config.custom.hidpi;
-
-in {
+{
   imports = [
     ./gtk.nix
     ./rofi.nix
@@ -24,7 +21,7 @@ in {
     x11.enable = true;
     package = pkgs.vanilla-dmz;
     name    = "Vanilla-DMZ-AA";
-    size    = if hidpi then 48 else 16;
+    size    = 16;
   };
 
   home.packages = [
diff --git a/gui/rofi.nix b/gui/rofi.nix
index 9d4b3cc..422aa04 100644
--- a/gui/rofi.nix
+++ b/gui/rofi.nix
@@ -1,11 +1,6 @@
 { config, pkgs, ... }:
 
-let
-  hidpiExtraConfig = if config.custom.hidpi then {
-    dpi = 160;
-  } else { };
-
-in {
+{
   programs.rofi = {
     enable = true;
     location = "top";
@@ -34,6 +29,6 @@ in {
       combi-modi = "windowcd,drun,ssh";
       terminal = "kitty";
       ssh-command = "{terminal} {ssh-client} {host}";
-    } // hidpiExtraConfig;
+    };
   };
 }
diff --git a/gui/xmonad.nix b/gui/xmonad.nix
index 126948c..d0bd1f9 100644
--- a/gui/xmonad.nix
+++ b/gui/xmonad.nix
@@ -1,12 +1,8 @@
 { config, pkgs, ... }:
 
-let
-  hidpi = config.custom.hidpi;
-
-in {
+{
   imports = [
     ./gtk.nix
-    ./rofi.nix
     ./twmn.nix
   ];
 
@@ -28,7 +24,7 @@ in {
     x11.enable = true;
     package = pkgs.vanilla-dmz;
     name    = "Vanilla-DMZ-AA";
-    size    = if hidpi then 48 else 16;
+    size    = 16;
   };
 
   home.packages = with pkgs; [
diff --git a/gui/zathura.nix b/gui/zathura.nix
index b6270ca..dccac31 100644
--- a/gui/zathura.nix
+++ b/gui/zathura.nix
@@ -1,14 +1,11 @@
 { config, pkgs, ... }:
 
-let
-  hidpi = config.custom.hidpi;
-
-in {
+{
   programs.zathura = {
     enable = true;
 
     options = {
-      font = if hidpi then "Iosevka 28px" else "Iosevka 16px";
+      font = "Iosevka 16px";
 
       inputbar-fg   = "#161616";
       inputbar-bg   = "#909737";
diff --git a/host/asterix.nix b/host/asterix.nix
index 830a894..2d1e19d 100644
--- a/host/asterix.nix
+++ b/host/asterix.nix
@@ -11,6 +11,4 @@
   home.packages = with pkgs; [
     acpi
   ];
-
-  custom.hidpi = false;
 }
diff --git a/host/athena.nix b/host/athena.nix
index 8fc7357..b5e9b75 100644
--- a/host/athena.nix
+++ b/host/athena.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ../gui/default.nix
+    ../gui/xmonad.nix
     ../gui/networkmanager.nix
     ../gui/stalonetray.nix
     ../gui/redshift.nix
@@ -14,6 +15,4 @@
     arandr
     blueman
   ];
-
-  custom.hidpi = false;
 }
diff --git a/host/hephaestus.nix b/host/hephaestus.nix
index e7c9514..9410f15 100644
--- a/host/hephaestus.nix
+++ b/host/hephaestus.nix
@@ -3,12 +3,11 @@
 {
   imports = [
     ../gui/default.nix
+    ../gui/xmonad.nix
     ../gui/networkmanager.nix
     ../gui/stalonetray.nix
   ];
 
-  custom.hidpi = false;
-
   services.kdeconnect = {
     enable = true;
   };
diff --git a/host/idefix.nix b/host/idefix.nix
new file mode 100644
index 0000000..484f643
--- /dev/null
+++ b/host/idefix.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ../gui/default.nix
+  ];
+
+  home.packages = with pkgs; [
+    gnome3.gnome-tweaks
+  ];
+}
diff --git a/host/majestix.nix b/host/majestix.nix
index 26a17ea..f73a1c7 100644
--- a/host/majestix.nix
+++ b/host/majestix.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ../gui/default.nix
+    ../gui/xmonad.nix
   ];
-
-  custom.hidpi = false;
 }
diff --git a/host/obelix.nix b/host/obelix.nix
index f4717e8..35bf141 100644
--- a/host/obelix.nix
+++ b/host/obelix.nix
@@ -3,10 +3,9 @@
 {
   imports = [
     ../gui/default.nix
+    ../gui/xmonad.nix
   ];
 
-  custom.hidpi = false;
-
   custom.tasks = {
     "compustream_shell" = {
       description = "compustream dev shell";
@@ -14,8 +13,4 @@
       type = "local-shell";
     };
   };
-
-  services.kdeconnect = {
-    enable = true;
-  };
 }