accumulated changes

Author: debugloop

modules/home/class-laptop/ai.nix

@@ -0,0 +1,11 @@
+{pkgs, ...}: {
+  home = {
+    packages = with pkgs; [
+      awsume
+      claude-code
+      copilot-language-server
+      github-copilot-cli
+      amp-cli
+    ];
+  };
+}

modules/home/class-laptop/default.nix

@@ -1,5 +1,6 @@
 {pkgs, ...}: {
   imports = [
+    ./ai.nix
     ./applications.nix
     ./clipman.nix
     ./ghostty.nix
@@ -47,6 +48,7 @@
       # cli apps with graphical deps
       imagemagick
       pdftk
+      qmk
     ];
   };
 

modules/home/class-laptop/kitty.nix

@@ -106,8 +106,8 @@
     '';
     keybindings = {
       # os windows
-      "ctrl+shift+n" = "launch --type=os-window --cwd=current";
-      "ctrl+shift+r" = "set_window_title";
+      "alt+n" = "launch --type=os-window --cwd=current";
+      "alt+r" = "set_window_title";
 
       # clipboard
       "ctrl+shift+c" = "copy_to_clipboard";
@@ -116,33 +116,30 @@
       # scrolling
       "shift+page_up" = "scroll_page_up";
       "shift+page_down" = "scroll_page_down";
-      "shift+end" = "scroll_end";
-      "ctrl+shift+page_up" = "scroll_to_prompt -1";
-      "ctrl+shift+page_down" = "scroll_to_prompt +1";
+      "alt+page_up" = "scroll_to_prompt -1";
+      "alt+page_down" = "scroll_to_prompt +1";
 
       # font size
-      "ctrl+shift+equal" = "change_font_size current +2.0";
-      "ctrl+shift+minus" = "change_font_size current -2.0";
-      "ctrl+shift+0" = "change_font_size current 0";
+      "alt+plus" = "change_font_size current +2.0";
+      "alt+equal" = "change_font_size current +2.0";
+      "alt+minus" = "change_font_size current -2.0";
+      "alt+0" = "change_font_size current 0";
 
       # dump output to vim
-      "ctrl+shift+h" = "show_scrollback";
+      "alt+h" = "show_scrollback";
 
       # paste things
-      "ctrl+shift+g" = "kitten hints --hints-text-color=red --type hash --program -";
-      "ctrl+shift+w" = "kitten hints --hints-text-color=red --type word --program -";
-      "ctrl+shift+l" = "kitten hints --hints-text-color=red --type line --program -";
+      "alt+g" = "kitten hints --hints-text-color=red --type hash --program -";
+      "alt+w" = "kitten hints --hints-text-color=red --type word --program -";
+      "alt+f" = "kitten hints --hints-text-color=red --type path --program -";
 
-      # quick actions
-      "ctrl+shift+f" = "kitten hints --hints-text-color=red --type path";
-      "ctrl+shift+e" = "kitten hints --hints-text-color=red --type url --program default";
-      "ctrl+shift+u" = "kitten hints --hints-text-color=red --type url --program default";
-      "ctrl+shift+shift+u" = "kitten unicode_input";
+      # urls
+      "alt+e" = "kitten hints --hints-text-color=red --type url --program default";
+      "alt+u" = "kitten hints --hints-text-color=red --type url --program default";
 
       # markers
-      "ctrl+shift+m" = "create_marker";
-      "ctrl+shift+," = "remove_marker";
-      "ctrl+shift+f1" = "toggle_marker iregex 1 \\\\berr(or)?\\\\b 2 \\\\bwarn(ing)?\\\\b 3 \\\\b(info|debug|trace)\\\\b";
+      "alt+m" = "create_marker";
+      "alt+shift+m" = "remove_marker";
     };
   };
 }

modules/home/class-laptop/niri.nix

@@ -14,6 +14,7 @@
       screenshot-path = "~/pictures/screenshot-%d-%m-%Y-%T.png";
       input = {
         workspace-auto-back-and-forth = true;
+        # warp-mouse-to-focus.enable = true;
         focus-follows-mouse = {
           enable = true;
           max-scroll-amount = "0%";
@@ -23,7 +24,7 @@
             layout = "us";
             model = "pc105";
             variant = "altgr-intl";
-            options = "compose:rctrl,lv3:caps_switch";
+            options = "compose:rctrl,lv3:ralt_switch_multikey";
           };
         };
         touchpad = {
@@ -208,7 +209,7 @@
 
         # lock and suspend
         "Mod+Backslash".action = spawn "${pkgs.swaylock-effects}/bin/swaylock" "-f";
-        "Mod+Ctrl+Shift+Backslash".action = spawn "systemctl" "suspend";
+        "Mod+Ctrl+Backslash".action = spawn "systemctl" "suspend";
         "Cancel".action = spawn "${pkgs.swaylock-effects}/bin/swaylock" "-f";
 
         # window actions

modules/home/common/cloud.nix

@@ -9,6 +9,7 @@
   programs = {
     rbw.enable = true;
     tmate.enable = true;
+    granted.enable = true;
     gh = {
       enable = true;
       settings = {

modules/home/common/extra.nix

@@ -58,7 +58,7 @@
       ripgrep
       tailspin
       tcpdump
-      qsv
+      xan
     ];
   };
 }

modules/home/common/git.nix

@@ -6,6 +6,9 @@
   home = {
     packages = with pkgs; [
       git
+      jjui
+      jj-pre-push
+      jujutsu
       gitAndTools.git-absorb
       gitAndTools.git-trim
       mergiraf
@@ -17,6 +20,15 @@
       '';
     };
   };
+  programs.jujutsu = {
+    enable = true;
+    settings = {
+      user = {
+        email = "[email protected]";
+        name = "Daniel Nägele";
+      };
+    };
+  };
   programs.git = {
     enable = true;
     userName = "Daniel Nägele";
@@ -114,7 +126,7 @@
         if [ $# -eq 0 ]; then
           git ls-files --modified --others --exclude-standard | grep -Ev '^(vendor/|go.(mod|sum)$)'
         else
-          git show -m --pretty=tformat: --name-only @ | grep -Ev '^(vendor/|go.(mod|sum)$)'
+          git diff --name-only $@ | grep -Ev '^(vendor/|go.(mod|sum)$)'
         fi
       }; f";
 

modules/home/common/nvim/default.nix

@@ -58,6 +58,9 @@
         "nvim-treesitter-textobjects" # uses master
         "quicker-nvim"
         "snacks-nvim"
+        # "amp-nvim"
+        "copilot-lua"
+        "claudecode-nvim"
       ]
       (
         name: {

modules/home/common/nvim/lua/lsp.lua

@@ -188,6 +188,87 @@ vim.lsp.config("rust_analyzer", {
   end,
 })
 
+vim.lsp.config("copilot", {
+  cmd = {
+    "copilot-language-server",
+    "--stdio",
+  },
+  root_markers = { ".git" },
+  init_options = {
+    editorInfo = {
+      name = "Neovim",
+      version = tostring(vim.version()),
+    },
+    editorPluginInfo = {
+      name = "Neovim",
+      version = tostring(vim.version()),
+    },
+  },
+  settings = {
+    telemetry = {
+      telemetryLevel = "all",
+    },
+  },
+  on_attach = function(client, bufnr)
+    vim.api.nvim_buf_create_user_command(bufnr, "LspCopilotSignIn", function()
+      client:request(
+        ---@diagnostic disable-next-line: param-type-mismatch
+        "signIn",
+        vim.empty_dict(),
+        function(err, result)
+          if err then
+            vim.notify(err.message, vim.log.levels.ERROR)
+            return
+          end
+          if result.command then
+            local code = result.userCode
+            local command = result.command
+            vim.fn.setreg("+", code)
+            vim.fn.setreg("*", code)
+            local continue = vim.fn.confirm(
+              "Copied your one-time code to clipboard.\n" .. "Open the browser to complete the sign-in process?",
+              "&Yes\n&No"
+            )
+            if continue == 1 then
+              client:exec_cmd(command, { bufnr = bufnr }, function(cmd_err, cmd_result)
+                if cmd_err then
+                  vim.notify(err.message, vim.log.levels.ERROR)
+                  return
+                end
+                if cmd_result.status == "OK" then
+                  vim.notify("Signed in as " .. cmd_result.user .. ".")
+                end
+              end)
+            end
+          end
+
+          if result.status == "PromptUserDeviceFlow" then
+            vim.notify("Enter your one-time code " .. result.userCode .. " in " .. result.verificationUri)
+          elseif result.status == "AlreadySignedIn" then
+            vim.notify("Already signed in as " .. result.user .. ".")
+          end
+        end
+      )
+    end, { desc = "Sign in Copilot with GitHub" })
+    vim.api.nvim_buf_create_user_command(bufnr, "LspCopilotSignOut", function()
+      client:request(
+        ---@diagnostic disable-next-line: param-type-mismatch
+        "signOut",
+        vim.empty_dict(),
+        function(err, result)
+          if err then
+            vim.notify(err.message, vim.log.levels.ERROR)
+            return
+          end
+          if result.status == "NotSignedIn" then
+            vim.notify("Not signed in.")
+          end
+        end
+      )
+    end, { desc = "Sign out Copilot with GitHub" })
+  end,
+})
+
 vim.lsp.enable({
   "gopls",
   "typos-lsp",
@@ -198,4 +279,5 @@ vim.lsp.enable({
   "harper",
   "fish",
   "rust_analyzer",
+  -- "copilot",
 })

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

@@ -1,5 +1,8 @@
 vim.g.mapleader = " "
 
+vim.keymap.set("n", "<c-s>", ":w<cr>", { desc = "write" })
+vim.keymap.set("n", "<c-q>", ":wqa<cr>", { desc = "write and quit all" })
+
 -- better up/down
 vim.keymap.set("n", "j", [[ v:count > 1 ? "m'" . v:count . "j" : "gj" ]], { expr = true, silent = true })
 vim.keymap.set("n", "k", [[ v:count > 1 ? "m'" . v:count . "k" : "gk" ]], { expr = true, silent = true })
@@ -13,6 +16,7 @@ vim.keymap.set("n", "H", function()
   end
 end, { desc = "go to start of line" })
 vim.keymap.set({ "o", "x" }, "H", "^", { desc = "go to start of line" })
+-- TODO: add map to L before comment
 vim.keymap.set({ "n", "o", "x" }, "L", "$", { desc = "go to end of line" })
 
 -- better paste