messy commit

Author: debugloop

modules/home/class-laptop/mako.nix

@@ -4,7 +4,7 @@
     settings = {
       margin = "10";
       font = "pango:Fira Mono 9";
-      anchor = "bottom-left";
+      anchor = "bottom-right";
       layer = "overlay";
       group-by = "category,summary,body";
       background-color = "#${config.colors.background}";

modules/home/class-laptop/niri.nix

@@ -21,9 +21,7 @@
         };
         keyboard = {
           xkb = {
-            layout = "us";
-            model = "pc105";
-            variant = "altgr-intl";
+            layout = "eu";
             options = "compose:rctrl,lv3:ralt_switch_multikey";
           };
         };
@@ -269,12 +267,20 @@
         "Mod+J".action = focus-window-or-workspace-down;
         "Mod+K".action = focus-window-or-workspace-up;
         "Mod+L".action = focus-column-or-monitor-right;
+        "Mod+Left".action = focus-column-or-monitor-left;
+        "Mod+Down".action = focus-window-or-workspace-down;
+        "Mod+Up".action = focus-window-or-workspace-up;
+        "Mod+Right".action = focus-column-or-monitor-right;
 
         # small move
         "Mod+Shift+H".action = consume-or-expel-window-left;
         "Mod+Shift+L".action = consume-or-expel-window-right;
         "Mod+Shift+J".action = spawn "fish" "-c" "niri msg -j windows | jq -er '.[]|select(.is_focused==true)|.is_floating' && niri msg action move-window-to-workspace-down || niri msg action move-window-down-or-to-workspace-down";
         "Mod+Shift+K".action = spawn "fish" "-c" "niri msg -j windows | jq -er '.[]|select(.is_focused==true)|.is_floating' && niri msg action move-window-to-workspace-up || niri msg action move-window-up-or-to-workspace-up";
+        "Mod+Shift+Left".action = consume-or-expel-window-left;
+        "Mod+Shift+Right".action = consume-or-expel-window-right;
+        "Mod+Shift+Down".action = spawn "fish" "-c" "niri msg -j windows | jq -er '.[]|select(.is_focused==true)|.is_floating' && niri msg action move-window-to-workspace-down || niri msg action move-window-down-or-to-workspace-down";
+        "Mod+Shift+Up".action = spawn "fish" "-c" "niri msg -j windows | jq -er '.[]|select(.is_focused==true)|.is_floating' && niri msg action move-window-to-workspace-up || niri msg action move-window-up-or-to-workspace-up";
 
         # large move
         # "Mod+Ctrl+H".action = move-column-left-or-to-monitor-left;
@@ -283,6 +289,10 @@
         # "Mod+Ctrl+L".action = move-column-right-or-to-monitor-right;
         "Mod+Ctrl+H".action = spawn "fish" "-c" "niri msg -j windows | jq -er '.[]|select(.is_focused==true)|.is_floating' && niri msg action move-window-to-monitor-left || niri msg action move-column-left-or-to-monitor-left";
         "Mod+Ctrl+L".action = spawn "fish" "-c" "niri msg -j windows | jq -er '.[]|select(.is_focused==true)|.is_floating' && niri msg action move-window-to-monitor-right || niri msg action move-column-right-or-to-monitor-right";
+        "Mod+Ctrl+Down".action = move-workspace-down;
+        "Mod+Ctrl+Up".action = move-workspace-up;
+        "Mod+Ctrl+Left".action = spawn "fish" "-c" "niri msg -j windows | jq -er '.[]|select(.is_focused==true)|.is_floating' && niri msg action move-window-to-monitor-left || niri msg action move-column-left-or-to-monitor-left";
+        "Mod+Ctrl+Right".action = spawn "fish" "-c" "niri msg -j windows | jq -er '.[]|select(.is_focused==true)|.is_floating' && niri msg action move-window-to-monitor-right || niri msg action move-column-right-or-to-monitor-right";
 
         # swaylike workspace focus with wrapping
         # "Mod+Ctrl+J".action = spawn "fish" "-c" "niri msg -j workspaces | jq -r 'sort_by(.idx).[-2].is_focused' | grep true; and niri msg action focus-workspace (niri msg -j workspaces | jq -r 'sort_by(.idx).[0].idx'); or niri msg action focus-workspace-down";

modules/home/common/git.nix

@@ -87,7 +87,7 @@
       url."ssh://[email protected]/".insteadOf = "https://github.com/";
       user.signingkey = "~/.ssh/id_ed25519";
 
-      aliases = {
+      alias = {
         # shorthands for daily stuff
         a = "add";
         amend = "commit --amend --no-edit";
@@ -192,6 +192,8 @@
   };
   programs.delta = {
     enable = true;
+    enableJujutsuIntegration = true;
+    enableGitIntegration = true;
     options = {
       file-style = "omit";
       hunk-header-decoration-style = "blue ul box";

modules/home/common/nvim/lua/maps.lua

@@ -1,7 +1,31 @@
 vim.g.mapleader = " "
 
+vim.keymap.set({ "i", "c" }, "<c-bs>", "<c-w>")
+
 vim.keymap.set("n", "<c-s>", ":w<cr>", { desc = "write" })
 vim.keymap.set("n", "<c-q>", ":wqa<cr>", { desc = "write and quit all" })
+vim.keymap.set("n", "<pageup>", "<c-u>", { desc = "scroll half a page up" })
+vim.keymap.set("n", "<pagedown>", "<c-d>", { desc = "scroll half a page down" })
+vim.keymap.set("n", "<s-pageup>", "<c-b>", { desc = "scroll a page up" })
+vim.keymap.set("n", "<s-pagedown>", "<c-f>", { desc = "scroll a page down" })
+vim.keymap.set("n", "<s-left>", function()
+  local _, _, col, _ = unpack(vim.fn.getpos("."))
+  vim.cmd("normal! ^")
+  if col == vim.fn.getpos(".")[3] then
+    vim.cmd("normal! 0")
+  end
+end, { desc = "go to start of line" })
+vim.keymap.set({ "o", "x" }, "<s-left>", "^", { desc = "go to start of line" })
+vim.keymap.set({ "n", "o", "x" }, "<s-right>", "$", { desc = "go to end of line" })
+vim.keymap.set("n", "<home>", function()
+  local _, _, col, _ = unpack(vim.fn.getpos("."))
+  vim.cmd("normal! ^")
+  if col == vim.fn.getpos(".")[3] then
+    vim.cmd("normal! 0")
+  end
+end, { desc = "go to start of line" })
+vim.keymap.set({ "o", "x" }, "<home>", "^", { desc = "go to start of line" })
+vim.keymap.set({ "n", "o", "x" }, "<end>", "$", { desc = "go to end of line" })
 
 -- better up/down
 vim.keymap.set("n", "j", [[ v:count > 1 ? "m'" . v:count . "j" : "gj" ]], { expr = true, silent = true })

modules/home/common/nvim/lua/plugins.lua

@@ -24,59 +24,7 @@ local function inject_all(specs)
 end
 
 return inject_all({
-  {
-    "sourcegraph/amp.nvim",
-    branch = "main",
-    lazy = false,
-    opts = { auto_start = false, log_level = "info" },
-  },
-  {
-    "zbirenbaum/copilot.lua",
-    cmd = "Copilot",
-    event = "InsertEnter",
-    keys = {
-      {
-        "<leader>oa",
-        function()
-          require("copilot.suggestion").toggle_auto_trigger()
-        end,
-        desc = "toggle AI completion",
-      },
-    },
-    opts = {
-      server = {
-        type = "binary",
-        custom_server_filepath = "/etc/profiles/per-user/danieln/bin/copilot-language-server",
-      },
-      suggestion = {
-        trigger_on_accept = false,
-        auto_trigger = true,
-        keymap = {
-          accept = "<cr>",
-          accept_word = "<s-cr>",
-          accept_line = false,
-          next = "<c-cr>",
-          prev = false,
-          dismiss = "<space>",
-        },
-      },
-    },
-    config = function(_, opts)
-      require("copilot").setup(opts)
-      vim.api.nvim_create_autocmd("User", {
-        pattern = "BlinkCmpMenuOpen",
-        callback = function()
-          vim.b.copilot_suggestion_hidden = true
-        end,
-      })
-      vim.api.nvim_create_autocmd("User", {
-        pattern = "BlinkCmpMenuClose",
-        callback = function()
-          vim.b.copilot_suggestion_hidden = false
-        end,
-      })
-    end,
-  },
+
   {
     "coder/claudecode.nvim",
     dependencies = {
@@ -114,12 +62,12 @@ return inject_all({
       { "<leader>ad", "<cmd>ClaudeCodeDiffDeny<cr>", desc = "Deny diff" },
     },
   },
+
   {
     "saghen/blink.cmp",
     lazy = false, -- it handles itself and is an integral part anyhow
     dependencies = {
       { "rafamadriz/friendly-snippets" },
-      { "zbirenbaum/copilot.lua" },
     },
     opts = {
       appearance = {
@@ -203,9 +151,6 @@ return inject_all({
       },
       sources = {
         default = { "lsp", "path", "snippets", "buffer", "lazydev" },
-        per_filetype = {
-          codecompanion = { "codecompanion" },
-        },
         providers = {
           lsp = {
             fallbacks = { "lazydev" },
@@ -285,6 +230,7 @@ return inject_all({
 
   {
     "sindrets/diffview.nvim",
+    enabled = false,
     cmd = { "DiffviewOpen", "DiffviewPR" },
     keys = {
       {
@@ -764,7 +710,7 @@ return inject_all({
     opts = {
       view = {
         style = "sign",
-        signs = { add = "┃", change = "┃", delete = "_" },
+        signs = { add = "│", change = "│", delete = "_" },
         priority = 20,
       },
       mappings = {
@@ -793,6 +739,20 @@ return inject_all({
         desc = "browse files",
       },
     },
+    config = function(_, opts)
+      require("mini.files").setup(opts)
+      vim.api.nvim_create_autocmd("User", {
+        pattern = "MiniFilesBufferCreate",
+        callback = function(args)
+          local buf_id = args.data.buf_id
+          vim.keymap.set("n", "<left>", MiniFiles.go_out, { buffer = buf_id })
+          vim.keymap.set("n", "<right>", function()
+            MiniFiles.go_in({ close_on_file = true })
+          end, { buffer = buf_id })
+          vim.keymap.set("n", "<s-right>", MiniFiles.go_in, { buffer = buf_id })
+        end,
+      })
+    end,
   },
 
   {
@@ -1725,61 +1685,61 @@ return inject_all({
     end,
   },
 
-  -- {
-  --   "nvim-treesitter/nvim-treesitter",
-  --   branch = "main",
-  --   lazy = false,
-  --   dependencies = {
-  --     {
-  --       "nvim-treesitter/nvim-treesitter-textobjects",
-  --       branch = "main",
-  --     },
-  --   },
-  --   config = function(_, _)
-  --     vim.api.nvim_create_autocmd("FileType", {
-  --       pattern = { "*" },
-  --       callback = function()
-  --         local ok = pcall(vim.treesitter.start)
-  --         if ok then
-  --           vim.wo.foldexpr = "v:lua.vim.treesitter.foldexpr()"
-  --           vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
-  --         end
-  --       end,
-  --     })
-  --   end,
-  -- },
-
   {
     "nvim-treesitter/nvim-treesitter",
+    branch = "main",
     lazy = false,
     dependencies = {
       {
         "nvim-treesitter/nvim-treesitter-textobjects",
+        branch = "main",
       },
     },
-    opts = {
-      ensure_installed = {}, -- we get this from nix
-      highlight = {
-        enable = true,
-      },
-      incremental_selection = {
-        enable = false,
-        keymaps = {
-          init_selection = "<cr>",
-          node_incremental = "<cr>",
-          scope_incremental = "<s-cr>",
-          node_decremental = "<bs>",
-        },
-      },
-      indent = {
-        enable = true,
-      },
-    },
-    config = function(_, opts)
-      require("nvim-treesitter.configs").setup(opts)
+    config = function(_, _)
+      vim.api.nvim_create_autocmd("FileType", {
+        pattern = { "*" },
+        callback = function()
+          local ok = pcall(vim.treesitter.start)
+          if ok then
+            vim.wo.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+            vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+          end
+        end,
+      })
     end,
   },
 
+  -- {
+  --   "nvim-treesitter/nvim-treesitter",
+  --   lazy = false,
+  --   dependencies = {
+  --     {
+  --       "nvim-treesitter/nvim-treesitter-textobjects",
+  --     },
+  --   },
+  --   opts = {
+  --     ensure_installed = {}, -- we get this from nix
+  --     highlight = {
+  --       enable = true,
+  --     },
+  --     incremental_selection = {
+  --       enable = false,
+  --       keymaps = {
+  --         init_selection = "<cr>",
+  --         node_incremental = "<cr>",
+  --         scope_incremental = "<s-cr>",
+  --         node_decremental = "<bs>",
+  --       },
+  --     },
+  --     indent = {
+  --       enable = true,
+  --     },
+  --   },
+  --   config = function(_, opts)
+  --     require("nvim-treesitter.configs").setup(opts)
+  --   end,
+  -- },
+
   {
     "nvim-treesitter/nvim-treesitter-context",
     dependencies = {

modules/nixos/class-laptop/virt.nix

@@ -1,11 +1,11 @@
-{...}: {
+{pkgs, ...}: {
   virtualisation = {
     docker = {
-      enable = false; # rootful docker disabled
-      daemon.settings = {
-        rootless = {
-          enable = true;
-          setSocketVariable = true;
+      enable = false;
+      rootless = {
+        enable = true;
+        setSocketVariable = true;
+        daemon.settings = {
           bip = "10.200.0.1/24";
           default-address-pools = [
             {
@@ -21,4 +21,23 @@
       };
     };
   };
+
+  # Use pasta instead of slirp4netns for better DNS handling
+  # Pasta auto-discovers DNS from /etc/resolv.conf by default via --dns-host
+  environment.systemPackages = [ pkgs.passt ];
+  systemd.user.services.docker = {
+    path = [ pkgs.passt ];
+    environment = {
+      DOCKERD_ROOTLESS_ROOTLESSKIT_NET = "pasta";
+      DOCKERD_ROOTLESS_ROOTLESSKIT_PORT_DRIVER = "implicit";
+      # Use Cloudflare DNS for pasta (works on any network)
+      # Containers don't need split DNS, so public resolver is fine
+      DOCKERD_ROOTLESS_ROOTLESSKIT_PASTA_OPTIONS = "--dns-host 1.1.1.1";
+    };
+  };
+  # https://github.com/NixOS/nixpkgs/issues/231191#issuecomment-1664053176
+  environment.etc."resolv.conf".mode = "direct-symlink";
+  networking.firewall = {
+    checkReversePath = "loose";
+  };
 }

modules/nixos/common/default.nix

@@ -25,6 +25,7 @@
 
   networking = {
     hostName = hostName;
+    firewall.enable = true;
     nftables.enable = true;
   };