1
Fork 0
mirror of https://github.com/thegeneralist01/config.git synced 2026-05-30 08:37:01 +02:00

Compare commits

..

No commits in common. "bb4804dfc10f6bee92c4fece3d4186db89b78f7d" and "1971d7f7d563112c6079ae1a80947f325a3608c5" have entirely different histories.

4 changed files with 19 additions and 32 deletions

View file

@ -15,7 +15,9 @@ in {
userName = "TheGeneralist"; userName = "TheGeneralist";
userEmail = "180094941+thegeneralist01@users.noreply.github.com"; userEmail = "180094941+thegeneralist01@users.noreply.github.com";
lfs.enable = true; lfs = {
enable = true;
};
extraConfig = { extraConfig = {
commit.gpgSign = true; commit.gpgSign = true;

View file

@ -461,6 +461,4 @@ def --wrapped jc [...arguments: string@"nu-complete jc"]: [any -> table, any ->
} }
} }
if $nu.is-interactive { greeting
greeting
}

View file

@ -69,9 +69,7 @@ in
config' = homeArgs.config; config' = homeArgs.config;
nuExecCondition = nuExecCondition =
if config.isDarwin then if config.isDarwin then
'' ''[ -z "$INTELLIJ_ENVIRONMENT_READER" ] && [ -z "$skip" ]''
[[ $- == *i* ]] && [ -z "$skip" ] && [ -t 1 ]
''
else else
''[ -z "$INTELLIJ_ENVIRONMENT_READER" ] && [ -z "$skip" ] && [ -z "$SSH_TTY" ]''; ''[ -z "$INTELLIJ_ENVIRONMENT_READER" ] && [ -z "$skip" ] && [ -z "$SSH_TTY" ]'';
in in
@ -82,14 +80,11 @@ in
source ${config'.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh source ${config'.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh
if ${nuExecCondition}; then if ${nuExecCondition}; then
parent_cmd="$(ps -o command= -p "$PPID" 2>/dev/null || true)"
case "$parent_cmd" in
*"/Applications/Zed.app/Contents/MacOS/zed --printenv"*) return ;;
esac
SHELL='${lib.getExe <| lib.head config'.shellsByPriority}' exec "$SHELL" SHELL='${lib.getExe <| lib.head config'.shellsByPriority}' exec "$SHELL"
fi fi
''; '';
} }
) )
]; ];
} }

View file

@ -101,11 +101,6 @@
action.spawn = [ "ghostty" ]; action.spawn = [ "ghostty" ];
}; };
"Mod+G" = {
hotkey-overlay.title = "Open Terminal: ghostty";
action.spawn = [ "ghostty" ];
};
"Mod+B" = { "Mod+B" = {
hotkey-overlay.title = "Open Browser: helium"; hotkey-overlay.title = "Open Browser: helium";
action.spawn = [ "helium" ]; action.spawn = [ "helium" ];
@ -116,10 +111,10 @@
action.spawn = [ "sh" "-" "firefox" ]; action.spawn = [ "sh" "-" "firefox" ];
}; };
# "Mod+Shift+Q" = { "Mod+Shift+Q" = {
# hotkey-overlay.title = "Lock Screen: gtklock"; hotkey-overlay.title = "Lock Screen: gtklock";
# action.spawn = [ "gtklock" ]; action.spawn = [ "gtklock" ];
# }; };
"Mod+D" = { "Mod+D" = {
hotkey-overlay.title = "Open App Launcher: fuzzel"; hotkey-overlay.title = "Open App Launcher: fuzzel";
@ -396,14 +391,11 @@
package = pkgs.niri; package = pkgs.niri;
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = [
fuzzel pkgs.fuzzel
xfce.thunar pkgs.xfce.thunar
playerctl pkgs.playerctl
wireplumber pkgs.wireplumber
yaziPlugins.wl-clipboard
wl-clipboard-x11
wl-clipboard-rs
]; ];
services.xserver = { services.xserver = {