diff --git a/flake.lock b/flake.lock index cbd6321..739fdd4 100644 --- a/flake.lock +++ b/flake.lock @@ -67,10 +67,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1620162462, - "narHash": "sha256-6wQPEXPnwBklHoRIuEPdc00FN8HfaFX1cZ7gxv16sd8=", - "path": "/nix/store/3fj5qc4czsr7hx224220yvpmmfyav3nd-source", - "rev": "39e6bf76474ce742eb027a88c4da6331f0a1526f", + "lastModified": 1621840840, + "narHash": "sha256-o6h6+d5ZwrFmOTe+ma9s1Z9kyHsCW1C84IA8RZ9/fIU=", + "path": "/nix/store/jjsygkm01c9fg053m3l2ni1mny1iwmji-source", + "rev": "ea7d4aa9b8225abd6147339f0d56675d6f1f0fd1", "type": "path" }, "original": { @@ -167,11 +167,11 @@ "vim-racket-src": "vim-racket-src" }, "locked": { - "lastModified": 1621990541, - "narHash": "sha256-zrXU2EZkYaeOsArgOOa+uPyRMk1akGrH6x3YEITT8tk=", + "lastModified": 1621995553, + "narHash": "sha256-b6b70uXapSAnKhloFNGHx/0XAHTT2y1S2IWZ1/h3W90=", "owner": "techieAgnostic", "repo": "vim", - "rev": "6fa58750231bec979238ca7c1159aefb876d4166", + "rev": "5ea5a27aad96543cbfb8f59418a6f9759b65aced", "type": "github" }, "original": { diff --git a/modules/zsh/home.nix b/modules/zsh/home.nix index 09591a3..a1c35b1 100644 --- a/modules/zsh/home.nix +++ b/modules/zsh/home.nix @@ -21,8 +21,10 @@ in { ignoreDups = true; share = true; }; - initExtra = '' + initExtraBeforeCompInit = '' export PATH='/run/wrappers/bin:/home/thorn/.nix-profile/bin:/etc/profiles/per-user/thorn/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/home/thorn/.config/zsh/plugins/fast-syntax-highlighting' + ''; + initExtra = '' setopt promptsubst autoload -U colors && colors export PROMPT='%{$fg[white]%}%B$(swatch)%b %{$fg[blue]%}%2~ %{$fg[green]%}%B>%b ' diff --git a/users/thorn/default.nix b/users/thorn/default.nix index 3aa4316..e04d830 100644 --- a/users/thorn/default.nix +++ b/users/thorn/default.nix @@ -9,11 +9,13 @@ # read all pub keys from ./pubkeys openssh.authorizedKeys.keys = map builtins.readFile (builtins.readDir ./pubkeys); + isNormalUser = true; home = "/home/thorn"; description = "Thorn Avery"; extraGroups = [ "wheel" "networkmanager" "disks" ]; + shell = pkgs.zsh; }; - + }