flake update

Signed-off-by: cy <cy@cy7.sh>

flake.lock

@@ -493,11 +493,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740624780,
+        "lastModified": 1740840901,
-        "narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=",
+        "narHash": "sha256-nAHSkQJ2J5W8rGSReohh4xZ1b2edkG2UIj/4tF+ARAQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6",
+        "rev": "30da4310935450ea38931abf775ffe1dfab15355",
         "type": "github"
       },
       "original": {
@@ -614,11 +614,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1740647693,
+        "lastModified": 1740781229,
-        "narHash": "sha256-pYxhtDAOmlbP4XqgjIvbpi7CFtX8USH6DlRybS2Jxu4=",
+        "narHash": "sha256-H8i+LhDQr6PbAxFt37TXYoRkwHvGlSTuNJUrlE5bb0w=",
         "ref": "refs/heads/main",
-        "rev": "03ade5e6d75cb7705900cf696505b836fc831be0",
+        "rev": "99bc6867e8913ad8f5fa7d63fefd885743eac4c1",
-        "revCount": 17515,
+        "revCount": 17539,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/lix"
       },
@@ -694,11 +694,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1740655457,
+        "lastModified": 1740817768,
-        "narHash": "sha256-brpdF7wEdGDZWuV8T5axwzHr5gnGfB7Dua2QVAjSSL4=",
+        "narHash": "sha256-NFu4LhDHkc4xonmpknh2cI/0ozeXjFmoMxVz1HecqxI=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "2a098dfa179b6d89c962908df0e4840308db04df",
+        "rev": "f3dde1ed6d76545ac637a80a356d50f6a7089a2a",
         "type": "github"
       },
       "original": {
@@ -727,11 +727,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1740641916,
+        "lastModified": 1740749946,
-        "narHash": "sha256-aYAYvdKnmmlkN7t4VbPfPbAtWHHADKHL8bPlNYZ2bZY=",
+        "narHash": "sha256-uA03y5H8XI00ZxOIAAj3RGGOBOQCFjLyjLc79NH01oI=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "70dcd229cfaa54946163ccf0a1ea0ce595a35cc4",
+        "rev": "66113d7d76f6cf7d06e2ccde9281ff9bafab126c",
         "type": "github"
       },
       "original": {
@@ -937,11 +937,11 @@
     },
     "nixpkgs-stable_4": {
       "locked": {
-        "lastModified": 1740463929,
+        "lastModified": 1740743217,
-        "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=",
+        "narHash": "sha256-brsCRzLqimpyhORma84c3W2xPbIidZlIc3JGIuQVSNI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b",
+        "rev": "b27ba4eb322d9d2bf2dc9ada9fd59442f50c8d7c",
         "type": "github"
       },
       "original": {
@@ -1001,11 +1001,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1740642522,
+        "lastModified": 1740804553,
-        "narHash": "sha256-t6VfQs+u3CiVASTVkjQhBh5u8NcEo/VDWEYagCIwVCk=",
+        "narHash": "sha256-1vP/NaV+Ps+kFqfVBJ5yxYahML9Vk6VwLndtU9bDvUE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d6fde23c7a50cf47485e28fa0c51b8ed4cfdf1d7",
+        "rev": "9114ab05304c83c930673fee79948b3fb14acd9a",
         "type": "github"
       },
       "original": {
@@ -1211,11 +1211,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740623427,
+        "lastModified": 1740796337,
-        "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=",
+        "narHash": "sha256-FuoXrXZPoJEZQ3PF7t85tEpfBVID9JQIOnVKMNfTAb0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab",
+        "rev": "bbac9527bc6b28b6330b13043d0e76eac11720dc",
         "type": "github"
       },
       "original": {
@@ -1307,11 +1307,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740655383,
+        "lastModified": 1740827838,
-        "narHash": "sha256-HHb6wtlHWy/CW3oCtOyOQrNnzgtsvwvwM6wAlDvfTec=",
+        "narHash": "sha256-xHWVg/CgaJqID4BUxqqJ47ESXRzWOxRNhJ9+jBXKuLc=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "bcf7577daac02aa1a7dfaddc79324b7c6ca4af81",
+        "rev": "02d071ae1fadb1a63c6122d307ca5eb7e6b4feb9",
         "type": "github"
       },
       "original": {

home/codium.nix

@@ -17,28 +17,114 @@
           rust-lang.rust-analyzer
           shd101wyy.markdown-preview-enhanced
           fwcd.kotlin
+          alefragnani.bookmarks
+          tomrijndorp.find-it-faster
+          streetsidesoftware.code-spell-checker
         ];
       userSettings = {
         "workbench.colorTheme" = "GitHub Dark Default";
-        "files.autoSave" = "afterDelay";
+        "files.autoSave" = "onFocusChange";
         "nix.enableLanguageServer" = true;
         "nix.serverPath" = "nil";
         "editor.fontFamily" = "IBM Plex Mono";
-        "editor.fontSize" = 16;
+        "editor.fontSize" = 15;
-        "editor.wordWrap" = "on";
+        "window.zoomLevel" = 0.5;
 
-        # vim mode settings
+        # vim stuff
-        "vim.handleKeys" = {
+        "vim.leader" = ",";
-          "<C-b>" = false; # file tree toggle
-        };
         "vim.normalModeKeyBindings" = [
           {
             "before" = [ ";" ];
             "after" = [ ":" ];
             "silent" = true;
           }
+          {
+            "before" = [ "<leader>" "m" ];
+            "commands" = [ "bookmarks.toggle" ];
+          }
+          {
+            "before" = [ "<leader>" "l" ];
+            "commands" = [ "bookmarks.toggleLabeled" ];
+          }
+          {
+            "before" = [ "<leader>" "b" ];
+            "commands" = [ "bookmarks.list" ];
+          }
+          {
+            "before" = [ "<leader>" "s" ];
+            "commands" = [ "workbench.action.toggleSidebarVisibility" ];
+          }
+          {
+            "before" = [ "<leader>" "f" "f" ];
+            "commands" = [ "find-it-faster.findFiles" ];
+          }
+          {
+            "before" = [ "<leader>" "f" "g"];
+            "commands" = [ "find-it-faster.findWithinFiles"];
+          }
+          {
+            "before" = [ "<leader>" "f" "t"];
+            "commands" = [ "find-it-faster.findWithinFilesWithType"];
+          }
+          # "gd" for definitions is by default
+          {
+            "before" = [ "g" "r" ];
+            "commands" = [ "editor.action.goToReferences" ];
+          }
+          # the default is weird when you need to go back within a file
+          {
+            "before" = [ "C-o" ];
+            "commands" = [ "workbench.action.navigateBack" ];
+          }
+          {
+            "before" = [ "C-i" ];
+            "commands" = [ "workbench.action.navigateForward" ];
+          }
         ];
+        "vim.insertModeKeyBindings" = [
+          {
+            "before" = [ "C-a" ];
+            "commands"  = [ "cursorHome" ];
+          }
+          {
+            "before" = [ "C-e" ];
+            "commands" = [ "cursorEnd" ];
+          }
+        ];
+        "vim.visualModeKeyBindings" = [
+          {
+            "before" = [ ">" ];
+            "commands" = [ "editor.action.indentLines" ];
+          }
+          {
+            "before" = [ "<" ];
+            "commands" = [ "editor.action.outdentLines" ];
+          }
+        ];
+        "extensions.experimental.affinity" = {
+          "vscodevim.vim" = 1;
+        };
         "workbench.startupEditor" = "none";
+        "git.openRepositoryInParentFolders" = "never";
+        
+        # terminal stuff
+        "terminal.integrated.cursorBlinking" = true;
+        "terminal.integrated.cursorStyle" = "line";
+        "terminal.integrated.customGlyphs" = false;
+        "terminal.integrated.env.linux" = {
+          # https://github.com/tomrijndorp/vscode-finditfaster/issues/112#issuecomment-2475227546
+          FZF_DEFAULT_OPTS = "--bind ctrl-n:down,ctrl-p:up";
+        };
+        # don't let the workbench handle terminal keys like ctrl+n and friends
+	      "terminal.integrated.sendKeybindingsToShell" = true;
+        "terminal.integrated.allowChords" = false;
+
+	      "security.promptForLocalFileProtocolHandling" = false;
+	      "security.promptForRemoteFileProtocolHandling" = false;
+        "markdown-preview-enhanced.previewTheme" = "github-dark.css";
+	      "editor.minimap.enabled" = false;
+        "explorer.confirmDelete" = false;
+        "explorer.confirmDragAndDrop" = false;
       };
     };
   };

home/yt/common.nix

@@ -66,6 +66,7 @@
     };
   };
   programs.ripgrep.enable = true;
-  programs.man.generateCaches = true;
+  # programs.man.generateCaches = true; # slows down eval
   programs.fd.enable = true;
+  news.display = "silent";
 }

home/yt/ytnix.nix

@@ -54,7 +54,9 @@
     yarn
     rclone
     go
-    rustup
+    (rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override {
+      extensions = [ "rust-src" ];
+    }))
     pwgen
     lua-language-server
     gnumake

home/zsh/default.nix

@@ -51,6 +51,7 @@
       bindkey -M viins "^E" end-of-line
       bindkey -M viins "^A" beginning-of-line
       bindkey -M viins "^B" backward-char
+      bindkey -M viins "^F" forward-char
 
       # accept one word completion
       bindkey -M viins "^S" forward-word
@@ -111,6 +112,7 @@
       "grv" = "git remote --verbose";
       "gs" = "git status --short";
       "gss" = "git status";
+      "code" = "codium";
     };
   };
 

hosts/ytnix/default.nix

@@ -232,9 +232,9 @@
     snapshotOnly = true;
     settings = {
       snapshot_preserve_min = "latest";
-      target_preserve = "*d";
+      target_preserve = "30d";
-      target_preserve_min = "no";
+      target_preserve_min = "2d";
-      target = "/mnt/external/btr_backup/ytnix";
+      target = "/mnt/target/btr_backup/ytnix";
       stream_compress = "zstd";
       stream_compress_level = "8";
       snapshot_dir = "/snapshots";