Add nh utility & ZaneyOS version info

This commit is contained in:
Tyler Kelley 2024-02-17 12:57:15 -06:00
parent 427946c4ad
commit e2aabb7222
3 changed files with 6 additions and 5 deletions

View File

@ -18,15 +18,14 @@ lib.mkIf (theShell == "bash") {
fi fi
''; '';
sessionVariables = { sessionVariables = {
FLAKEDIR = "${flakeDir}";
ZANEYOS = true; ZANEYOS = true;
FLAKEBACKUP = "${flakeBackup}"; FLAKEBACKUP = "${flakeBackup}";
FLAKEPREV = "${flakePrev}"; FLAKEPREV = "${flakePrev}";
}; };
shellAliases = { shellAliases = {
sv="sudo nvim"; sv="sudo nvim";
flake-rebuild="sudo nixos-rebuild switch --flake ${flakeDir}"; flake-rebuild="nh os switch --nom --hostname ${flakeDir}";
flake-update="sudo nix flake update ${flakeDir}"; flake-update="nh os switch --nom --hostname ${flakeDir} --update";
gcCleanup="nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot"; gcCleanup="nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
v="nvim"; v="nvim";
ls="lsd"; ls="lsd";

View File

@ -12,7 +12,7 @@
pkg-config meson hugo gnumake ninja go nodejs symbola pkg-config meson hugo gnumake ninja go nodejs symbola
noto-fonts-color-emoji material-icons brightnessctl noto-fonts-color-emoji material-icons brightnessctl
toybox virt-viewer swappy ripgrep appimage-run toybox virt-viewer swappy ripgrep appimage-run
networkmanagerapplet yad playerctl networkmanagerapplet yad playerctl nh
]; ];
programs.steam.gamescopeSession.enable = true; programs.steam.gamescopeSession.enable = true;

View File

@ -5,7 +5,7 @@ let
inherit (import ./options.nix) inherit (import ./options.nix)
theLocale theTimezone gitUsername theLocale theTimezone gitUsername
theShell wallpaperDir wallpaperGit theShell wallpaperDir wallpaperGit
theLCVariables theKBDLayout; theLCVariables theKBDLayout flakeDir;
in { in {
imports = imports =
[ [
@ -53,6 +53,8 @@ in {
}; };
environment.variables = { environment.variables = {
ZOSVER = "unstable";
FLAKE = "${flakeDir}";
POLKIT_BIN = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; POLKIT_BIN = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
}; };