4o1x5/dotfiles
4o1x5/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

thinkpad: some changes with zsh

Browse source
This commit is contained in:
Barna Máté 2025-01-13 21:01:09 +01:00
parent df9cb6441d
commit 1b28e07930
4 changed files with 11 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hosts/strix/configuration.nix
View file

@ -1,4 +1,9 @@
{ config, pkgs, ... }: {
config,
pkgs,
user,
...
}:
{ {
imports = [ imports = [

1
hosts/strix/desktop.nix
View file

@ -42,6 +42,7 @@
#gimp #gimp
# remote desktop # remote desktop
#rustdesk #rustdesk
realvnc-vnc-viewer
]; ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [

6
hosts/strix/system/shell.nix
View file

@ -32,14 +32,13 @@
# ssh # ssh
pink = "ssh root@32.54.31.99"; 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"; carbon = "ssh root@32.54.31.180";
lime = "ssh root@32.54.31.241";
# remote deployment for homelab # remote deployment for homelab
deploy-carbon = "nixos-rebuild switch --flake .#carbon --target-host root@32.54.31.180 --show-trace"; 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-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"; EDITOR = "nvim";
# https://discourse.nixos.org/t/tmux-doesnt-use-tmux-config-generated-by-nix/42392/2 # 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 # 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"; ZSH_TMUX_CONFIG = "/etc/tmux.conf";
}; };

21
hosts/thinkpad/system/shell.nix
View file

@ -1,6 +1,5 @@
{ pkgs, user, ... }: { pkgs, user, ... }:
{ {
users.users.${user}.shell = pkgs.zsh; users.users.${user}.shell = pkgs.zsh;
programs.zsh.enable = true; programs.zsh.enable = true;
home-manager.users.${user} = { home-manager.users.${user} = {
@ -10,14 +9,6 @@
history.path = "$HOME/zsh/history"; history.path = "$HOME/zsh/history";
shellAliases = { 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 # Tmux shrothands
# https://github.com/gabysbrain/machine_config/blob/master/config/tmux.nix # https://github.com/gabysbrain/machine_config/blob/master/config/tmux.nix
@ -26,20 +17,10 @@
tks = "tmux kill-session -t"; tks = "tmux kill-session -t";
tn = "tmux new-session -t"; tn = "tmux new-session -t";
#dev = "nix develop --command zsh";
dev = ''nix develop "git+file://$(pwd)?submodules=1" --command zsh'';
# ssh # ssh
pink = "ssh root@32.54.31.99"; pink = "ssh root@32.54.31.99";
yellow = "ssh root@32.54.31.5";
carbon = "ssh root@32.54.31.180"; carbon = "ssh root@32.54.31.180";
lime = "ssh root@32.54.31.241"; carbon = "ssh root@32.54.31.180";
# 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";
}; };