noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-04-05 05:41:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

more progress

Browse Source
This commit is contained in:
Noah Masur 2025-02-25 04:10:25 +00:00
parent a4bebe653c
commit 50863e7232
No known key found for this signature in database
4 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platforms/home-manager/modules/nmasur/presets/programs/aerc.nix
View File

@ -196,7 +196,7 @@ in
xdg.desktopEntries.aerc = lib.mkIf (pkgs.stdenv.isLinux) { xdg.desktopEntries.aerc = lib.mkIf (pkgs.stdenv.isLinux) {
name = "aerc"; name = "aerc";
exec = "${config.terminalLaunchCommand} aerc %u"; exec = "${lib.getExe config.nmasur.presets.services.i3.terminal} aerc %u";
}; };
xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux { xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
"${config.xsession.windowManager.i3.config.modifier}+Shift+e" = "exec ${ "${config.xsession.windowManager.i3.config.modifier}+Shift+e" = "exec ${
@ -205,7 +205,7 @@ in
pkgs.writeShellScript "focus-mail.sh" '' pkgs.writeShellScript "focus-mail.sh" ''
count=$(ps aux | grep -c aerc) count=$(ps aux | grep -c aerc)
if [ "$count" -eq 1 ]; then if [ "$count" -eq 1 ]; then
i3-msg "exec --no-startup-id ${config.terminal} start --class aerc -- aerc" i3-msg "exec --no-startup-id ${lib.getExe config.nmasur.presets.services.i3.terminal} start --class aerc -- aerc"
sleep 0.25 sleep 0.25
fi fi
i3-msg "[class=aerc] focus" i3-msg "[class=aerc] focus"

6
platforms/home-manager/modules/nmasur/presets/programs/nixpkgs.nix
View File

@ -60,21 +60,21 @@ in
body = # fish body = # fish
'' ''
git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
echo "doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path}#${config.networking.hostName}" echo "doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path}"
''; '';
}; };
rebuild-nixos-offline = lib.mkIf config.nmasur.presets.programs.dotfiles.enable { rebuild-nixos-offline = lib.mkIf config.nmasur.presets.programs.dotfiles.enable {
body = # fish body = # fish
'' ''
git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
echo "doas nixos-rebuild switch --option substitute false --flake ${config.nmasur.presets.programs.dotfiles.path}#${config.networking.hostName}" echo "doas nixos-rebuild switch --option substitute false --flake ${config.nmasur.presets.programs.dotfiles.path}"
''; '';
}; };
rebuild-home = lib.mkIf config.nmasur.presets.programs.dotfiles.enable { rebuild-home = lib.mkIf config.nmasur.presets.programs.dotfiles.enable {
body = # fish body = # fish
'' ''
git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
echo "${lib.getExe pkgs.home-manager} switch --flake ${config.nmasur.presets.programs.dotfiles.path}#${config.networking.hostName}"; echo "${lib.getExe pkgs.home-manager} switch --flake ${config.nmasur.presets.programs.dotfiles.path}";
''; '';
}; };
}; };

40
platforms/home-manager/modules/nmasur/presets/services/i3.nix
View File

@ -184,34 +184,42 @@ in
# Launchers # Launchers
"${modifier}+Return" = "${modifier}+Return" =
"exec --no-startup-id ${lib.getExe cfg.terminal}; workspace ${ws2}; layout tabbed"; "exec --no-startup-id ${lib.getExe cfg.terminal}; workspace ${ws2}; layout tabbed";
"${modifier}+space" = "${modifier}+space" = lib.mkIf (
lib.mkIf cfg.commands.launcher != null "exec --no-startup-id ${cfg.commands.launcher}"; cfg.commands.launcher != null
"${modifier}+Shift+s" = ) "exec --no-startup-id ${cfg.commands.launcher}";
lib.mkIf cfg.commands.systemdSearch != null "exec --no-startup-id ${cfg.commands.systemdSearch}"; "${modifier}+Shift+s" = lib.mkIf (
"${modifier}+Shift+a" = cfg.commands.systemdSearch != null
lib.mkIf cfg.commands.audioSwitch != null "exec --no-startup-id ${cfg.commands.audioSwitch}"; ) "exec --no-startup-id ${cfg.commands.systemdSearch}";
"${modifier}+Shift+a" = lib.mkIf (
cfg.commands.audioSwitch != null
) "exec --no-startup-id ${cfg.commands.audioSwitch}";
"Mod1+Tab" = lib.mkIf ( "Mod1+Tab" = lib.mkIf (
cfg.commands.applicationSwitch != null cfg.commands.applicationSwitch != null
) "exec --no-startup-id ${cfg.commands.applicationSwitch}"; ) "exec --no-startup-id ${cfg.commands.applicationSwitch}";
"${modifier}+Shift+period" = "${modifier}+Shift+period" = lib.mkIf (
lib.mkIf cfg.commands.power != null "exec --no-startup-id ${cfg.commands.power}"; cfg.commands.power != null
"${modifier}+Shift+m" = ) "exec --no-startup-id ${cfg.commands.power}";
lib.mkIf cfg.commands.brightness != null "exec --no-startup-id ${cfg.commands.brightness}"; "${modifier}+Shift+m" = lib.mkIf (
"${modifier}+c" = cfg.commands.brightness != null
lib.mkIf cfg.commands.calculator != null "exec --no-startup-id ${cfg.commands.calculator}"; ) "exec --no-startup-id ${cfg.commands.brightness}";
"${modifier}+c" = lib.mkIf (
cfg.commands.calculator != null
) "exec --no-startup-id ${cfg.commands.calculator}";
"${modifier}+Shift+c" = "reload"; "${modifier}+Shift+c" = "reload";
"${modifier}+Shift+r" = "restart"; "${modifier}+Shift+r" = "restart";
"${modifier}+Shift+q" = "${modifier}+Shift+q" =
''exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"''; ''exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
"${modifier}+Shift+x" = lib.mkIf cfg.commands.lockScreen != null "exec ${cfg.commands.lockScreen}"; "${modifier}+Shift+x" = lib.mkIf (
cfg.commands.lockScreen != null
) "exec ${cfg.commands.lockScreen}";
"${modifier}+Mod1+h" = "${modifier}+Mod1+h" =
"exec --no-startup-id ${lib.getExe cfg.terminal} -e sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.nmasur.presets.programs.dotfiles.path}#${config.networking.hostName} || read'"; "exec --no-startup-id ${lib.getExe cfg.terminal} -e sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.nmasur.presets.programs.dotfiles.path} || read'";
"${modifier}+Mod1+r" = "${modifier}+Mod1+r" =
"exec --no-startup-id ${lib.getExe cfg.terminal} -e sh -c 'doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path}#${config.networking.hostName} || read'"; "exec --no-startup-id ${lib.getExe cfg.terminal} -e sh -c 'doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path} || read'";
# Window options # Window options
"${modifier}+q" = "kill"; "${modifier}+q" = "kill";
"${modifier}+b" = lib.mkIf cfg.commands.toggleBar "exec ${cfg.commands.toggleBar}"; "${modifier}+b" = lib.mkIf (cfg.commands.toggleBar != null) "exec ${cfg.commands.toggleBar}";
"${modifier}+f" = "fullscreen toggle"; "${modifier}+f" = "fullscreen toggle";
"${modifier}+h" = "focus left"; "${modifier}+h" = "focus left";
"${modifier}+j" = "focus down"; "${modifier}+j" = "focus down";

2
platforms/nixos/modules/nmasur/profiles/base.nix
View File

@ -57,5 +57,7 @@ in
}; };
allowUnfreePackages = config.home-manager.users.${username}.allowUnfreePackages;
}; };
} }