partially fill out vars for git

monochrome polybar icons
temp: disable jj fish integration
2025-07-06 21:20:13 +00:00 · 2024-02-16 20:56:28 -05:00 · 2024-02-16 20:56:03 -05:00 · 2024-02-13 09:49:32 -05:00 · 2024-02-13 09:49:22 -05:00 · 2024-02-13 09:48:56 -05:00
24 changed files with 268 additions and 244 deletions
--- a/flake.lock
+++ b/flake.lock
@ -1,22 +1,5 @@
 {
  "nodes": {
-    "Comment-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1681214440,
-        "narHash": "sha256-48hy+hiaDJLlgWqC7IeZI3dT+VwWkRo4atQbyPxu/ys=",
-        "owner": "numToStr",
-        "repo": "Comment.nvim",
-        "rev": "e51f2b142d88bb666dcaa77d93a07f4b419aca70",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numToStr",
-        "ref": "v0.8.0",
-        "repo": "Comment.nvim",
-        "type": "github"
-      }
-    },
    "baleia-nvim-src": {
      "flake": false,
      "locked": {
@ -53,11 +36,11 @@
    "bypass-paywalls-clean": {
      "flake": false,
      "locked": {
-        "lastModified": 1706880406,
-        "narHash": "sha256-8z2Gc3ITluXXbDij4Ltahpkxs7zdnMITvIAjotab/QU=",
+        "lastModified": 1707683475,
+        "narHash": "sha256-FhAwgDV+4lrtvjoX0DfjFxFuXx76xAl1QnVSqzqkkzI=",
        "owner": "magnolia1234",
        "repo": "bpc-uploads",
-        "rev": "c91cfd510390ab5a138f412ad2890b2cb2a2eafd",
+        "rev": "5013f74a9be9a4329c597b39a69cb4e1e8d6c544",
        "type": "gitlab"
      },
      "original": {
@ -82,6 +65,23 @@
        "type": "github"
      }
    },
+    "comment-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1681214440,
+        "narHash": "sha256-48hy+hiaDJLlgWqC7IeZI3dT+VwWkRo4atQbyPxu/ys=",
+        "owner": "numToStr",
+        "repo": "Comment.nvim",
+        "rev": "e51f2b142d88bb666dcaa77d93a07f4b419aca70",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numToStr",
+        "ref": "v0.8.0",
+        "repo": "Comment.nvim",
+        "type": "github"
+      }
+    },
    "darwin": {
      "inputs": {
        "nixpkgs": [
@ -110,11 +110,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706491084,
-        "narHash": "sha256-eaEv+orTmr2arXpoE4aFZQMVPOYXCBEbLgK22kOtkhs=",
+        "lastModified": 1707524024,
+        "narHash": "sha256-HmumZ8FuWAAYZrWUKm3N4G4h8nmZ5VUVX+vXLmCJNKM=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "f67ba6552845ea5d7f596a24d57c33a8a9dc8de9",
+        "rev": "d07de570ba05cec2807d058daaa044f6955720c7",
        "type": "github"
      },
      "original": {
@ -147,11 +147,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1707007453,
-        "narHash": "sha256-vs7uACn2/8GOApZJv52gAVsLfpjQWFgkHN2QJ7aVkl8=",
+        "lastModified": 1707612259,
+        "narHash": "sha256-oZgnpwtpcvjRaRF++IdEWvQUV3PU6bEAyUYv8gAGZbQ=",
        "owner": "bandithedoge",
        "repo": "nixpkgs-firefox-darwin",
-        "rev": "d839feb516758ad28bc1cef43008d55e749c1d6a",
+        "rev": "121995525d845657b2fea5d7a2b93f0f28540b43",
        "type": "github"
      },
      "original": {
@ -235,11 +235,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706985585,
-        "narHash": "sha256-ptshv4qXiC6V0GCfpABz88UGGPNwqs5tAxaRUKbk1Qo=",
+        "lastModified": 1707683400,
+        "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "1ca210648a6ca9b957efde5da957f3de6b1f0c45",
+        "rev": "21b078306a2ab68748abf72650db313d646cf2ca",
        "type": "github"
      },
      "original": {
@ -252,11 +252,11 @@
    "kitty-scrollback-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1706891759,
-        "narHash": "sha256-p7RPqLHO6D5CCTDQzUrEqTu9+jg+V7wtYfGbY4qjE9A=",
+        "lastModified": 1707528426,
+        "narHash": "sha256-avtAG7BR63V1V2eT6S8BmFmgtfhtJw9440lpQUhEILg=",
        "owner": "mikesmithgh",
        "repo": "kitty-scrollback.nvim",
-        "rev": "12f7687ac049d46a987c39b2b4f657fdf540fa4e",
+        "rev": "f9605398313077553433754adea1ed486107cdfa",
        "type": "github"
      },
      "original": {
@ -307,7 +307,7 @@
    "nextcloud-snappymail": {
      "flake": false,
      "locked": {
-        "lastModified": 1707018069,
+        "lastModified": 1707509765,
        "narHash": "sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo=",
        "type": "tarball",
        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
@ -325,11 +325,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706886721,
-        "narHash": "sha256-iDYxsE5xYoK8Ww2TYZDmgRQNIZl+QHJfChOxWh45g0k=",
+        "lastModified": 1707399750,
+        "narHash": "sha256-rDYGILM+qW9xvRALPsMKwWouFB7vwnDj0GTeRIkGdDM=",
        "owner": "gytis-ivaskevicius",
        "repo": "nix2vim",
-        "rev": "29253dcf0f645a44847006d436b096369ef42fd8",
+        "rev": "813ca68c6f8d287ced56efd7bc442dcc0cd1c9e9",
        "type": "github"
      },
      "original": {
@ -361,11 +361,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706085261,
-        "narHash": "sha256-7PgpHRHyShINcqgevPP1fJ6N8kM5ZSOJnk3QZBrOCQ0=",
+        "lastModified": 1707405218,
+        "narHash": "sha256-ZQ366Oo8WJbCqXAZET7N0Sz6RQ3G2IbqVtxQRSa3SXc=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "896f6589db5b25023b812bbb6c1f5d3a499b1132",
+        "rev": "843e2f04c716092797ffa4ce14c446adce2f09ef",
        "type": "github"
      },
      "original": {
@ -376,11 +376,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1706732774,
-        "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
+        "lastModified": 1707546158,
+        "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d",
+        "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0",
        "type": "github"
      },
      "original": {
@ -390,34 +390,34 @@
        "type": "github"
      }
    },
-    "null-ls-nvim-src": {
-      "flake": false,
+    "nur": {
      "locked": {
-        "lastModified": 1691810493,
-        "narHash": "sha256-cWA0rzkOp/ekVKaFee7iea1lhnqKtWUIU+fW5M950wI=",
-        "owner": "jose-elias-alvarez",
-        "repo": "null-ls.nvim",
-        "rev": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7",
+        "lastModified": 1707684252,
+        "narHash": "sha256-uIxfAPm/qsK1KSBVe3HwSGVHziTcgYY67WXSmYIDvNU=",
+        "owner": "nix-community",
+        "repo": "nur",
+        "rev": "73479b37282accecfc7f3f91e56a0b709f104ad2",
        "type": "github"
      },
      "original": {
-        "owner": "jose-elias-alvarez",
-        "repo": "null-ls.nvim",
+        "owner": "nix-community",
+        "repo": "nur",
        "type": "github"
      }
    },
-    "nur": {
+    "nvim-lint-src": {
+      "flake": false,
      "locked": {
-        "lastModified": 1707013032,
-        "narHash": "sha256-9kEY/D0Q6sF+p6vJRefVXDK4QQdwK4Q0lSQdsYICad0=",
-        "owner": "nix-community",
-        "repo": "nur",
-        "rev": "ab432acea15134873882610c0e936a882319bc8a",
+        "lastModified": 1707389610,
+        "narHash": "sha256-o2XCMJOySY7A40yS8/aFqhOSpPWTleD4DnOMssSKmXc=",
+        "owner": "mfussenegger",
+        "repo": "nvim-lint",
+        "rev": "966ab3dc37eee3e413692264b44a3011b05a6060",
        "type": "github"
      },
      "original": {
-        "owner": "nix-community",
-        "repo": "nur",
+        "owner": "mfussenegger",
+        "repo": "nvim-lint",
        "type": "github"
      }
    },
@ -441,11 +441,11 @@
    "nvim-tree-lua-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1706571452,
-        "narHash": "sha256-b0LIqLC8cCRX1NyJx4eH5c4v5Fqqw5mMleAnQ2VRctM=",
+        "lastModified": 1707632320,
+        "narHash": "sha256-hZ6YMrVGZRYfdbsULSz4MEn7D8y9g3CtzuxTBseTuck=",
        "owner": "kyazdani42",
        "repo": "nvim-tree.lua",
-        "rev": "f39f7b6fcd3865ac2146de4cb4045286308f2935",
+        "rev": "4a87b8b46b4a30107971871df3cb7f4c30fdd5d0",
        "type": "github"
      },
      "original": {
@ -457,11 +457,11 @@
    "nvim-treesitter-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1706952848,
-        "narHash": "sha256-pNjEODR+QJPDL58O4NM7SjzZEN8D3bXDHbKLNOS3fL8=",
+        "lastModified": 1707658579,
+        "narHash": "sha256-inzHbLYMyGfr1d5HUv7jd/DyjeM7GSUxQmtxuU4t/Ew=",
        "owner": "nvim-treesitter",
        "repo": "nvim-treesitter",
-        "rev": "4fbf150a1621d52f17b099506e1a32f107079210",
+        "rev": "b52b298669f0813bbfbc12d07280c9e2f6f17ebc",
        "type": "github"
      },
      "original": {
@ -503,11 +503,11 @@
    "rep": {
      "flake": false,
      "locked": {
-        "lastModified": 1705833236,
-        "narHash": "sha256-hm+v+b97z1HnY/7QHZxc0GygCq9W0mJauyjnz48ddaM=",
+        "lastModified": 1707216692,
+        "narHash": "sha256-/dH+mNtNHaYFndVhoqmz4Sc3HeemoQt1HGD98mb9Qhw=",
        "owner": "robenkleene",
        "repo": "rep-grep",
-        "rev": "365acc5d599934e94dc066eb85b7ddd684ba508b",
+        "rev": "10510d47e392cb9d30a861c69f702fd194b3fa88",
        "type": "github"
      },
      "original": {
@ -518,11 +518,11 @@
    },
    "root": {
      "inputs": {
-        "Comment-nvim-src": "Comment-nvim-src",
        "baleia-nvim-src": "baleia-nvim-src",
        "bufferline-nvim-src": "bufferline-nvim-src",
        "bypass-paywalls-clean": "bypass-paywalls-clean",
        "cmp-nvim-lsp-src": "cmp-nvim-lsp-src",
+        "comment-nvim-src": "comment-nvim-src",
        "darwin": "darwin",
        "disko": "disko",
        "fidget-nvim-src": "fidget-nvim-src",
@ -537,8 +537,8 @@
        "nix2vim": "nix2vim",
        "nixos-generators": "nixos-generators",
        "nixpkgs": "nixpkgs",
-        "null-ls-nvim-src": "null-ls-nvim-src",
        "nur": "nur",
+        "nvim-lint-src": "nvim-lint-src",
        "nvim-lspconfig-src": "nvim-lspconfig-src",
        "nvim-tree-lua-src": "nvim-tree-lua-src",
        "nvim-treesitter-src": "nvim-treesitter-src",
@ -643,11 +643,11 @@
    "tree-sitter-bash": {
      "flake": false,
      "locked": {
-        "lastModified": 1705686017,
-        "narHash": "sha256-+Mpks0FyQLl26TX63J6WhaAl/QDUR1k9wSUY5SFwL+w=",
+        "lastModified": 1707605310,
+        "narHash": "sha256-bUOwR1m0tBA0mI8/zOxa44nuTK6LICE7gINIk+a/ov0=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-bash",
-        "rev": "f7239f638d3dc16762563a9027faeee518ce1bd9",
+        "rev": "1c6ebd1ae1d4afb140df094b2ac443a52bf7ff95",
        "type": "github"
      },
      "original": {
@ -780,11 +780,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706867893,
-        "narHash": "sha256-c5bADvtL35S3vsJaXR5YWTXe08W0gSwOrTOXfpJB4Ac=",
+        "lastModified": 1707476384,
+        "narHash": "sha256-9YortZTCO9r7wFHX92t+npUDmD5VcKrkVmwaPCvEiXI=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "bcae8dc73b931b7f0fc65f1f1ef93dc379dfd66b",
+        "rev": "76ca59d8d4423b27c0238bc31401692ebc571365",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -69,16 +69,12 @@
      url = "github:hrsh7th/cmp-nvim-lsp";
      flake = false;
    };
-    null-ls-nvim-src = {
-      url = "github:jose-elias-alvarez/null-ls.nvim";
-      flake = false;
-    };
    baleia-nvim-src = {
      # https://github.com/m00qek/baleia.nvim/tags
      url = "github:m00qek/baleia.nvim";
      flake = false;
    };
-    Comment-nvim-src = {
+    comment-nvim-src = {
      # https://github.com/numToStr/Comment.nvim/releases
      url = "github:numToStr/Comment.nvim/v0.8.0";
      flake = false;
@ -124,6 +120,10 @@
      url = "github:mikesmithgh/kitty-scrollback.nvim";
      flake = false;
    };
+    nvim-lint-src = {
+      url = "github:mfussenegger/nvim-lint";
+      flake = false;
+    };

    # Tree-Sitter Grammars
    tree-sitter-bash = {
@ -375,6 +375,10 @@
          path = ./templates/haskell;
          description = "Haskell template";
        };
+        rust = {
+          path = ./templates/rust;
+          description = "Rust template";
+        };
      };

    };
--- a/modules/common/applications/kitty.nix
+++ b/modules/common/applications/kitty.nix
@ -57,7 +57,7 @@
          allow_remote_control = "socket-only";
          listen_on = "unix:/tmp/kitty";
          action_alias =
-            "kitty_scrollback_nvim kitten ${pkgs.kitty-scrollback-nvim}/python/kitty_scrollback_nvim.py";
+            "kitty_scrollback_nvim kitten ${pkgs.vimPlugins.kitty-scrollback-nvim}/python/kitty_scrollback_nvim.py";

          # Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache)
          background = config.theme.colors.base00;
--- a/modules/common/neovim/config/lsp.nix
+++ b/modules/common/neovim/config/lsp.nix
@ -6,105 +6,107 @@
  options.kubernetes =
    lib.mkEnableOption "Whether to enable Kubernetes features";

-  config =
+  config = {
+    plugins = [
+      pkgs.vimPlugins.nvim-lspconfig
+      pkgs.vimPlugins.conform-nvim
+      pkgs.vimPlugins.fidget-nvim
+      pkgs.vimPlugins.nvim-lint
+    ];

-    let
-
-      terraformFormat = if config.terraform then ''
-        require("null-ls").builtins.formatting.terraform_fmt.with({
-            command = "${pkgs.terraform}/bin/terraform",
-            extra_filetypes = { "hcl" },
-        }),
-      '' else
-        "";
-
-    in {
-      plugins = [
-        pkgs.vimPlugins.nvim-lspconfig
-        pkgs.vimPlugins.null-ls-nvim
-        pkgs.vimPlugins.fidget-nvim
-      ];
-
-      setup.fidget = { };
-
-      use.lspconfig.lua_ls.setup = dsl.callWith {
-        settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
-        capabilities =
-          dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
-        cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
-      };
-
-      use.lspconfig.nil_ls.setup = dsl.callWith {
-        cmd = [ "${pkgs.nil}/bin/nil" ];
-        capabilities =
-          dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
-      };
-
-      use.lspconfig.pyright.setup = dsl.callWith {
-        cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
-      };
-
-      use.lspconfig.terraformls.setup = dsl.callWith {
-        cmd = if config.terraform then [
-          "${pkgs.terraform-ls}/bin/terraform-ls"
-          "serve"
-        ] else
-          [ "echo" ];
-      };
-
-      use.lspconfig.rust_analyzer.setup = dsl.callWith {
-        cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ];
-        settings = {
-          "['rust-analyzer']" = { check = { command = "clippy"; }; };
-        };
-      };
-
-      vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];
-
-      lua = ''
-        ${builtins.readFile ./lsp.lua}
-
-        -- Prevent infinite log size (change this when debugging)
-        vim.lsp.set_log_level("off")
-
-        require("null-ls").setup({
-            sources = {
-                require("null-ls").builtins.formatting.stylua.with({ command = "${pkgs.stylua}/bin/stylua" }),
-                require("null-ls").builtins.formatting.black.with({ command = "${pkgs.black}/bin/black" }),
-                require("null-ls").builtins.diagnostics.ruff.with({ command = "${pkgs.ruff}/bin/ruff" }),
-                require("null-ls").builtins.formatting.fish_indent.with({ command = "${pkgs.fish}/bin/fish_indent" }),
-                require("null-ls").builtins.formatting.nixfmt.with({ command = "${pkgs.nixfmt}/bin/nixfmt" }),
-                require("null-ls").builtins.formatting.rustfmt.with({ command = "${pkgs.rustfmt}/bin/rustfmt" }),
-                require("null-ls").builtins.diagnostics.shellcheck.with({ command = "${pkgs.shellcheck}/bin/shellcheck" }),
-                require("null-ls").builtins.formatting.shfmt.with({
-                    command = "${pkgs.shfmt}/bin/shfmt",
-                    extra_args = { "-i", "4", "-ci" },
-                }),
-                ${terraformFormat}
-            },
-
-            on_attach = function(client, bufnr)
-                if client.supports_method("textDocument/formatting") then
-                    -- Auto-format on save
-                    vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
-                    vim.api.nvim_create_autocmd("BufWritePre", {
-                        group = augroup,
-                        buffer = bufnr,
-                        callback = function()
-                            vim.lsp.buf.format({ bufnr = bufnr })
-                        end,
-                    })
-                    -- Use internal formatting for bindings like gq.
-                    vim.api.nvim_create_autocmd("LspAttach", {
-                        callback = function(args)
-                            vim.bo[args.buf].formatexpr = nil
-                        end,
-                    })
-                end
-            end,
-        })
-      '';
+    setup.fidget = { };

+    use.lspconfig.lua_ls.setup = dsl.callWith {
+      settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
+      capabilities =
+        dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+      cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
    };

+    use.lspconfig.nil_ls.setup = dsl.callWith {
+      cmd = [ "${pkgs.nil}/bin/nil" ];
+      capabilities =
+        dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+    };
+
+    use.lspconfig.pyright.setup = dsl.callWith {
+      cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
+    };
+
+    use.lspconfig.terraformls.setup = dsl.callWith {
+      cmd = if config.terraform then [
+        "${pkgs.terraform-ls}/bin/terraform-ls"
+        "serve"
+      ] else
+        [ "echo" ];
+    };
+
+    use.lspconfig.rust_analyzer.setup = dsl.callWith {
+      cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ];
+      settings = {
+        "['rust-analyzer']" = {
+          check = { command = "clippy"; };
+          files = { excludeDirs = [ ".direnv" ]; };
+        };
+      };
+    };
+
+    setup.conform = {
+      format_on_save = {
+        # These options will be passed to conform.format()
+        timeout_ms = 1500;
+        lsp_fallback = true;
+      };
+      formatters_by_ft = {
+        lua = [ "stylua" ];
+        python = [ "black" ];
+        fish = [ "fish_indent" ];
+        nix = [ "nixfmt" ];
+        rust = [ "rustfmt" ];
+        sh = [ "shfmt" ];
+        terraform = if config.terraform then [ "terraform_fmt" ] else [ ];
+        hcl = if config.terraform then [ "terraform_fmt" ] else [ ];
+      };
+      formatters = {
+        lua.command = "${pkgs.stylua}/bin/stylua";
+        black.command = "${pkgs.black}/bin/black";
+        fish_indent.command = "${pkgs.fish}/bin/fish_indent";
+        nixfmt.command = "${pkgs.nixfmt}/bin/nixfmt";
+        rustfmt = {
+          command = "${pkgs.rustfmt}/bin/rustfmt";
+          prepend_args = [ "--edition" "2021" ];
+        };
+        shfmt = {
+          command = "${pkgs.shfmt}/bin/shfmt";
+          prepend_args = [ "-i" "4" "-ci" ];
+        };
+        terraform_fmt.command =
+          if config.terraform then "${pkgs.terraform}/bin/terraform" else "";
+      };
+    };
+
+    use.lint = {
+      linters_by_ft = dsl.toTable {
+        python = [ "ruff" ];
+        sh = [ "shellcheck" ];
+      };
+    };
+
+    vim.api.nvim_create_autocmd = dsl.callWith [
+      (dsl.toTable [ "BufEnter" "BufWritePost" ])
+      (dsl.rawLua "{ callback = function() require('lint').try_lint() end }")
+    ];
+
+    lua = ''
+      ${builtins.readFile ./lsp.lua}
+
+      local ruff = require('lint').linters.ruff; ruff.cmd = "${pkgs.ruff}/bin/ruff"
+      local shellcheck = require('lint').linters.shellcheck; shellcheck.cmd = "${pkgs.shellcheck}/bin/shellcheck"
+
+      -- Prevent infinite log size (change this when debugging)
+      vim.lsp.set_log_level("off")
+    '';
+
+  };
+
 }
--- a/modules/common/neovim/config/misc.nix
+++ b/modules/common/neovim/config/misc.nix
@ -8,7 +8,7 @@
    pkgs.vimPlugins.glow-nvim # Markdown preview popup
    pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
    pkgs.vimPlugins.which-key-nvim # Keybind helper
-    pkgs.kitty-scrollback-nvim # Scrollback pager for kitty
+    pkgs.vimPlugins.kitty-scrollback-nvim # Scrollback pager for kitty
  ];

  # Initialize some plugins
--- a/modules/common/neovim/config/syntax.nix
+++ b/modules/common/neovim/config/syntax.nix
@ -24,8 +24,8 @@
    pkgs.vimPlugins.playground # Tree-sitter experimenting
    pkgs.vimPlugins.nginx-vim
    pkgs.vimPlugins.vim-helm
-    pkgs.baleia-nvim # Clean ANSI from kitty scrollback
-    # pkgs.hmts-nvim # Tree-sitter injections for home-manager
+    pkgs.vimPlugins.baleia-nvim # Clean ANSI from kitty scrollback
+    # pkgs.vimPlugins.hmts-nvim # Tree-sitter injections for home-manager
    (pkgs.vimUtils.buildVimPlugin {
      pname = "nmasur";
      version = "0.1";
--- a/modules/common/shell/fish/functions/fish_user_key_bindings.fish
+++ b/modules/common/shell/fish/functions/fish_user_key_bindings.fish
@ -18,5 +18,5 @@ bind -M insert \cn 'commandline -r "nix shell nixpkgs#"'
 bind -M default \cn 'commandline -r "nix shell nixpkgs#"'
 bind -M insert \x11F nix-fzf
 bind -M default \x11F nix-fzf
-bind -M insert \ch _atuin_search --filter-mode global
-bind -M default \ch _atuin_search --filter-mode global
+bind -M insert \ch '_atuin_search --filter-mode global'
+bind -M default \ch '_atuin_search --filter-mode global'
--- a/modules/common/shell/git.nix
+++ b/modules/common/shell/git.nix
@ -45,7 +45,7 @@ in {
      # TODO: fix with variables
      xdg.configFile."git/personal".text = ''
        [user]
-            name = "Noah Masur"
+            name = "${config.fullName}"
            email = "7386960+nmasur@users.noreply.github.com"
      '';

--- a/modules/common/shell/jujutsu.nix
+++ b/modules/common/shell/jujutsu.nix
@ -4,7 +4,7 @@

    home-manager.users.${config.user}.programs.jujutsu = {
      enable = true;
-      enableFishIntegration = true;
+      enableFishIntegration = false; # Temp: not working

      # https://github.com/martinvonz/jj/blob/main/docs/config.md
      settings = {
--- a/modules/darwin/hammerspoon.nix
+++ b/modules/darwin/hammerspoon.nix
@ -16,6 +16,7 @@
          firefox = "${pkgs.firefox-bin}/Applications/Firefox.app";
          discord = "${pkgs.discord}/Applications/Discord.app";
          kitty = "${pkgs.kitty}/Applications/kitty.app";
+          obsidian = "${pkgs.obsidian}/Applications/Obsidian.app";
          slack = "${pkgs.slack}/Applications/Slack.app";
        };
      xdg.configFile."hammerspoon/Spoons/MoveWindow.spoon".source =
--- a/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua
+++ b/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua
@ -8,10 +8,10 @@ obj.name = "Launcher"
 obj.version = "0.1"
 obj.license = "MIT - https://opensource.org/licenses/MIT"

-local width = hs.screen.mainScreen():fullFrame().w
+local screen = hs.screen.primaryScreen()
 local switcherWidth = 500
 obj.canvas = hs.canvas.new({
-    x = width / 2 - switcherWidth / 2,
+    x = (screen:fullFrame().x + screen:fullFrame().w) / 2 - switcherWidth / 2,
    y = 1,
    h = 3,
    w = switcherWidth,
@ -80,7 +80,7 @@ function obj:init()
        self:switch("Messages.app")
    end)
    self.launcher:bind("", "O", function()
-        self:switch("Obsidian.app")
+        self:switch("@obsidian@")
    end)
    self.launcher:bind("", "P", function()
        self:switch("System Preferences.app")
--- a/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua
+++ b/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua
@ -56,7 +56,7 @@ function obj:init()
        local frame = win:frame()
        -- maximize if possible
        local max = win:screen():fullFrame()
-        frame.x = max.w / 2
+        frame.x = (max.x * 2 + max.w) / 2
        frame.y = max.y
        frame.w = max.w / 2
        frame.h = max.h
--- a/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua
+++ b/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua
@ -51,6 +51,7 @@ local function worklayout()
        local laptop = {
            { "Firefox",  nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
            { "Obsidian", nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
+            { "Calendar", nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
        }
        local layout = concat(left, right, laptop)
        hs.layout.apply(layout)
--- a/modules/darwin/kitty.nix
+++ b/modules/darwin/kitty.nix
@ -3,7 +3,6 @@
  # MacOS-specific settings for Kitty
  home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
    programs.kitty = {
-      darwinLaunchOptions = [ "--start-as=fullscreen" ];
      font.size = lib.mkForce 20;
      settings = {
        shell = "/run/current-system/sw/bin/fish";
--- a/modules/darwin/system.nix
+++ b/modules/darwin/system.nix
@ -201,6 +201,10 @@

        echo "Choose and order dock icons"
        defaults write com.apple.dock persistent-apps -array ${persistentApps}
+
+        echo "Reduce Menu Bar padding"
+        defaults write -globalDomain NSStatusItemSelectionPadding -int 6
+        defaults write -globalDomain NSStatusItemSpacing -int 6
      '';

    };
--- a/modules/darwin/utilities.nix
+++ b/modules/darwin/utilities.nix
@ -7,7 +7,7 @@
  home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {

    home.packages = with pkgs; [
-      # visidata # CSV inspector
+      visidata # CSV inspector
      dos2unix # Convert Windows text files
      inetutils # Includes telnet
      youtube-dl # Convert web videos
--- a/modules/nixos/applications/nautilus.nix
+++ b/modules/nixos/applications/nautilus.nix
@ -36,23 +36,12 @@
      # Set Nautilus as default for opening directories
      xdg.mimeApps = {
        associations.added."inode/directory" = [ "org.gnome.Nautilus.desktop" ];
-        # associations.removed = {
-        #   "inode/directory" = [ "kitty-open.desktop" ];
-        # };
        defaultApplications."inode/directory" =
          lib.mkBefore [ "org.gnome.Nautilus.desktop" ];
      };

    };

-    # # Set default for opening directories
-    # xdg.mime = {
-    #   addedAssociations."inode/directory" = [ "org.gnome.Nautilus.desktop" ];
-    #   removedAssociations = { "inode/directory" = [ "kitty-open.desktop" ]; };
-    #   defaultApplications."inode/directory" =
-    #     lib.mkForce [ "org.gnome.Nautilus.desktop" ];
-    # };
-
    # Delete Trash files older than 1 week
    systemd.user.services.empty-trash = {
      description = "Empty Trash on a regular basis";
--- a/modules/nixos/graphical/polybar.nix
+++ b/modules/nixos/graphical/polybar.nix
@ -141,7 +141,7 @@
            format-volume = "<ramp-volume> <label-volume>";
            # format-volume-background = colors.background;
            # label-volume-background = colors.background;
-            format-volume-foreground = config.theme.colors.base0B;
+            format-volume-foreground = config.theme.colors.base04;
            label-volume = "%percentage%%";
            label-muted = "󰝟 ---";
            label-muted-foreground = config.theme.colors.base03;
@ -197,7 +197,7 @@
            date = "%d %b %l:%M %p";
            date-alt = "%Y-%m-%d %H:%M:%S";
            label = "%date%";
-            label-foreground = config.theme.colors.base0A;
+            label-foreground = config.theme.colors.base06;
            # format-background = colors.background;
          };
          "module/keyboard" = {
--- a/modules/nixos/services/cloudflare.nix
+++ b/modules/nixos/services/cloudflare.nix
@ -80,7 +80,7 @@ in {
    };

    # Allows Nextcloud to trust Cloudflare IPs
-    services.nextcloud.extraOptions.trusted_proxies = cloudflareIpRanges;
+    services.nextcloud.settings.trusted_proxies = cloudflareIpRanges;

  };
 }
--- a/modules/nixos/services/nextcloud.nix
+++ b/modules/nixos/services/nextcloud.nix
@ -14,7 +14,7 @@
        adminpassFile = config.secrets.nextcloud.dest;
        dbtype = "mysql";
      };
-      extraOptions = {
+      settings = {
        default_phone_region = "US";
        # Allow access when hitting either of these hosts or IPs
        trusted_domains = [ config.hostnames.content ];
--- a/modules/nixos/services/paperless.nix
+++ b/modules/nixos/services/paperless.nix
@ -48,23 +48,12 @@
      before = [ "paperless.service" ];
    };

-    # Fix permissions on a regular schedule
-    systemd.timers.paperless-permissions = {
-      timerConfig = {
-        OnCalendar = "*-*-* *:0/5"; # Every 5 minutes
-        Unit = "paperless-permissions.service";
-      };
-      wantedBy = [ "timers.target" ];
-    };
-
    # Fix paperless shared permissions
-    systemd.services.paperless-permissions = {
-      description = "Allow group access to paperless files";
-      serviceConfig = { Type = "oneshot"; };
-      script = ''
-        find ${config.services.paperless.mediaDir} -type f -exec chmod 640 -- {} +
-      '';
-    };
+    systemd.services.paperless-web.serviceConfig.UMask = lib.mkForce "0026";
+    systemd.services.paperless-scheduler.serviceConfig.UMask =
+      lib.mkForce "0026";
+    systemd.services.paperless-task-queue.serviceConfig.UMask =
+      lib.mkForce "0026";

  };

--- a/modules/nixos/system/user.nix
+++ b/modules/nixos/system/user.nix
@ -1,4 +1,4 @@
-{ config, lib, ... }: {
+{ config, pkgs, lib, ... }: {

  options = {

@ -31,11 +31,22 @@

    };

+    # Allow writing custom scripts outside of Nix
+    # Probably shouldn't make this a habit
+    environment.localBinInPath = true;
+
    home-manager.users.${config.user}.xdg = {

      # Allow Nix to manage the default applications list
      mimeApps.enable = true;

+      # Create a desktop option for Burp
+      desktopEntries.burp = lib.mkIf pkgs.stdenv.isLinux {
+        name = "Burp";
+        exec = "${config.homePath}/.local/bin/burp.sh";
+        categories = [ "Application" ];
+      };
+
      # Set directories for application defaults
      userDirs = {
        enable = true;
--- a/overlays/kitty-scrollback-nvim.patch
+++ b/overlays/kitty-scrollback-nvim.patch
@ -0,0 +1,13 @@
+diff --git a/lua/kitty-scrollback/health.lua b/lua/kitty-scrollback/health.lua
+index 9d87dfa..a231b8d 100644
+--- a/lua/kitty-scrollback/health.lua
+++ b/lua/kitty-scrollback/health.lua
+@@ -234,7 +234,7 @@ local function check_kitty_debug_config()
+ end
+ 
+ local function check_kitty_scrollback_nvim_version()
+-  local current_version = nil
+  local current_version = 'master'
+   local tag_cmd = { 'git', 'describe', '--exact-match', '--tags' }
+   local ksb_dir =
+     vim.fn.fnamemodify(vim.api.nvim_get_runtime_file('lua/kitty-scrollback', false)[1], ':h:h')
--- a/overlays/neovim-plugins.nix
+++ b/overlays/neovim-plugins.nix
@ -16,26 +16,37 @@ let

 in {

-  nvim-lspconfig = withSrc prev.vimPlugins.nvim-lspconfig inputs.nvim-lspconfig;
-  cmp-nvim-lsp = withSrc prev.vimPlugins.cmp-nvim-lsp inputs.cmp-nvim-lsp;
-  null-ls-nvim = withSrc prev.vimPlugins.null-ls-nvim inputs.null-ls-nvim;
-  comment-nvim = withSrc prev.vimPlugins.comment-nvim inputs.comment-nvim;
-  nvim-treesitter =
-    withSrc prev.vimPlugins.nvim-treesitter inputs.nvim-treesitter;
-  telescope-nvim = withSrc prev.vimPlugins.telescope-nvim inputs.telescope-nvim;
-  telescope-project-nvim = withSrc prev.vimPlugins.telescope-project-nvim
-    inputs.telescope-project-nvim;
-  toggleterm-nvim =
-    withSrc prev.vimPlugins.toggleterm-nvim inputs.toggleterm-nvim;
-  bufferline-nvim =
-    withSrc prev.vimPlugins.bufferline-nvim inputs.bufferline-nvim;
-  nvim-tree-lua = withSrc prev.vimPlugins.nvim-tree-lua inputs.nvim-tree-lua;
-  fidget-nvim = withSrc prev.vimPlugins.fidget-nvim inputs.fidget-nvim;
+  vimPlugins = prev.vimPlugins // {

-  # Packaging plugins entirely with Nix
-  baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
-  hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
-  kitty-scrollback-nvim =
-    plugin "kitty-scrollback-nvim" inputs.kitty-scrollback-nvim-src;
+    nvim-lspconfig =
+      withSrc prev.vimPlugins.nvim-lspconfig inputs.nvim-lspconfig-src;
+    cmp-nvim-lsp = withSrc prev.vimPlugins.cmp-nvim-lsp inputs.cmp-nvim-lsp-src;
+    comment-nvim = withSrc prev.vimPlugins.comment-nvim inputs.comment-nvim-src;
+    nvim-treesitter =
+      withSrc prev.vimPlugins.nvim-treesitter inputs.nvim-treesitter-src;
+    telescope-nvim =
+      withSrc prev.vimPlugins.telescope-nvim inputs.telescope-nvim-src;
+    telescope-project-nvim = withSrc prev.vimPlugins.telescope-project-nvim
+      inputs.telescope-project-nvim-src;
+    toggleterm-nvim =
+      withSrc prev.vimPlugins.toggleterm-nvim inputs.toggleterm-nvim-src;
+    bufferline-nvim =
+      withSrc prev.vimPlugins.bufferline-nvim inputs.bufferline-nvim-src;
+    nvim-tree-lua =
+      withSrc prev.vimPlugins.nvim-tree-lua inputs.nvim-tree-lua-src;
+    fidget-nvim = withSrc prev.vimPlugins.fidget-nvim inputs.fidget-nvim-src;
+    nvim-lint = withSrc prev.vimPlugins.nvim-lint inputs.nvim-lint-src;
+
+    # Packaging plugins entirely with Nix
+    baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
+    hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
+    kitty-scrollback-nvim = prev.vimUtils.buildVimPlugin {
+      pname = "kitty-scrollback-nvim";
+      src = inputs.kitty-scrollback-nvim-src;
+      version = "master";
+      patches = [ ./kitty-scrollback-nvim.patch ];
+    };
+
+  };

 }
Author	SHA1	Message	Date
Noah Masur	013f67c0a8	partially fill out vars for git	2024-02-16 20:56:28 -05:00
Noah Masur	fb145e5772	monochrome polybar icons	2024-02-16 20:56:03 -05:00
Noah Masur	408b329684	temp: disable jj fish integration	2024-02-13 09:49:32 -05:00
Noah Masur	ad70457600	fix: compress menu bar icons	2024-02-13 09:49:22 -05:00
Noah Masur	f54f7b6e2e	fix: launching obsidian built by nix on macos	2024-02-13 09:48:56 -05:00
Noah Masur	2700efa6e4	increase format timeout in neovim	2024-02-11 22:28:05 -05:00
Noah Masur	e44adf4568	rust-analyzer: ignore direnv folder	2024-02-11 16:20:23 -05:00
Noah Masur	471b258ff7	update flake.lock	2024-02-11 16:20:06 -05:00
Noah Masur	ac6329baf6	patch kitty-scrollback-nvim because health check depends on git	2024-02-10 21:41:19 -05:00
Noah Masur	a61ac456a9	fix: neovim refactor adjusted reference for kitty-scrollback	2024-02-10 21:15:28 -05:00
Noah Masur	cf77adb366	neovim lsp refactor remove null-ls (archived, deprecated) replace formatting with conform.nvim replace diagnostics with nvim-lint fixed issue where overlay neovim plugins weren't being applied	2024-02-10 21:04:37 -05:00
Noah Masur	2217568a59	clean up commented xdg mime associations	2024-02-10 09:18:37 -05:00
Noah Masur	05deb5b979	fix paperless permissions with umask instead of running a systemd service timer	2024-02-10 01:40:04 +00:00
Noah Masur	8621e2375d	fix: nextcloud extraOptions renamed	2024-02-10 01:37:21 +00:00
Noah Masur	25975da0c1	reenable visidata on mac	2024-02-09 10:33:17 -05:00
Noah Masur	a79719c21a	fix: atuin search keybind	2024-02-09 09:51:29 -05:00
Noah Masur	5aea58df79	clean up hammerspoon on m3 w display for some reason, i need to multiply x to line up half-max frames	2024-02-08 15:28:46 -05:00
Noah Masur	1833bfddfb	prefer kitty to not start fullscreen on m3 macbook pro	2024-02-07 23:14:06 -05:00