default.nix

@@ -1,6 +1,6 @@
-let
+{
-  sources = import ./npins;
+  sources ? import ./npins,
-in
+}:
 {
   # for repl sessions
   inherit sources;

nix/configurations/vanadium/home/firefox.nix

@@ -115,7 +115,6 @@ in
           [
             addons.sponsorblock
             addons.return-youtube-dislikes
-            addons.shinigami-eyes
             addons.consent-o-matic
           ];
       };

nix/configurations/vanadium/home/zen-browser.nix

@@ -115,7 +115,6 @@ in
           [
             addons.sponsorblock
             addons.return-youtube-dislikes
-            addons.shinigami-eyes
             addons.consent-o-matic
           ];
       };

nix/configurations/vanadium/nixos/connectivity.nix

@@ -63,13 +63,6 @@
       # 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

nix/homeModules/common/fish/default.nix

@@ -12,15 +12,12 @@
   # 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
-    };
   };
 
   #

nix/homeModules/common/fish/shellInit.fish

@@ -83,4 +83,7 @@ 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

nix/homeModules/common/ghostty.nix

@@ -28,8 +28,6 @@ in
         "ctrl+-=decrease_font_size:1"
       ];
 
-      mouse-hide-while-typing = true;
-
       # Theme
       background = "#fdf6e3";
       foreground = "#073642";

nix/packages/by-name/tmux-sessionizer/package.nix

@@ -2,7 +2,6 @@
   writeShellApplication,
   tmux,
   procps,
-  fd,
   fzf,
   gnused,
   lib,
@@ -43,7 +42,6 @@ let
   tmux-sessionizer = writeShellApplication {
     name = "tmux-sessionizer";
     runtimeInputs = [
-      fd
       fzf
       gnused
     ];

shell.nix

@@ -1,11 +1,8 @@
-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,