new website

programs/default.nix

@@ -214,7 +214,7 @@
             just
             uv
             llvmPackages.bintools
-            nodejs
+            nodejs_22
 
             (writeShellScriptBin "nas" ''
               mkdir -p ~/Documents/nas

programs/firefox/default.nix

@@ -168,6 +168,18 @@ inputs@{ machine, ... }:
                   keyword = "!no";
                   url = "https://search.nixos.org/options?query=%s";
                 }
+                {
+                  keyword = "!ri";
+                  url = "https://github.com/rust-lang/rust/issues/%s";
+                }
+                {
+                  keyword = "!tf";
+                  url = "https://rust.tf/%s";
+                }
+                {
+                  keyword = "!dg";
+                  url = "https://rustc-dev-guide.rust-lang.org/?search=%s";
+                }
 
                 # {
                 #   name = "bank";

programs/fish/default.nix

@@ -20,6 +20,7 @@ inputs@{ machine, ... }:
           "cp-ser" = cp-media "ser" "shows";
           "cp-ani" = cp-media "ani" "anime";
           "ragdoll" = ragdoll;
+          "jjj" = jjj;
           "dumpasm" = "${pkgs.custom.dumpasm}/bin/dumpasm";
           "p" = calc;
           "s" = "systemctl";

programs/fish/scripts.nix

@@ -34,4 +34,21 @@
     SSH_TMUX_SESSION_NAME="ssh-from-$(hostname)-$TMUX_SESSION_NAME"
     tmux detach -E "kitten ssh -t ragdoll \"export TMUX_SESSION_NAME=$SSH_TMUX_SESSION_NAME; tmux attach -t $SSH_TMUX_SESSION_NAME || tmux new -e TMUX_SESSION_NAME=$SSH_TMUX_SESSION_NAME -s $SSH_TMUX_SESSION_NAME\"; exec tmux attach -t $TMUX_SESSION_NAME"
   ''}/bin/ragdoll";
+  jjj = "${pkgs.writeScriptBin "jjj" ''
+    cmd="\${"1:-show"}"
+    shift
+
+    selected=$(
+      jj log -r 'all()' --color=always \
+        | fzf \
+            --min-height=15 \
+            --cycle \
+            --ansi \
+            --prompt "jj $cmd> "
+    ) || exit 0
+
+    rev=$(echo "$selected" | awk '{for(i=1;i<=NF;i++) if(length($i)>=7){print $i; exit}}')
+
+    jj "$cmd" -r "$rev" "$@"
+  ''}/bin/jjj";
 }

programs/jj/default.nix

@@ -85,7 +85,8 @@ inputs@{ machine, ... }:
               '';
               # if(.contained_in('first_parent(@)'), label("git_head", "HEAD")),
               status_summary = "'\n' ++ self.diff().summary() ++ '\n'";
-              log_oneline_with_status_summary = "log_oneline ++ if(self.current_working_copy() && self.diff().files().len() > 0, status_summary)";
+              space = "'\n\n\n'";
+              log_oneline_with_status_summary = "if(self.current_working_copy(), space) ++ log_oneline ++ if(self.current_working_copy() && self.diff().files().len() > 0, status_summary)";
             };
 
             aliases =

programs/niri/default.nix

@@ -364,7 +364,7 @@ inputs@{ machine, ... }:
             };
             "Mod+Period" = {
               allow-when-locked = true;
-              action.spawn-sh = "playerctl nest";
+              action.spawn-sh = "playerctl next";
             };
             "Mod+Comma" = {
               allow-when-locked = true;

programs/nvim/config.lua

@@ -111,7 +111,7 @@ vim.cmd([[
 ]])
 
 vim.cmd([[
-    let g:suda_smart_edit = 1
+    " let g:suda_smart_edit = 1
     filetype plugin indent on
 ]])
 

programs/nvim/default.nix

@@ -36,7 +36,7 @@ inputs@{ machine, ... }:
             EDITOR = "nvim";
           };
 
-          packages = with pkgs-unstable; [
+          packages = with pkgs; [
             tree-sitter
             (pkgs.stdenv.mkDerivation {
               name = "editor-hax";
@@ -83,7 +83,7 @@ inputs@{ machine, ... }:
           clipboard.providers.wl-copy.enable = true;
 
           performance = {
-            byteCompileLua.enable = true;
+            byteCompileLua.enable = false;
             combinePlugins = {
               enable = false;
 
@@ -93,12 +93,12 @@ inputs@{ machine, ... }:
             };
           };
 
-          extraLuaPackages = ps: [ ps.magick ];
+          # extraLuaPackages = ps: [ ps.magick ];
           extraPackages = [ pkgs.imagemagick ];
 
           # package = (import inputs.unstable { inherit (pkgs) system; }).neovim-unwrapped;
           # package = pkgs.neovim-unwrapped;
-          package = with pkgs-unstable; neovim-unwrapped;
+          # package = with pkgs-unstable; neovim-unwrapped;
 
           colorschemes.onedark = {
             enable = true;

programs/nvim/keys.nix

@@ -30,7 +30,7 @@ in
     (luamap "n" "<leader>/" "${telescope}.current_buffer_fuzzy_find()")
     # last used pickers/searches
     (luamap "n" "<leader>p" "${telescope}.pickers()")
-    (luamap "n" "<leader>m" "${telescope}.search_history()")
+    (luamap "n" "<leader>m" "${telescope}.marks()")
     # open buffers
     (luamap "n" "<leader>b" "${telescope}.buffers({sort_mru = true})")
     (luamap "n" "<leader><Tab>" "${telescope}.buffers({sort_mru = true})")

programs/nvim/plugins.nix

@@ -168,6 +168,13 @@ in
         };
       };
 
+      marks = {
+        enable = true;
+        settings = {
+          cyclic = true;
+        };
+      };
+
       rainbow-delimiters.enable = true;
       lsp-format.enable = true;
       fugitive.enable = true;
@@ -177,7 +184,7 @@ in
       nvim-autopairs.enable = true;
       spider.enable = true;
       origami = {
-        enable = true;
+        enable = false;
         settings.autofold.enabled = false;
       };
 
@@ -799,7 +806,7 @@ in
       telescope-ui-select-nvim
       telescope-fzf-native-nvim
 
-      vim-suda
+      # vim-suda
       render-markdown
       telescope-file-browser
       vim-astro

programs/ssh.nix

@@ -18,8 +18,8 @@ inputs@{ machine, ... }:
             proxyJump = "fili";
           };
           ragdoll = {
-            hostname = "192.168.178.138";
-            proxyJump = "fili";
+            hostname = "hexcat.nl";
+            port = 4455;
           };
 
           "*" = {