Update

2024-10-04 21:03:01 +02:00 · 2024-10-04 21:03:01 +02:00 · 58fa41a210
commit 58fa41a210
parent 8f6b049129
15 changed files with 417 additions and 184 deletions
--- a/docs/TODO.md
+++ b/docs/TODO.md
@ -3,19 +3,21 @@
 feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))

 - [ ] Hyprshade (replacement for gammastep)
- [ ] !!! Qutebrowser Bitwarden integration (I need this.)
+  - [ ] !!! Qutebrowser Bitwarden integration (I need this.)
 - [ ] Hyprland
  - [ ] Fix screenshots (screenshot region's border shows up in the screenshot, hyprshot jq error?) and add in the scripts doc
+- [ ] Nixy
+  - [ ] Open Keybindings
 - [ ] Nixvim
+  - [ ] Markdown tab size 2
  - [ ] Harpoon
  - [ ] UFO for folding
  - [ ] neotest golang
-  - [ ] Keymaps:
-    - Trouble
-    - Tagbar (actually not working)
-    - Markdown
+  - [ ] nvim dap
  - [ ] <https://github.com/0fie/Mika>
+  - [ ] <https://github.com/redyf/Neve/blob/main/config/utils/whichkey.nix>
 - [ ] Update docs
+- [ ] Workflow README

 ## Server

--- a/home/programs/nvim/colorscheme.nix
+++ b/home/programs/nvim/colorscheme.nix
@ -1,11 +1,46 @@
 {
  programs.nixvim = {
-    enable = true;
-    colorschemes.catppuccin = {
-      enable = true;
-      settings = {
-        transparent_background = true;
-        flavour = "mocha";
+    colorschemes = {
+      catppuccin = {
+        enable = true;
+        settings = {
+          background = {
+            light = "macchiato";
+            dark = "mocha";
+          };
+          flavour =
+            "mocha"; # "latte", "mocha", "frappe", "macchiato" or raw lua code
+          disable_bold = false;
+          disable_italic = false;
+          disable_underline = false;
+          transparent_background = true;
+          term_colors = true;
+          integrations = {
+            cmp = true;
+            noice = true;
+            notify = true;
+            neotree = true;
+            harpoon = true;
+            gitsigns = true;
+            which_key = true;
+            illuminate = { enabled = true; };
+            treesitter = true;
+            treesitter_context = true;
+            telescope.enabled = true;
+            indent_blankline.enabled = true;
+            mini.enabled = true;
+            native_lsp = {
+              enabled = true;
+              inlay_hints = { background = true; };
+              underlines = {
+                errors = [ "underline" ];
+                hints = [ "underline" ];
+                information = [ "underline" ];
+                warnings = [ "underline" ];
+              };
+            };
+          };
+        };
      };
    };
  };
--- a/home/programs/nvim/default.nix
+++ b/home/programs/nvim/default.nix
@ -8,10 +8,11 @@
    ./plugins/tree.nix
    ./plugins/ui.nix
    ./plugins/utils.nix
-    ./plugins/zen-mode.nix

    ./options.nix
    ./colorscheme.nix
    ./keymaps.nix
  ];
+
+  programs.nixvim.enable = true;
 }
--- a/home/programs/nvim/keymaps.nix
+++ b/home/programs/nvim/keymaps.nix
@ -1,59 +1,287 @@
 {
-  programs.nixvim.keymaps = [
-    {
-      key = "<leader>fm";
-      action = "<cmd>lua vim.lsp.buf.format()<cr>";
-      options.desc = "LSP Format";
-    }
+  programs.nixvim = {
+    plugins.which-key = {
+      enable = true;
+      settings = {
+        icons = {
+          breadcrumb = "»";
+          group = "+";
+          separator = ""; # ➜
+        };
+        spec = [
+          # General Mappings
+          {
+            __unkeyed-1 = "<leader>c";
+            mode = [ "n" "v" ];
+            group = "+code";
+          }
+          {
+            __unkeyed-1 = "<leader>d";
+            mode = [ "n" "v" ];
+            group = "+debug";
+          }
+          {
+            __unkeyed-1 = "<leader>s";
+            mode = "n";
+            group = "+search";
+          }
+          {
+            __unkeyed-1 = "<leader>t";
+            mode = "n";
+            group = "+trouble";
+          }
+          {
+            __unkeyed-1 = "<leader>u";
+            mode = "n";
+            group = "+ui";
+          }
+          {
+            __unkeyed-1 = "<leader>w";
+            mode = "n";
+            group = "+windows";
+          }
+        ];
+        win = {
+          border = "none";
+          wo.winblend = 0;
+        };
+      };
+    };

-    # UI
-    {
-      key = "<leader>uw";
-      action = "<cmd>set wrap!<cr>";
-      options.desc = "Toggle word wrapping";
-    }
-    {
-      key = "<leader>uW";
-      action = "<cmd>set linebreak!<cr>";
-      options.desc = "Toggle linebreak";
-    }
+    keymaps = [
+      # General Mappings
+      {
+        key = "<leader>e";
+        action = "<cmd>Oil --float<cr>";
+        options.desc = "Oil";
+      }
+      {
+        key = "-";
+        action = "<cmd>Oil<cr>";
+        options.desc = "Oil";
+      }
+      {
+        key = "<C-h>";
+        action = "<cmd>TmuxNavigateLeft<cr>";
+      }
+      {
+        key = "<C-j>";
+        action = "<cmd>TmuxNavigateDown<cr>";
+      }
+      {
+        key = "<C-k>";
+        action = "<cmd>TmuxNavigateUp<cr>";
+      }
+      {
+        key = "<C-l>";
+        action = "<cmd>TmuxNavigateRight<cr>";
+      }

-    {
-      key = "<leader>uz";
-      action = "<cmd>ZenMode<cr>";
-      options.desc = "Toggle ZenMode";
-    }
+      # UI
+      {
+        key = "<leader>uw";
+        action = "<cmd>set wrap!<cr>";
+        options.desc = "Toggle word wrapping";
+      }
+      {
+        key = "<leader>ul";
+        action = "<cmd>set linebreak!<cr>";
+        options.desc = "Toggle linebreak";
+      }
+      {
+        key = "<leader>us";
+        action = "<cmd>set spell!<cr>";
+        options.desc = "Toggle spellcheck";
+      }
+      {
+        key = "<leader>uc";
+        action = "<cmd>set cursorline!<cr>";
+        options.desc = "Toggle cursorline";
+      }
+      {
+        key = "<leader>un";
+        action = "<cmd>set number!<cr>";
+        options.desc = "Toggle line numbers";
+      }
+      {
+        key = "<leader>ur";
+        action = "<cmd>set relativenumber!<cr>";
+        options.desc = "Toggle relative line numbers";
+      }
+      {
+        key = "<leader>ut";
+        action = "<cmd>set showtabline=2<cr>";
+        options.desc = "Show tabline";
+      }
+      {
+        key = "<leader>uT";
+        action = "<cmd>set showtabline=0<cr>";
+        options.desc = "Hide tabline";
+      }

-    # Trouble
-    {
-      key = "<leader>tx";
-      action = "<cmd>Trouble diagnostics toggle<cr>";
-      options.desc = "Diagnostics (Trouble)";
-    }
-    {
-      key = "<leader>tX";
-      action = "<cmd>Trouble diagnostics toggle filter.buf=0<cr>";
-      options.desc = "Buffer Diagnostics (Trouble)";
-    }
-    {
-      key = "<leader>ts";
-      action = "<cmd>Trouble symbols toggle focus=false<cr>";
-      options.desc = "Symbols (Trouble)";
-    }
-    {
-      key = "<leader>tl";
-      action = "<cmd>Trouble lsp toggle focus=false win.position=right<cr>";
-      options.desc = "LSP Definitions / references / ... (Trouble)";
-    }
-    {
-      key = "<leader>tL";
-      action = "<cmd>Trouble loclist toggle<cr>";
-      options.desc = "Location List (Trouble)";
-    }
-    {
-      key = "<leader>tQ";
-      action = "<cmd>Trouble qflist toggle<cr>";
-      options.desc = "Quickfix List (Trouble)";
-    }
-  ];
+      # Search
+      {
+        key = "<leader> ";
+        action = "<cmd>lua require('telescope.builtin').find_files()<cr>";
+        options.desc = "Telescope";
+      }
+      {
+        key = "<leader>sg";
+        action = "<cmd>lua require('telescope.builtin').live_grep()<cr>";
+        options.desc = "Livegrep";
+      }
+      {
+        key = "<leader>sf";
+        action = "<cmd>lua require('telescope.builtin').find_files()<cr>";
+        options.desc = "Find Files";
+      }
+      {
+        key = "<leader>sb";
+        action = "<cmd>lua require('telescope.builtin').buffers()<cr>";
+        options.desc = "Buffers";
+      }
+      {
+        key = "<leader>sh";
+        action = "<cmd>lua require('telescope.builtin').help_tags()<cr>";
+        options.desc = "Help Tags";
+      }
+      {
+        key = "<leader>sc";
+        action = "<cmd>lua require('telescope.builtin').commands()<cr>";
+        options.desc = "Commands";
+      }
+      {
+        key = "<leader>sm";
+        action = "<cmd>lua require('telescope.builtin').marks()<cr>";
+        options.desc = "Marks";
+      }
+      {
+        key = "<leader>so";
+        action = "<cmd>lua require('telescope.builtin').oldfiles()<cr>";
+        options.desc = "Oldfiles";
+      }
+      {
+        key = "<leader>ss";
+        action = "<cmd>lua require('telescope.builtin').spell_suggest()<cr>";
+        options.desc = "Spell Suggest";
+      }
+      {
+        key = "<leader>st";
+        action = "<cmd>lua require('telescope.builtin').treesitter()<cr>";
+        options.desc = "Treesitter";
+      }
+      {
+        key = "<leader>sr";
+        action = "<cmd>:noh<return><esc>";
+        options.desc = "Reset search";
+      }
+
+      # Trouble
+      {
+        key = "<leader>tx";
+        action = "<cmd>Trouble diagnostics toggle<cr>";
+        options.desc = "Diagnostics (Trouble)";
+      }
+      {
+        key = "<leader>tX";
+        action = "<cmd>Trouble diagnostics toggle filter.buf=0<cr>";
+        options.desc = "Buffer Diagnostics (Trouble)";
+      }
+      {
+        key = "<leader>ts";
+        action = "<cmd>Trouble symbols toggle focus=false<cr>";
+        options.desc = "Symbols (Trouble)";
+      }
+      {
+        key = "<leader>tl";
+        action = "<cmd>Trouble lsp toggle focus=false win.position=right<cr>";
+        options.desc = "LSP Definitions / references / ... (Trouble)";
+      }
+      {
+        key = "<leader>tL";
+        action = "<cmd>Trouble loclist toggle<cr>";
+        options.desc = "Location List (Trouble)";
+      }
+      {
+        key = "<leader>tQ";
+        action = "<cmd>Trouble qflist toggle<cr>";
+        options.desc = "Quickfix List (Trouble)";
+      }
+
+      # Windows
+      {
+        key = "<leader>ws";
+        action = "<cmd>split<cr>";
+        options.desc = "Split";
+      }
+      {
+        key = "<leader>wv";
+        action = "<cmd>vsplit<cr>";
+        options.desc = "VSplit";
+      }
+      {
+        key = "<leader>wd";
+        action = "<cmd>close<cr>";
+        options.desc = "Close";
+      }
+
+      # code
+      {
+        key = "<leader>cd";
+        action = "<cmd>lua vim.lsp.buf.definition()<cr>";
+        options.desc = "LSP Definition";
+      }
+      {
+        key = "<leader>cr";
+        action = "<cmd>lua vim.lsp.buf.references()<cr>";
+        options.desc = "LSP References";
+      }
+      {
+        key = "<leader>ci";
+        action = "<cmd>lua vim.lsp.buf.implementation()<cr>";
+        options.desc = "LSP Implementation";
+      }
+      {
+        key = "<leader>ct";
+        action = "<cmd>lua vim.lsp.buf.type_definition()<cr>";
+        options.desc = "LSP Type Definition";
+      }
+      {
+        key = "<leader>cs";
+        action = "<cmd>lua vim.lsp.buf.signature_help()<cr>";
+        options.desc = "LSP Signature Help";
+      }
+      {
+        key = "<leader>ch";
+        action = "<cmd>lua vim.lsp.buf.hover()<cr>";
+        options.desc = "LSP Hover";
+      }
+      {
+        key = "<leader>ca";
+        action = "<cmd>lua vim.lsp.buf.code_action()<cr>";
+        options.desc = "LSP Code Action";
+      }
+      {
+        key = "<leader>cf";
+        action = "<cmd>lua vim.lsp.buf.formatting()<cr>";
+        options.desc = "LSP Formatting";
+      }
+      {
+        key = "<leader>ce";
+        action = "<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<cr>";
+        options.desc = "LSP Line Diagnostics";
+      }
+      {
+        key = "<leader>cn";
+        action = "<cmd>lua vim.lsp.diagnostic.goto_next()<cr>";
+        options.desc = "LSP Next Diagnostic";
+      }
+      {
+        key = "<leader>cp";
+        action = "<cmd>lua vim.lsp.diagnostic.goto_prev()<cr>";
+        options.desc = "LSP Previous Diagnostic";
+      }
+
+    ];
+  };
 }
--- a/home/programs/nvim/plugins/cmp.nix
+++ b/home/programs/nvim/plugins/cmp.nix
@ -15,7 +15,10 @@
        sources = [
          { name = "nvim_lsp"; }
          { name = "luasnip"; }
-          { name = "buffer"; }
+          {
+            name = "buffer";
+            option.get_bufnrs.__raw = "vim.api.nvim_list_bufs";
+          }
          { name = "nvim_lua"; }
          { name = "path"; }
        ];
@ -80,7 +83,7 @@
          completion = {
            winhighlight =
              "FloatBorder:CmpBorder,Normal:CmpPmenu,Search:PmenuSel";
-            scrollbar = true;
+            scrollbar = false;
            sidePadding = 0;
            border = [ "╭" "─" "╮" "│" "╯" "─" "╰" "│" ];
          };
--- a/home/programs/nvim/plugins/lsp.nix
+++ b/home/programs/nvim/plugins/lsp.nix
@ -9,16 +9,9 @@
        gopls.enable = true;
        nixd.enable = true;
        tailwindcss.enable = true;
-        # html.enable = true; # FIXME: broken for some reason
+        html.enable = true;
        svelte.enable = true;
        marksman.enable = true;
-        ltex = {
-          enable = false;
-          settings = {
-            enabled = false;
-            language = "en";
-          };
-        };
      };
      keymaps.lspBuf = {
        "gd" = "definition";
--- a/home/programs/nvim/plugins/markdown.nix
+++ b/home/programs/nvim/plugins/markdown.nix
@ -9,7 +9,7 @@
    extraConfigLua = "require('render-markdown').setup({})";
    plugins = {
      mkdnflow = {
-        enable = true;
+        enable = false;
        mappings = {

          # Main
--- a/home/programs/nvim/plugins/tree.nix
+++ b/home/programs/nvim/plugins/tree.nix
@ -40,22 +40,5 @@
        };
      };
    };
-    keymaps = [
-      {
-        key = "-";
-        action = "<cmd>Oil<cr>";
-        options.desc = "Oil";
-      }
-      {
-        key = "<leader>e";
-        action = "<cmd>Oil --float<cr>";
-        options.desc = "Oil";
-      }
-      {
-        key = "<leader>E";
-        action = "<cmd>Neotree toggle<cr>";
-        options.desc = "Neotree";
-      }
-    ];
  };
 }
--- a/home/programs/nvim/plugins/ui.nix
+++ b/home/programs/nvim/plugins/ui.nix
@ -9,14 +9,54 @@
      Headline1.bold = true;
    };
    plugins = {
-      lualine.enable = true;
+      lualine = {
+        enable = true;
+        settings = {
+          options = {
+            sections = {
+              lualine_a = [ "mode" ];
+              lualine_b = [ ];
+              lualine_c = [ ];
+              lualine_y = [{
+                __unkeyed-1 = "aerial";
+                colored = true;
+                cond = {
+                  __raw = ''
+                    function()
+                      local buf_size_limit = 1024 * 1024
+                      if vim.api.nvim_buf_get_offset(0, vim.api.nvim_buf_line_count(0)) > buf_size_limit then
+                        return false
+                      end
+
+                      return true
+                    end
+                  '';
+                };
+                dense = false;
+                dense_sep = ".";
+                depth = { __raw = "nil"; };
+                sep = " ) ";
+              }];
+              lualine_z = [{ __unkeyed-1 = "location"; }];
+            };
+            tabline = {
+              lualine_a = [{
+                __unkeyed-1 = "buffers";
+                symbols = { alternate_file = ""; };
+              }];
+              lualine_z = [ "tabs" ];
+            };
+          };
+        };
+      };
+      dap.enable = true;
      web-devicons.enable = true;
      noice.enable = true;
      gitsigns = {
        enable = true;
        settings.current_line_blame = false;
      };
-      bufferline.enable = true;
+      # bufferline.enable = true;
      trouble.enable = true;
      indent-blankline.enable = true;
      which-key.enable = true;
--- a/home/programs/nvim/plugins/utils.nix
+++ b/home/programs/nvim/plugins/utils.nix
@ -13,10 +13,6 @@
      friendly-snippets.enable = true;
      telescope = {
        enable = true;
-        keymaps = {
-          "<leader>fg" = "live_grep";
-          "<leader> " = "find_files";
-        };
        extensions.fzf-native = { enable = true; };
      };
      treesitter = {
@ -29,23 +25,5 @@
      };
      treesitter-context.enable = true;
    };
-    keymaps = [
-      {
-        key = "<C-h>";
-        action = "<cmd>TmuxNavigateLeft<cr>";
-      }
-      {
-        key = "<C-j>";
-        action = "<cmd>TmuxNavigateDown<cr>";
-      }
-      {
-        key = "<C-k>";
-        action = "<cmd>TmuxNavigateUp<cr>";
-      }
-      {
-        key = "<C-l>";
-        action = "<cmd>TmuxNavigateRight<cr>";
-      }
-    ];
  };
 }
--- a/home/programs/nvim/plugins/zen-mode.nix
+++ b/home/programs/nvim/plugins/zen-mode.nix
@ -1,31 +0,0 @@
-{
-  programs.nixvim.plugins.zen-mode = {
-    enable = true;
-    settings = {
-      on_open = ''
-        function()
-          require("gitsigns.actions").toggle_current_line_blame()
-          vim.opt.relativenumber = false
-          vim.opt.signcolumn = "no"
-          vim.opt.wrap = true
-          vim.opt.linebreak = true
-        end
-      '';
-      plugins = {
-        gitsigns = { enabled = true; };
-        options = {
-          enabled = true;
-          ruler = false;
-          showcmd = false;
-        };
-        tmux = { enabled = true; };
-      };
-      window = {
-        backdrop = 0.95;
-        height = 1;
-        options = { signcolumn = "no"; };
-        width = 0.9;
-      };
-    };
-  };
-}
--- a/home/programs/shell/tmux.nix
+++ b/home/programs/shell/tmux.nix
@ -25,7 +25,8 @@
    plugins = with pkgs; [
      tmuxPlugins.vim-tmux-navigator
      tmuxPlugins.resurrect
-      tmuxPlugins.nord
+      tmuxPlugins.sensible
+      tmuxPlugins.tokyo-night-tmux
    ];
  };
 }
--- a/home/scripts/hyprfocus/default.nix
+++ b/home/scripts/hyprfocus/default.nix
@ -1,19 +1,35 @@
 { pkgs, ... }:
 let
-  hyprfocus = pkgs.writeShellScriptBin "hyprfocus" ''
-    hyprctl keyword "general:gaps_in" 0
-    hyprctl keyword "general:gaps_out" 0
-    # TODO: Fix this:
-    hyprpanel-toggle
-    hyprctl keyword "general:border_size" 1
-    hyprctl keyword "decoration:rounding" 0
-    hyprctl keyword "decoration:drop_shadow" false
-    hyprctl keyword "decoration:inactive_opacity" 0.98
-    hyprctl keyword "decoration:active_opacity" 1
-  '';
+  hyprfocus-on = pkgs.writeShellScriptBin "hyprfocus-on"
+    # bash
+    ''
+      hyprctl keyword "general:gaps_in" 0
+      hyprctl keyword "general:gaps_out" 0
+      # TODO: Fix this:
+      hyprpanel-toggle
+      hyprctl keyword "general:border_size" 1
+      hyprctl keyword "decoration:rounding" 0
+      hyprctl keyword "decoration:drop_shadow" false
+      hyprctl keyword "decoration:inactive_opacity" 0.98
+      hyprctl keyword "decoration:active_opacity" 1
+      echo "1" > /tmp/hyprfocus
+    '';

-  hyprfocus-kill = pkgs.writeShellScriptBin "hyprfocus-kill" ''
-    hyprctl reload
-    hyprpanel-reload
-  '';
-in { home.packages = [ hyprfocus hyprfocus-kill ]; }
+  hyprfocus-off = pkgs.writeShellScriptBin "hyprfocus-off"
+    # bash
+    ''
+      hyprctl reload
+      hyprpanel-reload
+      rm /tmp/hyprfocus
+    '';
+
+  hyprfocus-toggle = pkgs.writeShellScriptBin "hyprfocus-toggle"
+    # bash 
+    ''
+      if [ -f /tmp/hyprfocus ]; then
+        hyprfocus-kill
+      else
+        hyprfocus
+      fi
+    '';
+in { home.packages = [ hyprfocus-on hyprfocus-off hyprfocus-toggle ]; }
--- a/home/system/batsignal/default.nix
+++ b/home/system/batsignal/default.nix
@ -1,6 +1,6 @@
 {
  services.batsignal = {
    enable = true;
-    extraArgs = [ "-c 10" "-w 30" "-f 97" ];
+    extraArgs = [ "-c 10" "-w 30" "-f disabled" ];
  };
 }
--- a/home/system/hyprland/default.nix
+++ b/home/system/hyprland/default.nix
@ -36,7 +36,6 @@
    xwayland.enable = true;
    systemd.enable = true;
    package = inputs.hyprland.packages."${pkgs.system}".hyprland;
-    plugins = [ inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo ];

    settings = {
      "$mod" = "SUPER";
@ -55,21 +54,6 @@
        ",prefered,auto,1"
      ];

-      plugin = {
-        hyprexpo = {
-          columns = 2;
-          gap_size = 5;
-          bg_col = "rgb(111111)";
-          workspace_method =
-            "center current"; # [center/first] [workspace] e.g. first 1 or center m+1
-
-          enable_gesture = true; # laptop touchpad
-          gesture_fingers = 3; # 3 or 4
-          gesture_distance = 300; # how far is the "max"
-          gesture_positive = true; # positive = swipe down. Negative = swipe up.
-        };
-      };
-
      bind = [
        "$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty" # Kitty
        "$mod, E, exec, ${pkgs.xfce.thunar}/bin/thunar" # Thunar
@ -78,7 +62,7 @@
        "$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock
        "$mod, X, exec, powermenu" # Powermenu
        "$mod, SPACE, exec, menu" # Launcher
-        "$shiftMod, SPACE, hyprexpo:expo, toggle" # HyprExpo
+        "$shiftMod, SPACE, exec, hyprfocus-toggle" # Toggle HyprFocus

        "$mod, Q, killactive," # Close window
        "$mod, T, togglefloating," # Toggle Floating