diff --git a/.envrc b/.envrc index 0e0fc98..3550a30 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1 @@ use flake -PATH_add bin diff --git a/bin/deploy-home b/bin/deploy-home deleted file mode 100755 index 6071c52..0000000 --- a/bin/deploy-home +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -# vim: ft=sh - -home-manager switch --flake .#$USER@$(hostname) diff --git a/bin/deploy-nixos b/bin/deploy-nixos deleted file mode 100755 index 48d1dbb..0000000 --- a/bin/deploy-nixos +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -# vim: ft=sh - -sudo nixos-rebuild switch --flake .#$(hostname) diff --git a/bin/deploy-vps b/bin/deploy-vps deleted file mode 100755 index 0233f02..0000000 --- a/bin/deploy-vps +++ /dev/null @@ -1,4 +0,0 @@ -#!/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 7214934..4b487de 100644 --- a/flake.nix +++ b/flake.nix @@ -89,12 +89,20 @@ pkgs.sops ]; - packages = [ - (pkgs.symlinkJoin { - name = "deploy-bin"; - paths = [ ./bin ]; - }) - ]; + 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 + } + ''; }; } ); diff --git a/home/hosts/y2q.nix b/home/hosts/y2q.nix index 1a66ab1..fa93732 100644 --- a/home/hosts/y2q.nix +++ b/home/hosts/y2q.nix @@ -9,8 +9,6 @@ ../modules/cli/btop.nix ../modules/cli/yazi.nix ../modules/cli/nixvim - ../modules/cli/zsh.nix - ../modules/cli/direnv.nix ]; home = { @@ -19,13 +17,6 @@ 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"; }