From b9bfb14bad7e10fbec4e76e66852f23521b0c4ed Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 15:31:18 +0200 Subject: [PATCH 1/5] fonts.nix: remove custom font building this takes a truly stupid amount of resources --- modules/style/fonts.nix | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/modules/style/fonts.nix b/modules/style/fonts.nix index 18727cb..46bad17 100644 --- a/modules/style/fonts.nix +++ b/modules/style/fonts.nix @@ -1,24 +1,5 @@ {pkgs, ...}: let inherit (builtins) mapAttrs; - valiosevka = pkgs.iosevka.override { - privateBuildPlan = { - family = "valiosevka"; - spacing = "normal"; - serifs = "sans"; - noCvSs = true; - exportGlyphNames = false; - - ligations.inherits = "dlig"; - variants = { - inherits = "ss15"; - design = { - e = "flat-crossbar"; - f = "diagonal-tailed-crossbar-at-x-height"; - }; - }; - }; - set = "Fancy"; - }; in { # A (somewhat) sane list of fonts to be installed. fonts = { @@ -73,7 +54,6 @@ in { comic-shanns-mono symbols-only ; - inherit valiosevka; }; fontDir = { # Whether to create a directory with links to all fonts in From b4c1c7891a91f8f9db387339a0cb4668e72e0780 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 15:31:18 +0200 Subject: [PATCH 2/5] foot.nix: cleanup --- modules/programs/gui/foot.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/programs/gui/foot.nix b/modules/programs/gui/foot.nix index 8677994..8aed3ea 100644 --- a/modules/programs/gui/foot.nix +++ b/modules/programs/gui/foot.nix @@ -17,10 +17,8 @@ title = "foot"; locked-title = "no"; - font = "valiosevka:size=14"; - font-bold = "valiosevka:size=14"; - # font = "Iosevka Nerd Font:size=14"; - # font-bold = "Iosevka Nerd Font:size=14"; + font = "Iosevka Nerd Font:size=14"; + font-bold = "Iosevka Nerd Font:size=14"; line-height = 20; letter-spacing = 0; From 2b045992c1e496b22179f31232098b7fb18d46ea Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 15:31:18 +0200 Subject: [PATCH 3/5] thunar/module.nix: add {enableOption, gvfs, file-roller, thumbnails} --- modules/programs/gui/thunar/module.nix | 46 +++++++++++++++++--------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/modules/programs/gui/thunar/module.nix b/modules/programs/gui/thunar/module.nix index 7a829d0..0937764 100644 --- a/modules/programs/gui/thunar/module.nix +++ b/modules/programs/gui/thunar/module.nix @@ -3,21 +3,37 @@ lib, pkgs, ... -}: { - programs.thunar = { - enable = true; - plugins = builtins.attrValues { - inherit - (pkgs.xfce) - thunar-volman - thunar-vcs-plugin - thunar-archive-plugin - thunar-media-tags-plugin - ; +}: let + inherit (lib.modules) mkIf; + inherit (lib.options) mkEnableOption; + cfg = config.modules.programs.thunar; +in { + options.modules.programs.thunar.enable = mkEnableOption "Thunar file manager"; + config = mkIf cfg.enable { + programs.thunar = { + enable = true; + plugins = builtins.attrValues { + inherit + (pkgs.xfce) + thunar-volman + thunar-vcs-plugin + thunar-archive-plugin + thunar-media-tags-plugin + ; + }; }; - }; - services.gvfs = { - enable = true; - package = pkgs.gvfs; + services.gvfs = { + enable = true; + package = pkgs.gvfs; + }; + + # Archive management + programs.file-roller = { + enable = true; + package = pkgs.file-roller; + }; + + # image thumbnails + services.tumbler.enable = true; }; } From 7ccea14afbe7ca9d18db07ce84f6c3e2fd5f3dba Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 15:31:18 +0200 Subject: [PATCH 4/5] {temperance, hermit}/configuration.nix: enable thunar --- hosts/hermit/configuration.nix | 1 + hosts/temperance/configuration.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix index a33bdc4..ef3a6a6 100644 --- a/hosts/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -69,6 +69,7 @@ ssh.enable = true; btop.enable = true; nh.enable = true; + thunar.enable = true; }; }; system.stateVersion = "23.11"; diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix index cfc2982..a3a09dc 100644 --- a/hosts/temperance/configuration.nix +++ b/hosts/temperance/configuration.nix @@ -91,6 +91,7 @@ in { ssh.enable = true; btop.enable = true; nh.enable = true; + thunar.enable = true; }; }; } From e0fb4b8903408bd2052d2d36c076bf470ce82e53 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 15:31:18 +0200 Subject: [PATCH 5/5] services: move .nix files into their own dirs --- .../services/{firewall.nix => firewall/module.nix} | 0 modules/services/{greetd.nix => greetd/module.nix} | 0 modules/services/{locate.nix => locate/module.nix} | 0 modules/services/{mako.nix => mako/module.nix} | 0 modules/services/module.nix | 11 ----------- modules/services/{mpd.nix => mpd/module.nix} | 0 .../services/{pipewire.nix => pipewire/module.nix} | 0 modules/services/{ssh.nix => ssh/module.nix} | 0 8 files changed, 11 deletions(-) rename modules/services/{firewall.nix => firewall/module.nix} (100%) rename modules/services/{greetd.nix => greetd/module.nix} (100%) rename modules/services/{locate.nix => locate/module.nix} (100%) rename modules/services/{mako.nix => mako/module.nix} (100%) delete mode 100644 modules/services/module.nix rename modules/services/{mpd.nix => mpd/module.nix} (100%) rename modules/services/{pipewire.nix => pipewire/module.nix} (100%) rename modules/services/{ssh.nix => ssh/module.nix} (100%) diff --git a/modules/services/firewall.nix b/modules/services/firewall/module.nix similarity index 100% rename from modules/services/firewall.nix rename to modules/services/firewall/module.nix diff --git a/modules/services/greetd.nix b/modules/services/greetd/module.nix similarity index 100% rename from modules/services/greetd.nix rename to modules/services/greetd/module.nix diff --git a/modules/services/locate.nix b/modules/services/locate/module.nix similarity index 100% rename from modules/services/locate.nix rename to modules/services/locate/module.nix diff --git a/modules/services/mako.nix b/modules/services/mako/module.nix similarity index 100% rename from modules/services/mako.nix rename to modules/services/mako/module.nix diff --git a/modules/services/module.nix b/modules/services/module.nix deleted file mode 100644 index b874528..0000000 --- a/modules/services/module.nix +++ /dev/null @@ -1,11 +0,0 @@ -_: { - imports = [ - ./pipewire.nix - ./locate.nix - ./ssh.nix - ./greetd.nix - ./mako.nix - ./mpd.nix - ./firewall.nix - ]; -} diff --git a/modules/services/mpd.nix b/modules/services/mpd/module.nix similarity index 100% rename from modules/services/mpd.nix rename to modules/services/mpd/module.nix diff --git a/modules/services/pipewire.nix b/modules/services/pipewire/module.nix similarity index 100% rename from modules/services/pipewire.nix rename to modules/services/pipewire/module.nix diff --git a/modules/services/ssh.nix b/modules/services/ssh/module.nix similarity index 100% rename from modules/services/ssh.nix rename to modules/services/ssh/module.nix