From d8704de501aacbf5aa6e4ee59c59a2c76849d76f Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 25 Sep 2025 07:20:36 +0000 Subject: [PATCH 01/21] wsl adjustments --- nixos-wsl.nix | 5 +++-- shell-only.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos-wsl.nix b/nixos-wsl.nix index dc484cd..191a2a6 100644 --- a/nixos-wsl.nix +++ b/nixos-wsl.nix @@ -2,15 +2,16 @@ { imports = [ inputs.nixos-wsl.nixosModules.default - ./system-modules/users.nix - ./system-modules/gc.nix + ./system-modules/base-packages.nix ./system-modules/docker.nix + ./system-modules/gc.nix ./system-modules/gpg.nix ./system-modules/networking.nix ./system-modules/nixd.nix # ./system-modules/sops.nix # ./system-modules/sshd.nix # ./system-modules/syncthing.nix + ./system-modules/users.nix ]; system.stateVersion = pkgs.version; # system.stateVersion = "24.11"; diff --git a/shell-only.nix b/shell-only.nix index bf972ea..4f29f55 100644 --- a/shell-only.nix +++ b/shell-only.nix @@ -31,7 +31,7 @@ home.username = hyper.user; # home.homeDirectory = hyper.home; # for some reason you cant use hyper.home here home.homeDirectory = "/home/${hyper.user}"; - home.stateVersion = pkgs.version; + home.stateVersion = hyper.pkgs-version; xdg = { enable = true; configHome = "${hyper.home}/.config"; From 511dac22a828b04ba7baba09498cce2eca821d2d Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 25 Sep 2025 07:23:33 +0000 Subject: [PATCH 02/21] wsl manages resolv.conf --- system-modules/networking.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/system-modules/networking.nix b/system-modules/networking.nix index 246a0f5..0b43ad8 100644 --- a/system-modules/networking.nix +++ b/system-modules/networking.nix @@ -1,11 +1,6 @@ -{ config, pkgs, ... }@all: with all; -{ - # sops.secrets = { - # "wireless-networking.env" = {}; - # }; - +{ config, pkgs, ... }@all: with all; { networking = { - nameservers = [ + nameservers = pkgs.lib.mkIf (hyper.host != "NxWSL") [ # wsl manages resolv.conf "1.1.1.1" "8.8.8.8" ]; From fa168f01a6c3d5d2137b5d6b131370b9fadc1e98 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 25 Sep 2025 08:03:24 +0000 Subject: [PATCH 03/21] nxf robustness --- home-modules/fish.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-modules/fish.nix b/home-modules/fish.nix index e6a721e..07b33b4 100644 --- a/home-modules/fish.nix +++ b/home-modules/fish.nix @@ -20,12 +20,12 @@ " | lolcat --force 2> /dev/null) msg=" - $(echo -e "$logo" | sed -n 3p): $(cat /etc/*-release | grep PRETTY_NAME | cut -c 14- | rev | cut -c 2- | rev) + $(echo -e "$logo" | sed -n 3p): $(cat /etc/*-releas 2> /dev/null || echo 'PRETTY_NAME="[No Release]"' | grep PRETTY_NAME | cut -c 14- | rev | cut -c 2- | rev) $(echo -e "$logo" | sed -n 4p): ''${XDG_CURRENT_DESKTOP^} $(echo -e "$logo" | sed -n 5p): ''${TERM^} $(echo -e "$logo" | sed -n 6p): $(bash --version | head --lines 1 | cut -f -4 -d' ' | sed -E 's-(.*?), version (.*?)\(.*-\1 \2-g') $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev | sed 's/./\U&/') - $(echo -e "$logo" | sed -n 8p): ''$(uname -r) + $(echo -e "$logo" | sed -n 8p): ''$(uname -r | sed -E 's=(.+-.+-.+-.+)-.+=\1=g') $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g' | sed 's/./\U&/') $(echo -e "$logo" | sed -n 10p): $(yazi --version | sed -E 's-(.*?) \(.*-\1-g') $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1 | sed 's/./\U&/') @@ -112,7 +112,7 @@ ''; nx_backup = let destination = if hyper.host == "NxNORTH" then "${hyper.home}/shared/" else "${hyper.home}/backups/"; - in pkgs.lib.mkIf (hyper.host != "NxACE") '' + in pkgs.lib.mkIf (hyper.host != "NxACE" && hyper.host != "NxWSL") '' set RPATH (curl -s https://${hyper.domain}/latest-backup) rsync -avz --info=progress2 -e "ssh -p ${builtins.toString secrets.ssh.port}" ${hyper.user}@ssh.${hyper.domain}:"$RPATH" ${destination} ''; From aa6962cb0defde543ef4f4d84e6893f71e030d66 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:02:32 +0200 Subject: [PATCH 04/21] twitch oauth chatterino --- git-crypt/secrets.nix | Bin 3552 -> 3552 bytes home-modules/spotify.nix | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 home-modules/spotify.nix diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix index ef17bb3b8f964d0e4ffafb641be5905a32ba7a7e..63bb135e31ba0055984f90a031f5a5574fa8ca6b 100644 GIT binary patch literal 3552 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 Oou1B^AODMO>SO>>vIBtt literal 3552 zcmZQ@_Y83kiVO&0xZ8I0RKMCmU$>1b*bKzZFaMPMy);9&S>$Kc4n6kZQk^ds_L(v% z^f+W*vtE{N`)jY0;EFpNCumuQ1ZJN<^=!w1)vT(=r@Z|hrlVlhb@X4em&a|X6VrpgMp+K-8wT@G1XZaiJeBd4zN^tMFi&z=AS z&repXHm$Xa5Y*XxW<&ez1Gl7}wckJfa>`ZHt%b&Bp*z2dKWCGju=RLf^>cx0!JJ&NsFOqt^dCIwyvL3}2=PEYveL2SQxzkgA+MFdNM{TSq(d2!d)m)SHoskW>*ryw$D6r>?=Sf}|7+j{`I1k! zw^V$~?U`s`>U=n{dGNa4Vf%pE&bttXTi+~@9IyKIS{yiTI}iB~`W zS8zJcee>?m4{w7?jw88S&zna4-s-5I|6OUSY`t~-shuY8yquf^9%jCipOSa8YwOY1 z*>WKh1S{t9Nvy05z2wmtx?(end1qJpr6SkKzJpU~&cbc~{Xo{46*);Y3 z>$BkrUTM9z6@?e(o2;6uDLqr#WSXPh-nZwSrp`Nf z$;tDx^6AQg@TXdOJ8tj5zX&(|#UaPU>=Z>ojOP&NqtV()#C;rs_73QhmKVCcMm^Vdg zmW6bpUSR{nmiR*(RP--|PTx@G$am~-^ZM@*e-B+yJhC@2VQqO*2iI7Kx(IDMJ)T#Ge=ww{f>Oj;FkQsYu=>a(@!m`Te|rFu1Qx_&f9*;`<63zY484B z3Ul2{`KF$mKez7Ot4$wyXA}f_*GqkOi71n}x%E|t;Ns=mg(GO9j7*j*>$yJghD z&Tm#&m=wfJ0!|w9e-#iXJ^%?p_KbF%PlAEci-WdpuSgWD$RQFtUK6` ziE1gVI5lBO8J|z&L$+6c&rC`c>#fYVG~J7RYi9kvh$9^79E*0WW_mLx{$v>A)PIdv zrJ95Tov&q8eY1S9de5m@i}>@O8SwnAT%PrS^ZWF>-3755awWFD*!JM+lltgcjlW&f z%ziO#xv)anaq-ht1~(1jmK$%5{Bfbk(@3sP>32xw_4M{lw<2b+?Bb&maVr?k@;M4PdErsdNl@Dp!uUwiRdO1vg zifJqF8i_Znc9qwi)z7e3T-eP1*7M4qZhph~KBoOSn^)GU$_HlE1?}Cca(&wx#XlU; zE9*{Nut+Q@&rtg};lkZCiS|XuSq-#SvcCRpAm;iiV^QYLV-wb`SpCqj$A9{o#myF? z6RzLbVY+qm=1B4870K!>796|(FwV<=v8!+AVv!qfb$Zfkt+vfv+`#qTM>AJoV1v>kn&LLcOLmnaxV@ckfzedqncJjLh){mAm`;mCWnwW=PDI zZ2hcs&rk5aRVp=t_3g4|;t5R9KcDd36%TEr+ z9xiogYG^tsot|&N%&~u^ztDr>aWcPJc8puVMIi3{DY4gITDL4dXX_@q+RTB0A=RSpyh{E? z8}6H>Nj=TecJ`}3zTIG#^w;a~j3RqMui3fpbQ)z>{A{mwcE98FNabSDs)+sWZ@X#~ zmo*<)>ATKocjgWKO}$-PTFd3T-?w*fe${@o@bJb-Xs>w6<^iyzoukr_J7LzS}Yuxh#EMed$HF zCbL8Pt@E}iwNkl??K@I$C^Oyo@_g#6d%}~PzAEv?x7u%upK)l}`l=b%YwHk)&MA!EDh7E=5A9?XZ=SGGzbqp2P{yWU)i&mZZxV_+cVAsQ z*W=dPo!rlRjkbJ!(WX9M`JwSXW9yy?;(}ka-@m-sZ!+=6{} zEqneM)%6dhqzg6}tc|nO6S$YZiNCX4=Gz@tCZBgI9_y_qDR%HI4CFz)6HPiN<{VX!wT{JDJedquAB?}lF?q84czR$Gq zmgdU$_kE}DJuS3Nt-e`--&yHg$fN3l>aEOuyWd=Ccq}ivQ+d(P{56*T>lrUil(JNb zvS$Ay^m73-+k@Vve?0%TyR2U!c%KUpa(!~Ef@t(;U> z&gS3B()yR*>ON_jkhJB@_p96-7yn-uyTSiMDCZe#xiEJ{xg5v#f36ma@ujI5{>oN4 zzE=7>!k$jva>Spt;qaZh1& z_r3Px!r6>~8%L-A&B-TAx#^iBRcbFNVGN7mO*XS|=2SUpiDI8i)j`}CIq`h7-?8=kD* zQE0ExHreiP%TorEy-E_V;=B*sHL+MH;v?K&W8AWIp_tH$dV`$!7bz|U^^VbkN4Yg# zHpM(Waa!xqrFXJg>T3>G^Kaw&v}9ux-|CEe2^Zc6Y}UTyyyw(pRwYlip5sc&C1o{P z+n-#>+Imv1NM8Qt@~3zD7W00ywSPD_;dG8kzE02A6RY}mMwsV?mNhgQl+Yl3C%{PeI_rdl#3n z)|vlC+{cr7`+g`~dcxqm<}t&ZwBF0cr*c(KUCjG*TV}Spl$65q?*$UCmBTnsC7e?+ zWt}J4GD-U2`_rnL+!MY;8-DwFw_JahSf9W$weZEgoAomtu0Nlf=*xMe{On@Q3$i^6 zIgWaX*EMWWzPIy{_CdzAI+ZeNkFU#}6z^1+l~j7Xf5B#UEvFT+xgVo%#Hf6&rLNi zTKI$&&9Um1KQS-zxm+kFm-U*z1mUgalZ#UPJe5G}AsU5P)59$p$stvy9 zmYissP|PTO`0M|ZuYMlo-mjiF&%!<~b^W_Fj~f``_b2kIZP>+SV*IVp#Wf^E-6FzC-%L#l?d6U*Gz&%YVhg`5dfm zHY~!S*&^Rg8;2!sy_=R$`g-A-Pt$KKXnJR$ahc`9n8R6}{U;29{_KBR<7CQu_NKX{ zg>l#Cz4qp3T`trH+26F|33~0Dwe8$oo?N+qtmcfKWtX;{+`8}1rf<^P+nzSd2WMn1 zixOB7y8Ga#a6he|O>8&fc9;d9=`Gb2W1MpKmw@i=)XJ|c4vZ%^gzP%FMEiqkMXk(K Ijs{g<0JXvEga7~l diff --git a/home-modules/spotify.nix b/home-modules/spotify.nix new file mode 100644 index 0000000..09fb1ca --- /dev/null +++ b/home-modules/spotify.nix @@ -0,0 +1,29 @@ +{ pkgs, ... }@all: with all; +{ + home = { + programs.spotify-player = { + enable = true; + settings = { + theme = "default"; + # border_type = "Rounded"; + progress_bar_type = "Line"; + playback_window_position = "Bottom"; + play_icon = ""; + pause_icon = ""; + liked_icon = ""; + copy_command = { + command = "wl-copy"; + args = [ ]; + }; + # client_id = "65b708073fc0480ea92a077233ca87bd"; + client_port = 8888; + ap_port = 443; + device = { + audio_cache = true; + normalization = true; + volume = 50; + }; + }; + }; + }; +} From ea3d4937ffbce4973a318c1f0eccc13d6d8a2ee3 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:02:55 +0200 Subject: [PATCH 05/21] hyprpanel fix caldav_event polling --- home-modules/bar/hyprpanel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-modules/bar/hyprpanel.nix b/home-modules/bar/hyprpanel.nix index 128719d..92015cf 100644 --- a/home-modules/bar/hyprpanel.nix +++ b/home-modules/bar/hyprpanel.nix @@ -27,7 +27,7 @@ "custom/caldav_event" = { execute = "caldav_event"; label = "󰃰 {}"; - interval = 1000; + interval = 60000; hideOnEmpty = false; actions = {}; }; From a4d6b98b4b2bef61d5db97849ac21bbde7bd7196 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:03:15 +0200 Subject: [PATCH 06/21] hyprpanel move media to the left --- home-modules/bar/hyprpanel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-modules/bar/hyprpanel.nix b/home-modules/bar/hyprpanel.nix index 92015cf..ab9267b 100644 --- a/home-modules/bar/hyprpanel.nix +++ b/home-modules/bar/hyprpanel.nix @@ -51,12 +51,12 @@ # "bluetooth" "network" "windowtitle" + "media" ]; "middle" = [ "workspaces" ]; "right" = [ "submap" "custom/caldav_event" - "media" "custom/cclock" "notifications" "systray" From 6a4f270959c2e07c6bf59c35fe253af64f57729e Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:03:30 +0200 Subject: [PATCH 07/21] playerctl --- home-modules/pkgs-list/desktop.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-modules/pkgs-list/desktop.nix b/home-modules/pkgs-list/desktop.nix index d718c52..ea526de 100644 --- a/home-modules/pkgs-list/desktop.nix +++ b/home-modules/pkgs-list/desktop.nix @@ -1,5 +1,6 @@ { pkgs, ... }@all: with all; { home.packages = with pkgs; [ + xdg-desktop-portal brightnessctl blueman fontpreview @@ -7,7 +8,7 @@ gsettings-desktop-schemas imv pavucontrol - # playerctl + playerctl swww wev wl-clipboard From 9d28a08cd4cc43a0e5ebc80f3baeeb6bfb8e5091 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:04:09 +0200 Subject: [PATCH 08/21] spotify --- home-modules/pkgs-list/programs.nix | 1 - home-modules/spotify.nix | 75 ++++++++++++++++++++--------- home.nix | 1 + 3 files changed, 52 insertions(+), 25 deletions(-) diff --git a/home-modules/pkgs-list/programs.nix b/home-modules/pkgs-list/programs.nix index c936a71..793b4d4 100644 --- a/home-modules/pkgs-list/programs.nix +++ b/home-modules/pkgs-list/programs.nix @@ -3,7 +3,6 @@ chromium element-desktop qbittorrent - unstable.spotify wl-clipboard xfce.thunar ] ++ (if (hyper.host != "NxACE") then [ diff --git a/home-modules/spotify.nix b/home-modules/spotify.nix index 09fb1ca..1ef4a6d 100644 --- a/home-modules/spotify.nix +++ b/home-modules/spotify.nix @@ -1,29 +1,56 @@ { pkgs, ... }@all: with all; { - home = { - programs.spotify-player = { - enable = true; - settings = { - theme = "default"; - # border_type = "Rounded"; - progress_bar_type = "Line"; - playback_window_position = "Bottom"; - play_icon = ""; - pause_icon = ""; - liked_icon = ""; - copy_command = { - command = "wl-copy"; - args = [ ]; - }; - # client_id = "65b708073fc0480ea92a077233ca87bd"; - client_port = 8888; - ap_port = 443; - device = { - audio_cache = true; - normalization = true; - volume = 50; - }; - }; + home.packages = with pkgs; [ + unstable.spotify + ]; + services.librespot = { + enable = true; + package = pkgs.unstable.librespot; + }; + sops.secrets."spotify/spotiy-player-clinet-id" = { path = "%r/secrets/spotify/spotiy-player-clinet-id"; }; + programs.spotify-player = { + enable = true; + package = pkgs.unstable.spotify-player; + settings = { + border_type = "Rounded"; + client_id_command = "cat $XDG_RUNTIME_DIR/secrets/spotify/spotiy-player-clinet-id"; + copy_command.command = "wl-copy"; + cover_img_length = 20; + cover_img_scale = 1; # if this is not 1 it doesnt fit in the box (for me) + cover_img_width = 9; # this ratio depends on your terminal font + device.normalization = true; + genre_num = 32; # all of them + liked_icon = ""; + name = "spotify-player-${hyper.host}"; + pause_icon = ""; + playback_window_position = "Bottom"; + play_icon = ""; + progress_bar_position = "Right"; # "Bottom" + progress_bar_type = "Rectangle"; # "Line" + theme = "${hyper.user}"; }; + themes = [{ + name = "${hyper.user}"; + component_style = with rice.color; { + block_title = { fg = accent.bright; }; + border = { fg = border; }; + current_playing = { fg = special.base; bg = special.darker; modifiers = ["Italic"]; }; + like = { fg = positive.base; }; + lyrics_played = { fg = subtle.base; }; + lyrics_playing = { fg = special.base; }; + page_desc = { fg = secondary.base; }; + playback_album = { fg = secondary.base; }; + playback_artists = { fg = secondary.base; }; + playback_genres = { fg = subtle.base; }; + playback_metadata = { fg = accent.base; bg = background; }; + playback_progress_bar = { fg = accent.brighter; bg = accent.dark; modifiers = ["Bold"]; }; + playback_status = { fg = accent.bright; }; + playback_track = { fg = accent.bright; modifiers = ["Bold"]; }; + secondary_row = { fg = secondary.base; }; + selection = { bg = accent.dark; }; + table_header = { fg = tertiary.bright; }; + # playback_progress_bar_unfilled (Specific to progress_bar_type as Line) = ""; + }; + }]; }; } diff --git a/home.nix b/home.nix index 194c3dc..f06d957 100644 --- a/home.nix +++ b/home.nix @@ -55,6 +55,7 @@ ./home-modules/scanning.nix ./home-modules/sent.nix ./home-modules/sops.nix + ./home-modules/spotify.nix ./home-modules/ssh.nix ./home-modules/starship.nix ./home-modules/tts.nix From cea416b457e48bfd856534651e3b1c91b7ebd280 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:05:15 +0200 Subject: [PATCH 09/21] chatterino update --- home-modules/chatterino.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-modules/chatterino.nix b/home-modules/chatterino.nix index 2faa000..9a360de 100644 --- a/home-modules/chatterino.nix +++ b/home-modules/chatterino.nix @@ -6,7 +6,7 @@ let # "asmongold" # "Caedrel" # "EintrachtSpandau" - "GamesDoneQuick" + # "GamesDoneQuick" "Odoamne" "iwdominate" "imls" @@ -20,13 +20,13 @@ let "lol_nemesis" # "NASA" "NoWay4u_Sir" - "OfficialMikeShinoda" + # "OfficialMikeShinoda" "Rekkles" "riotgames" "thebausffs" "ThePrimeagen" "Tolkin" - # "TSM_ImperialHal" + "imperialhal__" "velja_lol" # "Xisuma" "zackrawrr" @@ -46,7 +46,7 @@ let }; }; in { - sops.secrets."streamlink/twitch-oauth" = { path = "%r/secrets/streamlink/twich-oauth"; }; + # sops.secrets."streamlink/twitch-oauth" = { path = "%r/secrets/streamlink/twich-oauth"; }; home = { packages = with pkgs; [ From 60b4066e9b2951e8a2aff9f19abdb24b4693072e Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:07:37 +0200 Subject: [PATCH 10/21] lazygit define pkg --- home-modules/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-modules/git.nix b/home-modules/git.nix index eda9977..9f9b1c5 100644 --- a/home-modules/git.nix +++ b/home-modules/git.nix @@ -31,6 +31,7 @@ }; programs.lazygit = { enable = true; + package = pkgs.lazygit; settings = { windowSize = "normal"; gui.theme = with rice.color; { From b7eb0654427ca5582e4733a892fad9ad7c4cd621 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:07:48 +0200 Subject: [PATCH 11/21] stable opencode --- home-modules/opencode.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-modules/opencode.nix b/home-modules/opencode.nix index 7865a61..4030b94 100644 --- a/home-modules/opencode.nix +++ b/home-modules/opencode.nix @@ -1,7 +1,7 @@ { pkgs, ... }@all: with all; { home = { packages = with pkgs; [ - latest.opencode + opencode ]; file.".config/opencode/opencode.json".text = let model = "qwen2.5-coder:7b"; From e4222347583217e69fd3365d58eaf6dbedd970c0 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:08:29 +0200 Subject: [PATCH 12/21] sops use key 13 --- home-modules/sops.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home-modules/sops.nix b/home-modules/sops.nix index 0f730dd..7290bb6 100644 --- a/home-modules/sops.nix +++ b/home-modules/sops.nix @@ -5,8 +5,7 @@ ]; sops = { - age.keyFile = lib.mkIf (hyper.host == "NxACE") "${hyper.home}.age_nx2_key_13.txt"; - gnupg.home = lib.mkIf (hyper.host != "NxACE") "${hyper.home}.gnupg"; + age.keyFile = "${hyper.home}.age_nx2_key_13.txt"; defaultSopsFile = ../sops-secrets.yaml; # %r is $XDG_RUNTIME_DIR From 61984aecf9b4c767b48b5d9f32091eccd809c996 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:09:11 +0200 Subject: [PATCH 13/21] fix term file chooser --- home-modules/yazi.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/home-modules/yazi.nix b/home-modules/yazi.nix index 752325d..ad0afaa 100644 --- a/home-modules/yazi.nix +++ b/home-modules/yazi.nix @@ -1,5 +1,5 @@ { pkgs, ... }@all: with all; let - tfc = pkgs.latest.xdg-desktop-portal-termfilechooser; + tfc = pkgs.xdg-desktop-portal-termfilechooser; in { home.packages = [ pkgs.unar @@ -420,7 +420,14 @@ in { enable = true; xdgOpenUsePortal = true; config.common."org.freedesktop.impl.portal.FileChooser" = "termfilechooser"; - extraPortals = [ tfc ]; + extraPortals = [ tfc ] ++ (with pkgs; [ + xdg-desktop-portal-hyprland + xdg-desktop-portal + xdg-desktop-portal-gnome + xdg-desktop-portal-gtk + xdg-desktop-portal-hyprland + xdg-desktop-portal-wlr + ]); }; }; home.sessionVariables."GTK_USE_PORTAL" = "1"; From 7b3d4e5dfd69ea0f906b8d56562f34b4cf5d1707 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:09:22 +0200 Subject: [PATCH 14/21] fix yazi tab coloring --- home-modules/yazi.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-modules/yazi.nix b/home-modules/yazi.nix index ad0afaa..d7e6bae 100644 --- a/home-modules/yazi.nix +++ b/home-modules/yazi.nix @@ -331,7 +331,7 @@ in { border_style = { fg = border; }; }; tabs = { - active = { fg = accent.dark; bg = accent.base; }; + active = { fg = secondary.dark; bg = secondary.base; }; inactive = { fg = secondary.base; bg = secondary.dark; }; # sep_inner = # sep_outer = From 5fda87907854ca8f314fc56564d2ed76951a6782 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:10:52 +0200 Subject: [PATCH 15/21] more rice --- flake-modules/rice.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/flake-modules/rice.nix b/flake-modules/rice.nix index 12cfc31..717aa19 100644 --- a/flake-modules/rice.nix +++ b/flake-modules/rice.nix @@ -7,10 +7,24 @@ pkgs: rec { gap-size = 5; border-width = 2; color = let - dark = (-0.5); - bright = (0.5); - alter-set = let f = lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; }; - alter = let f = lib.alter-luminace-hex; in color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; }; + dark = (-0.4); + darker = (-0.6); + bright = 0.4; + brighter = 0.7; + alter-set = let f = lib.alter-luminace-hex; in color-name: color-value: { + base = color-value; + dark = f color-value dark; + darker = f color-value darker; + bright = f color-value bright; + brighter = f color-value brighter; + }; + alter = let f = lib.alter-luminace-hex; in color-value: { + base = color-value; + dark = f color-value dark; + darker = f color-value darker; + bright = f color-value bright; + brighter = f color-value brighter; + }; # ccolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)); ccolor = builtins.mapAttrs alter-set { black = "#040404"; # "#111111" "#001100"; @@ -33,6 +47,7 @@ pkgs: rec { # tertiary = magenta; # special = yellow; # weird = green; + subtle = { darker = "#111111"; dark = "#444444"; base = "#777777"; bright = "#999999"; brighter = "#cccccc"; }; positive = alter "#00dd00"; negative = alter "#dd0000"; border = accent.base; From 122a4c6cd84fc8e1be33d178cc45098eed5f7d5d Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:11:39 +0200 Subject: [PATCH 16/21] fix hyprland opacities --- home-modules/hyprland.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index 05bf154..4d352ff 100644 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }@all: with all; -let +{ pkgs, ... }@all: with all; let animation-speed = "5"; transparency = builtins.toString rice.transparency; terminal = "ghostty"; @@ -14,12 +13,11 @@ let left = { name = "desc:Philips Consumer Electronics Company 273PLPH AU11423002132"; resolution = "1920x1080"; position = "0x0"; scale = "1.0"; }; # right = { name = "HDMI-A-2"; resolution = "1920x1080"; position = "4480x360"; scale = "1.0"; }; }; - ace = { - main = { name = "HDMI-A-1"; resolution = "3840x2160"; position = "0x0"; scale = "2.0"; }; - }; + ace.main = { name = "HDMI-A-1"; resolution = "3840x2160"; position = "0x0"; scale = "2.0"; }; }; in { home.packages = with pkgs; [ + xdg-desktop-portal-hyprland hyprland-protocols hyprlock hypridle @@ -256,16 +254,16 @@ in { "opacity ${transparency}, class:^(Code)$" "opacity ${transparency}, class:^(code-oss)$" "opacity ${transparency}, class:^(discord)$" - "opacity ${transparency}, class:^(vesktop)$" + # "opacity ${transparency}, class:^(vesktop)$" # "opacity ${transparency}, class:^(Element)$" "opacity ${transparency}, class:^(lutris)$" "opacity ${transparency}, class:^(neovide)$" # "opacity ${transparency}, class:^(obsidian)$" - "opacity ${transparency}, class:^(vesktop)$" "opacity ${transparency}, class:^(VSCodium)$" "opacity ${transparency}, title:^(wlogout)$" "opaque, title:^(GNU Image Manipulation Program)$" + "opaque, fullscreen:1" "pin, title:^(Picture-in-Picture)$" From d3a407f1a5bba6855bf0c6e9b4cfd83e4cd023ea Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:16:39 +0200 Subject: [PATCH 17/21] more rice color pallete --- home-modules/color-pallete.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/home-modules/color-pallete.nix b/home-modules/color-pallete.nix index ea4696c..4bf0c59 100644 --- a/home-modules/color-pallete.nix +++ b/home-modules/color-pallete.nix @@ -3,17 +3,25 @@ home.file.".config/color-pallete.html".text = with rice.color; let cb = color-set: color-name: size: /* html */ ''
+
+

${color-name}.darker

+

${color-set.darker}

+
-

${color-name}.dark

-

${color-set.dark}

+

${color-name}.dark

+

${color-set.dark}

${color-name}.base

${color-set.base}

-

${color-name}.bright

-

${color-set.bright}

+

${color-name}.bright

+

${color-set.bright}

+
+
+

${color-name}.brighter

+

${color-set.brighter}

''; @@ -67,8 +75,9 @@ ${cb accent "accent" 100} ${cb secondary "secondary" 100} ${cb tertiary "tertiary" 100} - ${cb weird "weird" 100} - ${cb special "special" 100} + ${cb weird "weird" 80} + ${cb special "special" 80} + ${cb subtle "subtle" 80}
${cb positive "positive" 70} ${cb negative "negative" 70} From 31925a507478c037aa191a82b4ac7bce5976bdd2 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:19:04 +0200 Subject: [PATCH 18/21] flake bump --- flake.lock | 116 ++++++++++++++++++++++++++--------------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/flake.lock b/flake.lock index 2ad837b..92e30fe 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756320983, - "narHash": "sha256-huaJ1CvBsylibf55pjiFEpiKxYU235iAzwMhJ+iDSjw=", + "lastModified": 1759184217, + "narHash": "sha256-9XS/OqgjH7aof2Vt6AGe2voA0U/xrWL7QJQnqa6B80Y=", "owner": "9001", "repo": "copyparty", - "rev": "f4f702c39dd2365f6ca43ed6b72a84c708fded8d", + "rev": "fc2754cba589774a4ff665546653e753c72ba7ce", "type": "github" }, "original": { @@ -220,11 +220,11 @@ ] }, "locked": { - "lastModified": 1756245065, - "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "54b2879ce622d44415e727905925e21b8f833a98", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -279,11 +279,11 @@ ] }, "locked": { - "lastModified": 1755678602, - "narHash": "sha256-uEC5O/NIUNs1zmc1aH1+G3GRACbODjk2iS0ET5hXtuk=", + "lastModified": 1758192433, + "narHash": "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "157cc52065a104fc3b8fa542ae648b992421d1c7", + "rev": "c44e749dd611521dee940d00f7c444ee0ae4cfb7", "type": "github" }, "original": { @@ -308,11 +308,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1756325904, - "narHash": "sha256-PRz3GE4ZBScWrHTVegpM4B2YLZplp1iPwmZ9AeYBbsg=", + "lastModified": 1759169434, + "narHash": "sha256-SAJKAYq1QeDCx19+JVwkvyfXLpmXJrOyUCRH+Dy7T/c=", "ref": "refs/heads/main", - "rev": "378e130f1426648d8d734049800128f9882805bf", - "revCount": 6395, + "rev": "38c1e72c9d81fcdad8f173e06102a5da18836230", + "revCount": 6467, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1756325158, - "narHash": "sha256-aJ9jAYtZ64MWBpWPfH1q+t6U9b6kJWc2yK9Vrlj6fZY=", + "lastModified": 1758895089, + "narHash": "sha256-HOIITlSwB5iuVEVLmWNGu8bvI83Y2IbN8SzJQmBDwvg=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "bf843fc6adf90d43a5dd7742e9df61d395ba780d", + "rev": "4d940a10aff16b240533c9b6527a14ff91e5e5ae", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1753819801, - "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", + "lastModified": 1757694755, + "narHash": "sha256-j+w5QUUr2QT/jkxgVKecGYV8J7fpzXCMgzEEr6LG9ug=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", + "rev": "5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c", "type": "github" }, "original": { @@ -462,11 +462,11 @@ ] }, "locked": { - "lastModified": 1753622892, - "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=", + "lastModified": 1756810301, + "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809", + "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", "type": "github" }, "original": { @@ -483,11 +483,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1754887838, - "narHash": "sha256-npC+H+Wl60EdrV75sjqm+bbbLbKgCCGn4ALSM0B2OWA=", + "lastModified": 1759033501, + "narHash": "sha256-QhcOFLJYC9CiSVPkci62ghMEAJChzl+L98To1pKvnRQ=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "2b61fd2115262243b03aa9afe8dfd8a78e71636c", + "rev": "e54884da1d6a1af76af9d053887bf3750dd554fd", "type": "github" }, "original": { @@ -576,11 +576,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1755261305, - "narHash": "sha256-EOqCupB5X5WoGVHVcfOZcqy0SbKWNuY3kq+lj1wHdu8=", + "lastModified": 1758785683, + "narHash": "sha256-mRn51IeEBXeNh5a6xNLylk4PKBX0s/QQxgkEbYoPq/w=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "203a7b463f307c60026136dd1191d9001c43457f", + "rev": "1bfb978f2f6261b6086e04af17f9418e1fe36d70", "type": "github" }, "original": { @@ -607,11 +607,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1756326156, - "narHash": "sha256-EvRCnKAE5oL9wOIT/LrA5+pJVpTvhH71OReJDTOZDyk=", + "lastModified": 1759184131, + "narHash": "sha256-pDILdFbj+3Vt/RNZ4ODbIQqJ2HdeyidDAVggQ+hRDh0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "636dea4f2cd65b8c558149a957423da47c1cbc95", + "rev": "0d4b74fdab79df77ae1e29f6b9e3a32ee6160032", "type": "github" }, "original": { @@ -639,11 +639,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1756266583, - "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756266583, - "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", + "lastModified": 1758198701, + "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", + "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", "type": "github" }, "original": { @@ -686,11 +686,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "github" }, "original": { @@ -702,11 +702,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1756217674, - "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=", + "lastModified": 1758791193, + "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620", + "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", "type": "github" }, "original": { @@ -717,11 +717,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1752596105, - "narHash": "sha256-lFNVsu/mHLq3q11MuGkMhUUoSXEdQjCHvpReaGP1S2k=", + "lastModified": 1756288264, + "narHash": "sha256-Om8adB1lfkU7D33VpR+/haZ2gI5r3Q+ZbIPzE5sYnwE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dab3a6e781554f965bde3def0aa2fda4eb8f1708", + "rev": "ddd1826f294a0ee5fdc198ab72c8306a0ea73aa9", "type": "github" }, "original": { @@ -741,11 +741,11 @@ ] }, "locked": { - "lastModified": 1755960406, - "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", + "lastModified": 1758108966, + "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", + "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "type": "github" }, "original": { @@ -826,11 +826,11 @@ ] }, "locked": { - "lastModified": 1752633862, - "narHash": "sha256-Bj7ozT1+5P7NmvDcuAXJvj56txcXuAhk3Vd9FdWFQzk=", + "lastModified": 1756348497, + "narHash": "sha256-xJp3VnoYh4kpsaKFO/7SsGbwOz7pI1ZmjbqpXEuR2cw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8668ca94858206ac3db0860a9dec471de0d995f8", + "rev": "0adf92c70d23fb4f703aea5d3ebb51ac65994f7f", "type": "github" }, "original": { @@ -846,11 +846,11 @@ ] }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1759030640, + "narHash": "sha256-53VP3BqMXJqD1He1WADTFyUnpta3mie56H7nC59tSic=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "9ac51832c70f2ff34fcc97b05fa74b4a78317f9e", "type": "github" }, "original": { @@ -952,11 +952,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1756309929, - "narHash": "sha256-udly1zNvxR6UKFZSkbutSEZ9EihUd+pPCDBaseppB5s=", + "lastModified": 1759072128, + "narHash": "sha256-n8mpisSJ3JLi9wI5CidfEMQeF8ogSiZUalAAPK3m1qA=", "owner": "sxyazi", "repo": "yazi", - "rev": "dd7afaa64aa54fac5bd30404eb44ccd9d68f31c5", + "rev": "879ed4999694c84d62ba85979e5031d58b85f85d", "type": "github" }, "original": { From 418dcad22cb5d6bd4ec4f3cbe020e752e2b2dbad Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:19:45 +0200 Subject: [PATCH 19/21] sops for the stuff below oops (spotify clinet id etc) --- sops-secrets.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sops-secrets.yaml b/sops-secrets.yaml index da36693..e9f4f09 100644 --- a/sops-secrets.yaml +++ b/sops-secrets.yaml @@ -21,6 +21,8 @@ weechat: passphrase: ENC[AES256_GCM,data:3NVhMouf3wwMJTZCvIjbi5fjHJHxe25Q+wRo,iv:W8cShdM3iUyEiRCPNupMin3gfF+cqGxslD18CAvUW4c=,tag:DXBATGEhHjhXqy+J9BNVwg==,type:str] streamlink: twitch-oauth: ENC[AES256_GCM,data:SvV0CBVL6MO0zqiRg2Ns00KNHLDfzgNObse5F69n,iv:h0DFbwIVKfJSoVowgO3voAOdHXIsw1D3O/aweFRVKcI=,tag:PW0gc+gzlfdOUvIoYIkywg==,type:str] +spotify: + spotiy-player-clinet-id: ENC[AES256_GCM,data:hJpLMgWKzPpqTffr80Jh65Zl3MzKGXiMb8x2F1CxuSQ=,iv:Q8TdEZiAtcdkndsKmvCAlnuu+i60xXUBX6I6VSxwQow=,tag:CIeaJbkMeqRoWnuOgERHYw==,type:str] nx2site: cloudflare: api-token-dns-edit: ENC[AES256_GCM,data:fR4fH6NqwtHI8aebEwjUn5JMoy3q3GXgu/dREe8JK7yRBIOhJ8BKuw==,iv:fQqLRYCN/7zhpHzYxMcn8q1aA7x4qd3qWGgrFWn2E/U=,tag:GJ1muJG755ch/84Sgcf2Vw==,type:str] @@ -89,8 +91,8 @@ sops: YkJWUEMySU50ZHVxUzVudjNnYURXak0KkMn/8sFrrviqb3s8DtS/BAbrdCwJ+jv/ A8rXQkKMjvTqG1f0fq5IlSmRAQy7XFBzkfbKdIUoefhey190WPEHaw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-08-06T22:09:56Z" - mac: ENC[AES256_GCM,data:s3lBIa/Y0fjtFFTDggC+Oxd9T5A1al9ULh4VM78vS+A6nmCZWdezLkY1CwXPrCcrwYQtnKrj5N4Y1jQQmEkF1UIcgkvH7ZQsT7MOJyvWhZUx2/wIg1DwcdlHYJAiwFkIkZ1fEvE4m/uDCWA8xO4qWU4NJaxPzTyapPKKF4VwkNs=,iv:tqDVOQlwS+CMzX8MxrBRPjBVj1Svx91eQx2xamAsSiE=,tag:VJf1at+026fQJ5ML2D/PEg==,type:str] + lastmodified: "2025-09-07T21:03:20Z" + mac: ENC[AES256_GCM,data:x8eIqQQGxtB5ukScesN1Lf4cFicTOi3VSOr/hFxKzccgwW7HLLEqwjai6e67KUFC2otaN9TR7ft0tUsTVwWRVRCHnpEoQ5KshLHy2zsk+CmPIpWTLCZJBpe154z3rRLlc10DCM7yhqArzepw0HgE4j1knADqLVwC7e0k+o/OmE8=,iv:uXeIv19J3LmYg7gtA2SGUSoMe9uccrvvztlDFSSs1V8=,tag:YTJpZdw1K+7//EARR+MviA==,type:str] pgp: - created_at: "2025-06-08T12:35:30Z" enc: |- From ebfd72baa860d07bf67df8004b490f17ba8f38d0 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 00:32:13 +0200 Subject: [PATCH 20/21] wikipedia rice --- home-modules/firefox.nix | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/home-modules/firefox.nix b/home-modules/firefox.nix index 363e78a..491cb51 100644 --- a/home-modules/firefox.nix +++ b/home-modules/firefox.nix @@ -194,6 +194,48 @@ background-color: transparent !important; } } + @-moz-document domain(wikipedia.org) { + body, html, div.mw-page-container, .vector-header, .mw-header { + background-color: transparent !important; + } + :root { + --color-base: ${foreground} !important; + --color-base--hover: ${accent.bright} !important; + --color-emphasized: ${accent.base} !important; + --color-progressive: ${accent.base} !important; + --color-progressive--hover: ${accent.brighter} !important; + --color-progressive--active: ${secondary.bright} !important; + --color-destructive: ${negative.base} !important; + --color-destructive--hover: ${negative.brighter} !important; + --color-destructive--active: ${negative.bright} !important; + --color-visited: ${secondary.base} !important; + --color-visited--hover: ${secondary.brighter} !important; + --color-visited--active: ${secondary.bright} !important; + --color-error: ${negative.base} !important; + --color-error--hover: ${negative.bright} !important; + --color-error--active: ${negative.bright} !important; + --color-warning: ${weird.base} !important; + --color-success: ${positive.base} !important; + --color-notice: ${special.base} !important; + --color-content-added: ${positive.base} !important; + --color-content-removed: ${negative.base} !important; + --color-base--subtle: ${accent.dark} !important; + --box-shadow-color-base: ${black.base} !important; + --background-color-base: transparent !important; + --background-color-neutral: transparent !important; + --background-color-neutral-subtle: transparent !important; + --background-color-interactive: ${accent.darker} !important; + --background-color-interactive--hover: ${accent.dark} !important; + --background-color-interactive--active: ${secondary.dark} !important; + --background-color-interactive-subtle: ${subtle.darker} !important; + --background-color-interactive-subtle--hover: ${subtle.dark} !important; + --background-color-interactive-subtle--active: ${subtle.base} !important; + --border-color-base: ${border} !important; + --border-color-emphasized: ${border2} !important; + --border-color-subtle: ${subtle.base} !important; + --border-color-muted: ${subtle.dark} !important; + } + } @-moz-document domain(youtube.com) { body, html, div#content, ytd-app, #frosted-glass.with-chipbar.ytd-app, ytd-shorts[is-dark] #cinematic-shorts-scrim.ytd-shorts { background-color: transparent !important; From f11db2239eae4699f9a99eb153231ab9433040a0 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 30 Sep 2025 16:29:22 +0000 Subject: [PATCH 21/21] nxf format --- home-modules/fish.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/home-modules/fish.nix b/home-modules/fish.nix index 07b33b4..6a4cfeb 100644 --- a/home-modules/fish.nix +++ b/home-modules/fish.nix @@ -4,7 +4,7 @@ fish any-nix-shell - (writeShellScriptBin "nxfetch" '' + (writeShellScriptBin "nxfetch" /* bash */ '' logo=$(echo -e " ⠀⠀⠀⠀⠰⣿⣧⠀⠀⠹⣿⣧⠀⣴⣿⠆⠀⠀⠀⠀ OS @@ -17,20 +17,20 @@ ⠀⠀⠀⠀⠀⣰⣿⣿⣿⡄⠉⠉⢻⣿⣏⠉⠉⠀⠀⠀ TFM ⠀⠀⠀⠀⠰⣿⠟⠀⢻⣿⣆⠀⠀⠻⣿⠆⠀⠀⠀⠀ PROMPT - " | lolcat --force 2> /dev/null) + " | lolcat --force 2> /dev/null) - msg=" - $(echo -e "$logo" | sed -n 3p): $(cat /etc/*-releas 2> /dev/null || echo 'PRETTY_NAME="[No Release]"' | grep PRETTY_NAME | cut -c 14- | rev | cut -c 2- | rev) - $(echo -e "$logo" | sed -n 4p): ''${XDG_CURRENT_DESKTOP^} - $(echo -e "$logo" | sed -n 5p): ''${TERM^} - $(echo -e "$logo" | sed -n 6p): $(bash --version | head --lines 1 | cut -f -4 -d' ' | sed -E 's-(.*?), version (.*?)\(.*-\1 \2-g') - $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev | sed 's/./\U&/') - $(echo -e "$logo" | sed -n 8p): ''$(uname -r | sed -E 's=(.+-.+-.+-.+)-.+=\1=g') - $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g' | sed 's/./\U&/') - $(echo -e "$logo" | sed -n 10p): $(yazi --version | sed -E 's-(.*?) \(.*-\1-g') - $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1 | sed 's/./\U&/') - " - echo -e "$msg" + msg=" + $(echo -e "$logo" | sed -n 3p): $(cat /etc/*-releas 2> /dev/null || echo 'PRETTY_NAME="[No Release]"' | grep PRETTY_NAME | cut -c 14- | rev | cut -c 2- | rev) + $(echo -e "$logo" | sed -n 4p): ''${XDG_CURRENT_DESKTOP^} + $(echo -e "$logo" | sed -n 5p): ''${TERM^} + $(echo -e "$logo" | sed -n 6p): $(bash --version | head --lines 1 | cut -f -4 -d' ' | sed -E 's-(.*?), version (.*?)\(.*-\1 \2-g') + $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev | sed 's/./\U&/') + $(echo -e "$logo" | sed -n 8p): ''$(uname -r | sed -E 's=(.+-.+-.+-.+)-.+=\1=g') + $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g' | sed 's/./\U&/') + $(echo -e "$logo" | sed -n 10p): $(yazi --version | sed -E 's-(.*?) \(.*-\1-g') + $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1 | sed 's/./\U&/') + " + echo -e "$msg" '') ];