all: minor changes

.gitignore

@@ -1,3 +1,4 @@
 templates/*/result*
 templates/*/flake.lock
 /result*
+/repl*

flake.nix

@@ -40,13 +40,23 @@
     };
     oscuro = {
       url = "github:L-Nafaryus/oscuro";
+      inputs.bonfire.follows = "";
     };
     obs-image-reaction = {
       url = "github:L-Nafaryus/obs-image-reaction";
     };
     nixvim = {
       url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+
+        devshell.follows = "";
+        flake-compat.follows = "";
+        git-hooks.follows = "";
+        home-manager.follows = "";
+        nix-darwin.follows = "";
+        treefmt-nix.follows = "";
+      };
     };
     ags = {
       url = "github:Aylur/ags";

lib/preconfiguredModules/bonvim.nix

@@ -48,6 +48,9 @@
     smoothscroll = true;
 
     autowrite = true;
+
+    pumblend = 10;
+    pumheight = 10;
   };
 
   globals = {
@@ -65,11 +68,30 @@
   # Copy/paste
   plugins.yanky = {
     enable = true;
-    systemClipboard.syncWithRing = true;
+    settings.system_clipboard.sync_with_ring = true;
   };
 
   extraPlugins = with pkgs.vimPlugins; [nvim-web-devicons];
 
+  diagnostics = {
+    underline = true;
+    update_in_insert = false;
+    # lsp diagnostics grouped in the end of file
+    virtual_text = {
+      spacing = 4;
+      source = "if_many";
+      prefix = "●";
+    };
+    # lsp diagnostic lines disabled by default, toggle it for pretty lines
+    virtual_lines = false;
+    # sort diagnostic messages
+    severity_sort = true;
+    # hightlight word under cursor
+    document_highlight = {
+      enabled = true;
+    };
+  };
+
   # Theme
   colorschemes.catppuccin = {
     enable = true;
@@ -97,10 +119,10 @@
             background = true;
           };
           underlines = {
-            errors = ["underline"];
+            errors = ["undercurl"];
-            hints = ["underline"];
+            hints = ["undercurl"];
-            information = ["underline"];
+            information = ["undercurl"];
-            warnings = ["underline"];
+            warnings = ["undercurl"];
           };
         };
       };
@@ -354,7 +376,7 @@
         nil-ls.enable = true;
         # pylyzer.enable = true;    # not working with virtual environments currently :(
         pylsp = {
-          enable = true;
+          enable = true; # https://github.com/nix-community/nixvim/pull/1893
           settings.plugins = {
             pyflakes.enabled = true;
             black.enabled = true;
@@ -367,6 +389,15 @@
           rustcPackage = rustc;
           installCargo = true;
           installRustc = true;
+          settings = {
+            checkOnSave = true;
+            check.command = "clippy";
+            inlayHints = {
+              enable = true;
+              showParameterNames = true;
+            };
+            procMacro.enable = true;
+          };
         };
         volar.enable = true;
         tailwindcss.enable = true;
@@ -485,9 +516,71 @@
           "<c-space>" = "cmp.mapping.complete()";
           "<cr>" = "cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true })";
           "<tab>" = "cmp.mapping(cmp.mapping.confirm({ select = true }), { 'i', 's', 'c' })";
-          "<c-p>" = "cmp.mapping.select_prev_item()";
+          "<up>" = "cmp.mapping.select_prev_item()";
-          "<c-n>" = "cmp.mapping.select_next_item()";
+          "<down>" = "cmp.mapping.select_next_item()";
         };
+        formatting.format = ''
+          function(entry, item)
+              local icons = {
+                Array         = " ",
+                Boolean       = "󰨙 ",
+                Class         = " ",
+                Codeium       = "󰘦 ",
+                Color         = " ",
+                Control       = " ",
+                Collapsed     = " ",
+                Constant      = "󰏿 ",
+                Constructor   = " ",
+                Copilot       = " ",
+                Enum          = " ",
+                EnumMember    = " ",
+                Event         = " ",
+                Field         = " ",
+                File          = " ",
+                Folder        = " ",
+                Function      = "󰊕 ",
+                Interface     = " ",
+                Key           = " ",
+                Keyword       = " ",
+                Method        = "󰊕 ",
+                Module        = " ",
+                Namespace     = "󰦮 ",
+                Null          = " ",
+                Number        = "󰎠 ",
+                Object        = " ",
+                Operator      = " ",
+                Package       = " ",
+                Property      = " ",
+                Reference     = " ",
+                Snippet       = " ",
+                String        = " ",
+                Struct        = "󰆼 ",
+                TabNine       = "󰏚 ",
+                Text          = " ",
+                TypeParameter = " ",
+                Unit          = " ",
+                Value         = " ",
+                Variable      = "󰀫 ",
+              }
+
+              if icons[item.kind] then
+                item.kind = icons[item.kind] .. item.kind
+              end
+
+              local widths = {
+                abbr = vim.g.cmp_widths and vim.g.cmp_widths.abbr or 40,
+                menu = vim.g.cmp_widths and vim.g.cmp_widths.menu or 30,
+              }
+
+              for key, width in pairs(widths) do
+                if item[key] and vim.fn.strdisplaywidth(item[key]) > width then
+                  item[key] = vim.fn.strcharpart(item[key], 0, width - 1) .. "…"
+                end
+              end
+
+              return item
+            end
+        '';
       };
     };
     cmp-nvim-lsp.enable = true;

nixosConfigurations/astora/default.nix

@@ -105,7 +105,16 @@
   };
   services.dbus.enable = true;
 
-  services.printing.enable = true;
+  services.printing = {
+    enable = true;
+    drivers = [pkgs.hplip];
+  };
+
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+  };
 
   services.pipewire = {
     enable = true;

nixosConfigurations/astora/hardware.nix

@@ -179,8 +179,6 @@
     pulseaudio.enable = false;
   };
 
-  sound.enable = true;
-
   networking = {
     networkmanager.enable = true;
     networkmanager.unmanaged = ["interface-name:ve-*"];

packages/bonfire-docs/src/notes.md

@@ -29,4 +29,9 @@ sudo nixos-rebuild switch --flake ".?submodules=1#astora"
 nixos-rebuild switch --flake ".?submodules=1#catarina" --build-host l-nafaryus@astora --target-host l.nafaryus@catarina --use-remote-sudo
 ```
 
+* How to repair corrupted links in nix-store:
+
+```sh
+nix-store --verify --check-contents --repair
+```
 

packages/bonvim/default.nix

@@ -10,9 +10,9 @@
     pkgs = pkgs;
     module = bonLib.preconfiguredModules.bonvim;
     extraSpecialArgs = {
-      rustc = fenixPkgs.complete.rustc;
+      rustc = fenixPkgs.complete.toolchain;
-      cargo = fenixPkgs.complete.cargo;
+      cargo = fenixPkgs.complete.toolchain;
-      rust-analyzer = fenixPkgs.complete.rust-analyzer;
+      rust-analyzer = fenixPkgs.complete.toolchain;
     };
   };
 in