diff --git a/hosts/default.nix b/hosts/default.nix index 0ee3baa..b7964a5 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -10,7 +10,6 @@ in { ../modules inputs.home-manager.nixosModules.home-manager inputs.agenix.nixosModules.default - inputs.stylix.nixosModules.stylix ]; }; hermit = lib.nixosSystem rec { @@ -22,7 +21,6 @@ in { inputs.home-manager.nixosModules.home-manager inputs.agenix.nixosModules.default inputs.lix-module.nixosModules.default - inputs.stylix.nixosModules.stylix inputs.nixos-hardware.nixosModules.dell-xps-15-7590-nvidia ]; }; diff --git a/hosts/vali/hermit/configuration.nix b/hosts/vali/hermit/configuration.nix index adb4f46..752203a 100644 --- a/hosts/vali/hermit/configuration.nix +++ b/hosts/vali/hermit/configuration.nix @@ -89,7 +89,6 @@ }; helix.enable = true; kakoune.enable = true; - # nixvim.enable = false; # broken at the moment neovim.enable = true; }; services = { diff --git a/modules/editors/nvf/default.nix b/modules/editors/nvf/default.nix index 07f7a65..688e37a 100644 --- a/modules/editors/nvf/default.nix +++ b/modules/editors/nvf/default.nix @@ -1,3 +1,4 @@ +# credits to raf, his repo is in the README.md! { pkgs, config, @@ -28,7 +29,7 @@ in { imports = concatLists [ # neovim-flake home-manager module [nvf.nixosModules.default] - # construct this entore directory as a module + # construct this entire directory as a module # which means all default.nix files will be imported automtically (mkNeovimModule {path = ./.;}) ]; diff --git a/modules/editors/nvf/lua/display/ui.lua b/modules/editors/nvf/lua/display/ui.lua index 720dbf4..93fcae2 100644 --- a/modules/editors/nvf/lua/display/ui.lua +++ b/modules/editors/nvf/lua/display/ui.lua @@ -20,74 +20,74 @@ opt.cursorline = true opt.whichwrap:append('<,>,h,l,[,]') opt.list = true --- haracters to fill the statuslines, vertical separators and special +-- characters to fill the statuslines, vertical separators and special -- lines in the window.opt.whichwrap:append('<,>,h,l,[,]') opt.fillchars:append({ - -- replace window border with slightly thicker characters - -- although taking a bit of more space, it helps me better - -- identify the window borders - horiz = '━', - horizup = '┻', - horizdown = '┳', - vert = '┃', - vertleft = '┫', - vertright = '┣', - verthoriz = '╋', + -- replace window border with slightly thicker characters + -- although taking a bit of more space, it helps me better + -- identify the window borders + horiz = '━', + horizup = '┻', + horizdown = '┳', + vert = '┃', + vertleft = '┫', + vertright = '┣', + verthoriz = '╋', - eob = ' ', -- suppress end of buffer lines (~) - diff = '╱', -- deleted lines of the 'diff' option + eob = ' ', -- suppress end of buffer lines (~) + diff = '╱', -- deleted lines of the 'diff' option - msgsep = '‾', + msgsep = '‾', - -- replace fold chars - fold = ' ', - foldopen = '', - foldclose = '', + -- replace fold chars + fold = ' ', + foldopen = '', + foldclose = '', }) -- List chars that would b shown on all modes -- better kept simple, because it gets REALLY -- noisy in an average buffer local normal_listchars = { - extends = '›', -- Alternatives: … ,» - precedes = '‹', -- Alternatives: … ,« + extends = '›', -- Alternatives: … ,» + precedes = '‹', -- Alternatives: … ,« } opt.listchars = normal_listchars -- Show listchars while in Insert mode. local insert_listchars = { - eol = nil, - tab = '▎·', - lead = '·', - space = '·', - trail = '.', - multispace = '… ', - nbsp = '¤', + eol = nil, + tab = '▎·', + lead = '·', + space = '·', + trail = '.', + multispace = '… ', + nbsp = '¤', } -- Show listchars while in Insert mode. vim.api.nvim_create_augroup('InsertModeListChars', { clear = true }) vim.api.nvim_create_autocmd({ 'InsertEnter', 'InsertLeavePre' }, { - group = 'InsertModeListChars', - pattern = '*', - callback = function(args) - if vim.tbl_contains({ 'quickfix', 'prompt' }, args.match) then - return - end + group = 'InsertModeListChars', + pattern = '*', + callback = function(args) + if vim.tbl_contains({ 'quickfix', 'prompt' }, args.match) then + return + end - if args.event == 'InsertEnter' then - vim.opt_local.listchars = insert_listchars - else - vim.opt_local.listchars = normal_listchars - end + if args.event == 'InsertEnter' then + vim.opt_local.listchars = insert_listchars + else + vim.opt_local.listchars = normal_listchars + end - -- check if ibl is enabled - -- @diagnostic disable-next-line: no-unknown, unused-local - local status_ok, ibl = pcall(require, 'ibl') - if not status_ok then - return - end - require('ibl').debounced_refresh(0) - end, + -- check if ibl is enabled + -- @diagnostic disable-next-line: no-unknown, unused-local + local status_ok, ibl = pcall(require, 'ibl') + if not status_ok then + return + end + require('ibl').debounced_refresh(0) + end, }) diff --git a/modules/editors/nvf/settings.nix b/modules/editors/nvf/settings.nix index 43ef9c8..55ffb52 100644 --- a/modules/editors/nvf/settings.nix +++ b/modules/editors/nvf/settings.nix @@ -47,6 +47,8 @@ in { preventJunkFiles = true; useSystemClipboard = true; + tabWidth = 4; + autoIndent = true; spellcheck = { enable = true; # TODO add de diff --git a/modules/styling/stylix.nix b/modules/styling/stylix.nix index 77ab969..5d07ef2 100644 --- a/modules/styling/stylix.nix +++ b/modules/styling/stylix.nix @@ -1,5 +1,6 @@ { config, + inputs, pkgs, lib, ... @@ -9,6 +10,7 @@ inherit (config.modules.theming.stylix.cursor) size; inherit (config.modules.theming.stylix.fontsizes) terminal popups applications; in { + imports = [inputs.stylix.nixosModules.stylix]; options.modules.theming.stylix = { enable = lib.mkEnableOption "stylix"; scheme = lib.mkOption { @@ -93,7 +95,7 @@ in { applications = 0.9; popups = 0.9; desktop = 0.9; - terminal = 0.85; + terminal = 1.0; }; targets = { console.enable = true;