diff options
| -rw-r--r-- | config/niri/jontop.kdl | 2 | ||||
| -rw-r--r-- | config/nvim/lua/lsp.lua | 4 | ||||
| -rw-r--r-- | config/nvim/lua/settings.lua | 2 | ||||
| -rw-r--r-- | hosts/jontop/default.nix | 15 | ||||
| -rw-r--r-- | modules/desktop/apps/editors/neovim.nix | 20 | ||||
| -rw-r--r-- | modules/options.nix | 2 |
6 files changed, 35 insertions, 10 deletions
diff --git a/config/niri/jontop.kdl b/config/niri/jontop.kdl index 950e728..aff1c95 100644 --- a/config/niri/jontop.kdl +++ b/config/niri/jontop.kdl @@ -343,7 +343,7 @@ binds { // Suggested binds for running programs: terminal, app launcher, screen locker. Mod+Return hotkey-overlay-title="Open a Terminal: kitty" { spawn "kitty"; } Mod+D hotkey-overlay-title="Run an Application: wofi" { spawn "wofi" "--show" "drun"; } - Mod+W hotkey-overlay-title="Open a Web Browser: firefox" { spawn "firefox"; } + Mod+W hotkey-overlay-title="Open a Web Browser: librewolf" { spawn "librewolf"; } // You can also use a shell. Do this if you need pipes, multiple commands, etc. // Note: the entire command goes as a single argument in the end. diff --git a/config/nvim/lua/lsp.lua b/config/nvim/lua/lsp.lua index 1c2b0ae..fcbeebd 100644 --- a/config/nvim/lua/lsp.lua +++ b/config/nvim/lua/lsp.lua @@ -192,8 +192,4 @@ keyset("n", "<space>k", ":<C-u>CocPrev<cr>", opts) -- Resume latest coc list keyset("n", "<space>p", ":<C-u>CocListResume<cr>", opts) -require("nvim-treesitter.config").setup({ - highlight = { enable = true, }, -}) - require("gitsigns").setup({}) diff --git a/config/nvim/lua/settings.lua b/config/nvim/lua/settings.lua index 6f440bb..8915f9a 100644 --- a/config/nvim/lua/settings.lua +++ b/config/nvim/lua/settings.lua @@ -32,3 +32,5 @@ vim.opt.splitbelow = true vim.opt.splitright = true vim.opt.colorcolumn = "80" vim.opt.updatetime = 250 + +vim.g.zig_fmt_autosave = 0 diff --git a/hosts/jontop/default.nix b/hosts/jontop/default.nix index 3882dee..d932fc7 100644 --- a/hosts/jontop/default.nix +++ b/hosts/jontop/default.nix @@ -1,4 +1,5 @@ { + config, inputs, lib, pkgs, @@ -37,10 +38,14 @@ environment.systemPackages = [ pkgs.man-pages pkgs.man-pages-posix - pkgs.xbacklight ]; documentation.dev.enable = true; + boot = { + kernelModules = [ "tp_smapi" ]; + extraModulePackages = with config.boot.kernelPackages; [ tp_smapi ]; + }; + modules = { hardware = { laptop.enable = true; @@ -53,7 +58,7 @@ desktop = { niri.enable = true; apps = { - browsers.firefox.enable = true; + browsers.librewolf.enable = true; games = { enable = true; steam.enable = true; @@ -61,14 +66,20 @@ mpd.enable = false; flatpak.enable = true; newsboat.enable = true; + virt-manager.enable = true; }; }; }; + programs.direnv.enable = true; + virtualisation.docker.enable = true; + home.packages = with pkgs; [ cataclysm-dda (callPackage (rootPath + /packages/freeciv/default.nix) {}) libreoffice + hunspell hunspellDicts.en_US texliveMedium + vscode ]; } diff --git a/modules/desktop/apps/editors/neovim.nix b/modules/desktop/apps/editors/neovim.nix index e3bb02e..e719565 100644 --- a/modules/desktop/apps/editors/neovim.nix +++ b/modules/desktop/apps/editors/neovim.nix @@ -26,6 +26,7 @@ in { pkgs.texlab pkgs.zls pkgs.wgsl-analyzer + pkgs.clang-tools ]; home.manager.programs.neovim = { @@ -50,7 +51,7 @@ in { "nix.serverPath" = "nil"; "zig.enabled" = true; - "zig.path" = "${pkgs.zls}/bin/zls"; + "zig.path" = "zls"; "languageserver" = { "wgsl" = { @@ -72,9 +73,24 @@ in { plenary-nvim telescope-nvim wgsl-vim + zig-vim nvim-lspconfig - nvim-treesitter nvim-treesitter.withAllGrammars + { + plugin = nvim-treesitter.withAllGrammars; + type = "lua"; + config = '' + require('nvim-treesitter.config').setup { + highlight = { enable = true }, + indent = { enable = true }, + } + vim.api.nvim_create_autocmd('FileType', { + pattern = { 'c', 'h', 'lua', 'nix', 'mk', 'zig' }, + callback = function() vim.treesitter.start() end, + }) + vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" + ''; + } coc-clangd coc-rust-analyzer diff --git a/modules/options.nix b/modules/options.nix index 04566eb..6c8af13 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -89,7 +89,7 @@ home = "/home/${name}"; isNormalUser = true; group = "users"; - extraGroups = ["wheel"]; + extraGroups = ["wheel" "docker"]; uid = 1000; }; |