From 43fd967b7804b1f1b47ee52625e5610e9a216ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 26 Jan 2026 10:37:22 +0100 Subject: [PATCH 1/9] Revert "vanadium/connectivity: remove instagram ban" This reverts commit 2e6aa202e644aabc426620c6f7809c396f452214. --- nix/configurations/vanadium/nixos/connectivity.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nix/configurations/vanadium/nixos/connectivity.nix b/nix/configurations/vanadium/nixos/connectivity.nix index 17ca3b84..8d881955 100644 --- a/nix/configurations/vanadium/nixos/connectivity.nix +++ b/nix/configurations/vanadium/nixos/connectivity.nix @@ -63,6 +63,10 @@ # This is the fascist one, just block it because I can't tell 0.0.0.0 nixos.wiki + # Gotta purify my smoos brain for a while + 0.0.0.0 instagram.com + 0.0.0.0 www.instagram.com + # The "people who you viewed can see you" thing is weird af 0.0.0.0 linkedin.com 0.0.0.0 www.linkedin.com From b55accdd01090d8b3ec53fe777e9dbe0e25667e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 26 Jan 2026 10:37:47 +0100 Subject: [PATCH 2/9] Reapply "vanadium/connectivity: block youtube for a while" This reverts commit a1d4740d26cac0f3ef579d76f032751f235f4f07. --- nix/configurations/vanadium/nixos/connectivity.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nix/configurations/vanadium/nixos/connectivity.nix b/nix/configurations/vanadium/nixos/connectivity.nix index 8d881955..37d8c312 100644 --- a/nix/configurations/vanadium/nixos/connectivity.nix +++ b/nix/configurations/vanadium/nixos/connectivity.nix @@ -67,6 +67,9 @@ 0.0.0.0 instagram.com 0.0.0.0 www.instagram.com + 0.0.0.0 youtube.com + 0.0.0.0 www.youtube.com + # The "people who you viewed can see you" thing is weird af 0.0.0.0 linkedin.com 0.0.0.0 www.linkedin.com From 6c178a152db7dcc2eaeaf920c7dbcfaa9248c839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 26 Jan 2026 16:07:13 +0100 Subject: [PATCH 3/9] Revert "vanadium/firefox: -addons.shinigami-eyes" This reverts commit e537aebd15528582d21f966e3e12268e9b128321. --- nix/configurations/vanadium/home/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/configurations/vanadium/home/firefox.nix b/nix/configurations/vanadium/home/firefox.nix index 6edc85cb..af525054 100644 --- a/nix/configurations/vanadium/home/firefox.nix +++ b/nix/configurations/vanadium/home/firefox.nix @@ -115,6 +115,7 @@ in [ addons.sponsorblock addons.return-youtube-dislikes + addons.shinigami-eyes addons.consent-o-matic ]; }; From b9093075f9af6943a8452361b51c8090cbffba96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 26 Jan 2026 16:10:18 +0100 Subject: [PATCH 4/9] vanadium/zen-browser: +addons.shinigami-eyes --- nix/configurations/vanadium/home/zen-browser.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/configurations/vanadium/home/zen-browser.nix b/nix/configurations/vanadium/home/zen-browser.nix index beee8d6a..c658d744 100644 --- a/nix/configurations/vanadium/home/zen-browser.nix +++ b/nix/configurations/vanadium/home/zen-browser.nix @@ -115,6 +115,7 @@ in [ addons.sponsorblock addons.return-youtube-dislikes + addons.shinigami-eyes addons.consent-o-matic ]; }; From 08b934cf21d04ad18c4c8440b4764c639ed36200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 26 Jan 2026 21:08:18 +0100 Subject: [PATCH 5/9] {default,shell}.nix: remove sources from arguments --- default.nix | 6 +++--- shell.nix | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index 729c5d87..c6d15dab 100644 --- a/default.nix +++ b/default.nix @@ -1,6 +1,6 @@ -{ - sources ? import ./npins, -}: +let + sources = import ./npins; +in { # for repl sessions inherit sources; diff --git a/shell.nix b/shell.nix index 1fc63cf4..31c91133 100644 --- a/shell.nix +++ b/shell.nix @@ -1,8 +1,11 @@ +let + sources = import ./npins; +in { - sources ? import ./npins, pkgs ? import sources.nixpkgs { overlays = map import [ ./nix/overlays/disko.nix + ./nix/overlays/npins.nix ]; }, withGHC ? false, From 94e3d872f0224a421d72c18d062a735b2e922349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 26 Jan 2026 21:35:00 +0100 Subject: [PATCH 6/9] home/fish: use home-manager to configure vivid --- nix/homeModules/common/fish/default.nix | 6 +++++- nix/homeModules/common/fish/shellInit.fish | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nix/homeModules/common/fish/default.nix b/nix/homeModules/common/fish/default.nix index dbb6e438..9b5994fa 100644 --- a/nix/homeModules/common/fish/default.nix +++ b/nix/homeModules/common/fish/default.nix @@ -12,12 +12,16 @@ # Script dependencies # home.packages = [ - pkgs.vivid pkgs.nix-output-monitor # pretty ui for shells ]; programs = { fd.enable = true; fzf.enable = true; + # fd uses LS_COLORS + vivid = { + enable = true; + activeTheme = "solarized-light"; # similar to milou + }; }; # diff --git a/nix/homeModules/common/fish/shellInit.fish b/nix/homeModules/common/fish/shellInit.fish index 0a1cfd24..c99199ca 100644 --- a/nix/homeModules/common/fish/shellInit.fish +++ b/nix/homeModules/common/fish/shellInit.fish @@ -83,7 +83,4 @@ set -x fzf_fd_opts --hidden --exclude=.git # fzf-fish using patdiff would show incomplete diff, it is a bug # don't do it -# fd uses LS_COLORS -set -x LS_COLORS (vivid -m 24-bit generate solarized-light) # similar to milou - set -g sponge_purge_only_on_exit true From a9a85f16a44ab48b7a7a1fee1f8b5e84eccceb6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 26 Jan 2026 21:35:43 +0100 Subject: [PATCH 7/9] home/fish: remove fd --- nix/homeModules/common/fish/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nix/homeModules/common/fish/default.nix b/nix/homeModules/common/fish/default.nix index 9b5994fa..77f15131 100644 --- a/nix/homeModules/common/fish/default.nix +++ b/nix/homeModules/common/fish/default.nix @@ -15,9 +15,8 @@ pkgs.nix-output-monitor # pretty ui for shells ]; programs = { - fd.enable = true; fzf.enable = true; - # fd uses LS_COLORS + # attempt to make color look less bad vivid = { enable = true; activeTheme = "solarized-light"; # similar to milou From 64921628a80186c1cd2a6ef1d5e69185b41177a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 26 Jan 2026 21:42:29 +0100 Subject: [PATCH 8/9] home/ghostty: hide cursor when typing --- nix/homeModules/common/ghostty.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nix/homeModules/common/ghostty.nix b/nix/homeModules/common/ghostty.nix index d259e588..2b0513f4 100644 --- a/nix/homeModules/common/ghostty.nix +++ b/nix/homeModules/common/ghostty.nix @@ -28,6 +28,8 @@ in "ctrl+-=decrease_font_size:1" ]; + mouse-hide-while-typing = true; + # Theme background = "#fdf6e3"; foreground = "#073642"; From e645fcebfe6a507becb832f781a3f3b3b406a021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 26 Jan 2026 21:56:48 +0100 Subject: [PATCH 9/9] packages/tmux-sessionizer: add fd as dependency --- nix/packages/by-name/tmux-sessionizer/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nix/packages/by-name/tmux-sessionizer/package.nix b/nix/packages/by-name/tmux-sessionizer/package.nix index 63c7cbc1..7e18e495 100644 --- a/nix/packages/by-name/tmux-sessionizer/package.nix +++ b/nix/packages/by-name/tmux-sessionizer/package.nix @@ -2,6 +2,7 @@ writeShellApplication, tmux, procps, + fd, fzf, gnused, lib, @@ -42,6 +43,7 @@ let tmux-sessionizer = writeShellApplication { name = "tmux-sessionizer"; runtimeInputs = [ + fd fzf gnused ];