diff --git a/.envrc b/.envrc index 3550a30..0e0fc98 100644 --- a/.envrc +++ b/.envrc @@ -1 +1,2 @@ use flake +PATH_add bin diff --git a/bin/deploy-home b/bin/deploy-home new file mode 100755 index 0000000..6071c52 --- /dev/null +++ b/bin/deploy-home @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +# vim: ft=sh + +home-manager switch --flake .#$USER@$(hostname) diff --git a/bin/deploy-nixos b/bin/deploy-nixos new file mode 100755 index 0000000..48d1dbb --- /dev/null +++ b/bin/deploy-nixos @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +# vim: ft=sh + +sudo nixos-rebuild switch --flake .#$(hostname) diff --git a/bin/deploy-vps b/bin/deploy-vps new file mode 100755 index 0000000..0233f02 --- /dev/null +++ b/bin/deploy-vps @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +# vim: ft=sh + +nixos-rebuild switch --flake .#vps --target-host root@vps diff --git a/flake.nix b/flake.nix index 4b487de..7214934 100644 --- a/flake.nix +++ b/flake.nix @@ -89,20 +89,12 @@ pkgs.sops ]; - shellHook = '' - HOST=$(hostname) - deploy-nixos() { - sudo nixos-rebuild switch --flake .#$HOST "$@" - } - - deploy-vps() { - nixos-rebuild switch --flake .#vps --target-host root@vps "$@" - } - - deploy-home() { - home-manager switch --flake .#$USER@$HOST - } - ''; + packages = [ + (pkgs.symlinkJoin { + name = "deploy-bin"; + paths = [ ./bin ]; + }) + ]; }; } ); diff --git a/home/hosts/y2q.nix b/home/hosts/y2q.nix index fa93732..1a66ab1 100644 --- a/home/hosts/y2q.nix +++ b/home/hosts/y2q.nix @@ -9,6 +9,8 @@ ../modules/cli/btop.nix ../modules/cli/yazi.nix ../modules/cli/nixvim + ../modules/cli/zsh.nix + ../modules/cli/direnv.nix ]; home = { @@ -17,6 +19,13 @@ stateVersion = "24.11"; }; + programs.zsh.initContent = '' + PROMPT='%n@%m:%~/ > ' + export EDITOR="nvim" + export VISUAL="nvim" + export LANG=en_US.UTF-8 + ''; + nixpkgs.config.allowUnfree = true; systemd.user.startServices = "sd-switch"; }