authorgravatar for git@paperclover.netclover caruso <git@paperclover.net> 2025-08-22 11:53:52-07:00
committergravatar for git@paperclover.netclover caruso <git@paperclover.net> 2025-08-22 11:53:52-07:00
log6685dd8e70c72853ef29acb217082ade33ab5ae0
tree399be5cff9bbc9e529075fd8048a375466f3f1a2
parentae43ca83248e7afaaa6738a3092aff26e2db88ba

chore: move shell settings into default

5 files changed, 24 insertions(+), 22 deletions(-)

modules/home/default.nix+11-7
......@@ -120,16 +120,20 @@ in
120120 inherit (pkgs.fishPlugins.bang-bang) src;
121121 }
122122 ];
123 shellAliases = {
124 }
125 // lib.optionalAttrs (!host.darwin) {
126 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
127 };
128123 shellInit = ''
129 batman --export-env | source
130 test -r '/Users/${user.username}/.opam/opam-init/init.fish' && source '/Users/${user.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
124 if type -q batman
125 batman --export-env | source
126 end
127 test -r "$HOME"'/.opam/opam-init/init.fish' && source "$HOME"'/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
131128 '';
132129 };
130 zsh = {
131 enableCompletion = true;
132 autosuggestion.enable = true;
133 syntaxHighlighting.enable = true;
134 autocd = true;
135 history.size = 10000;
136 };
133137
134138 ghostty.settings.custom-shader = lib.mkIf (
135139 cfg.ghostty.shader != null
modules/neovim/blink-cmp.nix+2-1
......@@ -1,4 +1,4 @@
1{ ... }:
1{ lib, ... }:
22{
33 vim.autocomplete.blink-cmp = {
44 enable = true;
......@@ -14,6 +14,7 @@
1414 setupOpts = {
1515 keymap = {
1616 preset = "super-tab";
17 "<C-.>" = [ "show" ];
1718 };
1819 completion = {
1920 ghost_text.enabled = false;
modules/neovim/default.nix+2
......@@ -125,10 +125,12 @@
125125 enable_cursor_hijack = true;
126126 git_status_async = true;
127127 close_if_last_window = true;
128 window.width = 30;
128129 filesystem.filtered_items = {
129130 # dotfiles are often used for project configuration
130131 hide_dotfiles = false;
131132 never_show = [
133 ".git"
132134 ".DS_Store" # macOS
133135 "thumbs.db" # Windows
134136 ];
users/clover/home.nix-7
......@@ -52,7 +52,6 @@ in
5252 theme = "light:catppuccin-latte,dark:catppuccin-macchiato";
5353 font-family = "AT Name Mono";
5454 adjust-cursor-thickness = 1;
55 minimum-contrast = 1.1;
5655 background-opacity = 0.9;
5756 background-blur = true;
5857 };
......@@ -61,12 +60,6 @@ in
6160 # zsh is the shell i use
6261 zsh = {
6362 enable = true;
64 enableCompletion = true;
65 autosuggestion.enable = true;
66 syntaxHighlighting.enable = true;
67
68 history.size = 10000;
69
7063 shellAliases = {
7164 switch = "nh darwin switch ~/config";
7265 gg = "lazygit";
users/natalie/home.nix+9-7
......@@ -1,11 +1,5 @@
1{ lib, host, ... }@args:
12{
2 pkgs,
3 lib,
4 options,
5 ...
6}@args:
7{
8
93 programs = {
104 # sort-lines:start
115 atuin.enable = true;
......@@ -17,6 +11,14 @@
1711 lsd.enable = true;
1812 android-sdk.enable = true;
1913 # sort-lines:end
14
15 fish = {
16 shellAliases =
17 { }
18 // lib.optionalAttrs (!host.darwin) {
19 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
20 };
21 };
2022 };
2123
2224 home.packages = import ./packages.nix args;