| author |  Natalie Marks <nmarks413@gmail.com> 2025-04-30 12:37:35-07:00 |
| committer | Natalie Marks <nmarks413@gmail.com> 2025-04-30 12:37:35-07:00 |
| log | e9844c71c462397a4c9042ae064b13385b761e45 |
| tree | add73eb37c12cd07267ebef991a8fc0ac881ffac |
| parent | b103004218ddf9c510ccd29e6244c890545b9006 |
| signature | Commit is signed but in an unrecognized format. |
disabled nixvim for now
8 files changed, 38 insertions(+), 6 deletions(-)
hosts
desktop
laptop
modules
nixvim
plugins
hosts/desktop/configuration.nix+2-1
| ... | @@ -133,8 +133,9 @@ | ... | @@ -133,8 +133,9 @@ |
| 133 | # services.xserver.libinput.enable = true; | 133 | # services.xserver.libinput.enable = true; |
| 134 | 134 | ||
| 135 | # Define a user account. Don't forget to set a password with ‘passwd’. | 135 | # Define a user account. Don't forget to set a password with ‘passwd’. |
| 136 | users.defaultUserShell = pkgs.fish; | 136 | # users.defaultUserShell = pkgs.fish; |
| 137 | users.users.${userSettings.username} = { | 137 | users.users.${userSettings.username} = { |
| 138 | shell = pkgs.fish; | ||
| 138 | isNormalUser = true; | 139 | isNormalUser = true; |
| 139 | description = "Natalie Marks"; | 140 | description = "Natalie Marks"; |
| 140 | extraGroups = ["networkmanager" "wheel" "docker"]; | 141 | extraGroups = ["networkmanager" "wheel" "docker"]; |
hosts/desktop/home.nix+1-1
| ... | @@ -12,7 +12,7 @@ in { | ... | @@ -12,7 +12,7 @@ in { |
| 12 | imports = [ | 12 | imports = [ |
| 13 | inputs.nixvim.homeManagerModules.nixvim | 13 | inputs.nixvim.homeManagerModules.nixvim |
| 14 | #set up nixvim | 14 | #set up nixvim |
| 15 | ../../modules/nixvim | 15 | # ../../modules/nixvim |
| 16 | ]; | 16 | ]; |
| 17 | home = { | 17 | home = { |
| 18 | stateVersion = "23.05"; # Please read the comment before changing. | 18 | stateVersion = "23.05"; # Please read the comment before changing. |
hosts/laptop/home.nix+1-1
| ... | @@ -10,7 +10,7 @@ | ... | @@ -10,7 +10,7 @@ |
| 10 | imports = [ | 10 | imports = [ |
| 11 | inputs.nixvim.homeManagerModules.nixvim | 11 | inputs.nixvim.homeManagerModules.nixvim |
| 12 | #set up nixvim | 12 | #set up nixvim |
| 13 | ../../modules/nixvim | 13 | # ../../modules/nixvim |
| 14 | ]; | 14 | ]; |
| 15 | programs = import ../../modules/shared/homeManagerPrograms.nix {inherit inputs config pkgs lib userSettings systemSettings;}; | 15 | programs = import ../../modules/shared/homeManagerPrograms.nix {inherit inputs config pkgs lib userSettings systemSettings;}; |
| 16 | 16 |
modules/nixvim/plugins/blink.nix+30-1
| ... | @@ -25,7 +25,13 @@ | ... | @@ -25,7 +25,13 @@ |
| 25 | settings = { | 25 | settings = { |
| 26 | keymap.preset = "super-tab"; | 26 | keymap.preset = "super-tab"; |
| 27 | completion = { | 27 | completion = { |
| 28 | ghost_test.enabled = true; | 28 | accept.auto_brackets.enabled = false; |
| 29 | ghost_test.enabled = false; | ||
| 30 | |||
| 31 | list.selection = { | ||
| 32 | preselect = true; | ||
| 33 | auto_insert = false; | ||
| 34 | }; | ||
| 29 | 35 | ||
| 30 | documentation = { | 36 | documentation = { |
| 31 | auto_show = true; | 37 | auto_show = true; |
| ... | @@ -33,6 +39,29 @@ | ... | @@ -33,6 +39,29 @@ |
| 33 | window.border = "rounded"; | 39 | window.border = "rounded"; |
| 34 | }; | 40 | }; |
| 35 | }; | 41 | }; |
| 42 | |||
| 43 | menu.draw.components = { | ||
| 44 | kind_icon.text.__raw = '' | ||
| 45 | function(ctx) | ||
| 46 | local kind_icon, _, _ = require('mini.icons').get('lsp', ctx.kind) | ||
| 47 | -- Check for both nil and the default fallback icon | ||
| 48 | if not kind_icon or kind_icon == '' then | ||
| 49 | -- Use our configured kind_icons | ||
| 50 | return require('blink.cmp.config').appearance.kind_icons[ctx.kind] or "" | ||
| 51 | end | ||
| 52 | return kind_icon | ||
| 53 | end, | ||
| 54 | -- Optionally, you may also use the highlights from mini.icons | ||
| 55 | highlight = function(ctx) | ||
| 56 | local _, hl, _ = require('mini.icons').get('lsp', ctx.kind) | ||
| 57 | return hl | ||
| 58 | end | ||
| 59 | ''; | ||
| 60 | }; | ||
| 61 | }; | ||
| 62 | |||
| 63 | fuzzy = { | ||
| 64 | implementation = "prefer_rust_with_warning"; | ||
| 36 | }; | 65 | }; |
| 37 | }; | 66 | }; |
| 38 | }; | 67 | }; |
modules/nixvim/plugins/default.nix+1
| ... | @@ -1,5 +1,6 @@ | ... | @@ -1,5 +1,6 @@ |
| 1 | {pkgs, ...}: { | 1 | {pkgs, ...}: { |
| 2 | imports = [ | 2 | imports = [ |
| 3 | ./blink.nix | 3 | ./blink.nix |
| 4 | ./lz-n.nix | ||
| 4 | ]; | 5 | ]; |
| 5 | } | 6 | } |
modules/nixvim/plugins/lz-n.nix+1-1
| ... | @@ -1,5 +1,5 @@ | ... | @@ -1,5 +1,5 @@ |
| 1 | {pkgs, ...}: { | 1 | {pkgs, ...}: { |
| 2 | programs.nixvim.programs = { | 2 | programs.nixvim.plugins = { |
| 3 | lz-n = { | 3 | lz-n = { |
| 4 | enable = true; | 4 | enable = true; |
| 5 | }; | 5 | }; |
modules/shared/homeManagerPrograms.nix+1-1
| ... | @@ -59,9 +59,9 @@ | ... | @@ -59,9 +59,9 @@ |
| 59 | reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now"; | 59 | reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now"; |
| 60 | }; | 60 | }; |
| 61 | shellInit = '' | 61 | shellInit = '' |
| 62 | 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 | ||
| 63 | batman --export-env | source | 62 | batman --export-env | source |
| 64 | ''; | 63 | ''; |
| 64 | ##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 | ||
| 65 | }; | 65 | }; |
| 66 | home-manager.enable = true; | 66 | home-manager.enable = true; |
| 67 | } | 67 | } |
modules/shared/packages.nix+1
| ... | @@ -109,6 +109,7 @@ with pkgs; [ | ... | @@ -109,6 +109,7 @@ with pkgs; [ |
| 109 | 109 | ||
| 110 | #math | 110 | #math |
| 111 | texlive.combined.scheme-full | 111 | texlive.combined.scheme-full |
| 112 | zathura | ||
| 112 | 113 | ||
| 113 | #fun things | 114 | #fun things |
| 114 | cowsay | 115 | cowsay |