diff --git a/home/zsh.nix b/home/zsh.nix index 64bc3ca..6890db7 100755 --- a/home/zsh.nix +++ b/home/zsh.nix @@ -33,6 +33,10 @@ fzf --reverse | xargs -I{} code {} -n && exit } + function reboot() { + echo "Nice try. Use `sudo /run/current-system/sw/bin/reboot` instead." + } + function makerole() { mkdir -p "roles/$1/tasks" mkdir -p "roles/$1/defaults" @@ -42,6 +46,10 @@ touch "roles/$1/defaults/main.yml" } + function nav() { + cd "$(find "$HOME" \( -name .git -o -name vendor -o -name node_modules -o -name .npm \) -prune -o -type d -print | fzf --reverse)" + } + function ansible-edit() { ROOT_DIR="$HOME/repos/ansible-on-prem/inventory" FINAL_PATH=$(find $ROOT_DIR -name "*$1*.yml" -type f) @@ -49,42 +57,6 @@ EDITOR='code --wait' \ ansible-vault edit "$FINAL_PATH" \ --vault-password-file "$HOME/.ansible-vault-key" - # case "$1" in - # group_vars) - # EDITOR='code --wait'\ - # ansible-vault edit \ - # /home/xbazzi/repos/ansible-on-prem/inventory/group_vars/all.yml - # ;; - # hosts) - # EDITOR='code --wait'\ - # ansible-vault edit \ - # /home/xbazzi/repos/ansible-on-prem/inventory/hosts.yml - # ;; - # pve1) - # EDITOR='code --wait'\ - # ansible-vault edit \ - # /home/xbazzi/repos/ansible-on-prem/inventory/host_vars/pve1.yml - # ;; - # pve2) - # EDITOR='code --wait'\ - # ansible-vault edit \ - # /home/xbazzi/repos/ansible-on-prem/inventory/host_vars/pve2.yml - # ;; - # pve3) - # EDITOR='code --wait'\ - # ansible-vault edit \ - # /home/xbazzi/repos/ansible-on-prem/inventory/host_vars/pve3.yml - # ;; - # prod3) - # EDITOR='code --wait'\ - # ansible-vault edit \ - # /home/xbazzi/repos/ansible-on-prem/inventory/host_vars/prod3.yml - # ;; - # *) - # echo "Usage: ansible-edit {group_vars|hosts|pve1|pve2|pve3}"\ - # return 1 - # ;; - # esac } ''; @@ -98,12 +70,14 @@ flakePath = "~/nixos-config"; in { - ls="eza -lh --group-directories-first --icons"; + # la="eza -s modified -r -lh"; + la="eza -s modified -lhr --icons --git"; + ls="eza -lh --group-directories-first --icons --git"; clipboard="xclip -selection clipboard"; - ll = "ls -l"; + ll = "\\ls -lath"; update = "sudo nixos-rebuild switch"; - la = "ls -lAth"; - lr = "ls -ltr"; + # la = "ls -lAth"; + # lr = "ls -ltr"; rebuild = "sudo nixos-rebuild switch --flake ${flakePath}"; hms = "home-manager switch --flake ${flakePath}"; config = "nvim ~/nix/configuration.nix"; diff --git a/system/configuration.nix b/system/configuration.nix index 2f3eb16..9f2ce3d 100755 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -102,10 +102,10 @@ "wheel" "wireshark" ]; - # packages = with pkgs; [ - # ]; }; + programs.direnv.enable = true; + # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; diff --git a/system/packages.nix b/system/packages.nix index fb27f08..fe9c185 100755 --- a/system/packages.nix +++ b/system/packages.nix @@ -47,8 +47,11 @@ minicom wireshark trash-cli + openssl tree screenkey + # firefox + direnv ]; programs.nix-ld.enable = true; diff --git a/system/vscode.nix b/system/vscode.nix index 2999582..4f6b096 100755 --- a/system/vscode.nix +++ b/system/vscode.nix @@ -21,6 +21,9 @@ vscode-icons-team.vscode-icons ms-vscode-remote.remote-containers bmewburn.vscode-intelephense-client + zxh404.vscode-proto3 + # arrterian.nix-env-selector + mkhl.direnv ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ { name = "remote-ssh-edit";