README.md

@@ -5,7 +5,7 @@ My configuration is simple: I have one personal laptop with one user.
 
 ## Features
 
-- Nixpkgs 23.11
+- Nixpkgs 23.05
 - Flakes!
 - [Nix User Repository (NUR)](https://github.com/nix-community/NUR)
     - Currently only used for Firefox Plugins

flake.lock

@@ -53,14 +53,14 @@
         ]
       },
       "locked": {
-        "lastModified": 1700814205,
+        "lastModified": 1700392168,
-        "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
+        "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz"
+        "url": "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz"
+        "url": "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"
       }
     },
     "homeage": {
@@ -101,43 +101,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701389149,
+        "lastModified": 1700678569,
-        "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=",
+        "narHash": "sha256-2Ki+2UvOidxEb3xB4ADqlbPQ2BZOF4uZMR094O8or2I=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c",
+        "rev": "8f1180704ac35baded1a74164365ac7cdfba6f38",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1701040486,
-        "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "45827faa2132b8eade424f6bdd48d8828754341a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nur": {
       "locked": {
-        "lastModified": 1700923974,
+        "lastModified": 1700855055,
-        "narHash": "sha256-3SWdqep5XzFEuK+5iJkDe/mTIvidS3Gs47W/DVXuRnE=",
+        "narHash": "sha256-QKjcrEntfghcXBsrenDE46OxaF/4YQVStAQfyDOQcPA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "2644c4a32642a32ea01dc63fd780404c21c82d7a",
+        "rev": "ebf2c68214f10ee5b9372ae4960a7b54af514bd3",
         "type": "github"
       },
       "original": {
@@ -153,7 +137,6 @@
         "homeage": "homeage",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur"
       }
     }

flake.nix

@@ -2,12 +2,11 @@
   description = "My NixOS configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     nur.url = "github:nix-community/NUR";
     home-manager = {
       url =
-        "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz";
+        "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     homeage = {
@@ -22,24 +21,14 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
-  outputs = { nixpkgs, nixpkgs-unstable, home-manager, homeage, agenix, nur
+  outputs =
-    , nixos-hardware, ... }: {
+    { nixpkgs, home-manager, homeage, agenix, nur, nixos-hardware, ... }: {
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt;
 
-      nixosConfigurations.pim = nixpkgs.lib.nixosSystem rec {
+      nixosConfigurations.pim = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          {
+          { nixpkgs.overlays = [ nur.overlay ]; }
-            nixpkgs.overlays = [
-              nur.overlay
-              (final: _prev: {
-                unstable = import nixpkgs-unstable {
-                  inherit system;
-                  config.allowUnfree = true;
-                };
-              })
-            ];
-          }
           ./nixos
           agenix.nixosModules.default
           nixos-hardware.nixosModules.lenovo-thinkpad-x260

home-manager/bash/default.nix

@@ -3,6 +3,7 @@
     programs.bash = {
       enable = true;
       shellAliases = {
+        dig = "dog";
         htop = "btop";
         gp = "git push";
         gco = "git checkout";

home-manager/neovim/bufferline.lua

@@ -1,13 +1,13 @@
-require("bufferline").setup({
+require("bufferline").setup {
-	options = {
+    options = {
-		diagnostics = "nvim_lsp",
+        diagnostics = 'nvim_lsp',
-		diagnostics_indicator = function(count, level, diagnostics_dict, context)
+        diagnostics_indicator = function(count, level, diagnostics_dict, context)
-			local icon = level:match("error") and " " or " "
+            local icon = level:match("error") and " " or " "
-			return " " .. icon .. count
+            return " " .. icon .. count
-		end,
+        end,
-		separator_style = "slant",
+        separator_style = "slant",
-		hover = { enabled = true, reveal = { "close" } },
+        hover = {enabled = true, reveal = {'close'}}
-	},
+    }
-})
+}
 
-vim.keymap.set("n", "<leader>ft", ":BufferLinePick<CR>", {})
+vim.keymap.set('n', '<leader>ft', ":BufferLinePick<CR>", {})

home-manager/neovim/cmp.lua

@@ -1,43 +1,39 @@
-local cmp = require("cmp")
+local cmp = require('cmp')
-local luasnip = require("luasnip")
+local luasnip = require('luasnip')
 
-require("luasnip.loaders.from_vscode").lazy_load()
+require('luasnip.loaders.from_vscode').lazy_load()
-luasnip.config.setup({})
+luasnip.config.setup {}
 
-cmp.setup({
+cmp.setup {
-	snippet = {
+    snippet = {expand = function(args) luasnip.lsp_expand(args.body) end},
-		expand = function(args)
+    mapping = cmp.mapping.preset.insert {
-			luasnip.lsp_expand(args.body)
+        ['<C-n>'] = cmp.mapping.select_next_item(),
-		end,
+        ['<C-p>'] = cmp.mapping.select_prev_item(),
-	},
+        ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-	mapping = cmp.mapping.preset.insert({
+        ['<C-f>'] = cmp.mapping.scroll_docs(4),
-		["<C-n>"] = cmp.mapping.select_next_item(),
+        ['<C-Space>'] = cmp.mapping.complete {},
-		["<C-p>"] = cmp.mapping.select_prev_item(),
+        ['<CR>'] = cmp.mapping.confirm {
-		["<C-d>"] = cmp.mapping.scroll_docs(-4),
+            behavior = cmp.ConfirmBehavior.Replace,
-		["<C-f>"] = cmp.mapping.scroll_docs(4),
+            select = true
-		["<C-Space>"] = cmp.mapping.complete({}),
+        },
-		["<CR>"] = cmp.mapping.confirm({
+        ['<Tab>'] = cmp.mapping(function(fallback)
-			behavior = cmp.ConfirmBehavior.Replace,
+            if cmp.visible() then
-			select = true,
+                cmp.select_next_item()
-		}),
+            elseif luasnip.expand_or_locally_jumpable() then
-		["<Tab>"] = cmp.mapping(function(fallback)
+                luasnip.expand_or_jump()
-			if cmp.visible() then
+            else
-				cmp.select_next_item()
+                fallback()
-			elseif luasnip.expand_or_locally_jumpable() then
+            end
-				luasnip.expand_or_jump()
+        end, {'i', 's'}),
-			else
+        ['<S-Tab>'] = cmp.mapping(function(fallback)
-				fallback()
+            if cmp.visible() then
-			end
+                cmp.select_prev_item()
-		end, { "i", "s" }),
+            elseif luasnip.locally_jumpable(-1) then
-		["<S-Tab>"] = cmp.mapping(function(fallback)
+                luasnip.jump(-1)
-			if cmp.visible() then
+            else
-				cmp.select_prev_item()
+                fallback()
-			elseif luasnip.locally_jumpable(-1) then
+            end
-				luasnip.jump(-1)
+        end, {'i', 's'})
-			else
+    },
-				fallback()
+    sources = {{name = 'nvim_lsp'}, {name = 'luasnip'}}
-			end
+}
-		end, { "i", "s" }),
-	}),
-	sources = { { name = "nvim_lsp" }, { name = "luasnip" } },
-})

home-manager/neovim/default.nix

@@ -14,9 +14,9 @@
         neofetch
         gopls
         terraform-ls
+        luaformatter
+        efm-langserver
         nixfmt
-        stylua
-        black
       ];
 
       plugins = with pkgs.vimPlugins; [
@@ -69,11 +69,6 @@
         }
         nvim-web-devicons
         lsp-format-nvim
-        {
-          plugin = pkgs.unstable.vimPlugins.none-ls-nvim;
-          type = "lua";
-          config = builtins.readFile ./none-ls.lua;
-        }
       ];
     };
 

home-manager/neovim/leap.lua

@@ -1,4 +1,4 @@
-require("leap").add_default_mappings()
+require('leap').add_default_mappings()
 -- Don't remap 'x' in visual mode.
-vim.keymap.del({ "x", "o" }, "x")
+vim.keymap.del({'x', 'o'}, 'x')
-vim.keymap.del({ "x", "o" }, "X")
+vim.keymap.del({'x', 'o'}, 'X')

home-manager/neovim/lspconfig.lua

@@ -1,58 +1,59 @@
-require("lsp-format").setup({})
+require("lsp-format").setup {}
 
 local on_attach = function(client, bufnr)
-	local bufmap = function(keys, func)
+    local bufmap = function(keys, func)
-		vim.keymap.set("n", keys, func, { buffer = bufnr })
+        vim.keymap.set('n', keys, func, {buffer = bufnr})
-	end
+    end
 
-	bufmap("<leader>r", vim.lsp.buf.rename)
+    bufmap('<leader>r', vim.lsp.buf.rename)
-	bufmap("<leader>a", vim.lsp.buf.code_action)
+    bufmap('<leader>a', vim.lsp.buf.code_action)
 
-	bufmap("gd", vim.lsp.buf.definition)
+    bufmap('gd', vim.lsp.buf.definition)
-	bufmap("gD", vim.lsp.buf.declaration)
+    bufmap('gD', vim.lsp.buf.declaration)
-	bufmap("gI", vim.lsp.buf.implementation)
+    bufmap('gI', vim.lsp.buf.implementation)
-	bufmap("<leader>D", vim.lsp.buf.type_definition)
+    bufmap('<leader>D', vim.lsp.buf.type_definition)
 
-	bufmap("gr", require("telescope.builtin").lsp_references)
+    bufmap('gr', require('telescope.builtin').lsp_references)
-	bufmap("<leader>s", require("telescope.builtin").lsp_document_symbols)
+    bufmap('<leader>s', require('telescope.builtin').lsp_document_symbols)
-	bufmap("<leader>S", require("telescope.builtin").lsp_dynamic_workspace_symbols)
+    bufmap('<leader>S',
+           require('telescope.builtin').lsp_dynamic_workspace_symbols)
 
-	bufmap("K", vim.lsp.buf.hover)
+    bufmap('K', vim.lsp.buf.hover)
 
-	vim.api.nvim_buf_create_user_command(bufnr, "Format", function(_)
+    vim.api.nvim_buf_create_user_command(bufnr, 'Format',
-		vim.lsp.buf.format()
+                                         function(_) vim.lsp.buf.format() end,
-	end, {})
+                                         {})
 end
 
 local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
+capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
 
-require("neodev").setup()
+require('neodev').setup()
-require("lspconfig").nil_ls.setup({
+require'lspconfig'.nil_ls.setup {
-	on_attach = on_attach,
+    on_attach = on_attach,
-	capabilities = capabilities,
+    capabilities = capabilities
-})
+}
-require("lspconfig").pyright.setup({
+require'lspconfig'.pyright.setup {
-	on_attach = on_attach,
+    on_attach = on_attach,
-	capabilities = capabilities,
+    capabilities = capabilities
-})
+}
-require("lspconfig").gopls.setup({
+require'lspconfig'.gopls.setup {
-	on_attach = on_attach,
+    on_attach = on_attach,
-	capabilities = capabilities,
+    capabilities = capabilities
-})
+}
-require("lspconfig").terraformls.setup({
+require'lspconfig'.terraformls.setup {
-	on_attach = on_attach,
+    on_attach = on_attach,
-	capabilities = capabilities,
+    capabilities = capabilities
-})
+}
 
--- require'lspconfig'.efm.setup {
+require'lspconfig'.efm.setup {
---     on_attach = require("lsp-format").on_attach,
+    on_attach = require("lsp-format").on_attach,
---     init_options = {documentFormatting = true},
+    init_options = {documentFormatting = true},
---     settings = {
+    settings = {
---         languages = {
+        languages = {
---             lua = {{formatCommand = "lua-format -i", formatStdin = true}},
+            lua = {{formatCommand = "lua-format -i", formatStdin = true}},
---             nix = {{formatCommand = "nixfmt", formatStdin = true}}
+            nix = {{formatCommand = "nixfmt", formatStdin = true}}
---         }
+        }
---     },
+    },
---     filetypes = {"lua", "nix"}
+    filetypes = {"lua", "nix"}
--- }
+}

home-manager/neovim/none-ls.lua

@@ -1,51 +0,0 @@
--- renamed to none-ls
-local null_ls_status_ok, null_ls = pcall(require, "null-ls")
-if not null_ls_status_ok then
-	return
-end
-
-local formatting = null_ls.builtins.formatting
-local diagnostics = null_ls.builtins.diagnostics
-local code_actions = null_ls.builtins.code_actions
-
--- to setup format on save
-local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
-
-require("null-ls").setup({
-	sources = {
-		formatting.stylua,
-		formatting.black,
-	},
-
-	-- configure format on save
-	on_attach = function(current_client, bufnr)
-		if current_client.supports_method("textDocument/formatting") then
-			vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
-			vim.api.nvim_create_autocmd("BufWritePre", {
-				group = augroup,
-				buffer = bufnr,
-				callback = function()
-					vim.lsp.buf.format({
-						filter = function(client)
-							--  only use null-ls for formatting instead of lsp server
-							return client.name == "null-ls"
-						end,
-						bufnr = bufnr,
-					})
-				end,
-			})
-		end
-	end,
-})
-
--- formatting command
-vim.api.nvim_create_user_command("Format", function()
-	vim.lsp.buf.format(nil, 10000)
-end, {})
-
-vim.keymap.set(
-	"n",
-	"<leader>fm",
-	":Format<CR>",
-	{ desc = "Format current buffer (also done on save)", noremap = true, silent = true }
-)

home-manager/neovim/telescope.lua

@@ -1,17 +1,17 @@
-local builtin = require("telescope.builtin")
+local builtin = require('telescope.builtin')
 
-vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
+vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
+vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
-vim.keymap.set("n", "<leader>fb", builtin.buffers, {})
+vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
-vim.keymap.set("n", "<leader>fr", builtin.lsp_references, {})
+vim.keymap.set('n', '<leader>fr', builtin.lsp_references, {})
-vim.keymap.set("n", "<leader>fs", builtin.lsp_document_symbols, {})
+vim.keymap.set('n', '<leader>fs', builtin.lsp_document_symbols, {})
 
-require("telescope").setup({
+require('telescope').setup {
-	pickers = {
+    pickers = {
-		find_files = { theme = "dropdown" },
+        find_files = {theme = "dropdown"},
-		live_grep = { theme = "dropdown" },
+        live_grep = {theme = "dropdown"},
-		buffers = { theme = "dropdown" },
+        buffers = {theme = "dropdown"},
-		lsp_references = { theme = "dropdown" },
+        lsp_references = {theme = "dropdown"},
-		lsp_document_symbols = { theme = "dropdown" },
+        lsp_document_symbols = {theme = "dropdown"}
-	},
+    }
-})
+}

home-manager/neovim/treesitter.lua

@@ -1,9 +1,10 @@
-require("nvim-treesitter.configs").setup({
+require('nvim-treesitter.configs').setup {
-	ensure_installed = {},
+    ensure_installed = {},
 
-	auto_install = false,
+    auto_install = false,
 
-	highlight = { enable = true },
+    highlight = {enable = true},
+
+    indent = {enable = true}
+}
 
-	indent = { enable = true },
-})

nixos/default.nix

@@ -39,7 +39,7 @@
   };
 
   environment = {
-    systemPackages = with pkgs; [ wget curl git btop ripgrep vim dogdns tree dig ];
+    systemPackages = with pkgs; [ wget curl git btop ripgrep vim dogdns tree ];
     gnome.excludePackages = with pkgs; [
       gnome.totem
       gnome-tour