diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 2086c05..5571838 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -133,8 +133,9 @@ # services.xserver.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - users.defaultUserShell = pkgs.fish; + # users.defaultUserShell = pkgs.fish; users.users.${userSettings.username} = { + shell = pkgs.fish; isNormalUser = true; description = "Natalie Marks"; extraGroups = ["networkmanager" "wheel" "docker"]; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 1bcb40f..af74a4d 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -12,7 +12,7 @@ in { imports = [ inputs.nixvim.homeManagerModules.nixvim #set up nixvim - ../../modules/nixvim + # ../../modules/nixvim ]; home = { stateVersion = "23.05"; # Please read the comment before changing. diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 5707977..64a2897 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -10,7 +10,7 @@ imports = [ inputs.nixvim.homeManagerModules.nixvim #set up nixvim - ../../modules/nixvim + # ../../modules/nixvim ]; programs = import ../../modules/shared/homeManagerPrograms.nix {inherit inputs config pkgs lib userSettings systemSettings;}; diff --git a/modules/nixvim/plugins/blink.nix b/modules/nixvim/plugins/blink.nix index c066b6c..4768ef2 100644 --- a/modules/nixvim/plugins/blink.nix +++ b/modules/nixvim/plugins/blink.nix @@ -25,7 +25,13 @@ settings = { keymap.preset = "super-tab"; completion = { - ghost_test.enabled = true; + accept.auto_brackets.enabled = false; + ghost_test.enabled = false; + + list.selection = { + preselect = true; + auto_insert = false; + }; documentation = { auto_show = true; @@ -33,6 +39,29 @@ window.border = "rounded"; }; }; + + menu.draw.components = { + kind_icon.text.__raw = '' + function(ctx) + local kind_icon, _, _ = require('mini.icons').get('lsp', ctx.kind) + -- Check for both nil and the default fallback icon + if not kind_icon or kind_icon == '󰞋' then + -- Use our configured kind_icons + return require('blink.cmp.config').appearance.kind_icons[ctx.kind] or "" + end + return kind_icon + end, + -- Optionally, you may also use the highlights from mini.icons + highlight = function(ctx) + local _, hl, _ = require('mini.icons').get('lsp', ctx.kind) + return hl + end + ''; + }; + }; + + fuzzy = { + implementation = "prefer_rust_with_warning"; }; }; }; diff --git a/modules/nixvim/plugins/default.nix b/modules/nixvim/plugins/default.nix index 8ee50a4..997bb04 100644 --- a/modules/nixvim/plugins/default.nix +++ b/modules/nixvim/plugins/default.nix @@ -1,5 +1,6 @@ {pkgs, ...}: { imports = [ ./blink.nix + ./lz-n.nix ]; } diff --git a/modules/nixvim/plugins/lz-n.nix b/modules/nixvim/plugins/lz-n.nix index 5fcaaac..695dd3d 100644 --- a/modules/nixvim/plugins/lz-n.nix +++ b/modules/nixvim/plugins/lz-n.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { - programs.nixvim.programs = { + programs.nixvim.plugins = { lz-n = { enable = true; }; diff --git a/modules/shared/homeManagerPrograms.nix b/modules/shared/homeManagerPrograms.nix index 83fcda9..078b1f1 100644 --- a/modules/shared/homeManagerPrograms.nix +++ b/modules/shared/homeManagerPrograms.nix @@ -59,9 +59,9 @@ reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now"; }; shellInit = '' - test -r '/Users/${userSettings.username}/.opam/opam-init/init.fish' && source '/Users/${userSettings.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true batman --export-env | source ''; + ##test -r '/Users/${userSettings.username}/.opam/opam-init/init.fish' && source '/Users/${userSettings.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true }; home-manager.enable = true; } diff --git a/modules/shared/packages.nix b/modules/shared/packages.nix index 2f9b8ac..71c306e 100644 --- a/modules/shared/packages.nix +++ b/modules/shared/packages.nix @@ -109,6 +109,7 @@ with pkgs; [ #math texlive.combined.scheme-full + zathura #fun things cowsay