more fixups

config/nvim/lua/plugins/nvim.lua

@@ -348,30 +348,4 @@ return {
             { 'ySs', mode = 'n' },
         },
     },
-    {
-        'saghen/blink.indent',
-        opts = {
-            blocked = {
-                filetypes = {
-                    include_defaults = true,
-                    'fugitive',
-                    'markdown',
-                    'typst',
-                    'git',
-                },
-            },
-            static = {
-                char = '│',
-            },
-            scope = { enabled = false },
-        },
-    },
-    {
-        'zeybek/camouflage.nvim',
-        event = 'VeryLazy',
-        config = true,
-        keys = {
-            { '<leader>C', '<cmd>CamouflageToggle<cr>', desc = 'Toggle Camouflage' },
-        },
-    }
 }

config/nvim/plugin/autocmds.lua

@@ -73,3 +73,14 @@ vim.api.nvim_create_autocmd('WinLeave', {
         vim.wo.cursorline = false
     end,
 })
+
+vim.api.nvim_create_autocmd('BufEnter', {
+    group = aug,
+    callback = function()
+        local sw = vim.bo.shiftwidth
+        if sw <= 0 then return end
+        vim.opt_local.listchars:append({
+            leadmultispace = '│' .. string.rep(' ', sw - 1),
+        })
+    end,
+})

config/nvim/plugin/options.lua

@@ -35,7 +35,6 @@ o.list = true
 opt.listchars = {
     space = ' ',
     trail = '·',
-    tab = '  ',
 }
 
 opt.matchpairs:append('<:>')

config/tmux/tmux.conf

@@ -50,8 +50,8 @@ unbind \'; bind \' splitw -hc '#{pane_current_path}'
 unbind \-; bind \- splitw -vc '#{pane_current_path}'
 
 unbind y; bind y if -F '#{pane_in_mode}' 'send q' 'copy-mode'
-unbind /; bind / if -F '#{pane_in_mode}' 'send q' 'copy-mode \; send /'
+unbind /; bind / if -F '#{pane_in_mode}' 'send q' 'copy-mode ; send /'
-unbind ?; bind ? if -F '#{pane_in_mode}' 'send q' 'copy-mode \; send ?'
+unbind ?; bind ? if -F '#{pane_in_mode}' 'send q' 'copy-mode ; send ?'
 
 bind -T copy-mode-vi v send -X begin-selection
 bind -T copy-mode-vi y send -X copy-pipe-and-cancel 'test -n "$WAYLAND_DISPLAY" && wl-copy || xclip -in -sel c'

home/modules/bootstrap.nix

@@ -26,8 +26,10 @@ in
 
   home.activation.cloneNixConfig = lib.hm.dag.entryAfter [ "createDirectories" ] ''
     if [ ! -d "${repoDir}" ]; then
-      $DRY_RUN_CMD mkdir -p "$(dirname "${repoDir}")"
+      run mkdir -p "$(dirname "${repoDir}")"
-      $DRY_RUN_CMD ${pkgs.git}/bin/git clone https://github.com/barrettruth/nix-config.git "${repoDir}" || true
+      if ! run ${pkgs.git}/bin/git clone https://github.com/barrettruth/nix-config.git "${repoDir}" 2>&1; then
+        echo "WARNING: could not clone nix-config (network may not be ready)"
+      fi
     fi
   '';
 

home/modules/hyprpaper.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   lib,
   ...
 }:
@@ -7,10 +8,13 @@ let
   isNixOS = builtins.pathExists /etc/NIXOS;
 in
 {
+  home.packages = lib.mkIf isNixOS [ pkgs.hyprpaper ];
+
   services.hyprpaper = {
     enable = true;
     package = lib.mkIf (!isNixOS) null;
     settings = {
+      preload = [ "~/img/screen/wallpaper.jpg" ];
       wallpaper = [ ",~/img/screen/wallpaper.jpg" ];
       splash = false;
     };