feat!: rework config a bit, add some qol changes

.config/nvim/lazy-lock.json

@@ -1,26 +1,28 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "776a29c3e1ac61029ac3f57ac6b5937df2340162" },
+  "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
   "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
-  "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
+  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
-  "conform.nvim": { "branch": "master", "commit": "f643d1b51d1d3d14c8641a46ce44f6bce73c2697" },
+  "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
-  "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
+  "fidget.nvim": { "branch": "main", "commit": "2cb5edb2dd6700a958a446b20bb2be04d318da9d" },
+  "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
   "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "luau-lsp.nvim": { "branch": "main", "commit": "f81c6c713e4598abc484cbeabca918475d176c54" },
+  "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "c2682b0d9732bf52cbc34862056f143e71dc4a6d" },
+  "luau-lsp.nvim": { "branch": "main", "commit": "6c80704a4768c31e4c8e87180c9bae79343b169d" },
-  "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "7f0bf635082bb9b7d2b37766054526a6ccafdb85" },
-  "mini.nvim": { "branch": "main", "commit": "5a10dfb3ab49b3ee2425bc2c215b5067ccce1c79" },
+  "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
-  "neovim": { "branch": "main", "commit": "6b9840790cc7acdfadde07f308d34b62dd9cc675" },
+  "mini.nvim": { "branch": "main", "commit": "5d938b3a078a7eeae23ba9f04f180066ab8bd9ef" },
+  "neovim": { "branch": "main", "commit": "72befaffeac38db7bdd49e0549eaa2c4806dd878" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
-  "nvim-lspconfig": { "branch": "master", "commit": "8adb3b5938f6074a1bcc36d3c3916f497d2e8ec4" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a6dbc91d9ae373a87bcd9e3c15853e309691c39b" },
-  "nvim-tree.lua": { "branch": "master", "commit": "1c733e8c1957dc67f47580fe9c458a13b5612d5b" },
+  "nvim-tree.lua": { "branch": "master", "commit": "f0e9951778802526b14c934f7bf746e1e0ae5ed0" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
-  "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
+  "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" },
-  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "telescope-tabs": { "branch": "master", "commit": "9ca0800d4e9c2610d5cac4d121cde0d9fbd89a64" },
+  "telescope-tabs": { "branch": "master", "commit": "d16fae006ba978ccc5c5579d40f358e12a0f8d30" },
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }
+  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }
 }

.config/nvim/lua/rocketcamel/config/lazy.lua

@@ -32,4 +32,7 @@ require("lazy").setup({
 	install = { colorscheme = { "habamax" } },
 	-- automatically check for plugin updates
 	checker = { enabled = true },
+  change_detection = {
+    notify = false,
+  }
 })

.config/nvim/lua/rocketcamel/plugins/cmp.lua

@@ -0,0 +1,71 @@
+local function setup_keybinds()
+    vim.keymap.set("n", "gd", vim.lsp.buf.definition)
+    vim.keymap.set("n", "ev", function()
+        vim.diagnostic.open_float({ border = "rounded" })
+    end)
+    vim.keymap.set("n", "K", function()
+        vim.lsp.buf.hover({ border = "rounded" })
+    end)
+    vim.keymap.set("i", "<C-s>", function()
+        vim.lsp.buf.signature_help({ border = "rounded" })
+    end)
+    vim.diagnostic.config({ virtual_text = true })
+end
+
+return {
+    {
+        "hrsh7th/nvim-cmp",
+        dependencies = { "hrsh7th/cmp-cmdline",
+            "hrsh7th/cmp-path",
+            "hrsh7th/cmp-buffer",
+            "hrsh7th/cmp-nvim-lsp",
+        },
+        config = function()
+            local cmp = require("cmp")
+            cmp.setup({
+                snippet = {
+                    expand = function(args)
+                        require("luasnip").lsp_expand(args.body)
+                    end,
+                },
+                window = {
+                    completion = cmp.config.window.bordered(),
+                    documentation = cmp.config.window.bordered(),
+                },
+                mapping = cmp.mapping.preset.insert({
+                    ["<C-b>"] = cmp.mapping.scroll_docs(-4),
+                    ["<C-f>"] = cmp.mapping.scroll_docs(4),
+                    ["<C-Space>"] = cmp.mapping.complete(),
+                    ["<C-e>"] = cmp.mapping.abort(),
+                    ["<CR>"] = cmp.mapping.confirm({ select = true }),
+                }),
+                sources = cmp.config.sources({
+                    { name = "nvim_lsp" },
+                    { name = "luasnip" },
+                }, {
+                    { name = "buffer" },
+                }),
+            })
+            local capabilities = require("cmp_nvim_lsp").default_capabilities()
+            setup_keybinds()
+            vim.lsp.config("*", {
+                capabilities = capabilities,
+            })
+            cmp.setup.cmdline({ "/", "?" }, {
+                mapping = cmp.mapping.preset.cmdline(),
+                sources = {
+                    { name = "buffer" },
+                },
+            })
+            cmp.setup.cmdline(":", {
+                mapping = cmp.mapping.preset.cmdline(),
+                sources = cmp.config.sources({
+                    { name = "path" },
+                }, {
+                    { name = "cmdline" },
+                }),
+                matching = { disallow_symbol_nonprefix_matching = false },
+            })
+        end
+    }
+}

.config/nvim/lua/rocketcamel/plugins/fugitive.lua

@@ -1,3 +0,0 @@
-return {
-	{ "tpope/vim-fugitive" },
-}

.config/nvim/lua/rocketcamel/plugins/git.lua

@@ -0,0 +1,11 @@
+return {
+    {
+        "lewis6991/gitsigns.nvim",
+        config = function()
+            require("gitsigns").setup()
+        end
+    },
+  {
+    "tpope/vim-fugitive",
+  }
+}

.config/nvim/lua/rocketcamel/plugins/lsp.lua

@@ -1,122 +1,117 @@
 local function setup_luau()
-  require("luau-lsp").setup({
+    require("luau-lsp").setup({
-    platform = {
+        platform = {
-      type = "roblox",
+            type = "roblox",
-    },
+        },
-    types = {
+        types = {
-      roblox_security_level = "PluginSecurity",
+            roblox_security_level = "PluginSecurity",
-    },
+        },
-    sourcemap = {
+        sourcemap = {
-      enabled = true,
+            enabled = true,
-      autogenerate = true,
+            autogenerate = true,
-      rojo_project_file = "default.project.json",
+            rojo_project_file = "default.project.json",
-      sourcemap_file = "sourcemap.json",
+            sourcemap_file = "sourcemap.json",
-    },
+        },
-    plugin = {
+        plugin = {
-      enabled = true,
+            enabled = true,
-      port = 3667,
+            port = 3667,
-    },
+        },
-    fflags = {
+        fflags = {
-      enable_new_solver = true,
+            enable_new_solver = true,
-      sync = true,
+            sync = true,
-    },
+        },
-  })
+    })
 end
 
 return {
-  {
+    {
-    "neovim/nvim-lspconfig",
+        "neovim/nvim-lspconfig",
-    dependencies = {
+        dependencies = {
-      "williamboman/mason.nvim",
+            "williamboman/mason.nvim",
-      "williamboman/mason-lspconfig.nvim",
+            "williamboman/mason-lspconfig.nvim",
-      "j-hui/fidget.nvim",
+            "j-hui/fidget.nvim",
-      "lopi-py/luau-lsp.nvim",
+            "lopi-py/luau-lsp.nvim",
-      "hrsh7th/nvim-cmp",
+        },
-      "hrsh7th/cmp-cmdline",
+        config = function()
-      "hrsh7th/cmp-path",
+            require("mason").setup()
-      "hrsh7th/cmp-buffer",
+            require("fidget").setup({
-      "hrsh7th/cmp-nvim-lsp",
+                notification = {
+                    window = {
+                        winblend = 0,
+                    },
+                },
+            })
+            require("mason-lspconfig").setup({
+                ensure_installed = {
+                    "ts_ls",
+                    "lua_ls",
+                    "luau_lsp",
+                    "rust_analyzer",
+                    "nil_ls",
+                    "tailwindcss",
+                    "svelte",
+                    "html",
+                    "gopls",
+                    "templ",
+                },
+                automatic_enable = { exclude = { "luau_lsp" } },
+            })
+            setup_luau()
+            local cmp = require("cmp")
+            cmp.setup({
+                snippet = {
+                    expand = function(args)
+                        require("luasnip").lsp_expand(args.body)
+                    end,
+                },
+                window = {
+                    completion = cmp.config.window.bordered(),
+                    documentation = cmp.config.window.bordered(),
+                },
+                mapping = cmp.mapping.preset.insert({
+                    ["<C-b>"] = cmp.mapping.scroll_docs(-4),
+                    ["<C-f>"] = cmp.mapping.scroll_docs(4),
+                    ["<C-Space>"] = cmp.mapping.complete(),
+                    ["<C-e>"] = cmp.mapping.abort(),
+                    ["<CR>"] = cmp.mapping.confirm({ select = true }),
+                }),
+                sources = cmp.config.sources({
+                    { name = "nvim_lsp" },
+                    { name = "luasnip" },
+                }, {
+                    { name = "buffer" },
+                }),
+            })
+            local capabilities = require("cmp_nvim_lsp").default_capabilities()
+            vim.lsp.config("*", {
+                capabilities = capabilities,
+            })
+            vim.keymap.set("n", "gtd", vim.lsp.buf.definition)
+            vim.keymap.set("n", "ev", function()
+                vim.diagnostic.open_float({ border = "rounded" })
+            end)
+            vim.keymap.set("n", "K", function()
+                vim.lsp.buf.hover({ border = "rounded" })
+            end)
+            vim.keymap.set("i", "<C-s>", function()
+                vim.lsp.buf.signature_help({ border = "rounded" })
+            end)
+            vim.diagnostic.config({ virtual_text = true })
+            cmp.setup.cmdline({ "/", "?" }, {
+                mapping = cmp.mapping.preset.cmdline(),
+                sources = {
+                    { name = "buffer" },
+                },
+            })
+            cmp.setup.cmdline(":", {
+                mapping = cmp.mapping.preset.cmdline(),
+                sources = cmp.config.sources({
+                    { name = "path" },
+                }, {
+                    { name = "cmdline" },
+                }),
+                matching = { disallow_symbol_nonprefix_matching = false },
+            })
+        end,
     },
-    config = function()
-      require("mason").setup()
-      require("fidget").setup({
-        notification = {
-          window = {
-            winblend = 0,
-          },
-        },
-      })
-      require("mason-lspconfig").setup({
-        ensure_installed = {
-          "ts_ls",
-          "lua_ls",
-          "luau_lsp",
-          "rust_analyzer",
-          "nil_ls",
-          "tailwindcss",
-          "svelte",
-          "html",
-          "gopls",
-          "templ",
-        },
-        automatic_enable = { exclude = { "luau_lsp" } },
-      })
-      setup_luau()
-      local cmp = require("cmp")
-      cmp.setup({
-        snippet = {
-          expand = function(args)
-            require("luasnip").lsp_expand(args.body)
-          end,
-        },
-        window = {
-          completion = cmp.config.window.bordered(),
-          documentation = cmp.config.window.bordered(),
-        },
-        mapping = cmp.mapping.preset.insert({
-          ["<C-b>"] = cmp.mapping.scroll_docs(-4),
-          ["<C-f>"] = cmp.mapping.scroll_docs(4),
-          ["<C-Space>"] = cmp.mapping.complete(),
-          ["<C-e>"] = cmp.mapping.abort(),
-          ["<CR>"] = cmp.mapping.confirm({ select = true }),
-        }),
-        sources = cmp.config.sources({
-          { name = "nvim_lsp" },
-          { name = "luasnip" },
-        }, {
-          { name = "buffer" },
-        }),
-      })
-      local capabilities = require("cmp_nvim_lsp").default_capabilities()
-      vim.lsp.config("*", {
-        capabilities = capabilities,
-      })
-      vim.keymap.set("n", "gtd", vim.lsp.buf.definition)
-      vim.keymap.set("n", "ev", function()
-        vim.diagnostic.open_float({ border = "rounded" })
-      end)
-      vim.keymap.set("n", "K", function()
-        vim.lsp.buf.hover({ border = "rounded" })
-      end)
-      vim.keymap.set("i", "<C-s>", function()
-        vim.lsp.buf.signature_help({ border = "rounded" })
-      end)
-      vim.diagnostic.config({ virtual_text = true })
-      cmp.setup.cmdline({ "/", "?" }, {
-        mapping = cmp.mapping.preset.cmdline(),
-        sources = {
-          { name = "buffer" },
-        },
-      })
-      cmp.setup.cmdline(":", {
-        mapping = cmp.mapping.preset.cmdline(),
-        sources = cmp.config.sources({
-          { name = "path" },
-        }, {
-          { name = "cmdline" },
-        }),
-        matching = { disallow_symbol_nonprefix_matching = false },
-      })
-    end,
-  },
 }

.config/nvim/lua/rocketcamel/plugins/lualine.lua

@@ -0,0 +1,11 @@
+return {
+    {
+        "nvim-lualine/lualine.nvim",
+dependencies = { 'nvim-tree/nvim-web-devicons' },
+        config = function()
+      require("lualine").setup({
+            options = { theme = "rose-pine" }
+      })
+        end
+    }
+}

.config/nvim/lua/rocketcamel/plugins/nvim-tree.lua

@@ -1,8 +1,23 @@
 return {
-	{
+    {
-		"nvim-tree/nvim-tree.lua",
+        "nvim-tree/nvim-tree.lua",
-		config = function()
+        config = function()
-			require("nvim-tree").setup()
+            require("nvim-tree").setup({
-		end,
+                view = { width = 30, side = "left" },
-	},
+                filters = { dotfiles = false },
+                update_focused_file = {
+                    enable = true,
+                    update_cwd = true,
+                    ignore_list = {}
+                },
+                actions = {
+                    open_file = {
+                        quit_on_open = false,
+                        resize_window = true,
+                    }
+                }
+            })
+            vim.keymap.set("n", "<leader>e", ":NvimTreeToggle<CR>", { desc = "Toggle file explorer" })
+        end,
+    },
 }

.config/nvim/lua/rocketcamel/plugins/telescope.lua

@@ -1,20 +1,32 @@
 return {
-	{
+    {
-		"nvim-telescope/telescope.nvim",
+        "nvim-telescope/telescope.nvim",
-		dependencies = {
+        dependencies = {
-			"LukasPietzschmann/telescope-tabs",
+            "LukasPietzschmann/telescope-tabs",
-		},
+        },
-		config = function()
+        config = function()
-			local telescope = require("telescope")
+            local telescope = require("telescope")
-			local telescope_tabs = require("telescope-tabs")
+            local telescope_tabs = require("telescope-tabs")
-			local builtin = require("telescope.builtin")
+            local builtin = require("telescope.builtin")
-			telescope.load_extension("telescope-tabs")
+            telescope.setup({
-			telescope_tabs.setup()
+                pickers = {
-			vim.keymap.set("n", "<leader>pf", builtin.find_files, {})
+                    find_files = {
-			vim.keymap.set("n", "<C-p>", builtin.git_files, {})
+                        hidden = true,
-			vim.keymap.set("n", "<leader>pb", builtin.buffers)
+                    },
-			vim.keymap.set("n", "<leader>ps", builtin.live_grep)
+                    live_grep = {
-			vim.keymap.set("n", "<leader>pt", telescope_tabs.list_tabs)
+                        additional_args = function()
-		end,
+                            return {"--hidden"}
-	},
+                        end
+                    },
+                },
+            })
+
+            telescope.load_extension("telescope-tabs")
+            telescope_tabs.setup()
+            vim.keymap.set("n", "<C-p>", builtin.find_files, { desc = "Find files" })
+            vim.keymap.set("n", "<leader>fb", builtin.buffers, { desc = "Find buffers" })
+            vim.keymap.set("n", "<leader>fg", builtin.live_grep, { desc = "Search" })
+            vim.keymap.set("n", "<leader>ft", telescope_tabs.list_tabs)
+        end,
+    },
 }

.config/nvim/lua/rocketcamel/plugins/theme.lua

@@ -1,16 +1,16 @@
 return {
-	{
+    {
-		"rose-pine/neovim",
+        "rose-pine/neovim",
-		dependencies = {
+        dependencies = {
-			"nvim-tree/nvim-web-devicons",
+            "nvim-tree/nvim-web-devicons",
-		},
+        },
-		config = function()
+        config = function()
-			require("rose-pine").setup({
+            require("rose-pine").setup({
-				styles = {
+                styles = {
-					transparency = true,
+                    transparency = false,
-				},
+                },
-			})
+            })
-			vim.cmd("colorscheme rose-pine")
+            vim.cmd.colorscheme("rose-pine")
-		end,
+        end,
-	},
+    },
 }

.config/nvim/lua/rocketcamel/remap.lua

@@ -1,16 +1,2 @@
-vim.g.mapleader = " "
-vim.keymap.set("n", "<leader>pv", vim.cmd.NvimTreeOpen)
 vim.keymap.set("n", "<leader>x", vim.cmd.q)
-vim.keymap.set("i", "<C-c>", "<Esc>", { noremap = true, silent = true })
-vim.keymap.set("i", "<C-h>", "<Left>", { noremap = true, silent = false })
-vim.keymap.set("i", "<C-l>", "<Right>", { noremap = true, silent = true })
 vim.keymap.set("v", "<leader>y", '"+y', { noremap = true, silent = true })
-vim.keymap.set("n", "<leader>gs", vim.cmd.Git)
-vim.keymap.set("n", "<leader>gc", ":Git commit<CR>", { desc = "Git commit" })
-vim.keymap.set("n", "<leader>ga", function()
-	vim.ui.input({ prompt = "Git add: " }, function(input)
-		if input then
-			vim.cmd("Git add " .. input)
-		end
-	end)
-end)

.config/nvim/lua/rocketcamel/set.lua

@@ -6,6 +6,12 @@ vim.opt.tabstop = 2
 vim.opt.softtabstop = 2
 vim.opt.shiftwidth = 2
 vim.opt.expandtab = true
+vim.opt.smartindent = true
+vim.opt.wrap = false
+vim.opt.cursorline = true
+vim.opt.termguicolors = true
+vim.opt.scrolloff = 8
+vim.opt.signcolumn = "yes"
 
 vim.opt.hlsearch = false
 vim.opt.incsearch = true

nix/flake.lock

@@ -97,26 +97,6 @@
         "type": "github"
       }
     },
-    "mantle": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1740286249,
-        "narHash": "sha256-BvNcVzVXf8N7mCxV6PpO7cR5hx4k32BfuYiSmE1+DzA=",
-        "owner": "rocketcamel",
-        "repo": "mantle-nix",
-        "rev": "a5bdab16b5d3024e7be1f4f2bc9011b2999f3073",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rocketcamel",
-        "repo": "mantle-nix",
-        "type": "github"
-      }
-    },
     "nixos-wsl": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -169,55 +149,12 @@
         "type": "github"
       }
     },
-    "pesde": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743234589,
-        "narHash": "sha256-1m2PoBP7OL5oaw/xTx2opLEURzxWO16ZRT3Kms3khCw=",
-        "owner": "rocketcamel",
-        "repo": "pesde-nix",
-        "rev": "57df9aea751b121e10ce1b9104185912e525381a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rocketcamel",
-        "repo": "pesde-nix",
-        "type": "github"
-      }
-    },
-    "rokit": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1740302664,
-        "narHash": "sha256-CszU5pPaw1i03nesKvXxXQt83axbEStaYwP3sxQ31ts=",
-        "owner": "rocketcamel",
-        "repo": "rokit-nix",
-        "rev": "64b63797d6a3a9659de1fbd21612fee32e785f3d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rocketcamel",
-        "repo": "rokit-nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "custom-fonts": "custom-fonts",
         "home-manager": "home-manager",
-        "mantle": "mantle",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs_2",
-        "pesde": "pesde",
-        "rokit": "rokit",
         "sops-nix": "sops-nix",
         "status-bar": "status-bar"
       }

nix/flake.nix

@@ -4,20 +4,18 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.05";
     nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
+
     home-manager.url = "github:nix-community/home-manager?ref=release-25.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    pesde.url = "github:rocketcamel/pesde-nix";
+
-    pesde.inputs.nixpkgs.follows = "nixpkgs";
-    mantle.url = "github:rocketcamel/mantle-nix";
-    mantle.inputs.nixpkgs.follows = "nixpkgs";
-    rokit.url = "github:rocketcamel/rokit-nix";
-    rokit.inputs.nixpkgs.follows = "nixpkgs";
     custom-fonts.url = "path:./fonts";
     custom-fonts.inputs.nixpkgs.follows = "nixpkgs";
+
     status-bar = {
       url = "path:../astal";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -85,9 +83,6 @@
                   "flakes"
                 ];
                 environment.systemPackages = [
-                  inputs.pesde.packages.${host.architecture}.default
-                  inputs.mantle.packages.${host.architecture}.default
-                  inputs.rokit.packages.${host.architecture}.default
                   inputs.status-bar.packages.${host.architecture}.status-bar
                 ];
                 fonts.packages = [

nix/modules/desktop.nix

@@ -47,6 +47,8 @@
       swappy
       termscp
       awscli2
+      gitui
+      htop
     ];
     programs.hyprland = {
       enable = true;

nix/users/luca/zsh.nix

@@ -18,7 +18,6 @@ in
   syntaxHighlighting.enable = true;
   history.size = 1000;
   envExtra = ''
-    export PATH="$PATH:$HOME/.rokit/bin"
     export GOPATH="$HOME/go"
     export GOBIN="$HOME/go/bin"
     export PATH="$GOBIN:$PATH"