From a5a784b2d57632a0a8f11278416433e74798a2ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 17 Jun 2024 09:59:39 +0200 Subject: [PATCH 01/10] refactor: clean up a bit --- modules/profiles/desktop.nix | 6 +- modules/programs/nvim/default.nix | 2 +- modules/programs/nvim/plugins/coding.nix | 102 ++++++++++++++--------- modules/programs/python.nix | 10 ++- 4 files changed, 69 insertions(+), 51 deletions(-) diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index 5d63b9b..c20efae 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -4,8 +4,8 @@ , ... }: -with lib; let + inherit (lib) mkEnableOption mkIf mkDefault; cfg = config.my.profiles.desktop; in { @@ -101,10 +101,6 @@ in }) ]; - nixpkgs.config.permittedInsecurePackages = [ - "electron-25.9.0" # obsidian - ]; - programs.nix-ld.enable = true; home-manager.users.moritz = { diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix index 5619db8..92f795e 100644 --- a/modules/programs/nvim/default.nix +++ b/modules/programs/nvim/default.nix @@ -1,8 +1,8 @@ { config, lib, pkgs, inputs, ... }: -with lib; let cfg = config.my.programs.nvim; + inherit (lib) mkEnableOption mkIf readFile; in { imports = lib.my.listModulesRec ./plugins; diff --git a/modules/programs/nvim/plugins/coding.nix b/modules/programs/nvim/plugins/coding.nix index 0c2d0bf..61e6ac7 100644 --- a/modules/programs/nvim/plugins/coding.nix +++ b/modules/programs/nvim/plugins/coding.nix @@ -1,26 +1,28 @@ { pkgs, lib, inputs, ... }: -with builtins; +let + inherit (builtins) readFile; +in { - config.home-manager.users.moritz.programs.neovim.lazy.plugins = with pkgs.vimPlugins; [ + config.home-manager.users.moritz.programs.neovim.lazy.plugins = [ { - plugin = oil-nvim; + plugin = pkgs.vimPlugins.oil-nvim; lazy = false; opts = { }; - dependencies = [{ plugin = nvim-web-devicons; }]; + dependencies = [{ plugin = pkgs.vimPlugins.nvim-web-devicons; }]; } { - plugin = lualine-nvim; + plugin = pkgs.vimPlugins.lualine-nvim; opts = { }; - dependencies = [{ plugin = nvim-web-devicons; }]; + dependencies = [{ plugin = pkgs.vimPlugins.nvim-web-devicons; }]; } { - plugin = mini-nvim; + plugin = pkgs.vimPlugins.mini-nvim; lazy = false; conf = readFile ./lua/mini-nvim.lua; } { - plugin = nvim-cmp; + plugin = pkgs.vimPlugins.nvim-cmp; keys = [ { key = "tc"; cmd = "CmpToggle"; desc = "Toggle Cmp sources"; } ]; @@ -28,26 +30,43 @@ with builtins; event = [ "InsertEnter" ]; dependencies = [ { - plugin = nvim-autopairs; + plugin = pkgs.vimPlugins.nvim-autopairs; opts = { }; } - { plugin = cmp-async-path; } - { plugin = cmp-buffer; } - { plugin = cmp-cmdline; } - { plugin = cmp-nvim-lsp; } - { plugin = cmp_luasnip; } - { plugin = cmp-spell; } - { plugin = cmp-nvim-lsp-signature-help; } - { plugin = friendly-snippets; } - { plugin = lspkind-nvim; } + { plugin = pkgs.vimPlugins.cmp-async-path; } + { plugin = pkgs.vimPlugins.cmp-buffer; } + { plugin = pkgs.vimPlugins.cmp-cmdline; } + { plugin = pkgs.vimPlugins.cmp-nvim-lsp; } + { plugin = pkgs.vimPlugins.cmp_luasnip; } + { plugin = pkgs.vimPlugins.cmp-spell; } + { plugin = pkgs.vimPlugins.cmp-nvim-lsp-signature-help; } { - plugin = luasnip; + plugin = pkgs.vimPlugins.copilot-cmp; + opts = { }; + dependencies = [ + { + plugin = pkgs.vimPlugins.copilot-lua; + opts = { + suggestion = { enabled = false; }; + panel = { enabled = false; }; + }; + conf = /* lua */ '' + require("copilot").setup(opts) + vim.cmd("Copilot disable") + ''; + } + ]; + } + { plugin = pkgs.vimPlugins.friendly-snippets; } + { plugin = pkgs.vimPlugins.lspkind-nvim; } + { + plugin = pkgs.vimPlugins.luasnip; conf = readFile ./lua/luasnip.lua; } ]; } { - plugin = direnv-vim; + plugin = pkgs.vimPlugins.direnv-vim; lazy = false; } { @@ -60,25 +79,26 @@ with builtins; dependencies = [ { # TODO: add all required tools to neovim or silence warnings - plugin = pkgs.vimPlugins.null-ls-nvim.overrideAttrs (_: { - version = lib.my.mkVersionInput inputs.none-ls-nvim; - src = inputs.none-ls-nvim; - }); + plugin = pkgs.vimPlugins.none-ls-nvim; conf = readFile ./lua/null-ls-nvim.lua; dependencies = [ - { plugin = which-key-nvim; } - { plugin = plenary-nvim; } + { + plugin = pkgs.vimUtils.buildVimPlugin { + pname = "none-ls-shellcheck.nvim"; + version = lib.my.mkVersionInput inputs.none-ls-shellcheck-nvim; + src = inputs.none-ls-shellcheck-nvim; + }; + } ]; } - { plugin = which-key-nvim; } - { plugin = lsp_lines-nvim; } + { plugin = pkgs.vimPlugins.lsp_lines-nvim; } { - plugin = inc-rename-nvim; + plugin = pkgs.vimPlugins.inc-rename-nvim; opts = { input_buffer_type = "dressing"; }; dependencies = [ - { plugin = dressing-nvim; } + { plugin = pkgs.vimPlugins.dressing-nvim; } ]; } { @@ -91,7 +111,7 @@ with builtins; ]; } { - plugin = vim-fugitive; + plugin = pkgs.vimPlugins.vim-fugitive; cmd = [ "G" "Git" @@ -122,11 +142,11 @@ with builtins; ]; } { - plugin = vim-tmux-navigator; + plugin = pkgs.vimPlugins.vim-tmux-navigator; event = [ "VeryLazy" ]; } { - plugin = nvim-lastplace; + plugin = pkgs.vimPlugins.nvim-lastplace; event = [ "BufReadPost" "BufNewFile" ]; opts = { lastplace_ignore_buftype = [ "quickfix" "nofile" "help" ]; @@ -135,7 +155,7 @@ with builtins; }; } { - plugin = telescope-nvim; + plugin = pkgs.vimPlugins.telescope-nvim; cmd = [ "Telescope" ]; conf = builtins.readFile ./lua/telescope.lua; keys = [ @@ -159,31 +179,31 @@ with builtins; { key = "fr"; cmd = "Telescope oldfiles"; desc = "Recent files"; } ]; dependencies = [ - { plugin = plenary-nvim; } - { plugin = telescope-fzf-native-nvim; } + { plugin = pkgs.vimPlugins.plenary-nvim; } + { plugin = pkgs.vimPlugins.telescope-fzf-native-nvim; } ]; } { - plugin = vim-startuptime; + plugin = pkgs.vimPlugins.vim-startuptime; cmd = [ "StartupTime" ]; conf = readFile ./lua/vim-startuptime.lua; } { - plugin = typst-vim; + plugin = pkgs.vimPlugins.typst-vim; ft = [ "typst" "typ" ]; } { - plugin = comment-nvim; + plugin = pkgs.vimPlugins.comment-nvim; event = [ "BufReadPost" "BufNewFile" ]; opts = { }; } { - plugin = nvim-surround; + plugin = pkgs.vimPlugins.nvim-surround; event = [ "BufReadPost" "BufNewFile" ]; opts = { }; } { - plugin = conform-nvim; + plugin = pkgs.vimPlugins.conform-nvim; keys = [ { key = "="; cmd = "lua require('conform').format()"; desc = "format buffer"; mode = [ "n" "v" ]; } ]; diff --git a/modules/programs/python.nix b/modules/programs/python.nix index aa20e4e..7c98dcb 100644 --- a/modules/programs/python.nix +++ b/modules/programs/python.nix @@ -4,8 +4,10 @@ , ... }: -with lib; let + inherit (lib) range filterAttrs attrNames foldl' head tail mkOption mkEnableOption intersectLists genAttrs flip getAttr; + inherit (lib.types) listOf enum package; + cfg = config.my.programs.python; pythonVersions = map (version: "3${toString version}") (range 8 11); @@ -23,7 +25,7 @@ let enable = mkEnableOption (toString version); pythonPackages = mkOption { default = [ ]; - type = with types; listOf (enum (pythonPackages version)); + type = listOf (enum (pythonPackages version)); }; }; in @@ -32,11 +34,11 @@ in versions = genAttrs pythonVersions versionOpts; defaultPackages = mkOption { default = [ ]; - type = with types; listOf (enum commonPackages); + type = listOf (enum commonPackages); }; extraPackages = mkOption { default = [ ]; - type = with types; listOf package; + type = listOf package; }; }; From e45b2241fabcb0fd7c85b7c6d2be29ef51627191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 17 Jun 2024 10:01:08 +0200 Subject: [PATCH 02/10] feat: update nixd config --- .nixd.json | 9 -------- flake.nix | 1 + .../nvim/plugins/lua/nvim-lspconfig.lua | 22 ++++++++++++++++++- 3 files changed, 22 insertions(+), 10 deletions(-) delete mode 100644 .nixd.json diff --git a/.nixd.json b/.nixd.json deleted file mode 100644 index 31ab0e5..0000000 --- a/.nixd.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "options": { - "enable": true, - "target": { - "args": [], - "installable": ".#nixosConfigurations.nixos-desktop.options" - } - } -} diff --git a/flake.nix b/flake.nix index 37e227d..f5fa4f3 100644 --- a/flake.nix +++ b/flake.nix @@ -67,6 +67,7 @@ outputs = inputs@{ self, flake-parts, ... }: flake-parts.lib.mkFlake { inherit inputs; } { + debug = true; # NOTE: for nixd imports = [ inputs.pre-commit-hooks.flakeModule inputs.devshell.flakeModule diff --git a/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua b/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua index d618a7f..1c6dcbe 100644 --- a/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua +++ b/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua @@ -124,7 +124,6 @@ local servers = { "gleam", "gopls", "nil_ls", - "nixd", "pylsp", "ruff_lsp", "templ", @@ -134,6 +133,27 @@ for _, lsp in ipairs(servers) do lspconfig_setup(lsp, {}) end +lspconfig_setup("nixd", { + settings = { + nixd = { + nixpkgs = { + expr = "import { }", + }, + options = { + nixos = { + expr = '(builtins.getFlake ("git+file://" + toString ./.)).nixosConfigurations.nixos-desktop.options', + }, + ["flake-parts"] = { + expr = '(builtins.getFlake ("git+file://" + toString ./.)).debug.options', + }, + ["flake-parts2"] = { + expr = '(builtins.getFlake ("git+file://" + toString ./.)).currentSystem.options', + }, + }, + }, + }, +}) + -- Add templ filetype vim.filetype.add({ extension = { templ = "templ" } }) From c11a2c5596bb7df330d744397995410a133359bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 17 Jun 2024 10:01:32 +0200 Subject: [PATCH 03/10] chore: update inputs --- flake.lock | 337 ++++++++++++++++++++++++++++------------------------- 1 file changed, 180 insertions(+), 157 deletions(-) diff --git a/flake.lock b/flake.lock index 939c222..f3aca01 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "actions-preview-nvim": { "flake": false, "locked": { - "lastModified": 1710009411, - "narHash": "sha256-PIzXWOqmTeesPZg82iLkvLpJtOoDDljvwJq8wdvRtqQ=", + "lastModified": 1715088001, + "narHash": "sha256-jf2Jw10HOIA91lMouKNvVYACbTxOaXAxc00AB2HydNs=", "owner": "aznhe21", "repo": "actions-preview.nvim", - "rev": "5072b1b1065a6b22bdd46b5c21780a91d6a08071", + "rev": "e8d41b608e24319548637685c7cfa66fadaff2b2", "type": "github" }, "original": { @@ -26,11 +26,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1712079060, - "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", + "lastModified": 1715290355, + "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", "owner": "ryantm", "repo": "agenix", - "rev": "1381a759b205dff7a6818733118d02253340fd5e", + "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", "type": "github" }, "original": { @@ -118,11 +118,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1713406758, - "narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=", + "lastModified": 1715563999, + "narHash": "sha256-DDXZOKK0C5YeZ/GTUj7HiT+oqYIt8+qTsldaDvhWHFc=", "owner": "nix-community", "repo": "disko", - "rev": "1efd500e9805a9efbce401ed5999006d397b9f11", + "rev": "e972a78f4a49cd92075d64b6feeef64d26bf2996", "type": "github" }, "original": { @@ -184,11 +184,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -239,6 +239,27 @@ "type": "indirect" } }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "nix-super", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -294,6 +315,21 @@ } }, "flake-utils_4": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { "inputs": { "systems": "systems_6" }, @@ -314,11 +350,11 @@ "gen-nvim": { "flake": false, "locked": { - "lastModified": 1712049871, - "narHash": "sha256-Bt7yJxToUnPv3JqBwWQeywIbVRqzHBqnu3NUaIxFx/M=", + "lastModified": 1714746280, + "narHash": "sha256-0AEB6im8Jz5foYzmL6KEGSAYo48g1bkFpjlCSWT6JeE=", "owner": "David-Kunz", "repo": "gen.nvim", - "rev": "87fbe811155b90eea58622614809705b966009ad", + "rev": "bd19cf584b5b82123de977b44105e855e61e5f39", "type": "github" }, "original": { @@ -351,11 +387,11 @@ "hawtkeys-nvim": { "flake": false, "locked": { - "lastModified": 1711836933, - "narHash": "sha256-wxxnQvIMHUbDOAbBAswueULavoIoIDHdJK7T09IHD8E=", + "lastModified": 1715069568, + "narHash": "sha256-oVpWh5pVU/OMnQ8ZRgW3iNG8I0xsLJnRBvt67yPWLQ0=", "owner": "tris203", "repo": "hawtkeys.nvim", - "rev": "aeba04a4ccded2aa8c8fb5d74a3bea05a8f89dab", + "rev": "261cc311d4abdc88decceca6dc1013faa14c56ea", "type": "github" }, "original": { @@ -373,11 +409,11 @@ ] }, "locked": { - "lastModified": 1710478346, - "narHash": "sha256-Xjf8BdnQG0tLhPMlqQdwCIjOp7Teox0DP3N/jjyiGM4=", + "lastModified": 1713898448, + "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "64e7763d72c1e4c1e5e6472640615b6ae2d40fbf", + "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", "type": "github" }, "original": { @@ -414,11 +450,11 @@ ] }, "locked": { - "lastModified": 1713682182, - "narHash": "sha256-2RSqVmQMFmn6OjQ21SXnWC+HuSeqDLWLftRv/ZhEDZE=", + "lastModified": 1715486357, + "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", "owner": "nix-community", "repo": "home-manager", - "rev": "4cec20dbf5c0a716115745ae32531e34816ecbbe", + "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", "type": "github" }, "original": { @@ -432,11 +468,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1712505318, - "narHash": "sha256-fzlBLhXUN6y7mzEtcGNRDXxFakBEfaj4Bmj5PuoCNaM=", + "lastModified": 1713780596, + "narHash": "sha256-DDAYNGSnrBwvVfpKx+XjkuecpoE9HiEf6JW+DBQgvm0=", "owner": "hyprwm", "repo": "contrib", - "rev": "5870244b592c22558b658dbaf94f9e41afb0316f", + "rev": "110e6dc761d5c3d352574def3479a9c39dfc4358", "type": "github" }, "original": { @@ -479,22 +515,22 @@ "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", - "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_4", "systems": "systems_4", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1713660608, - "narHash": "sha256-Wy9I4K1vuWtOv/UEpKmpDb6O8YaAY3GcC3pZu70DWMY=", + "lastModified": 1713283263, + "narHash": "sha256-Urb/njWiHYUudXpmK8EKl9Z58esTIG0PxXw5LuM2r5g=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "7c3bd4c19fe47f2d92463b81d9b38651b7a1a268", + "rev": "fe7b748eb668136dd0558b7c8279bfcd7ab4d759", "type": "github" }, "original": { "owner": "hyprwm", + "ref": "v0.39.1", "repo": "Hyprland", "type": "github" } @@ -511,11 +547,11 @@ ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -549,31 +585,6 @@ "type": "github" } }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1713619586, - "narHash": "sha256-fIhNlYhPhG5AJ8DxX3LaitnccnQ+X2MCL39W2Abp7mM=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "9e13e0915273959bfd98a10662f678c15ac71c77", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "impermanence": { "locked": { "lastModified": 1708968331, @@ -607,11 +618,11 @@ }, "master": { "locked": { - "lastModified": 1713689773, - "narHash": "sha256-4M4c9n6sYbT7Sd/RvB9pej+7BoP7X1lNrFiboNV4O7I=", + "lastModified": 1715589090, + "narHash": "sha256-zrAP+EtMbOMx0XBFPgy/u0bfUBdh0F/mLUhHiaCPMi8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a8a8401b7b26112a9b75d6c00306e160fe8f8cb3", + "rev": "983a74210808ebf5a93c5ed26de1adbc45ac6f4c", "type": "github" }, "original": { @@ -669,11 +680,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1713650988, - "narHash": "sha256-YAbwiZkKxpbM+fdTVcXmp49XtHMDYQNng/wc9L85eZs=", + "lastModified": 1715551630, + "narHash": "sha256-hNuCVU96sDo1zmnt0OSLRYv56f2CrH9XrftPsK8fMWo=", "owner": "neovim", "repo": "neovim", - "rev": "9e1bbb9813e0ea4e37f6325fe00e8f43617ef912", + "rev": "c7958356bef304320d86cd541d0de8db968c6cc8", "type": "github" }, "original": { @@ -692,11 +703,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1713657840, - "narHash": "sha256-O99sOWro/5J4qWyIFZ3vEw+abLnzOv4jrfA7FaRoyrI=", + "lastModified": 1715558773, + "narHash": "sha256-yyKzLgpCjnY6Nns5O9M13LgNtevO5UCenQr61BO0AiI=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "3ad9c1eae733e9ba5cc73c6833e3d62dbc12df9e", + "rev": "2d293e623b20fc71d94c3c96d8fc47e280edd1c7", "type": "github" }, "original": { @@ -705,21 +716,6 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -727,11 +723,11 @@ ] }, "locked": { - "lastModified": 1713668931, - "narHash": "sha256-rVlwWQlgFGGK3aPVcKmtYqWgjYnPah5FOIsYAqrMN2w=", + "lastModified": 1715483403, + "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "07ece11b22217b8459df589f858e92212b74f1a1", + "rev": "f9027322f48b427da23746aa359a6510dfcd0228", "type": "github" }, "original": { @@ -757,17 +753,16 @@ }, "nix-monitored": { "inputs": { - "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1708169437, - "narHash": "sha256-qR3UF6xf+ts/lCY2UlacKtNzZq/9jxsgsdXxiQ5gcPU=", + "lastModified": 1715016928, + "narHash": "sha256-JZx+enK1RlsMSJGmX/KTpADtxrCPDztQRKpO22LKZZM=", "owner": "ners", "repo": "nix-monitored", - "rev": "382ed0cad468cb0b5426bf0905da573efa96c218", + "rev": "776e497a13b8b403065d59c45a3fdc07b76a0db1", "type": "github" }, "original": { @@ -779,16 +774,18 @@ "nix-super": { "inputs": { "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_4", "libgit2": "libgit2", "nixpkgs": "nixpkgs_6", - "nixpkgs-regression": "nixpkgs-regression" + "nixpkgs-regression": "nixpkgs-regression", + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1713633256, - "narHash": "sha256-MKKP3oye1YlF4zq0cARo3BrYzinBaBSJzcdaTxatuew=", + "lastModified": 1713821351, + "narHash": "sha256-JctHGT1oa4pet4PgUKRM7pf0w+qGe0a/ahVij8bee3o=", "owner": "privatevoid-net", "repo": "nix-super", - "rev": "1a2019bb819dde804d7aed43853e31e1a6ea6ea3", + "rev": "5ecd820c18b1aaa3c8ee257a7a9a2624c4107031", "type": "github" }, "original": { @@ -815,20 +812,14 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", - "type": "github" + "lastModified": 1714640452, + "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" } }, "nixpkgs-regression": { @@ -865,11 +856,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713254108, - "narHash": "sha256-0TZIsfDbHG5zibtlw6x0yOp3jkInIGaJ35B7Y4G8Pec=", + "lastModified": 1715499532, + "narHash": "sha256-9UJLb8rdi2VokYcfOBQHUzP3iNxOPNWcbK++ENElpk0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fd19c8be2551a61c1ddc3d9f86d748f4db94f00", + "rev": "af8b9db5c00f1a8e4b83578acc578ff7d823b786", "type": "github" }, "original": { @@ -897,11 +888,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "lastModified": 1715087517, + "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", "type": "github" }, "original": { @@ -913,11 +904,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1713596654, - "narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", + "lastModified": 1715499532, + "narHash": "sha256-9UJLb8rdi2VokYcfOBQHUzP3iNxOPNWcbK++ENElpk0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be", + "rev": "af8b9db5c00f1a8e4b83578acc578ff7d823b786", "type": "github" }, "original": { @@ -945,11 +936,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1713627711, - "narHash": "sha256-kWlK1w/rqPBrs5rF4btRgXpzVstmNxA8rgc6kBzc89s=", + "lastModified": 1715499532, + "narHash": "sha256-9UJLb8rdi2VokYcfOBQHUzP3iNxOPNWcbK++ENElpk0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0c97ced70e0b92d46e5e53e239fec5201f8b0811", + "rev": "af8b9db5c00f1a8e4b83578acc578ff7d823b786", "type": "github" }, "original": { @@ -991,29 +982,29 @@ "type": "github" } }, - "none-ls-nvim": { + "none-ls-shellcheck-nvim": { "flake": false, "locked": { - "lastModified": 1713584427, - "narHash": "sha256-tJEyILFUEdGASYkkaoUEsKcyTWU4XLHtkNF2MJstuyY=", - "owner": "nvimtools", - "repo": "none-ls.nvim", - "rev": "88821b67e6007041f43b802f58e3d9fa9bfce684", + "lastModified": 1710845791, + "narHash": "sha256-t06Nu7wVEGoJtaaZh/psvuC9kdYhwh6JeOd0cg3WVHY=", + "owner": "gbprod", + "repo": "none-ls-shellcheck.nvim", + "rev": "0f84461241e76e376a95fb7391deac82dc3efdbf", "type": "github" }, "original": { - "owner": "nvimtools", - "repo": "none-ls.nvim", + "owner": "gbprod", + "repo": "none-ls-shellcheck.nvim", "type": "github" } }, "nur": { "locked": { - "lastModified": 1713683463, - "narHash": "sha256-4byae6EewzcPs1C1JGOts1PLVr+PlR7+FOOqJGNSBIQ=", + "lastModified": 1715588836, + "narHash": "sha256-H6dKRVSLE7rJfCFUuaSsjgJBhwKqodAK+QCdldD4gRw=", "owner": "nix-community", "repo": "NUR", - "rev": "568cd159bad8d8a2e3c2f3f7b71dd27a3d553b45", + "rev": "3478942a77be062c5914af2607021f8fbf3abc71", "type": "github" }, "original": { @@ -1025,11 +1016,11 @@ "nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1713507075, - "narHash": "sha256-/SqLT0PG2RUWyknYpcXlcU/aUyKWZMBs35s1sPRkEmc=", + "lastModified": 1715493027, + "narHash": "sha256-qOzuJLyJz3wiLoZ/Gy4EQvWDhVprNHID1oUbOIA4MwM=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "ed8b8a15acc441aec669f97d75f2c1f2ac8c8aa5", + "rev": "94513a5b246cf32a8f87ca714af50911df63351c", "type": "github" }, "original": { @@ -1040,11 +1031,21 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": [ + "nix-super" + ], "flake-utils": "flake-utils_4", - "gitignore": "gitignore", - "nixpkgs": "nixpkgs_8", - "nixpkgs-stable": "nixpkgs-stable" + "gitignore": [ + "nix-super" + ], + "nixpkgs": [ + "nix-super", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nix-super", + "nixpkgs" + ] }, "locked": { "lastModified": 1712897695, @@ -1060,14 +1061,36 @@ "type": "github" } }, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_5", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_8", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1714478972, + "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "2849da033884f54822af194400f8dff435ada242", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "river": { "flake": false, "locked": { - "lastModified": 1713527168, - "narHash": "sha256-oYVyqNfXjmR6axGyki+jZVOOHFVt1YWAX08eqxtVE6c=", + "lastModified": 1715523364, + "narHash": "sha256-Gzv/Gu4OwOJZAyWH3rNx+AW5hJR+5Alxss0lCP+gbQk=", "ref": "refs/heads/master", - "rev": "9bbd34a0e31b6d429df2d39a59d8990a9585e186", - "revCount": 1248, + "rev": "1e3ef88bd573e4940f7e9dcffdbf119161473e4d", + "revCount": 1254, "submodules": true, "type": "git", "url": "https://github.com/riverwm/river" @@ -1102,10 +1125,10 @@ "nix-monitored": "nix-monitored", "nix-super": "nix-super", "nixpkgs": "nixpkgs_7", - "none-ls-nvim": "none-ls-nvim", + "none-ls-shellcheck-nvim": "none-ls-shellcheck-nvim", "nur": "nur", "nvim-lspconfig": "nvim-lspconfig", - "pre-commit-hooks": "pre-commit-hooks", + "pre-commit-hooks": "pre-commit-hooks_2", "river": "river", "smartcolumn-nvim": "smartcolumn-nvim", "stable": "stable", @@ -1149,11 +1172,11 @@ "statuscol-nvim": { "flake": false, "locked": { - "lastModified": 1708023805, - "narHash": "sha256-I6Wefl83mcMURtJEq1yaR2thxVMfpJmjSplapeVyKYE=", + "lastModified": 1714347907, + "narHash": "sha256-Rl0VlsExASyx0+Le7VsY4aVQ+LqFWknZSFh40qGWEHI=", "owner": "luukvbaal", "repo": "statuscol.nvim", - "rev": "e9e4c30b68abe456d80a0b144149ebf3f4527ed8", + "rev": "ef3617d0c8cfaa29f7bcdaa8b7cc35df2a409bae", "type": "github" }, "original": { @@ -1271,11 +1294,11 @@ "telekasten-nvim": { "flake": false, "locked": { - "lastModified": 1713339207, - "narHash": "sha256-eg1xJUl4a+tIyJyN+UcaK0bP1o+zEo6mARFlJcsAwM8=", + "lastModified": 1713773667, + "narHash": "sha256-RsxzOa9bQMKB6LRyo4Vc9hxIJGJ35NSBrLdEi2BSaBU=", "owner": "renerocksai", "repo": "telekasten.nvim", - "rev": "24fd8c1e7eb989dba9efa5d174e42870f08da8fb", + "rev": "319276a7853ff996b7bb1ed4250d8047c84ad29d", "type": "github" }, "original": { @@ -1359,11 +1382,11 @@ ] }, "locked": { - "lastModified": 1713214484, - "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=", + "lastModified": 1714662532, + "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61", + "rev": "1f228ba2f1f254195c0b571302b37482861abee3", "type": "github" }, "original": { From fcfc54871715cfba1ec1c6d0632cf5f290760874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 17 Jun 2024 10:02:10 +0200 Subject: [PATCH 04/10] feat: improve nvim experience --- flake.nix | 4 ++-- .../programs/nvim/plugins/lua/null-ls-nvim.lua | 4 ++-- modules/programs/nvim/plugins/lua/nvim-cmp.lua | 18 ++++++++++-------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index f5fa4f3..16bb6a4 100644 --- a/flake.nix +++ b/flake.nix @@ -37,8 +37,6 @@ smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim"; telekasten-nvim.flake = false; telekasten-nvim.url = "github:renerocksai/telekasten.nvim"; - none-ls-nvim.flake = false; - none-ls-nvim.url = "github:nvimtools/none-ls.nvim"; neotest-python.flake = false; neotest-python.url = "github:MoritzBoehme/neotest-python/fix-runtimepath-search"; statuscol-nvim.flake = false; @@ -47,6 +45,8 @@ gen-nvim.url = "github:David-Kunz/gen.nvim"; hawtkeys-nvim.flake = false; hawtkeys-nvim.url = "github:tris203/hawtkeys.nvim"; + none-ls-shellcheck-nvim.flake = false; + none-ls-shellcheck-nvim.url = "github:gbprod/none-ls-shellcheck.nvim"; # river river.url = "git+https://github.com/riverwm/river?submodules=1"; diff --git a/modules/programs/nvim/plugins/lua/null-ls-nvim.lua b/modules/programs/nvim/plugins/lua/null-ls-nvim.lua index fe88108..b5717c0 100644 --- a/modules/programs/nvim/plugins/lua/null-ls-nvim.lua +++ b/modules/programs/nvim/plugins/lua/null-ls-nvim.lua @@ -3,14 +3,14 @@ local null_ls = require("null-ls") null_ls.setup({ sources = { -- Code actions - null_ls.builtins.code_actions.shellcheck, + require("none-ls-shellcheck.code_actions"), null_ls.builtins.code_actions.statix, -- Diagnostics null_ls.builtins.diagnostics.checkmake, null_ls.builtins.diagnostics.deadnix, null_ls.builtins.diagnostics.dotenv_linter, null_ls.builtins.diagnostics.fish, - null_ls.builtins.diagnostics.shellcheck, + require("none-ls-shellcheck.diagnostics"), null_ls.builtins.diagnostics.statix, null_ls.builtins.diagnostics.trail_space, null_ls.builtins.diagnostics.yamllint, diff --git a/modules/programs/nvim/plugins/lua/nvim-cmp.lua b/modules/programs/nvim/plugins/lua/nvim-cmp.lua index 04b3daa..4da693c 100644 --- a/modules/programs/nvim/plugins/lua/nvim-cmp.lua +++ b/modules/programs/nvim/plugins/lua/nvim-cmp.lua @@ -8,6 +8,9 @@ cmp.setup({ mode = "symbol", -- show only symbol annotations maxwidth = 50, -- prevent the popup from showing more than provided characters ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead + symbol_map = { + Copilot = "", + }, }), }, enabled = function() @@ -59,14 +62,13 @@ cmp.setup({ end, { "i", "s" }), }), sources = cmp.config.sources({ - { name = "async_path", priority = 1 }, - { name = "nvim_lsp", priority = 2 }, - { name = "nvim_lsp_signature_help", priority = 3 }, - { name = "luasnip", priority = 4 }, - }, { - { name = "async_path" }, - { name = "buffer" }, - { name = "spell" }, + { priority = 1, name = "async_path" }, + { priority = 1, name = "buffer" }, + { priority = 1, name = "spell" }, + { priority = 2, name = "nvim_lsp" }, + { priority = 3, name = "copilot" }, + { priority = 3, name = "nvim_lsp_signature_help" }, + { priority = 4, name = "luasnip" }, }), }) From 8ce8af36defb21fea7aa5c6e38fa3b401c7a46db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 17 Jun 2024 10:02:38 +0200 Subject: [PATCH 05/10] feat: improve jetbrains --- modules/profiles/impermanence.nix | 1 + modules/programs/jetbrains/ideavimrc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/profiles/impermanence.nix b/modules/profiles/impermanence.nix index 6cf6c6e..13efb7d 100644 --- a/modules/profiles/impermanence.nix +++ b/modules/profiles/impermanence.nix @@ -49,6 +49,7 @@ in ".config/github-copilot" ".config/kdeconnect" ".config/keepassxc" + ".java/.userPrefs/jetbrains/" ".local/share/JetBrains" ".local/share/direnv" ".local/share/nvim" diff --git a/modules/programs/jetbrains/ideavimrc b/modules/programs/jetbrains/ideavimrc index 0a79200..b397f97 100644 --- a/modules/programs/jetbrains/ideavimrc +++ b/modules/programs/jetbrains/ideavimrc @@ -52,7 +52,6 @@ map gI (GotoImplementation) "" Other let g:WhichKeyDesc_terminal = 't Terminal' map t (ActivateTerminalToolWindow) -map (HideActiveWindow) map = (ReformatCode) "" Folding From ed9c5111e4fa669928466a1e04675b40e3cfca84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 17 Jun 2024 11:12:00 +0200 Subject: [PATCH 06/10] feat: add gitbutler --- modules/programs/gitbutler/default.nix | 24 ++++++++++++++++++++++++ modules/programs/gitbutler/package.nix | 16 ++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 modules/programs/gitbutler/default.nix create mode 100644 modules/programs/gitbutler/package.nix diff --git a/modules/programs/gitbutler/default.nix b/modules/programs/gitbutler/default.nix new file mode 100644 index 0000000..073dd0f --- /dev/null +++ b/modules/programs/gitbutler/default.nix @@ -0,0 +1,24 @@ +{ config +, pkgs +, lib +, ... +}: + +let + inherit (lib) mkEnableOption mkIf mkOption types; + + cfg = config.my.programs.gitbutler; +in +{ + options.my.programs.gitbutler = { + enable = mkEnableOption "gitbutler"; + package = mkOption { + default = pkgs.callPackage ./package.nix { }; + type = types.package; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + }; +} diff --git a/modules/programs/gitbutler/package.nix b/modules/programs/gitbutler/package.nix new file mode 100644 index 0000000..a0b2102 --- /dev/null +++ b/modules/programs/gitbutler/package.nix @@ -0,0 +1,16 @@ +{ fetchzip, appimageTools }: + +let + pname = "git-butler"; + version = "0.12.4"; + buildNum = "994"; + + srcZipped = fetchzip { + url = "https://releases.gitbutler.com/releases/release/${version}-${buildNum}/linux/x86_64/git-butler_${version}_amd64.AppImage.tar.gz"; + hash = "sha256-+QP+H0bVSLbobv/W6lFBbl08RnwKvG8BVo68bwMrAzM="; + }; +in +appimageTools.wrapType2 { + inherit pname version; + src = "${srcZipped}/git-butler_${version}_amd64.AppImage"; +} From fad19c6a58eb6f9593dab1d4fa5951756036d5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 17 Jun 2024 11:12:45 +0200 Subject: [PATCH 07/10] feat!: remove statuscol-nvim --- flake.lock | 18 --------------- flake.nix | 2 -- .../nvim/plugins/lua/statuscol-nvim.lua | 22 ------------------- 3 files changed, 42 deletions(-) delete mode 100644 modules/programs/nvim/plugins/lua/statuscol-nvim.lua diff --git a/flake.lock b/flake.lock index f3aca01..6b1eb3d 100644 --- a/flake.lock +++ b/flake.lock @@ -1132,7 +1132,6 @@ "river": "river", "smartcolumn-nvim": "smartcolumn-nvim", "stable": "stable", - "statuscol-nvim": "statuscol-nvim", "telekasten-nvim": "telekasten-nvim", "timers": "timers" } @@ -1169,23 +1168,6 @@ "type": "github" } }, - "statuscol-nvim": { - "flake": false, - "locked": { - "lastModified": 1714347907, - "narHash": "sha256-Rl0VlsExASyx0+Le7VsY4aVQ+LqFWknZSFh40qGWEHI=", - "owner": "luukvbaal", - "repo": "statuscol.nvim", - "rev": "ef3617d0c8cfaa29f7bcdaa8b7cc35df2a409bae", - "type": "github" - }, - "original": { - "owner": "luukvbaal", - "ref": "0.10", - "repo": "statuscol.nvim", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 16bb6a4..d2dec7c 100644 --- a/flake.nix +++ b/flake.nix @@ -39,8 +39,6 @@ telekasten-nvim.url = "github:renerocksai/telekasten.nvim"; neotest-python.flake = false; neotest-python.url = "github:MoritzBoehme/neotest-python/fix-runtimepath-search"; - statuscol-nvim.flake = false; - statuscol-nvim.url = "github:luukvbaal/statuscol.nvim/0.10"; # HACK: fix for neovim-nightly gen-nvim.flake = false; gen-nvim.url = "github:David-Kunz/gen.nvim"; hawtkeys-nvim.flake = false; diff --git a/modules/programs/nvim/plugins/lua/statuscol-nvim.lua b/modules/programs/nvim/plugins/lua/statuscol-nvim.lua deleted file mode 100644 index f3d2c67..0000000 --- a/modules/programs/nvim/plugins/lua/statuscol-nvim.lua +++ /dev/null @@ -1,22 +0,0 @@ -vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]] -local builtin = require("statuscol.builtin") -require("statuscol").setup({ - segments = { - { - sign = { name = { ".*" }, auto = true }, - click = "v:lua.ScSa", - }, - { - text = { builtin.lnumfunc }, - click = "v:lua.ScLa", - }, - { - sign = { namespace = { "gitsigns*" }, auto = true }, - click = "v:lua.ScSa", - }, - { - text = { builtin.foldfunc, " " }, - click = "v:lua.ScFa", - }, - }, -}) From ca9f07d950599beb147d66d77501fa215deb7b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 17 Jun 2024 11:12:59 +0200 Subject: [PATCH 08/10] fix: hyprland --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index d2dec7c..04d9c75 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ # Hyprland hypr-contrib.url = "github:hyprwm/contrib"; - hyprland.url = "github:hyprwm/Hyprland"; + hyprland.url = "github:hyprwm/Hyprland/v0.39.1"; # Laptop asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout"; From 73689d50bf921c050f86790be7c3684a8f649eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 17 Jun 2024 11:13:09 +0200 Subject: [PATCH 09/10] feat: enable gitbutler --- hosts/nixos-laptop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/nixos-laptop/default.nix b/hosts/nixos-laptop/default.nix index ca86959..87ed2be 100644 --- a/hosts/nixos-laptop/default.nix +++ b/hosts/nixos-laptop/default.nix @@ -21,7 +21,7 @@ impermanence.enable = true; }; programs.hyprland.enable = true; - # programs.river.enable = true; + programs.gitbutler.enable = true; programs.exercism.enable = true; }; From 3b4b7b665761c8ee46ff7b589d0831d91cfaee48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 17 Jun 2024 11:13:39 +0200 Subject: [PATCH 10/10] feat: fix some wayland issues --- modules/programs/hyprland/_config.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/programs/hyprland/_config.nix b/modules/programs/hyprland/_config.nix index c2182cd..0ae737b 100644 --- a/modules/programs/hyprland/_config.nix +++ b/modules/programs/hyprland/_config.nix @@ -117,6 +117,13 @@ in force_default_wallpaper = 0 } + xwayland { + force_zero_scaling = true + } + + # scale non native wayland gtk applications + env = GDK_SCALE,1.2 + # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more # Firefox Sharing Indicator ${mkRules ["float" "move 49% 40" "noborder"] ["title:^(.*Sharing Indicator.*)$"]}