summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/niri/jonbox.kdl4
-rw-r--r--config/nvim/lua/lsp.lua7
-rw-r--r--hosts/jontop/default.nix4
-rw-r--r--modules/desktop/apps/editors/neovim.nix2
-rw-r--r--modules/device.nix1
-rw-r--r--modules/hardware/printer.nix21
6 files changed, 37 insertions, 2 deletions
diff --git a/config/niri/jonbox.kdl b/config/niri/jonbox.kdl
index e885c1d..a1826f9 100644
--- a/config/niri/jonbox.kdl
+++ b/config/niri/jonbox.kdl
@@ -325,6 +325,10 @@ window-rule {
clip-to-geometry true
}
+cursor {
+ xcursor-size 12
+}
+
binds {
// Keys consist of modifiers separated by + signs, followed by an XKB key name
// in the end. To find an XKB name for a particular key, you may use a program
diff --git a/config/nvim/lua/lsp.lua b/config/nvim/lua/lsp.lua
index 5d84e30..2e823ec 100644
--- a/config/nvim/lua/lsp.lua
+++ b/config/nvim/lua/lsp.lua
@@ -71,6 +71,13 @@ vim.api.nvim_create_autocmd("CursorHold", {
desc = "Highlight symbol under cursor on CursorHold"
})
+vim.api.nvim_create_autocmd("Filetype", {
+ pattern = "c",
+ callback = function()
+ vim.opt_local.spell = false
+ end,
+})
+
-- Symbol renaming
keyset("n", "<leader>rn", "<Plug>(coc-rename)", {silent = true})
diff --git a/hosts/jontop/default.nix b/hosts/jontop/default.nix
index 7b5c6c0..a5d3d25 100644
--- a/hosts/jontop/default.nix
+++ b/hosts/jontop/default.nix
@@ -46,6 +46,7 @@
gpu = "intel";
drive = "ssd";
hasBluetooth = true;
+ hasPrinter = true;
};
desktop = {
niri.enable = true;
@@ -65,6 +66,7 @@
home.packages = with pkgs; [
cataclysm-dda
(callPackage (rootPath + /packages/freeciv/default.nix) {})
- unstable.unciv
+ libreoffice
+ texliveMedium
];
}
diff --git a/modules/desktop/apps/editors/neovim.nix b/modules/desktop/apps/editors/neovim.nix
index f0040e0..304aca7 100644
--- a/modules/desktop/apps/editors/neovim.nix
+++ b/modules/desktop/apps/editors/neovim.nix
@@ -65,8 +65,8 @@ in {
nvim-treesitter nvim-treesitter.withAllGrammars
coc-clangd
+ coc-rust-analyzer
coc-lua
- coc-spell-checker
];
};
};
diff --git a/modules/device.nix b/modules/device.nix
index acf9eb5..fbf4d95 100644
--- a/modules/device.nix
+++ b/modules/device.nix
@@ -11,6 +11,7 @@
drive = lib.mkOption {type = lib.types.enum ["ssd" "nvme"];};
hasBluetooth = lib.mkOption {type = lib.types.bool;};
+ hasPrinter = lib.mkOption { type = lib.types.bool; };
displayProtocol = lib.mkOption {type = lib.types.enum ["xserver" "wayland"];};
};
}
diff --git a/modules/hardware/printer.nix b/modules/hardware/printer.nix
new file mode 100644
index 0000000..f4efd99
--- /dev/null
+++ b/modules/hardware/printer.nix
@@ -0,0 +1,21 @@
+{
+ config,
+ options,
+ lib,
+ pkgs,
+ ...
+}: let
+ device = config.modules.device;
+in {
+
+ config = lib.mkIf (device.hasPrinter) (lib.mkMerge [
+ {
+ services.printing.enable = true;
+ services.avahi = {
+ enable = true;
+ nssmdns4 = true;
+ openFirewall = true;
+ };
+ }
+ ]);
+}