From b53871bec3ef4dc8bd8e3f33d542df5a59bd7bf1 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Wed, 17 Apr 2024 23:21:43 +0200 Subject: [PATCH] add nh, nvd and nom --- home-manager/zsh.nix | 5 +++-- modules/misc/cli-tools.nix | 3 +++ users/kopatz/default.nix | 3 +++ users/option.nix | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix index 7fc3b95..e521e7b 100644 --- a/home-manager/zsh.nix +++ b/home-manager/zsh.nix @@ -9,9 +9,10 @@ ll = "ls -l"; update = "sudo nixos-rebuild switch"; updateOffline = "sudo nixos-rebuild switch --option substitute false"; - checkTime = "(cd ~/Nextcloud/work_drive/TS && nix run)"; + updateFancy = "nh os switch"; + checkTime = "(cd /synced/work_drive/TS && nix run)"; checkWaylandWindowsKDE = "qdbus org.kde.KWin /KWin org.kde.KWin.showDebugConsole"; - backupNoita = "cp -r ~/.local/share/Steam/steamapps/compatdata/881100/pfx/drive_c/users/steamuser/AppData/LocalLow/Nolla_Games_Noita/save00 ~/Nextcloud/backups/noita_save"; + backupNoita = "cp -r ~/.local/share/Steam/steamapps/compatdata/881100/pfx/drive_c/users/steamuser/AppData/LocalLow/Nolla_Games_Noita/save00 /synced/default/backups/noita_save"; # TODO: gifsicle -O3 --lossy=30 noita-20240328-191617-1612416266-00316616.gif -o noita-20240328-191617-1612416266.gif ssh = "TERM=xterm-256color ssh"; }; diff --git a/modules/misc/cli-tools.nix b/modules/misc/cli-tools.nix index e035b24..100a5fd 100644 --- a/modules/misc/cli-tools.nix +++ b/modules/misc/cli-tools.nix @@ -38,6 +38,9 @@ in tmux fatrace # monitor filesystem events ripgrep + nh + nix-output-monitor # nom + nvd # nix diff, example: nvd diff /nix/var/nix/profiles/system-389-link /nix/var/nix/profiles/system-390-link ]; }; } diff --git a/users/kopatz/default.nix b/users/kopatz/default.nix index a0d9322..0e9f8cf 100644 --- a/users/kopatz/default.nix +++ b/users/kopatz/default.nix @@ -8,6 +8,9 @@ imports = [ ../default.nix ]; mainUser.name = "kopatz"; mainUser.sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeP6qtVqE/gu72ZUZE8cdRi3INiUW9NqDR7SjXIzTw2 kopatz"; + environment.sessionVariables = { + FLAKE = "/home/${config.mainUser.name}/projects/github/nix-config"; + }; home-manager = { users.${config.mainUser.name} = import ./home.nix; diff --git a/users/option.nix b/users/option.nix index bb35200..3c5bd75 100644 --- a/users/option.nix +++ b/users/option.nix @@ -21,7 +21,7 @@ description = "Public key of the user"; }; }; - kop.user = { + custom.user = { name = lib.mkOption { default = "mainuser"; description = ''