mirror of
https://github.com/nmasur/dotfiles
synced 2024-11-22 23:55:37 +00:00
improve lockscreen and remove explicit packages
This commit is contained in:
Noah Masur
parent
7603005864
commit
6c6d80a1d0
@ -2,7 +2,10 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
lockCmd = ''i3lock --nofork --color "${config.gui.colorscheme.base00}"'';
|
lockCmd =
|
||||||
|
"${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span";
|
||||||
|
lockUpdate =
|
||||||
|
"${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.gui.wallpaper} --display 1 --span";
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
||||||
@ -16,226 +19,237 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
dmenu # Launcher
|
|
||||||
feh # Wallpaper
|
feh # Wallpaper
|
||||||
playerctl # Media control
|
playerctl # Media control
|
||||||
];
|
];
|
||||||
|
|
||||||
home-manager.users.${config.user}.xsession.windowManager.i3 = {
|
home-manager.users.${config.user} = {
|
||||||
enable = true;
|
xsession.windowManager.i3 = {
|
||||||
package = pkgs.i3-gaps;
|
enable = true;
|
||||||
config = let
|
package = pkgs.i3-gaps;
|
||||||
modifier = "Mod4"; # Super key
|
config = let
|
||||||
ws1 = "1:I";
|
modifier = "Mod4"; # Super key
|
||||||
ws2 = "2:II";
|
ws1 = "1:I";
|
||||||
ws3 = "3:III";
|
ws2 = "2:II";
|
||||||
ws4 = "4:IV";
|
ws3 = "3:III";
|
||||||
ws5 = "5:V";
|
ws4 = "4:IV";
|
||||||
ws6 = "6:VI";
|
ws5 = "5:V";
|
||||||
ws7 = "7:VII";
|
ws6 = "6:VI";
|
||||||
ws8 = "8:VIII";
|
ws7 = "7:VII";
|
||||||
ws9 = "9:IX";
|
ws8 = "8:VIII";
|
||||||
ws10 = "10:X";
|
ws9 = "9:IX";
|
||||||
in {
|
ws10 = "10:X";
|
||||||
modifier = modifier;
|
|
||||||
assigns = {
|
|
||||||
"${ws1}" = [{ class = "Firefox"; }];
|
|
||||||
"${ws2}" = [{ class = "Alacritty"; }];
|
|
||||||
"${ws3}" = [{ class = "discord"; }];
|
|
||||||
"${ws4}" = [{ class = "Steam"; }];
|
|
||||||
};
|
|
||||||
bars = [{ command = "echo"; }]; # Disable i3bar
|
|
||||||
colors = let
|
|
||||||
background = config.gui.colorscheme.base00;
|
|
||||||
inactiveBackground = config.gui.colorscheme.base01;
|
|
||||||
border = config.gui.colorscheme.base01;
|
|
||||||
inactiveBorder = config.gui.colorscheme.base01;
|
|
||||||
text = config.gui.colorscheme.base07;
|
|
||||||
inactiveText = config.gui.colorscheme.base04;
|
|
||||||
urgentBackground = config.gui.colorscheme.base08;
|
|
||||||
indicator = "#00000000";
|
|
||||||
in {
|
in {
|
||||||
background = config.gui.colorscheme.base00;
|
modifier = modifier;
|
||||||
focused = {
|
assigns = {
|
||||||
inherit background indicator text border;
|
"${ws1}" = [{ class = "Firefox"; }];
|
||||||
childBorder = background;
|
"${ws2}" = [{ class = "Alacritty"; }];
|
||||||
|
"${ws3}" = [{ class = "discord"; }];
|
||||||
|
"${ws4}" = [{ class = "Steam"; }];
|
||||||
};
|
};
|
||||||
focusedInactive = {
|
bars = [{ command = "echo"; }]; # Disable i3bar
|
||||||
inherit indicator;
|
colors = let
|
||||||
background = inactiveBackground;
|
background = config.gui.colorscheme.base00;
|
||||||
border = inactiveBorder;
|
inactiveBackground = config.gui.colorscheme.base01;
|
||||||
childBorder = inactiveBackground;
|
border = config.gui.colorscheme.base01;
|
||||||
text = inactiveText;
|
inactiveBorder = config.gui.colorscheme.base01;
|
||||||
|
text = config.gui.colorscheme.base07;
|
||||||
|
inactiveText = config.gui.colorscheme.base04;
|
||||||
|
urgentBackground = config.gui.colorscheme.base08;
|
||||||
|
indicator = "#00000000";
|
||||||
|
in {
|
||||||
|
background = config.gui.colorscheme.base00;
|
||||||
|
focused = {
|
||||||
|
inherit background indicator text border;
|
||||||
|
childBorder = background;
|
||||||
|
};
|
||||||
|
focusedInactive = {
|
||||||
|
inherit indicator;
|
||||||
|
background = inactiveBackground;
|
||||||
|
border = inactiveBorder;
|
||||||
|
childBorder = inactiveBackground;
|
||||||
|
text = inactiveText;
|
||||||
|
};
|
||||||
|
# placeholder = { };
|
||||||
|
unfocused = {
|
||||||
|
inherit indicator;
|
||||||
|
background = inactiveBackground;
|
||||||
|
border = inactiveBorder;
|
||||||
|
childBorder = inactiveBackground;
|
||||||
|
text = inactiveText;
|
||||||
|
};
|
||||||
|
urgent = {
|
||||||
|
inherit text indicator;
|
||||||
|
background = urgentBackground;
|
||||||
|
border = urgentBackground;
|
||||||
|
childBorder = urgentBackground;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
# placeholder = { };
|
floating.modifier = modifier;
|
||||||
unfocused = {
|
focus = {
|
||||||
inherit indicator;
|
mouseWarping = true;
|
||||||
background = inactiveBackground;
|
newWindow = "urgent";
|
||||||
border = inactiveBorder;
|
followMouse = false;
|
||||||
childBorder = inactiveBackground;
|
|
||||||
text = inactiveText;
|
|
||||||
};
|
};
|
||||||
urgent = {
|
keybindings = {
|
||||||
inherit text indicator;
|
|
||||||
background = urgentBackground;
|
# PulseAudio adjust volume
|
||||||
border = urgentBackground;
|
"XF86AudioRaiseVolume" = "exec --no-startup-id pamixer -i 2";
|
||||||
childBorder = urgentBackground;
|
"XF86AudioLowerVolume" = "exec --no-startup-id pamixer -d 2";
|
||||||
|
"XF86AudioMute" = "exec --no-startup-id pamixer -t";
|
||||||
|
"XF86AudioMicMute" =
|
||||||
|
"exec --no-startup-id pamixer --default-source -t";
|
||||||
|
|
||||||
|
# Adjust screen brightness
|
||||||
|
"Shift+F12" =
|
||||||
|
"exec ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ddcutil --display 2 setvcp 10 + 30";
|
||||||
|
"Shift+F11" =
|
||||||
|
"exec ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ddcutil --display 2 setvcp 10 - 30";
|
||||||
|
"XF86MonBrightnessUp" =
|
||||||
|
"exec ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ddcutil --display 2 setvcp 10 + 30";
|
||||||
|
"XF86MonBrightnessDown" =
|
||||||
|
"exec ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ddcutil --display 2 setvcp 10 - 30";
|
||||||
|
|
||||||
|
# Media player controls
|
||||||
|
"XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
|
||||||
|
"XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
|
||||||
|
"XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
|
||||||
|
"XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
|
||||||
|
|
||||||
|
# Launchers
|
||||||
|
"${modifier}+Return" =
|
||||||
|
"exec --no-startup-id alacritty; workspace ${ws2}; layout tabbed";
|
||||||
|
"${modifier}+space" =
|
||||||
|
"exec --no-startup-id ${config.gui.launcherCommand}";
|
||||||
|
"${modifier}+Shift+s" =
|
||||||
|
"exec --no-startup-id ${config.gui.systemdSearch}";
|
||||||
|
"${modifier}+Shift+c" = "reload";
|
||||||
|
"${modifier}+Shift+r" = "restart";
|
||||||
|
"${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'"'';
|
||||||
|
"${modifier}+Shift+x" = "exec ${lockCmd}";
|
||||||
|
|
||||||
|
# Window options
|
||||||
|
"${modifier}+q" = "kill";
|
||||||
|
"${modifier}+b" = "exec ${config.gui.toggleBarCommand}";
|
||||||
|
"${modifier}+f" = "fullscreen toggle";
|
||||||
|
"${modifier}+h" = "focus left";
|
||||||
|
"${modifier}+j" = "focus down";
|
||||||
|
"${modifier}+k" = "focus up";
|
||||||
|
"${modifier}+l" = "focus right";
|
||||||
|
"${modifier}+Left" = "focus left";
|
||||||
|
"${modifier}+Down" = "focus down";
|
||||||
|
"${modifier}+Up" = "focus up";
|
||||||
|
"${modifier}+Right" = "focus right";
|
||||||
|
"${modifier}+Shift+h" = "move left";
|
||||||
|
"${modifier}+Shift+j" = "move down";
|
||||||
|
"${modifier}+Shift+k" = "move up";
|
||||||
|
"${modifier}+Shift+l" = "move right";
|
||||||
|
"${modifier}+Shift+Left" = "move left";
|
||||||
|
"${modifier}+Shift+Down" = "move down";
|
||||||
|
"${modifier}+Shift+Up" = "move up";
|
||||||
|
"${modifier}+Shift+Right" = "move right";
|
||||||
|
|
||||||
|
# Tiling
|
||||||
|
"${modifier}+i" = "split h";
|
||||||
|
"${modifier}+v" = "split v";
|
||||||
|
"${modifier}+s" = "layout stacking";
|
||||||
|
"${modifier}+t" = "layout tabbed";
|
||||||
|
"${modifier}+e" = "layout toggle split";
|
||||||
|
"${modifier}+Shift+space" = "floating toggle";
|
||||||
|
"${modifier}+Control+space" = "focus mode_toggle";
|
||||||
|
"${modifier}+a" = "focus parent";
|
||||||
|
|
||||||
|
# Workspaces
|
||||||
|
"${modifier}+1" = "workspace ${ws1}";
|
||||||
|
"${modifier}+2" = "workspace ${ws2}";
|
||||||
|
"${modifier}+3" = "workspace ${ws3}";
|
||||||
|
"${modifier}+4" = "workspace ${ws4}";
|
||||||
|
"${modifier}+5" = "workspace ${ws5}";
|
||||||
|
"${modifier}+6" = "workspace ${ws6}";
|
||||||
|
"${modifier}+7" = "workspace ${ws7}";
|
||||||
|
"${modifier}+8" = "workspace ${ws8}";
|
||||||
|
"${modifier}+9" = "workspace ${ws9}";
|
||||||
|
"${modifier}+0" = "workspace ${ws10}";
|
||||||
|
|
||||||
|
# Move windows
|
||||||
|
"${modifier}+Shift+1" =
|
||||||
|
"move container to workspace ${ws1}; workspace ${ws1}";
|
||||||
|
"${modifier}+Shift+2" =
|
||||||
|
"move container to workspace ${ws2}; workspace ${ws2}";
|
||||||
|
"${modifier}+Shift+3" =
|
||||||
|
"move container to workspace ${ws3}; workspace ${ws3}";
|
||||||
|
"${modifier}+Shift+4" =
|
||||||
|
"move container to workspace ${ws4}; workspace ${ws4}";
|
||||||
|
"${modifier}+Shift+5" =
|
||||||
|
"move container to workspace ${ws5}; workspace ${ws5}";
|
||||||
|
"${modifier}+Shift+6" =
|
||||||
|
"move container to workspace ${ws6}; workspace ${ws6}";
|
||||||
|
"${modifier}+Shift+7" =
|
||||||
|
"move container to workspace ${ws7}; workspace ${ws7}";
|
||||||
|
"${modifier}+Shift+8" =
|
||||||
|
"move container to workspace ${ws8}; workspace ${ws8}";
|
||||||
|
"${modifier}+Shift+9" =
|
||||||
|
"move container to workspace ${ws9}; workspace ${ws9}";
|
||||||
|
"${modifier}+Shift+0" =
|
||||||
|
"move container to workspace ${ws10}; workspace ${ws10}";
|
||||||
|
|
||||||
|
# Move screens
|
||||||
|
"${modifier}+Control+l" = "move workspace to output right";
|
||||||
|
"${modifier}+Control+h" = "move workspace to output left";
|
||||||
|
|
||||||
|
# Resizing
|
||||||
|
"${modifier}+r" = ''mode "resize"'';
|
||||||
|
"${modifier}+Control+Shift+h" =
|
||||||
|
"resize shrink width 10 px or 10 ppt";
|
||||||
|
"${modifier}+Control+Shift+j" =
|
||||||
|
"resize grow height 10 px or 10 ppt";
|
||||||
|
"${modifier}+Control+Shift+k" =
|
||||||
|
"resize shrink height 10 px or 10 ppt";
|
||||||
|
"${modifier}+Control+Shift+l" = "resize grow width 10 px or 10 ppt";
|
||||||
};
|
};
|
||||||
|
modes = { };
|
||||||
|
startup = [
|
||||||
|
{
|
||||||
|
command = "feh --bg-fill ${config.gui.wallpaper}";
|
||||||
|
always = true;
|
||||||
|
notification = false;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
command = "i3-msg workspace ${ws1}";
|
||||||
|
notification = false;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
window = {
|
||||||
|
border = 0;
|
||||||
|
hideEdgeBorders = "smart";
|
||||||
|
titlebar = false;
|
||||||
|
};
|
||||||
|
workspaceAutoBackAndForth = false;
|
||||||
|
workspaceOutputAssign = [ ];
|
||||||
|
# gaps = {
|
||||||
|
# bottom = 8;
|
||||||
|
# top = 8;
|
||||||
|
# left = 8;
|
||||||
|
# right = 8;
|
||||||
|
# horizontal = 15;
|
||||||
|
# vertical = 15;
|
||||||
|
# inner = 15;
|
||||||
|
# outer = 0;
|
||||||
|
# smartBorders = "off";
|
||||||
|
# smartGaps = false;
|
||||||
|
# };
|
||||||
};
|
};
|
||||||
floating.modifier = modifier;
|
extraConfig = "";
|
||||||
focus = {
|
|
||||||
mouseWarping = true;
|
|
||||||
newWindow = "urgent";
|
|
||||||
followMouse = false;
|
|
||||||
};
|
|
||||||
keybindings = {
|
|
||||||
|
|
||||||
# PulseAudio adjust volume
|
|
||||||
"XF86AudioRaiseVolume" = "exec --no-startup-id pamixer -i 2";
|
|
||||||
"XF86AudioLowerVolume" = "exec --no-startup-id pamixer -d 2";
|
|
||||||
"XF86AudioMute" = "exec --no-startup-id pamixer -t";
|
|
||||||
"XF86AudioMicMute" =
|
|
||||||
"exec --no-startup-id pamixer --default-source -t";
|
|
||||||
|
|
||||||
# Adjust screen brightness
|
|
||||||
"Shift+F12" =
|
|
||||||
"exec ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ddcutil --display 2 setvcp 10 + 30";
|
|
||||||
"Shift+F11" =
|
|
||||||
"exec ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ddcutil --display 2 setvcp 10 - 30";
|
|
||||||
"XF86MonBrightnessUp" =
|
|
||||||
"exec ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ddcutil --display 2 setvcp 10 + 30";
|
|
||||||
"XF86MonBrightnessDown" =
|
|
||||||
"exec ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ddcutil --display 2 setvcp 10 - 30";
|
|
||||||
|
|
||||||
# Media player controls
|
|
||||||
"XF86AudioPlay" = "exec playerctl play-pause";
|
|
||||||
"XF86AudioStop" = "exec playerctl stop";
|
|
||||||
"XF86AudioNext" = "exec playerctl next";
|
|
||||||
"XF86AudioPrev" = "exec playerctl previous";
|
|
||||||
|
|
||||||
# Launchers
|
|
||||||
"${modifier}+Return" =
|
|
||||||
"exec --no-startup-id alacritty; workspace ${ws2}; layout tabbed";
|
|
||||||
"${modifier}+space" =
|
|
||||||
"exec --no-startup-id ${config.gui.launcherCommand}";
|
|
||||||
"${modifier}+Shift+s" =
|
|
||||||
"exec --no-startup-id ${config.gui.systemdSearch}";
|
|
||||||
"${modifier}+Shift+c" = "reload";
|
|
||||||
"${modifier}+Shift+r" = "restart";
|
|
||||||
"${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'"'';
|
|
||||||
"${modifier}+Shift+x" = "exec ${lockCmd}";
|
|
||||||
|
|
||||||
# Window options
|
|
||||||
"${modifier}+q" = "kill";
|
|
||||||
"${modifier}+b" = "exec ${config.gui.toggleBarCommand}";
|
|
||||||
"${modifier}+f" = "fullscreen toggle";
|
|
||||||
"${modifier}+h" = "focus left";
|
|
||||||
"${modifier}+j" = "focus down";
|
|
||||||
"${modifier}+k" = "focus up";
|
|
||||||
"${modifier}+l" = "focus right";
|
|
||||||
"${modifier}+Left" = "focus left";
|
|
||||||
"${modifier}+Down" = "focus down";
|
|
||||||
"${modifier}+Up" = "focus up";
|
|
||||||
"${modifier}+Right" = "focus right";
|
|
||||||
"${modifier}+Shift+h" = "move left";
|
|
||||||
"${modifier}+Shift+j" = "move down";
|
|
||||||
"${modifier}+Shift+k" = "move up";
|
|
||||||
"${modifier}+Shift+l" = "move right";
|
|
||||||
"${modifier}+Shift+Left" = "move left";
|
|
||||||
"${modifier}+Shift+Down" = "move down";
|
|
||||||
"${modifier}+Shift+Up" = "move up";
|
|
||||||
"${modifier}+Shift+Right" = "move right";
|
|
||||||
|
|
||||||
# Tiling
|
|
||||||
"${modifier}+i" = "split h";
|
|
||||||
"${modifier}+v" = "split v";
|
|
||||||
"${modifier}+s" = "layout stacking";
|
|
||||||
"${modifier}+t" = "layout tabbed";
|
|
||||||
"${modifier}+e" = "layout toggle split";
|
|
||||||
"${modifier}+Shift+space" = "floating toggle";
|
|
||||||
"${modifier}+Control+space" = "focus mode_toggle";
|
|
||||||
"${modifier}+a" = "focus parent";
|
|
||||||
|
|
||||||
# Workspaces
|
|
||||||
"${modifier}+1" = "workspace ${ws1}";
|
|
||||||
"${modifier}+2" = "workspace ${ws2}";
|
|
||||||
"${modifier}+3" = "workspace ${ws3}";
|
|
||||||
"${modifier}+4" = "workspace ${ws4}";
|
|
||||||
"${modifier}+5" = "workspace ${ws5}";
|
|
||||||
"${modifier}+6" = "workspace ${ws6}";
|
|
||||||
"${modifier}+7" = "workspace ${ws7}";
|
|
||||||
"${modifier}+8" = "workspace ${ws8}";
|
|
||||||
"${modifier}+9" = "workspace ${ws9}";
|
|
||||||
"${modifier}+0" = "workspace ${ws10}";
|
|
||||||
|
|
||||||
# Move windows
|
|
||||||
"${modifier}+Shift+1" =
|
|
||||||
"move container to workspace ${ws1}; workspace ${ws1}";
|
|
||||||
"${modifier}+Shift+2" =
|
|
||||||
"move container to workspace ${ws2}; workspace ${ws2}";
|
|
||||||
"${modifier}+Shift+3" =
|
|
||||||
"move container to workspace ${ws3}; workspace ${ws3}";
|
|
||||||
"${modifier}+Shift+4" =
|
|
||||||
"move container to workspace ${ws4}; workspace ${ws4}";
|
|
||||||
"${modifier}+Shift+5" =
|
|
||||||
"move container to workspace ${ws5}; workspace ${ws5}";
|
|
||||||
"${modifier}+Shift+6" =
|
|
||||||
"move container to workspace ${ws6}; workspace ${ws6}";
|
|
||||||
"${modifier}+Shift+7" =
|
|
||||||
"move container to workspace ${ws7}; workspace ${ws7}";
|
|
||||||
"${modifier}+Shift+8" =
|
|
||||||
"move container to workspace ${ws8}; workspace ${ws8}";
|
|
||||||
"${modifier}+Shift+9" =
|
|
||||||
"move container to workspace ${ws9}; workspace ${ws9}";
|
|
||||||
"${modifier}+Shift+0" =
|
|
||||||
"move container to workspace ${ws10}; workspace ${ws10}";
|
|
||||||
|
|
||||||
# Move screens
|
|
||||||
"${modifier}+Control+l" = "move workspace to output right";
|
|
||||||
"${modifier}+Control+h" = "move workspace to output left";
|
|
||||||
|
|
||||||
# Resizing
|
|
||||||
"${modifier}+r" = ''mode "resize"'';
|
|
||||||
"${modifier}+Control+Shift+h" = "resize shrink width 10 px or 10 ppt";
|
|
||||||
"${modifier}+Control+Shift+j" = "resize grow height 10 px or 10 ppt";
|
|
||||||
"${modifier}+Control+Shift+k" =
|
|
||||||
"resize shrink height 10 px or 10 ppt";
|
|
||||||
"${modifier}+Control+Shift+l" = "resize grow width 10 px or 10 ppt";
|
|
||||||
};
|
|
||||||
modes = { };
|
|
||||||
startup = [
|
|
||||||
{
|
|
||||||
command = "feh --bg-fill ${config.gui.wallpaper}";
|
|
||||||
always = true;
|
|
||||||
notification = false;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
command = "i3-msg workspace ${ws1}";
|
|
||||||
notification = false;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
window = {
|
|
||||||
border = 0;
|
|
||||||
hideEdgeBorders = "smart";
|
|
||||||
titlebar = false;
|
|
||||||
};
|
|
||||||
workspaceAutoBackAndForth = false;
|
|
||||||
workspaceOutputAssign = [ ];
|
|
||||||
# gaps = {
|
|
||||||
# bottom = 8;
|
|
||||||
# top = 8;
|
|
||||||
# left = 8;
|
|
||||||
# right = 8;
|
|
||||||
# horizontal = 15;
|
|
||||||
# vertical = 15;
|
|
||||||
# inner = 15;
|
|
||||||
# outer = 0;
|
|
||||||
# smartBorders = "off";
|
|
||||||
# smartGaps = false;
|
|
||||||
# };
|
|
||||||
};
|
};
|
||||||
extraConfig = "";
|
|
||||||
|
programs.fish.functions = {
|
||||||
|
update-lock-screen = {
|
||||||
|
description = "Update lockscreen with wallpaper";
|
||||||
|
body = lockUpdate;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.lock = {
|
systemd.services.lock = {
|
||||||
@ -245,8 +259,7 @@ in {
|
|||||||
User = config.user;
|
User = config.user;
|
||||||
Type = "forking";
|
Type = "forking";
|
||||||
Environment = "DISPLAY=:0";
|
Environment = "DISPLAY=:0";
|
||||||
ExecStart = ''
|
ExecStart = lockCmd;
|
||||||
${pkgs.i3lock}/bin/i3lock --color "${config.gui.colorscheme.base00}"'';
|
|
||||||
};
|
};
|
||||||
wantedBy = [ "sleep.target" "suspend.target" ];
|
wantedBy = [ "sleep.target" "suspend.target" ];
|
||||||
};
|
};
|
||||||
|
|||||||
@ -11,8 +11,6 @@
|
|||||||
|
|
||||||
home-manager.users.${config.user} = {
|
home-manager.users.${config.user} = {
|
||||||
|
|
||||||
home.packages = with pkgs; [ age ];
|
|
||||||
|
|
||||||
programs.himalaya = { enable = true; };
|
programs.himalaya = { enable = true; };
|
||||||
programs.mbsync = { enable = true; };
|
programs.mbsync = { enable = true; };
|
||||||
services.mbsync = {
|
services.mbsync = {
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
home-manager.users.${config.user} = {
|
home-manager.users.${config.user} = {
|
||||||
|
|
||||||
home.packages = with pkgs; [ exa fd bat ripgrep curl ];
|
home.packages = with pkgs; [ curl ];
|
||||||
|
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -38,7 +38,7 @@
|
|||||||
description = "Tidy up JSON using jq";
|
description = "Tidy up JSON using jq";
|
||||||
body = "pbpaste | jq '.' | pbcopy"; # Need to fix for non-macOS
|
body = "pbpaste | jq '.' | pbcopy"; # Need to fix for non-macOS
|
||||||
};
|
};
|
||||||
ls = { body = "exa $argv"; };
|
ls = { body = "${pkgs.exa}/bin/pkgs $argv"; };
|
||||||
note = {
|
note = {
|
||||||
description = "Edit or create a note";
|
description = "Edit or create a note";
|
||||||
argumentNames = "filename";
|
argumentNames = "filename";
|
||||||
|
|||||||
@ -27,12 +27,9 @@ in {
|
|||||||
tree # View directory hierarchy
|
tree # View directory hierarchy
|
||||||
htop # Show system processes
|
htop # Show system processes
|
||||||
glow # Pretty markdown previews
|
glow # Pretty markdown previews
|
||||||
prettyping # ping
|
|
||||||
qrencode # Generate qr codes
|
qrencode # Generate qr codes
|
||||||
vimv # Batch rename files
|
vimv # Batch rename files
|
||||||
dig # DNS lookup
|
dig # DNS lookup
|
||||||
# gnupg
|
|
||||||
# pass
|
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.zoxide.enable = true; # Shortcut jump command
|
programs.zoxide.enable = true; # Shortcut jump command
|
||||||
@ -51,11 +48,11 @@ in {
|
|||||||
ping = {
|
ping = {
|
||||||
description = "Improved ping";
|
description = "Improved ping";
|
||||||
argumentNames = "target";
|
argumentNames = "target";
|
||||||
body = "prettyping --nolegend $target";
|
body = "${pkgs.prettyping}/bin/prettyping --nolegend $target";
|
||||||
};
|
};
|
||||||
qr = {
|
qr = {
|
||||||
body =
|
body =
|
||||||
"qrencode $argv[1] -o /tmp/qr.png | open /tmp/qr.png"; # Fix for non-macOS
|
"${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | open /tmp/qr.png"; # Fix for non-macOS
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user