From b09d30959b18f7af0d0f764b3e07bfaac34a43ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 21 Apr 2024 10:57:01 +0200 Subject: [PATCH 1/6] feat: switch back to hyprland --- hosts/nixos-desktop/default.nix | 11 ++++++----- modules/programs/hyprland/_config.nix | 6 ++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index fea09f7..c3f010a 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -21,11 +21,12 @@ impermanence.enable = true; webis.enable = true; }; - programs.river = { - enable = true; - nvidiaSupport = true; - }; - programs.hyprland.enable = false; + # programs.river = { + # enable = true; + # nvidiaSupport = true; + # }; + programs.hyprland.enable = true; + programs.hyprland.nvidiaSupport = true; programs.exercism.enable = true; services.wallpaper.enable = true; }; diff --git a/modules/programs/hyprland/_config.nix b/modules/programs/hyprland/_config.nix index 6703ae9..651a896 100644 --- a/modules/programs/hyprland/_config.nix +++ b/modules/programs/hyprland/_config.nix @@ -119,7 +119,7 @@ in # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more # Firefox Sharing Indicator - ${mkRules ["float" "move 49% 40" "noborder" "nofullscreenrequest"] ["title:^(.*Sharing Indicator.*)$"]} + ${mkRules ["float" "move 49% 40" "noborder"] ["title:^(.*Sharing Indicator.*)$"]} # Emacs windowrulev2 = opaque, class:^(emacs)$ @@ -154,9 +154,7 @@ in bind = $mainMod , D , exec , hyprctl keyword general:layout dwindle bind = $mainMod , M , exec , hyprctl keyword general:layout master bind = $mainMod , R , exec , rofi -show combi - bind = $mainMod , RETURN , exec , footclient - bind = $mainMod SHIFT , RETURN , exec , foot - # bind = $mainMod SHIFT , RETURN , exec , kitty -- tmux new "ts || tn home ~" + bind = $mainMod , RETURN , exec , systemctl --user is-active --quiet foot && footclient --no-wait || foot # XF86 keys binde = , XF86AudioLowerVolume , exec , pamixer -d 5 From 54e55f4b6d1e8094b221a6221e892b0351bc9406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 21 Apr 2024 11:21:46 +0200 Subject: [PATCH 2/6] feat: cleanup --- modules/programs/nvim/plugins/coding.nix | 104 ++---------------- .../programs/nvim/plugins/lua/mini-nvim.lua | 46 -------- modules/programs/nvim/plugins/treesitter.nix | 10 -- modules/programs/nvim/plugins/ui.nix | 20 ---- 4 files changed, 7 insertions(+), 173 deletions(-) diff --git a/modules/programs/nvim/plugins/coding.nix b/modules/programs/nvim/plugins/coding.nix index 8f43ca2..7f40237 100644 --- a/modules/programs/nvim/plugins/coding.nix +++ b/modules/programs/nvim/plugins/coding.nix @@ -7,65 +7,18 @@ with builtins; plugin = oil-nvim; lazy = false; opts = { }; - dependencies = [ - { plugin = which-key-nvim; } - { plugin = nvim-web-devicons; } - ]; + dependencies = [{ plugin = nvim-web-devicons; }]; + } + { + plugin = lualine-nvim; + opts = { }; + dependencies = [{ plugin = nvim-web-devicons; }]; } { plugin = mini-nvim; lazy = false; conf = readFile ./lua/mini-nvim.lua; } - { - plugin = trouble-nvim; - cmd = [ "TodoTelescope" ]; - keys = [ - { - key = "cD"; - cmd = "TroubleToggle document_diagnostics"; - desc = "Document Diagnostics (Trouble)"; - } - { - key = "cW"; - cmd = "TroubleToggle workspace_diagnostics"; - desc = "Workspace Diagnostics (Trouble)"; - } - { key = "cl"; cmd = "TroubleToggle loclist"; desc = "Location List (Trouble)"; } - { key = "cq"; cmd = "TroubleToggle quickfix"; desc = "Quickfix List (Trouble)"; } - { key = "ft"; cmd = "TodoTelescope"; desc = "Todo"; } - { - key = "[q"; - func = /* lua */ '' - function() - if require("trouble").is_open() then - require("trouble").previous({ skip_groups = true, jump = true }) - else - vim.cmd.cprev() - end - end - ''; - desc = "Previous trouble/quickfix item"; - } - { - key = "]q"; - func = /* lua */ '' - function() - if require("trouble").is_open() then - require("trouble").next({ skip_groups = true, jump = true }) - else - vim.cmd.cnext() - end - end - ''; - desc = "Next trouble/quickfix item"; - } - ]; - opts = { }; - dependencies = [ - { plugin = nvim-web-devicons; } - ]; - } { plugin = nvim-cmp; keys = [ @@ -106,6 +59,7 @@ with builtins; conf = readFile ./lua/nvim-lspconfig.lua; 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; @@ -118,17 +72,6 @@ with builtins; } { plugin = which-key-nvim; } { plugin = lsp_lines-nvim; } - { - plugin = nvim-ufo; - conf = readFile ./lua/nvim-ufo.lua; - dependencies = [ - { plugin = promise-async; } - ]; - } - { - plugin = neodev-nvim; - conf = readFile ./lua/neodev-nvim.lua; - } { plugin = inc-rename-nvim; opts = { @@ -236,39 +179,6 @@ with builtins; event = [ "BufReadPost" "BufNewFile" ]; opts = { }; } - { - plugin = zen-mode-nvim; - keys = [ - { key = "tz"; cmd = "ZenMode"; desc = "Zen mode"; } - ]; - conf = /* lua */ '' - require("zen-mode").setup({ - plugins = { - tmux = { - enabled = true, - }, - }, - }) - ''; - dependencies = [ - { - plugin = twilight-nvim; - conf = /* lua */ '' - require("twilight").setup({ - context = 20, - expand = { -- for treesitter, we we always try to expand to the top-most ancestor with these types - "function", - "function_definition", - "if_statement", - "method", - "method_definition", - "table", - }, - }) - ''; - } - ]; - } { plugin = conform-nvim; keys = [ diff --git a/modules/programs/nvim/plugins/lua/mini-nvim.lua b/modules/programs/nvim/plugins/lua/mini-nvim.lua index 2a33821..9cbe157 100644 --- a/modules/programs/nvim/plugins/lua/mini-nvim.lua +++ b/modules/programs/nvim/plugins/lua/mini-nvim.lua @@ -1,47 +1 @@ require("mini.align").setup() -require("mini.move").setup() - -require("mini.statusline").setup({ - content = { - active = function() - local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 }) - local git = MiniStatusline.section_git({ trunc_width = 75 }) - local diagnostics = MiniStatusline.section_diagnostics({ trunc_width = 75 }) - local filename = MiniStatusline.section_filename({ trunc_width = 140 }) - local fileinfo = MiniStatusline.section_fileinfo({ trunc_width = 120 }) - local location = MiniStatusline.section_location({ trunc_width = 75 }) - local mode_hl_inverse = mode_hl .. "Inverse" - -- Usage of `MiniStatusline.combine_groups()` ensures highlighting and - -- correct padding with spaces between groups (accounts for 'missing' - -- sections, etc.) - return MiniStatusline.combine_groups({ - { hl = mode_hl_inverse, strings = {} }, - "", - { hl = mode_hl, strings = { mode } }, - { hl = "MiniStatuslineDevinfo", strings = { git, diagnostics } }, - "%<", -- Mark general truncate point - { hl = "MiniStatuslineFilename", strings = { filename } }, - "%=", -- End left alignment - { hl = "MiniStatuslineFileinfo", strings = { fileinfo } }, - { hl = mode_hl, strings = { location } }, - { hl = mode_hl_inverse, strings = {} }, - "", - }) - end, - }, -}) -local MiniStatuslineModes = { - "MiniStatuslineModeInsert", - "MiniStatuslineModeNormal", - "MiniStatuslineModeReplace", - "MiniStatuslineModeVisual", - "MiniStatuslineModeCommand", - "MiniStatuslineModeOther", -} -for _, mode_hl in ipairs(MiniStatuslineModes) do - local hl_table = vim.api.nvim_get_hl(0, { name = mode_hl }) - local fg = hl_table.fg - hl_table.fg = hl_table.bg - hl_table.bg = fg - vim.api.nvim_set_hl(0, mode_hl .. "Inverse", hl_table) -end diff --git a/modules/programs/nvim/plugins/treesitter.nix b/modules/programs/nvim/plugins/treesitter.nix index 8401f9f..2ba777c 100644 --- a/modules/programs/nvim/plugins/treesitter.nix +++ b/modules/programs/nvim/plugins/treesitter.nix @@ -65,15 +65,5 @@ with builtins; ]; } ) - { - plugin = nvim-treesitter-textsubjects; - event = [ "BufReadPost" "BufNewFile" ]; - conf = readFile ./lua/nvim-treesitter-textsubjects.lua; - } - { - plugin = nvim-treesitter-context; - event = [ "BufReadPost" "BufNewFile" ]; - opts = { }; - } ]; } diff --git a/modules/programs/nvim/plugins/ui.nix b/modules/programs/nvim/plugins/ui.nix index c44ce9b..ccfcb3b 100644 --- a/modules/programs/nvim/plugins/ui.nix +++ b/modules/programs/nvim/plugins/ui.nix @@ -20,26 +20,6 @@ with builtins; dependencies = [{ plugin = plenary-nvim; }]; opts = { }; } - { - plugin = pkgs.vimPlugins.statuscol-nvim.overrideAttrs (_: { - version = lib.my.mkVersionInput inputs.statuscol-nvim; - src = inputs.statuscol-nvim; - }); - event = [ "VeryLazy" ]; - conf = readFile ./lua/statuscol-nvim.lua; - } - { - plugin = pkgs.vimUtils.buildVimPlugin { - pname = "smartcolumn-nvim"; - version = lib.my.mkVersionInput inputs.smartcolumn-nvim; - src = inputs.smartcolumn-nvim; - }; - event = [ "BufReadPost" "BufNewFile" ]; - opts = { - colorcolumn = "120"; - disabled_filetypes = [ "help" "text" "markdown" "dashboard" ]; - }; - } { plugin = dressing-nvim; event = [ "VeryLazy" ]; From 2f4f58a68c647b8afe1b28934d985066af8b8ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 21 Apr 2024 11:54:00 +0200 Subject: [PATCH 3/6] feat: update inputs --- flake.lock | 294 +++++++++++++++----------------- hosts/nixos-desktop/default.nix | 2 +- modules/programs/foot.nix | 2 +- 3 files changed, 135 insertions(+), 163 deletions(-) diff --git a/flake.lock b/flake.lock index 83e43d8..939c222 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1712079060, + "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "1381a759b205dff7a6818733118d02253340fd5e", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1710156081, - "narHash": "sha256-4PMY6aumJi5dLFjBzF5O4flKXmadMNq3AGUHKYfchh0=", + "lastModified": 1713532798, + "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", "owner": "numtide", "repo": "devshell", - "rev": "bc68b058dc7e6d4d6befc4ec6c60082b6e844b7d", + "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", "type": "github" }, "original": { @@ -118,11 +118,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1711006105, - "narHash": "sha256-pvjqjx4L2Hx/NP3RWcwLjk+ABtMODAJ9+rgreU6fP6I=", + "lastModified": 1713406758, + "narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=", "owner": "nix-community", "repo": "disko", - "rev": "a8c966ee117c278a5aabc6f00b00ef62eb7e28f6", + "rev": "1efd500e9805a9efbce401ed5999006d397b9f11", "type": "github" }, "original": { @@ -184,11 +184,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "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": { @@ -205,11 +205,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": { @@ -277,14 +277,14 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -295,7 +295,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -314,11 +314,11 @@ "gen-nvim": { "flake": false, "locked": { - "lastModified": 1710408235, - "narHash": "sha256-aZ/ZMmatoIXnY3qtRjUqJStlpg0VGbJ1XdRjyDMhHqU=", + "lastModified": 1712049871, + "narHash": "sha256-Bt7yJxToUnPv3JqBwWQeywIbVRqzHBqnu3NUaIxFx/M=", "owner": "David-Kunz", "repo": "gen.nvim", - "rev": "2cb643b1a827bcdfc665a37d5f8174249d2d5bf5", + "rev": "87fbe811155b90eea58622614809705b966009ad", "type": "github" }, "original": { @@ -351,11 +351,11 @@ "hawtkeys-nvim": { "flake": false, "locked": { - "lastModified": 1706046129, - "narHash": "sha256-mbMmepQ6TXdsqQ1X8mybvcasPRCHGYMQ+6N3IXP75sM=", + "lastModified": 1711836933, + "narHash": "sha256-wxxnQvIMHUbDOAbBAswueULavoIoIDHdJK7T09IHD8E=", "owner": "tris203", "repo": "hawtkeys.nvim", - "rev": "a6ca6e4a4d07386a7ab327646c1dbf5155f09c44", + "rev": "aeba04a4ccded2aa8c8fb5d74a3bea05a8f89dab", "type": "github" }, "original": { @@ -414,11 +414,11 @@ ] }, "locked": { - "lastModified": 1710974515, - "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", + "lastModified": 1713682182, + "narHash": "sha256-2RSqVmQMFmn6OjQ21SXnWC+HuSeqDLWLftRv/ZhEDZE=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", + "rev": "4cec20dbf5c0a716115745ae32531e34816ecbbe", "type": "github" }, "original": { @@ -432,11 +432,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1710868143, - "narHash": "sha256-U5DLWla6nNiomFyCskYn6QfNCpVyQTeyG6FOAuEKHRg=", + "lastModified": 1712505318, + "narHash": "sha256-fzlBLhXUN6y7mzEtcGNRDXxFakBEfaj4Bmj5PuoCNaM=", "owner": "hyprwm", "repo": "contrib", - "rev": "4ee76323053bfae15cc05c294c7fda9997ca7fc3", + "rev": "5870244b592c22558b658dbaf94f9e41afb0316f", "type": "github" }, "original": { @@ -447,7 +447,10 @@ }, "hyprcursor": { "inputs": { - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -458,11 +461,11 @@ ] }, "locked": { - "lastModified": 1710257359, - "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=", + "lastModified": 1713612213, + "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974", + "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", "type": "github" }, "original": { @@ -475,18 +478,19 @@ "inputs": { "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang_2", + "hyprlang": "hyprlang", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_4", - "systems": "systems_5", + "systems": "systems_4", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1711034304, - "narHash": "sha256-K0Rt2uwpJ/5aFPwB7BICuSvZRardNKGLlgG+2CBnDxQ=", + "lastModified": 1713660608, + "narHash": "sha256-Wy9I4K1vuWtOv/UEpKmpDb6O8YaAY3GcC3pZu70DWMY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a94b902bef5eef3a4891726d51415c5d2e3391e3", + "rev": "7c3bd4c19fe47f2d92463b81d9b38651b7a1a268", "type": "github" }, "original": { @@ -524,17 +528,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "hyprcursor", "nixpkgs" ], - "systems": "systems_4" + "systems": [ + "hyprland", + "systems" + ] }, "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -543,7 +549,7 @@ "type": "github" } }, - "hyprlang_2": { + "hyprwayland-scanner": { "inputs": { "nixpkgs": [ "hyprland", @@ -555,16 +561,16 @@ ] }, "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "lastModified": 1713619586, + "narHash": "sha256-fIhNlYhPhG5AJ8DxX3LaitnccnQ+X2MCL39W2Abp7mM=", "owner": "hyprwm", - "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "repo": "hyprwayland-scanner", + "rev": "9e13e0915273959bfd98a10662f678c15ac71c77", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprlang", + "repo": "hyprwayland-scanner", "type": "github" } }, @@ -599,29 +605,13 @@ "type": "github" } }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, "master": { "locked": { - "lastModified": 1711034981, - "narHash": "sha256-Ug9/tGewXnV9Y6VFa1viuLfS5NoW+o+UXzZfGrpqMIU=", + "lastModified": 1713689773, + "narHash": "sha256-4M4c9n6sYbT7Sd/RvB9pej+7BoP7X1lNrFiboNV4O7I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "952804a3d25df456584e1c95b42a7196b35b2ebf", + "rev": "a8a8401b7b26112a9b75d6c00306e160fe8f8cb3", "type": "github" }, "original": { @@ -679,11 +669,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1710978612, - "narHash": "sha256-I/dYjIzi+aCDHn6pWx5yVrifrOLbAeazFBMXrQlTRs8=", + "lastModified": 1713650988, + "narHash": "sha256-YAbwiZkKxpbM+fdTVcXmp49XtHMDYQNng/wc9L85eZs=", "owner": "neovim", "repo": "neovim", - "rev": "c1c6c1ee12fa601194a410f78ecde11a9982a793", + "rev": "9e1bbb9813e0ea4e37f6325fe00e8f43617ef912", "type": "github" }, "original": { @@ -702,11 +692,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1710979437, - "narHash": "sha256-xUawWDHG4x71YxTfsjkmQ2FMPpEKqFKno3IbuX6bbqE=", + "lastModified": 1713657840, + "narHash": "sha256-O99sOWro/5J4qWyIFZ3vEw+abLnzOv4jrfA7FaRoyrI=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "d6386bdcfda37b9c7dca0b7e4c29993541f87fa3", + "rev": "3ad9c1eae733e9ba5cc73c6833e3d62dbc12df9e", "type": "github" }, "original": { @@ -737,11 +727,11 @@ ] }, "locked": { - "lastModified": 1710644923, - "narHash": "sha256-0fjbN5GYYDKPyPay0l8gYoH+tFfNqPPwP5sxxBreeA4=", + "lastModified": 1713668931, + "narHash": "sha256-rVlwWQlgFGGK3aPVcKmtYqWgjYnPah5FOIsYAqrMN2w=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e25efda85e39fcdc845e371971ac4384989c4295", + "rev": "07ece11b22217b8459df589f858e92212b74f1a1", "type": "github" }, "original": { @@ -790,16 +780,15 @@ "inputs": { "flake-compat": "flake-compat_2", "libgit2": "libgit2", - "lowdown-src": "lowdown-src", "nixpkgs": "nixpkgs_6", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1708070219, - "narHash": "sha256-/2fidzoXrrNwr8te2cU3JdtrpockWIjU4DpLgNr4FTo=", + "lastModified": 1713633256, + "narHash": "sha256-MKKP3oye1YlF4zq0cARo3BrYzinBaBSJzcdaTxatuew=", "owner": "privatevoid-net", "repo": "nix-super", - "rev": "924eb1127a21ebf4bd7f438d7c6aca133ce1de84", + "rev": "1a2019bb819dde804d7aed43853e31e1a6ea6ea3", "type": "github" }, "original": { @@ -827,11 +816,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -876,11 +865,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710889954, - "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=", + "lastModified": 1713254108, + "narHash": "sha256-0TZIsfDbHG5zibtlw6x0yOp3jkInIGaJ35B7Y4G8Pec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b", + "rev": "2fd19c8be2551a61c1ddc3d9f86d748f4db94f00", "type": "github" }, "original": { @@ -892,11 +881,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1658161305, - "narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=", + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" }, "original": { @@ -908,11 +897,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1713537308, + "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", "type": "github" }, "original": { @@ -924,11 +913,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1710889954, - "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=", + "lastModified": 1713596654, + "narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b", + "rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be", "type": "github" }, "original": { @@ -940,27 +929,27 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1700748986, - "narHash": "sha256-/nqLrNU297h3PCw4QyDpZKZEUHmialJdZW2ceYFobds=", + "lastModified": 1709083642, + "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ba29e2346bc542e9909d1021e8fd7d4b3f64db0", + "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05-small", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_7": { "locked": { - "lastModified": 1710889954, - "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=", + "lastModified": 1713627711, + "narHash": "sha256-kWlK1w/rqPBrs5rF4btRgXpzVstmNxA8rgc6kBzc89s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b", + "rev": "0c97ced70e0b92d46e5e53e239fec5201f8b0811", "type": "github" }, "original": { @@ -1005,11 +994,11 @@ "none-ls-nvim": { "flake": false, "locked": { - "lastModified": 1711021139, - "narHash": "sha256-FjDb53SNILxP9N9l5cJVBocj1ro/9eE8VKgR0Mv5+gs=", + "lastModified": 1713584427, + "narHash": "sha256-tJEyILFUEdGASYkkaoUEsKcyTWU4XLHtkNF2MJstuyY=", "owner": "nvimtools", "repo": "none-ls.nvim", - "rev": "18910d09d21d7df339805343bfe4a2b2e41c057b", + "rev": "88821b67e6007041f43b802f58e3d9fa9bfce684", "type": "github" }, "original": { @@ -1020,11 +1009,11 @@ }, "nur": { "locked": { - "lastModified": 1711034660, - "narHash": "sha256-AURgOJFzS+k+Sj9Aif198WM5dDyLJ1GMLaa9ge1NETY=", + "lastModified": 1713683463, + "narHash": "sha256-4byae6EewzcPs1C1JGOts1PLVr+PlR7+FOOqJGNSBIQ=", "owner": "nix-community", "repo": "NUR", - "rev": "1f626d2e2e780e5ba0fe203a7e74f79b57f1af67", + "rev": "568cd159bad8d8a2e3c2f3f7b71dd27a3d553b45", "type": "github" }, "original": { @@ -1036,11 +1025,11 @@ "nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1710924139, - "narHash": "sha256-wW6vmaCLBpiLtk87UXzppIP2WRzG/gdtsIcPPCnwucM=", + "lastModified": 1713507075, + "narHash": "sha256-/SqLT0PG2RUWyknYpcXlcU/aUyKWZMBs35s1sPRkEmc=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "d67715d3b746a19e951b6b0a99663fa909bb9e64", + "rev": "ed8b8a15acc441aec669f97d75f2c1f2ac8c8aa5", "type": "github" }, "original": { @@ -1058,11 +1047,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1710923068, - "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", "type": "github" }, "original": { @@ -1074,11 +1063,11 @@ "river": { "flake": false, "locked": { - "lastModified": 1711107438, - "narHash": "sha256-4nvFniKdJX+ZsoliFmWSzIAtZefekBCxmGS9xonHQN8=", + "lastModified": 1713527168, + "narHash": "sha256-oYVyqNfXjmR6axGyki+jZVOOHFVt1YWAX08eqxtVE6c=", "ref": "refs/heads/master", - "rev": "b77b42f0d640457411204bbae346df1d1a0c4f44", - "revCount": 1214, + "rev": "9bbd34a0e31b6d429df2d39a59d8990a9585e186", + "revCount": 1248, "submodules": true, "type": "git", "url": "https://github.com/riverwm/river" @@ -1236,16 +1225,16 @@ }, "systems_5": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1279,29 +1268,14 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "telekasten-nvim": { "flake": false, "locked": { - "lastModified": 1709039416, - "narHash": "sha256-fIXLxnPUMs8rXuEcsGIoz+UprtQlW9SB75dS6LKQGg4=", + "lastModified": 1713339207, + "narHash": "sha256-eg1xJUl4a+tIyJyN+UcaK0bP1o+zEo6mARFlJcsAwM8=", "owner": "renerocksai", "repo": "telekasten.nvim", - "rev": "a684d6ebe7026944b0a5323219d5f5364511e5b2", + "rev": "24fd8c1e7eb989dba9efa5d174e42870f08da8fb", "type": "github" }, "original": { @@ -1332,7 +1306,7 @@ }, "utils": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1692799911, @@ -1351,20 +1325,18 @@ "wlroots": { "flake": false, "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1709983277, - "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" + "lastModified": 1713124002, + "narHash": "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI=", + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "611a4f24cd2384378f6e500253983107c6656c64", + "type": "github" }, "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "611a4f24cd2384378f6e500253983107c6656c64", + "type": "github" } }, "xdph": { @@ -1387,11 +1359,11 @@ ] }, "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "lastModified": 1713214484, + "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61", "type": "github" }, "original": { diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index c3f010a..1df502b 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -40,7 +40,7 @@ }; home-manager.users.moritz.home.packages = with pkgs; [ anki - calibre + stable.calibre # NOTE: breaks often in unstable ]; hardware = { diff --git a/modules/programs/foot.nix b/modules/programs/foot.nix index 5486b3f..67d5a86 100644 --- a/modules/programs/foot.nix +++ b/modules/programs/foot.nix @@ -13,7 +13,7 @@ in config = mkIf cfg.enable { home-manager.users.moritz = { # HACK: to make foot server work - systemd.user.services.foot.Service.Environment = "PATH=/run/current-system/sw/bin/"; + systemd.user.services.foot.Service.Environment = lib.mkForce "PATH=/run/current-system/sw/bin/"; programs.foot = { enable = true; server.enable = true; From b1ecc723cc70f6572506837c4333f93fa4c484d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 21 Apr 2024 11:54:18 +0200 Subject: [PATCH 4/6] feat: do not use nix super by default --- modules/programs/nix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/programs/nix.nix b/modules/programs/nix.nix index 0e6fde9..9435552 100644 --- a/modules/programs/nix.nix +++ b/modules/programs/nix.nix @@ -38,8 +38,8 @@ in }; }; optimise.enable = mkEnableOption "nix-optimise"; - useSuper = mkEnableOption "use nix super" // { default = true; }; - useNom = mkEnableOption "use nix output monitor by default" // { default = true; }; + useSuper = mkEnableOption "use nix super"; + useNom = mkEnableOption "use nix output monitor" // { default = true; }; }; config = { From 42edc5bd2f031ac2d60d3cee31cf76270fe93a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 21 Apr 2024 11:54:36 +0200 Subject: [PATCH 5/6] fix: todo-comments-nvim plugin --- modules/programs/nvim/plugins/ui.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/programs/nvim/plugins/ui.nix b/modules/programs/nvim/plugins/ui.nix index ccfcb3b..96e28c2 100644 --- a/modules/programs/nvim/plugins/ui.nix +++ b/modules/programs/nvim/plugins/ui.nix @@ -16,7 +16,6 @@ with builtins; } { plugin = todo-comments-nvim; - event = [ "BufReadPost" "BufNewFile" ]; dependencies = [{ plugin = plenary-nvim; }]; opts = { }; } From 1b5659ac6c4cf8917a628c4aa5f442c82d6613a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 21 Apr 2024 12:00:38 +0200 Subject: [PATCH 6/6] feat: add easy mapping for "Gedit :" --- modules/programs/nvim/plugins/coding.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/programs/nvim/plugins/coding.nix b/modules/programs/nvim/plugins/coding.nix index 7f40237..0c2d0bf 100644 --- a/modules/programs/nvim/plugins/coding.nix +++ b/modules/programs/nvim/plugins/coding.nix @@ -117,6 +117,9 @@ with builtins; "GDelete" "GBrowse" ]; + keys = [ + { key = "gg"; cmd = "Gedit :"; desc = "Open Status"; } + ]; } { plugin = vim-tmux-navigator;