From 54ffe2e375a7113f8f48b0fd34a15a2718a65539 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 13 Sep 2025 17:44:14 +0200 Subject: [PATCH 01/11] feat: adds `fff` package --- modules/home/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 62c82ad..b9e2bcc 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -31,6 +31,7 @@ python3 # CLI shit + fff imagemagick foot termpdfpy From dd430bbe4a6a39d9339c296fcc2ca165c2480526 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 13 Sep 2025 17:44:59 +0200 Subject: [PATCH 02/11] feat: adds `scientifica` font --- modules/home/fonts.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/fonts.nix b/modules/home/fonts.nix index f0a2a97..93abc8a 100644 --- a/modules/home/fonts.nix +++ b/modules/home/fonts.nix @@ -1,6 +1,7 @@ { pkgs, ... }: { home.packages = with pkgs; [ + scientifica # nerd-fonts._0xproto # nerd-fonts._3270 # nerd-fonts.agave From cfe2e227b30726837d7ee9a42754a5f70fbaa01f Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 13 Sep 2025 17:47:13 +0200 Subject: [PATCH 03/11] chore: re-enable `displaylink` --- modules/core/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/default.nix b/modules/core/default.nix index 10c17fa..f4d87d3 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -3,7 +3,7 @@ imports = [ (import ./docker.nix) ] ++ [ (import ./hardware.nix) ] - # ++ [(import ./displaylink.nix)] + ++ [ (import ./displaylink.nix) ] # ++ [(import ./printing.nix)] ++ [ (import ./xserver.nix) ] ++ [ (import ./network.nix) ] From ddbca9dbd99015443c92a993a1978e40d625e5a5 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 13 Sep 2025 17:47:35 +0200 Subject: [PATCH 04/11] feat: adds `fprintd` for zinnia as well --- modules/core/yubikey.nix | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/modules/core/yubikey.nix b/modules/core/yubikey.nix index 36080f0..cb26b94 100644 --- a/modules/core/yubikey.nix +++ b/modules/core/yubikey.nix @@ -21,14 +21,32 @@ login.u2fAuth = true; greetd.u2fAuth = true; sudo.u2fAuth = true; - swaylock.fprintAuth = if (host == "sakura") then true else false; + swaylock.fprintAuth = + if (host == "sakura") then + true + else if (host == "zinnia") then + true + else + false; # No longer using Hyprlock, might stay here for if I ever switch to it again. hyprlock.u2fAuth = true; - hyprlock.fprintAuth = if (host == "sakura") then true else false; + hyprlock.fprintAuth = + if (host == "sakura") then + true + else if (host == "zinnia") then + true + else + false; }; }; - services.fprintd.enable = if (host == "sakura") then true else false; + services.fprintd.enable = + if (host == "sakura") then + true + else if (host == "zinnia") then + true + else + false; environment.systemPackages = with pkgs; [ yubikey-manager From 9dd9083a37fc157f9889611123fb73ae8e8acbce Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 13 Sep 2025 17:48:15 +0200 Subject: [PATCH 05/11] feat: adds `scientifica` --- modules/home/fonts.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/fonts.nix b/modules/home/fonts.nix index f0a2a97..93abc8a 100644 --- a/modules/home/fonts.nix +++ b/modules/home/fonts.nix @@ -1,6 +1,7 @@ { pkgs, ... }: { home.packages = with pkgs; [ + scientifica # nerd-fonts._0xproto # nerd-fonts._3270 # nerd-fonts.agave From 535780048ea303c74df8fa4faef37953090ee399 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 13 Sep 2025 18:12:47 +0200 Subject: [PATCH 06/11] chore: adds config for `foot` --- modules/home/foot.nix | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 modules/home/foot.nix diff --git a/modules/home/foot.nix b/modules/home/foot.nix new file mode 100644 index 0000000..8fb8829 --- /dev/null +++ b/modules/home/foot.nix @@ -0,0 +1,48 @@ +{ pkgs, username, ... }: +{ + home.file."/home/${username}.config/foot/foot.ini" = '' + # -*- conf -*- + + # font=GohuFont 14 Nerd Font Mono:size=9 + initial-window-mode=maximized + # [tweak] + # allow-overflowing-double-width-glyphs=true + + [desktop-notifications] + # command=notify-send --wait --app-name $\{app-id} --icon $\{app-id} --category $\{category} --urgency $\{urgency} --expire-time $\{expire-time} --hint STRING:image-path:$\{icon} --hint BOOLEAN:suppress-sound:$\{muted} --hint STRING:sound-name:$\{sound-name} --replace-id $\{replace-id} $\{action-argument} --print-id -- $\{title} $\{body} + # command-action-argument=--action $\{action-name}=$\{action-label} + # close="" + # inhibit-when-focused=yes + + [cursor] + style=block + + [colors] + alpha=0.5 + + background=000000 + foreground=878ba6 + flash=7f7f00 + flash-alpha=0.5 + + ## Normal/regular colors (color palette 0-7) + regular0=1e202f # black + regular1=7586f5 # red + regular2=fb6fa9 # green + regular3=ffb3d2 # yellow + regular4=8696fd # blue + regular5=fb6fa9 # magenta + regular6=a0acfe # cyan + regular7=878ba6 # white + + ## Bright colors (color palette 8-15) + bright0=4f5472 # bright black + bright1=fe81b5 # bright red + bright2=292c3d # bright green + bright3=444864 # bright yellow + bright4=5b6080 # bright blue + bright5=d2d8fe # bright magenta + bright6=f764a1 # bright cyan + bright7=ebedff # bright white + ''; +} From b31f9615ebe514e4b235ee6982e4dab1edfc2f2b Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 13 Sep 2025 18:13:03 +0200 Subject: [PATCH 07/11] chore: adds `terminfo` for `foot` --- roles/server.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/server.nix b/roles/server.nix index 7eb2f8a..5a81e7d 100644 --- a/roles/server.nix +++ b/roles/server.nix @@ -17,7 +17,8 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - pkgs.kitty.terminfo + kitty.terminfo + foot.terminfo powertop ]; From 6c6c3a86522e80bbd7b97696758864089eac0b81 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 13 Sep 2025 18:13:14 +0200 Subject: [PATCH 08/11] chore: enables `foot` --- modules/home/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/default.nix b/modules/home/default.nix index 96bcd35..8e47e1e 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -7,6 +7,7 @@ ++ [ (import ./hyprland) ] ++ [ (import ./hyprlock) ] ++ [ (import ./kitty.nix) ] + ++ [ (import ./foot.nix) ] ++ [ (import ./nvim.nix) ] ++ [ (import ./zathura.nix) ] ++ [ (import ./packages.nix) ] From 104d10f7b30aa260731a6d08cf3b8fc823f2b87b Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 13 Sep 2025 18:14:29 +0200 Subject: [PATCH 09/11] chore: no longer use `xserver` for login; will write a `zsh` function for this shortly --- modules/core/xserver.nix | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/core/xserver.nix b/modules/core/xserver.nix index 3e35c27..57fc11a 100644 --- a/modules/core/xserver.nix +++ b/modules/core/xserver.nix @@ -1,20 +1,20 @@ -{ username, ... }: +{ username, ... }: { - services = { - xserver = { - enable = true; - xkb.layout = "us"; - # displayManager.lightdm.greeters.slick.enable = true; - displayManager.lightdm.greeters.mini = { - enable = true; - user = "liv"; - extraConfig = '' - [greeter] - show-password-label = false - [greeter-theme] - background-image = "/home/liv/Pictures/wallpapers/others/anime-sky-lonely.png" - ''; - }; - }; - }; + #services = { + # xserver = { + # enable = true; + # xkb.layout = "us"; + # displayManager.lightdm.greeters.slick.enable = true; + # #displayManager.lightdm.greeters.mini = { + # # enable = true; + # # user = "liv"; + # # extraConfig = '' + # # [greeter] + # # show-password-label = false + # # [greeter-theme] + # # background-image = "/home/liv/Pictures/wallpapers/others/anime-sky-lonely.png" + # # ''; + # #}; + # }; + #}; } From cceceb35c7553732fe69e75533470ada519cd355 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 13 Sep 2025 20:03:52 +0200 Subject: [PATCH 10/11] chore(temp): comment out gestures for `hyprland` as they broke --- modules/home/hyprland/config.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index 69fb5b9..b8966c2 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -99,10 +99,10 @@ }; }; - gestures = { - workspace_swipe = true; - workspace_swipe_invert = true; - }; + #gestures = { + # workspace_swipe = true; + # workspace_swipe_invert = true; + #}; general = { "$mainMod" = "ALT"; From 73d770fe575f4ff1b4b612fdf0bb94a13c1a497d Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 13 Sep 2025 20:04:09 +0200 Subject: [PATCH 11/11] fix: use correct type for foot config --- modules/home/foot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/foot.nix b/modules/home/foot.nix index 8fb8829..bac074f 100644 --- a/modules/home/foot.nix +++ b/modules/home/foot.nix @@ -1,6 +1,6 @@ { pkgs, username, ... }: { - home.file."/home/${username}.config/foot/foot.ini" = '' + home.file."/home/${username}.config/foot/foot.ini".text = '' # -*- conf -*- # font=GohuFont 14 Nerd Font Mono:size=9