restructured

* laptop, pc and common now live in systems
* new dev shell to run dconf2nix
* New dconf weather entry (currently not functional)

systems/common/nvim/cmp.lua

@@ -0,0 +1,64 @@
+-- Set up nvim-cmp.
+local cmp = require'cmp'
+
+cmp.setup({
+	snippet = {
+      		expand = function(args)
+        		require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+      		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 }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+    	}),
+    	sources = cmp.config.sources({
+      		{ name = 'nvim_lsp' },
+      		-- { name = 'vsnip' }, -- For vsnip users.
+      		{ name = 'luasnip' }, -- For luasnip users.
+      		-- { name = 'ultisnips' }, -- For ultisnips users.
+      		-- { name = 'snippy' }, -- For snippy users.
+    	}, {
+      		{ name = 'buffer' },
+    	})
+})
+
+-- Set configuration for specific filetype.
+cmp.setup.filetype('gitcommit', {
+	sources = cmp.config.sources({
+      		{ name = 'git' }, -- You can specify the `git` source if [you were installed it](https://github.com/petertriho/cmp-git).
+    	}, {
+      		{ name = 'buffer' },
+    	})
+})
+
+-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline({ '/', '?' }, {
+	mapping = cmp.mapping.preset.cmdline(),
+    	sources = {
+      		{ name = 'buffer' }
+    	}
+})
+
+-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline(':', {
+    	mapping = cmp.mapping.preset.cmdline(),
+    	sources = cmp.config.sources({
+      		{ name = 'path' }
+    	}, {
+      		{ name = 'cmdline' }
+    	})
+})
+
+-- Set up lspconfig.
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+-- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
+require('lspconfig')['pyright'].setup {
+    	capabilities = capabilities
+}

systems/common/nvim/colors.lua

@@ -0,0 +1,11 @@
+require('tokyonight').setup({style = 'moon',})
+
+function ColorMyPencils(color)
+	color = color or 'tokyonight'
+	vim.cmd.colorscheme(color)
+
+        vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' })
+	vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' })
+end
+
+ColorMyPencils()

systems/common/nvim/default.nix

@@ -0,0 +1,54 @@
+{pkgs, ...}: {
+  config.programs.neovim = {
+    enable = true;
+
+    defaultEditor = true;
+    viAlias = true;
+    vimAlias = true;
+    vimdiffAlias = true;
+
+    plugins = with pkgs.vimPlugins;
+      [
+        telescope-nvim # fuzzy finder
+        tokyonight-nvim # theme
+        undotree # undotree
+        vim-fugitive # git integration
+        nvim-treesitter # syntax highlighting
+
+        # Autocomplete and LSP
+        nvim-lspconfig
+        nvim-cmp
+        cmp-nvim-lsp
+        luasnip
+      ]
+      ++ (with pkgs.vimPlugins.nvim-treesitter-parsers; [
+        # Parsers for syntax highlighting
+        nix
+        zig
+        python
+        vim
+        vimdoc
+        markdown
+        dockerfile
+        yaml
+        json
+        toml
+        lua
+        c
+        glsl
+        bash
+      ]);
+
+    extraPackages = [pkgs.nodePackages.pyright];
+    extraLuaConfig =
+      builtins.readFile ./keybinds.lua
+      + builtins.readFile ./colors.lua
+      + builtins.readFile ./undotree.lua
+      + builtins.readFile ./fugitive.lua
+      + builtins.readFile ./treesitter.lua
+      + builtins.readFile ./telescope.lua
+      + builtins.readFile ./cmp.lua
+      + builtins.readFile ./lspconfig.lua;
+    extraConfig = "set number relativenumber";
+  };
+}

systems/common/nvim/fugitive.lua

@@ -0,0 +1 @@
+vim.keymap.set('n', '<leader>gs', vim.cmd.Git)

systems/common/nvim/keybinds.lua

@@ -0,0 +1,2 @@
+vim.g.mapleader = ' '
+vim.keymap.set('n', '<leader>pv', vim.cmd.Ex)

systems/common/nvim/lspconfig.lua

@@ -0,0 +1,40 @@
+-- Global mappings.
+-- See `:help vim.diagnostic.*` for documentation on any of the below functions
+vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
+vim.keymap.set('n', '<C-p>', vim.diagnostic.goto_prev)
+vim.keymap.set('n', '<C-n>', vim.diagnostic.goto_next)
+vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
+
+-- Use LspAttach autocommand to only map the following keys
+-- after the language server attaches to the current buffer
+vim.api.nvim_create_autocmd('LspAttach', {
+	group = vim.api.nvim_create_augroup('UserLspConfig', {}),
+  	callback = function(ev)
+    	-- Enable completion triggered by <c-x><c-o>
+    	vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
+
+    	-- Buffer local mappings.
+    	-- See `:help vim.lsp.*` for documentation on any of the below functions
+    	local opts = { buffer = ev.buf }
+    	vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
+    	vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
+    	vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
+    	vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
+    	vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
+    	vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
+    	vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
+    	vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
+    	
+	vim.keymap.set('n', '<space>wl', function()
+      		print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+    	end, opts)
+    	
+	vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
+    	vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
+    	vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
+    	
+	vim.keymap.set('n', '<space>f', function()
+      		vim.lsp.buf.format { async = true }
+    	end, opts)
+  end,
+})

systems/common/nvim/telescope.lua

@@ -0,0 +1,7 @@
+local telescope = require('telescope.builtin')
+
+vim.keymap.set('n', '<leader>pf', telescope.find_files, {})
+vim.keymap.set('n', '<C-p>', telescope.git_files, {})
+vim.keymap.set('n', '<leader>ps', function()
+	telescope.grep_string({ search = vim.fn.input("Grep > ")});
+end)

systems/common/nvim/treesitter.lua

@@ -0,0 +1,8 @@
+-- Treesitter
+require'nvim-treesitter.configs'.setup {
+	highlight = {
+		-- `false` will disable the whole extension
+		enable = true,
+		additional_vim_regex_highlighting = false,
+	},
+}

systems/common/nvim/undotree.lua

@@ -0,0 +1 @@
+vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)