update packages

This commit is contained in:
Reid 2025-12-14 15:44:46 -08:00
parent d2c5931131
commit fd33edab0e
Signed by: reidlab
GPG key ID: DAF5EAF6665839FD
7 changed files with 101 additions and 100 deletions

View file

@ -416,7 +416,7 @@ in {
"Mod+Shift+Minus".action = set-window-height "-10%";
"Mod+Shift+Equal".action = set-window-height "+10%";
"Print".action = screenshot { show-pointer = false; };
"Print".action.screenshot = { show-pointer = false; };
"Mod+Grave".action = toggle-overview;
@ -425,12 +425,12 @@ in {
"XF86AudioMicMute".action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle";
"XF86AudioMicMute".allow-when-locked = true;
"XF86LaunchA".action = screenshot { show-pointer = false; };
"XF86LaunchA".action.screenshot = { show-pointer = false; };
"XF86LaunchB".action = sh "${lib.getExe pkgs.rofi-rbw-wayland} -a copy -t password --clear-after 20";
"XF86ScreenSaver".action = sh "${pkgs.systemd}/bin/loginctl lock-session";
# substitutions for when not on laptop
"Mod+Shift+S".action = screenshot { show-pointer = false; };
"Mod+Shift+S".action.screenshot = { show-pointer = false; };
"Mod+Shift+P".action = sh "${lib.getExe pkgs.rofi-rbw-wayland} -a copy -t password --clear-after 20";
"Mod+L".action = sh "${pkgs.systemd}/bin/loginctl lock-session";

View file

@ -6,12 +6,12 @@ let
in {
options.modules.desktop.regreet = {
enable = mkEnableOption "Enable regreet, a clean and customizable greeter for greetd";
# TODO: add packages here?
};
config = mkIf cfg.enable {
services.greetd = {
enable = true;
vt = 7;
settings = {
# TODO: probably should rewrite somehow,,,
# this is ugly, but it SOMEHOW WORKS??
@ -35,7 +35,7 @@ in {
'';
swayKiosk = command: "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.sway} --unsupported-gpu --config ${swayConfig command}";
in {
command = swayKiosk (lib.getExe pkgs.greetd.regreet);
command = swayKiosk (lib.getExe pkgs.regreet);
};
};
};

View file

@ -8,7 +8,7 @@ in {
enable = mkEnableOption "Enable rofi, a window switcher, run dialog and dmenu replacement";
package = mkOption {
type = types.package;
default = pkgs.rofi-wayland-unwrapped;
default = pkgs.rofi-unwrapped;
example = "pkgs.rofi";
};
};

View file

@ -18,8 +18,24 @@ in {
enable = true;
package = cfg.package;
userName = ''reidlab'';
userEmail = "reidlab325@gmail.com";
settings = {
user.name = ''reidlab'';
user.email = "reidlab325@gmail.com";
alias = {
graph = ''log --graph --color --pretty=format:"%C(yellow)%H%C(green)%d%C(reset)%n%x20%cd%n%x20%cn%x20(%ce)%n%x20%s%n"'';
amend = ''commit --amend --no-edit'';
amendall = ''commit --amend --no-edit --all'';
};
credential.helper = "${cfg.package}/bin/git-credential-libsecret";
push.autoSetupRemote = true;
push.gpgSign = "if-asked";
pull.rebase = true;
init.defaultBranch = "main";
};
signing = {
signByDefault = true;
@ -42,21 +58,6 @@ in {
"Icon?"
];
aliases = {
graph = ''log --graph --color --pretty=format:"%C(yellow)%H%C(green)%d%C(reset)%n%x20%cd%n%x20%cn%x20(%ce)%n%x20%s%n"'';
amend = ''commit --amend --no-edit'';
amendall = ''commit --amend --no-edit --all'';
};
extraConfig = {
credential.helper = "${cfg.package}/bin/git-credential-libsecret";
push.autoSetupRemote = true;
push.gpgSign = "if-asked";
pull.rebase = true;
init.defaultBranch = "main";
};
};
hm.programs.gh.enable = true;
};

View file

@ -39,7 +39,7 @@ in {
sh ${colorScript}
'';
functions.fish_greeting = ''
${lib.getExe pkgs.fastfetch} --logo-type small --key-width 11 -s title:separator:os:host:kernel:uptime:memory:swap:colors --colors-symbol circle --colors-padding-left 11
${lib.getExe pkgs.fastfetch} --logo-type small --key-width 11 -s title:separator:os:host:kernel:uptime:memory:swap
'';
};
};