Blunkall-Technologies/Olympus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consolidate

Browse Source
This commit is contained in:
Nathan
2025-12-18 12:08:45 -06:00
parent 2d09cfeea1
commit 0c1f0a4639
35 changed files with 57 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
home-manager/users/nathan/default.nix
View File

@@ -1,8 +1,8 @@
{ config, lib, pkgs, inputs, ... }: {
imports = [
# ./programs
# ./services
./programs
./services
./packages
./dotfiles
];

16
home-manager/users/nathan/dotfiles/hypr/main.conf
View File

@@ -20,7 +20,7 @@ source = ~/.cache/wal/colors-hypr.conf
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
input {
kb_layout = us,jp
kb_layout = us
kb_variant =
kb_model =
kb_options =
@@ -122,9 +122,9 @@ bind = $mainMod SHIFT, B, exec, firefox --private-window
bind = $mainMod, Q, killactive,
bind = $mainMod, R, exec, colorPrefix kitty -e _systemRebuild
#bind = $mainMod, R, exec, colorPrefix kitty -e _systemRebuild
bind = $mainMod SHIFT, R, exec, colorPrefix kitty -e _homeRebuild
#bind = $mainMod SHIFT, R, exec, colorPrefix kitty -e _homeRebuild
bind = $mainMod, F, exec, thunar
bind = $mainMod SHIFT, F, fullscreen
@@ -249,7 +249,7 @@ bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle
bind = $mainMod, F9, exec, pavucontrol
#screen lock key
bind = $mainMod, F12, exec, swaylock
#bind = $mainMod, F12, exec, swaylock
#logout shortcut
bind = CTRL ALT, Delete, exec, loginctl kill-session self
@@ -281,12 +281,12 @@ windowrulev2 = float, $cal
windowrulev2 = $scratchpadsize, $cal
windowrulev2 = workspace special silent, $cal
bind = $mainMod, semicolon, exec, colorPrefix pypr toggle lf
bind = $mainMod, E, exec, colorPrefix pypr toggle kitty
bind = $mainMod, C, exec, colorPrefix pypr toggle calendar
bind = $mainMod, semicolon, exec, pypr toggle lf
bind = $mainMod, E, exec, pypr toggle kitty
bind = $mainMod, C, exec, pypr toggle calendar
bind = CTRL SHIFT, Home, exec, ssh nathan@blunkall.us -fL 5900:localhost:5900 sleep 10; vncviewer localhost:5900 -fullscreen
bind = CTRL SHIFT, Home, exec, ssh nathan@esotericbytes.com -fL 5900:localhost:5900 sleep 10; vncviewer localhost:5900 -fullscreen
bind = CTRL SHIFT, Home, submap, clean

10
home-manager/users/nathan/dotfiles/hypr/pyprland.toml
View File

@@ -5,8 +5,8 @@
[scratchpads.lf]
animation = "fromTop"
command = "kitty --class scratchpad-lf -e lf ~"
lazy = false
command = "kitty --class scratchpad-lf lf ~"
lazy = true
class = "scratchpad-lf"
margin = 100
multi = true
@@ -14,9 +14,9 @@
[scratchpads.kitty]
animation = "fromBottom"
command = "kitty --class scratchpad-kitty -e tmux"
command = "kitty --class scratchpad-kitty"
class = "scratchpad-kitty"
lazy = false
lazy = true
margin = 100
multi = true
excludes = "*"
@@ -25,7 +25,7 @@
animation = "fromTop"
command = "kitty --class scratchpad-cal -e calcurse"
class = "scratchpad-cal"
lazy = false
lazy = true
margin = 100
multi = true
excludes = "*"

4
home-manager/users/nathan/programs/hyprland/default.nix
View File

@@ -37,8 +37,8 @@
};
extraConfig = (if config.homeconfig.host == "laptop" then ''
monitor=eDP-1,1920x1080@300,0x0,1
bind = CTRL SHIFT, XF86Launch2, exec, if [[ $(hyprctl monitors | grep 0x0 | sed -n -e "s/\t*1920x1080@//" -e "s/.[1234567890]* at 0x0//p") == 300 ]]; then hyprctl keyword monitor eDP-1,1920x1080@60,0x0,1; else hyprctl keyword monitor eDP-1,1920x1080@300,0x0,1; fi
bind = CTRL SHIFT, XF86Launch2, exec, bash -c 'if [[ $(hyprctl monitors | grep 0x0 | sed -n -e "s/\t*1920x1080@//" -e "s/.[1234567890]* at 0x0//p") == 300 ]]; then pkexec --user root /nix/var/nix/profiles/system/bin/switch-to-configuration switch; else pkexec --user root /nix/var/nix/profiles/system/specialisation/docked/bin/switch-to-configuration switch; fi'
bind = ALT, Escape, exec, if [[ $(hyprctl monitors | grep 0x0 | sed -n -e "s/\t*1920x1080@//" -e "s/.[1234567890]* at 0x0//p") == 300 ]]; then hyprctl keyword monitor eDP-1,1920x1080@60,0x0,1; else hyprctl keyword monitor eDP-1,1920x1080@300,0x0,1; fi
'' else if config.homeconfig.host == "homebox" then ''
monitor=HDMI-A-2,1920x1080@60,0x0,1
monitor=HEADLESS-2,1920x1080@60,0x0,1

34
home-manager/users/nathan/programs/hyprlock/default.nix
View File

@@ -13,6 +13,40 @@
services.hypridle = {
enable = true;
settings = {
general = {
lock_cmd = "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances.
before_sleep_cmd = "loginctl lock-session"; # lock before suspend.
after_sleep_cmd = "hyprctl --instance 0 dispatch dpms on"; # to avoid having to press a key twice to turn on the display.
};
listener = [
{
timeout = 150; # 2.5min.
on-timeout = "brightnessctl -s set 10"; # set monitor backlight to minimum, avoid 0 on OLED monitor.
on-resume = "brightnessctl -r"; # monitor backlight restore.
}
{
timeout = 300; # 5min
on-timeout = "loginctl lock-session"; # lock screen when timeout has passed
}
{
timeout = 330; # 5.5min
on-timeout = "hyprctl --instance 0 dispatch dpms off"; # screen off when timeout has passed
on-resume = "hyprctl --instance 0 dispatch dpms on && brightnessctl -r"; # screen on when activity is detected after timeout has fired.
}
{
timeout = 1800; # 30min
on-timeout = "systemctl suspend"; # suspend pc
}
];
};
};
};
}

1
home-manager/users/nathan/programs/hyprpanel/default.nix
View File

@@ -9,7 +9,6 @@
programs.hyprpanel = {
enable = true;
systemd.enable = false;
};
};
}

1
home-manager/users/nathan/programs/terminal/default.nix
View File

@@ -5,6 +5,7 @@
./bash
./eza
./fzf
./lf
./tmux
./kitty
./zoxide

2
home-manager/users/nathan/programs/terminal/kitty/default.nix
View File

@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: {
{ config, ... }: {
programs.kitty = {

7
home-manager/users/nathan/programs/terminal/lf/default.nix Normal file
View File

@@ -0,0 +1,7 @@
{ ... }: {
config = {
programs.lf = {
enable = true;
};
};
}