blake/nix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all hardcoded paths in home man

Browse Source
This commit is contained in:
blake
2025-11-06 00:05:12 -06:00
parent f0a8d8f0fb
commit c8a036edc2
3 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
users/blake/dots/core/zsh/default.nix
View File

@@ -6,6 +6,7 @@
}: let }: let
program = "zsh"; program = "zsh";
cfg = config.dots.${program}; cfg = config.dots.${program};
home_dir = config.home.homeDirectory;
#sec = sops.secrets; #sec = sops.secrets;
in { in {
options.dots.${program} = { options.dots.${program} = {
@@ -41,12 +42,12 @@ in {
shellAliases = { shellAliases = {
# --- zsh --- # --- zsh ---
cfz = "nvim $HOME/.config/zsh/.zshrc"; cfz = "nvim ${home_dir}/.config/zsh/.zshrc";
src = "source $HOME/.config/zsh/.zshrc"; src = "source ${home_dir}/.config/zsh/.zshrc";
# --- config editing --- # --- config editing ---
cfh = "nvim $HOME/.config/hypr/hyprland.conf"; cfh = "nvim ${home_dir}/.config/hypr/hyprland.conf";
cfl = "nvim $HOME/.config/lf/lfrc"; cfl = "nvim ${home_dir}/.config/lf/lfrc";
# --- navigation --- # --- navigation ---
ls = "ls --color=auto --group-directories-first"; ls = "ls --color=auto --group-directories-first";
@@ -58,8 +59,8 @@ in {
ds = "du -hs"; ds = "du -hs";
# --- shortcuts --- # --- shortcuts ---
vswap = "cd ~/.local/state/nvim/swap"; vswap = "cd ${home_dir}/.local/state/nvim/swap";
rswap = "rm ~/.local/state/nvim/swap/*"; rswap = "rm ${home_dir}/.local/state/nvim/swap/*";
v = "nvim"; v = "nvim";
sv = "sudo nvim"; sv = "sudo nvim";
vim = "nvim"; vim = "nvim";
@@ -75,9 +76,9 @@ in {
egrep = "egrep --color=auto"; egrep = "egrep --color=auto";
# --- scripts --- # --- scripts ---
rebuild = "sh ~/.nix/bin/rebuild.sh"; rebuild = "sh ${home_dir}/.nix/bin/rebuild.sh";
perms = "sudo sh ~/.nix/bin/perms.sh"; perms = "sudo sh ${home_dir}/.nix/bin/perms.sh";
bb = "sudo sh ~/.nix/bin/lf_borg.sh"; bb = "sudo sh ${home_dir}/.nix/bin/lf_borg.sh";
# --- git --- # --- git ---
status = "git status"; status = "git status";
@@ -85,9 +86,9 @@ in {
commit = "git commit -am"; commit = "git commit -am";
push = "git push"; push = "git push";
pull = "git pull"; pull = "git pull";
dotfiles = "/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME"; dotfiles = "/usr/bin/git --git-dir=${home_dir}/.dotfiles --work-tree=$HOME";
dtf = "/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME"; dtf = "/usr/bin/git --git-dir=${home_dir}/.dotfiles --work-tree=$HOME";
sec = "sops ~/.nix/secrets/secrets.yaml"; sec = "sops ${home_dir}/.nix/secrets/secrets.yaml";
# --- systemd --- # --- systemd ---
stat = "sudo systemctl status"; stat = "sudo systemctl status";
@@ -141,16 +142,6 @@ in {
"back-double-quoted-argument" = "fg=blue"; "back-double-quoted-argument" = "fg=blue";
}; };
}; };
# zplug = {
# enable = true;
# zplugHome = "$XDG_STATE_HOME/zsh/zplug";
# plugins = [
# {name = "zsh-users/zsh-syntax-highlighting";}
# ];
# };
}; };
# rid the world of ~/.zshenv
#home.file.".zshenv".enable = false;
}; };
} }

7
users/blake/dots/desktop/dunst/default.nix
View File

@@ -6,6 +6,7 @@
}: let }: let
program = "dunst"; program = "dunst";
cfg = config.dots.${program}; cfg = config.dots.${program};
home_dir = config.home.homeDirectory;
in { in {
options.dots.${program} = { options.dots.${program} = {
enable = lib.mkEnableOption "enables ${program}"; enable = lib.mkEnableOption "enables ${program}";
@@ -106,7 +107,7 @@ in {
foreground = lib.mkDefault "#888888"; foreground = lib.mkDefault "#888888";
frame_color = lib.mkDefault "#000000"; frame_color = lib.mkDefault "#000000";
timeout = 7; timeout = 7;
default_icon = "~/.nix/users/blake/assets/icons/normal_64px.png"; default_icon = "${home_dir}/.nix/users/blake/assets/icons/normal_64px.png";
}; };
urgency_normal = { urgency_normal = {
@@ -115,7 +116,7 @@ in {
frame_color = lib.mkDefault "#000000"; frame_color = lib.mkDefault "#000000";
timeout = 7; timeout = 7;
override_pause_level = 30; override_pause_level = 30;
default_icon = "~/.nix/users/blake/assets/icons/normal_64px.png"; default_icon = "${home_dir}/.nix/users/blake/assets/icons/normal_64px.png";
}; };
urgency_critical = { urgency_critical = {
@@ -124,7 +125,7 @@ in {
frame_color = lib.mkDefault "#ff0000"; frame_color = lib.mkDefault "#ff0000";
timeout = 0; timeout = 0;
override_pause_level = 60; override_pause_level = 60;
default_icon = "~/.nix/users/blake/assets/icons/critical_128px.png"; default_icon = "${home_dir}/.nix/users/blake/assets/icons/critical_128px.png";
}; };
}; };
}; };

16
users/blake/dots/desktop/hypr/default.nix
View File

@@ -6,7 +6,7 @@
}: let }: let
program = "hypr"; program = "hypr";
cfg = config.dots.${program}; cfg = config.dots.${program};
#sec = sops.secrets; home_dir = config.home.homeDirectory;
in { in {
options.dots.${program} = { options.dots.${program} = {
enable = lib.mkEnableOption "enables ${program}"; enable = lib.mkEnableOption "enables ${program}";
@@ -26,8 +26,8 @@ in {
settings = { settings = {
# --- displays --- # --- displays ---
source = [ source = [
"~/.config/hypr/monitors.conf" "${home_dir}/.config/hypr/monitors.conf"
"~/.config/hypr/workspaces.conf" "${home_dir}/.config/hypr/workspaces.conf"
]; ];
# --- environment variables --- # --- environment variables ---
@@ -129,7 +129,7 @@ in {
"$mainMod CONTROL, T, exec, cliphist wipe" "$mainMod CONTROL, T, exec, cliphist wipe"
# screenshots # screenshots
"$mainMod SHIFT, C, exec, hyprshot --mode region --output-folder ~/pictures/screenshots" "$mainMod SHIFT, C, exec, hyprshot --mode region --output-folder ${home_dir}/pictures/screenshots"
# multimedia # multimedia
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
@@ -218,8 +218,8 @@ in {
services.hyprpaper = { services.hyprpaper = {
enable = true; enable = true;
settings = { settings = {
preload = lib.mkDefault ["~/.nix/users/blake/assets/wallpapers/antartica.png"]; preload = lib.mkDefault ["${home_dir}/.nix/users/blake/assets/wallpapers/antartica.png"];
wallpaper = lib.mkDefault [",~/.nix/users/blake/assets/wallpapers/antartica.png"]; wallpaper = lib.mkDefault [",${home_dir}/.nix/users/blake/assets/wallpapers/antartica.png"];
ipc = "off"; ipc = "off";
splash = false; splash = false;
}; };
@@ -237,7 +237,7 @@ in {
background = lib.mkDefault [ background = lib.mkDefault [
{ {
monitor = ""; monitor = "";
path = lib.mkDefault "~/.nix/users/blake/assets/wallpapers/antartica.png"; path = lib.mkDefault "${home_dir}/.nix/users/blake/assets/wallpapers/antartica.png";
blur_passes = 1; blur_passes = 1;
color = lib.mkDefault "rgb(0047ab)"; color = lib.mkDefault "rgb(0047ab)";
} }
@@ -280,7 +280,7 @@ in {
image = [ image = [
{ {
monitor = ""; monitor = "";
path = "~/.nix/users/blake/assets/pfps/pikacig.jpg"; path = "${home_dir}/.nix/users/blake/assets/pfps/pikacig.jpg";
size = 350; size = 350;
border_color = lib.mkDefault "rgb(0047ab)"; border_color = lib.mkDefault "rgb(0047ab)";
rounding = -1; rounding = -1;