yep, more dotfiles

refactor(vm): move fish sway launch in vm module

+12 -7
-7
home-manager/fragments/shell.nix
··· 60 60 programs.fish = { 61 61 enable = true; 62 62 63 - # TODO: move to vm module 64 - loginShellInit = lib.optionalString (!isDarwin) '' 65 - if test (id --user $USER) -ge 1000 && test (tty) = "/dev/tty1" 66 - exec sway 2> /tmp/sway.(date -u +%Y-%m-%dT%H:%M:%S).log 67 - end 68 - ''; 69 - 70 63 interactiveShellInit = '' 71 64 abbr -a !! --position anywhere --function last_history_item 72 65 '';
+12
home-manager/fragments/vm.nix
··· 2 2 , config 3 3 , lib 4 4 , pkgs 5 + 6 + , isDarwin 5 7 , ... 6 8 }: 7 9 ··· 25 27 ''; 26 28 27 29 config = lib.mkIf cfg.enable { 30 + assertions = [ 31 + { assertion = (!isDarwin) || config.programs.fish.enable; message = "`kitty` fragment depends on `fish` program on darwin platforms"; } 32 + ]; 33 + 28 34 programs.swaylock = { 29 35 enable = true; 30 36 settings = { ··· 38 44 indicator-x-position = 100; 39 45 }; 40 46 }; 47 + 48 + programs.fish.loginShellInit = '' 49 + if test (id --user $USER) -ge 1000 && test (tty) = "/dev/tty1" 50 + exec sway 2> /tmp/sway.(date -u +%Y-%m-%dT%H:%M:%S).log 51 + end 52 + ''; 41 53 42 54 services.mako = { 43 55 enable = true;