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/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 ]; }; 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 ]; }; diff --git a/nix/configurations/vanadium/nixos/connectivity.nix b/nix/configurations/vanadium/nixos/connectivity.nix index 17ca3b84..37d8c312 100644 --- a/nix/configurations/vanadium/nixos/connectivity.nix +++ b/nix/configurations/vanadium/nixos/connectivity.nix @@ -63,6 +63,13 @@ # 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 + + 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 diff --git a/nix/homeModules/common/fish/default.nix b/nix/homeModules/common/fish/default.nix index dbb6e438..77f15131 100644 --- a/nix/homeModules/common/fish/default.nix +++ b/nix/homeModules/common/fish/default.nix @@ -12,12 +12,15 @@ # Script dependencies # home.packages = [ - pkgs.vivid pkgs.nix-output-monitor # pretty ui for shells ]; programs = { - fd.enable = true; fzf.enable = true; + # attempt to make color look less bad + 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 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"; 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 ]; 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,