diff --git a/hosts/strix/configuration.nix b/hosts/strix/configuration.nix index 7d86d1c..b5a61c3 100755 --- a/hosts/strix/configuration.nix +++ b/hosts/strix/configuration.nix @@ -1,4 +1,9 @@ -{ config, pkgs, ... }: +{ + config, + pkgs, + user, + ... +}: { imports = [ diff --git a/hosts/strix/desktop.nix b/hosts/strix/desktop.nix index e04e955..b2ee584 100755 --- a/hosts/strix/desktop.nix +++ b/hosts/strix/desktop.nix @@ -42,6 +42,7 @@ #gimp # remote desktop #rustdesk + realvnc-vnc-viewer ]; fonts.packages = with pkgs; [ diff --git a/hosts/strix/system/shell.nix b/hosts/strix/system/shell.nix index f66c6c0..9223a8e 100755 --- a/hosts/strix/system/shell.nix +++ b/hosts/strix/system/shell.nix @@ -32,14 +32,13 @@ # ssh pink = "ssh root@32.54.31.99"; - yellow = "ssh root@32.54.31.5"; + cyan = "ssh 4o1x5@cyan.4o1x5.dev"; carbon = "ssh root@32.54.31.180"; - lime = "ssh root@32.54.31.241"; # remote deployment for homelab deploy-carbon = "nixos-rebuild switch --flake .#carbon --target-host root@32.54.31.180 --show-trace"; - deploy-lime = "nixos-rebuild switch --flake .#lime --target-host root@32.54.31.241 --show-trace"; deploy-pink = "nixos-rebuild switch --flake .#pink --target-host root@32.54.31.99 --show-trace"; + deploy-cyan = "nixos-rebuild switch --flake .#cyan --target-host root@32.221.212.150 --show-trace"; }; @@ -51,6 +50,7 @@ EDITOR = "nvim"; # https://discourse.nixos.org/t/tmux-doesnt-use-tmux-config-generated-by-nix/42392/2 # for some reason tmux nix doesnt configure tmux right so I have to manually set it's configuration path + # btw this is probably due to tmux looking for the user level tmux config at ~/.config/tmux rather than the system wide one ZSH_TMUX_CONFIG = "/etc/tmux.conf"; }; diff --git a/hosts/thinkpad/system/shell.nix b/hosts/thinkpad/system/shell.nix index f66c6c0..eb5cb82 100755 --- a/hosts/thinkpad/system/shell.nix +++ b/hosts/thinkpad/system/shell.nix @@ -1,6 +1,5 @@ { pkgs, user, ... }: { - users.users.${user}.shell = pkgs.zsh; programs.zsh.enable = true; home-manager.users.${user} = { @@ -10,14 +9,6 @@ history.path = "$HOME/zsh/history"; shellAliases = { - update = "doas nixos-rebuild switch --impure"; - - # Docker shorthands - dc = "docker compose"; - dco = "docker container"; - dn = "docker network"; - dv = "docker volume"; - code = "codium"; # Tmux shrothands # https://github.com/gabysbrain/machine_config/blob/master/config/tmux.nix @@ -26,20 +17,10 @@ tks = "tmux kill-session -t"; tn = "tmux new-session -t"; - #dev = "nix develop --command zsh"; - - dev = ''nix develop "git+file://$(pwd)?submodules=1" --command zsh''; - # ssh pink = "ssh root@32.54.31.99"; - yellow = "ssh root@32.54.31.5"; carbon = "ssh root@32.54.31.180"; - lime = "ssh root@32.54.31.241"; - - # remote deployment for homelab - deploy-carbon = "nixos-rebuild switch --flake .#carbon --target-host root@32.54.31.180 --show-trace"; - deploy-lime = "nixos-rebuild switch --flake .#lime --target-host root@32.54.31.241 --show-trace"; - deploy-pink = "nixos-rebuild switch --flake .#pink --target-host root@32.54.31.99 --show-trace"; + carbon = "ssh root@32.54.31.180"; };