diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix index f901a81..0343137 100644 --- a/hosts/sakura/default.nix +++ b/hosts/sakura/default.nix @@ -57,6 +57,8 @@ cpuFreqGovernor = lib.mkDefault "ondemand"; }; + services.logind.lidSwitchDocked = "ignore"; + # change battery led to blue on suspend to indicate device is in suspend mode systemd.services."suspend-led-set" = { description = "blue led for sleep"; diff --git a/modules/home/foot.nix b/modules/home/foot.nix index 552b7fd..7c0f4b8 100644 --- a/modules/home/foot.nix +++ b/modules/home/foot.nix @@ -3,19 +3,109 @@ home.file.".config/foot/foot.ini".text = '' # -*- conf -*- - # font=GohuFont 14 Nerd Font Mono:size=9 + # shell=$SHELL (if set, otherwise user's default shell from /etc/passwd) + # term=foot (or xterm-256color if built with -Dterminfo=disabled) + # login-shell=no + + # app-id=foot # globally set wayland app-id. Default values are "foot" and "footclient" for desktop and server mode + # title=foot + # locked-title=no + + font=GohuFont 14 Nerd Font Mono:size=12 + # font-bold= + # font-italic= + # font-bold-italic= + # font-size-adjustment=0.5 + # line-height= + # letter-spacing=0 + # horizontal-letter-offset=0 + # vertical-letter-offset=0 + # underline-offset= + # underline-thickness= + # strikeout-thickness= + # box-drawings-uses-font-glyphs=no + # dpi-aware=no + # gamma-correct-blending=no + + # initial-color-theme=1 + # initial-window-size-pixels=700x500 # Or, + # initial-window-size-chars= initial-window-mode=maximized + # pad=0x0 center-when-maximized-and-fullscreen + # resize-by-cells=yes + # resize-keep-grid=yes + # resize-delay-ms=100 + + # bold-text-in-bright=no + # word-delimiters=,│`|:"'()[]{}<> + # selection-target=primary + # workers= + # utmp-helper=/usr/lib/utempter/utempter # When utmp backend is ‘libutempter’ (Linux) + # utmp-helper=/usr/libexec/ulog-helper # When utmp backend is ‘ulog’ (FreeBSD) + # [tweak] # allow-overflowing-double-width-glyphs=true + # uppercase-regex-insert=yes + + [environment] + # name=value + + [security] + # osc52=enabled # disabled|copy-enabled|paste-enabled|enabled + + [bell] + # system=yes + # urgent=no + # notify=no + # visual=no + # command= + # command-focused=no + [desktop-notifications] # command=notify-send --wait --app-name $\{app-id} --icon $\{app-id} --category $\{category} --urgency $\{urgency} --expire-time $\{expire-time} --hint STRING:image-path:$\{icon} --hint BOOLEAN:suppress-sound:$\{muted} --hint STRING:sound-name:$\{sound-name} --replace-id $\{replace-id} $\{action-argument} --print-id -- $\{title} $\{body} # command-action-argument=--action $\{action-name}=$\{action-label} # close="" # inhibit-when-focused=yes + + [scrollback] + # lines=1000 + # multiplier=3.0 + # indicator-position=relative + # indicator-format="" + + [url] + # launch=xdg-open $\{url} + # label-letters=sadfjklewcmpgh + # osc8-underline=url-mode + # regex=(((https?://|mailto:|ftp://|file:|ssh:|ssh://|git://|tel:|magnet:|ipfs://|ipns://|gemini://|gopher://|news:)|www\.)([0-9a-zA-Z:/?#@!$&*+,;=.~_%^\-]+|\([]\["0-9a-zA-Z:/?#@!$&'*+,;=.~_%^\-]*\)|\[[\(\)"0-9a-zA-Z:/?#@!$&'*+,;=.~_%^\-]*\]|"[]\[\(\)0-9a-zA-Z:/?#@!$&'*+,;=.~_%^\-]*"|'[]\[\(\)0-9a-zA-Z:/?#@!$&*+,;=.~_%^\-]*')+([0-9a-zA-Z/#@$&*+=~_%^\-]|\([]\["0-9a-zA-Z:/?#@!$&'*+,;=.~_%^\-]*\)|\[[\(\)"0-9a-zA-Z:/?#@!$&'*+,;=.~_%^\-]*\]|"[]\[\(\)0-9a-zA-Z:/?#@!$&'*+,;=.~_%^\-]*"|'[]\[\(\)0-9a-zA-Z:/?#@!$&*+,;=.~_%^\-]*')) + + # You can define your own regex's, by adding a section called + # 'regex:' with a 'regex' and 'launch' key. These can then be tied + # to a key-binding. See foot.ini(5) for details + + # [regex:your-fancy-name] + # regex= + # launch= $\{match} + # + # [key-bindings] + # regex-launch=[your-fancy-name] Control+Shift+q + # regex-copy=[your-fancy-name] Control+Alt+Shift+q + [cursor] style=block + # blink=no + # blink-rate=500 + # beam-thickness=1.5 + # underline-thickness= + + [mouse] + # hide-when-typing=no + # alternate-scroll-mode=yes + + [touch] + # long-press-delay=400 [colors] alpha=0.5 @@ -44,5 +134,186 @@ bright5=d2d8fe # bright magenta bright6=f764a1 # bright cyan bright7=ebedff # bright white + + # alpha-mode=default # Can be `default`, `matching` or `all` + # background=242424 + # foreground=ffffff + # flash=7f7f00 + # flash-alpha=0.5 + + # cursor=cda5ef + + ## Normal/regular colors (color palette 0-7) + # regular0=242424 # black + # regular1=f62b5a # red + # regular2=47b413 # green + # regular3=e3c401 # yellow + # regular4=24acd4 # blue + # regular5=f2affd # magenta + # regular6=13c299 # cyan + # regular7=e6e6e6 # white + + ## Bright colors (color palette 8-15) + # bright0=616161 # bright black + # bright1=ff4d51 # bright red + # bright2=35d450 # bright green + # bright3=e9e836 # bright yellow + # bright4=5dc5f8 # bright blue + # bright5=feabf2 # bright magenta + # bright6=24dfc4 # bright cyan + # bright7=ffffff # bright white + + ## dimmed colors (see foot.ini(5) man page) + # dim0= + # ... + # dim7= + + ## The remaining 256-color palette + # 16 = <256-color palette #16> + # ... + # 255 = <256-color palette #255> + + ## Sixel colors + # sixel0 = 000000 + # sixel1 = 3333cc + # sixel2 = cc2121 + # sixel3 = 33cc33 + # sixel4 = cc33cc + # sixel5 = 33cccc + # sixel6 = cccc33 + # sixel7 = 878787 + # sixel8 = 424242 + # sixel9 = 545499 + # sixel10 = 994242 + # sixel11 = 549954 + # sixel12 = 995499 + # sixel13 = 549999 + # sixel14 = 999954 + # sixel15 = cccccc + + ## Misc colors + # selection-foreground= + # selection-background= + # jump-labels= # black-on-yellow + # scrollback-indicator= # black-on-bright-blue + # search-box-no-match= # black-on-red + # search-box-match= # black-on-yellow + # urls= + + [colors2] + # Alternative color theme, see man page foot.ini(5) + + [csd] + # preferred=server + # size=26 + # font=GohuFont 14 Nerd Font Mono + # color= + # hide-when-maximized=no + # double-click-to-maximize=yes + # border-width=0 + # border-color= + # button-width=26 + # button-color= + # button-minimize-color= + # button-maximize-color= + # button-close-color= + + [key-bindings] + # scrollback-up-page=Shift+Page_Up Shift+KP_Page_Up + # scrollback-up-half-page=none + # scrollback-up-line=none + # scrollback-down-page=Shift+Page_Down Shift+KP_Page_Down + # scrollback-down-half-page=none + # scrollback-down-line=none + # scrollback-home=none + # scrollback-end=none + # clipboard-copy=Control+Shift+c XF86Copy + # clipboard-paste=Control+Shift+v XF86Paste + # primary-paste=Shift+Insert + # search-start=Control+Shift+r + # font-increase=Control+plus Control+equal Control+KP_Add + # font-decrease=Control+minus Control+KP_Subtract + # font-reset=Control+0 Control+KP_0 + # spawn-terminal=Control+Shift+n + # minimize=none + # maximize=none + # fullscreen=none + # pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none + # pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none + # pipe-selected=[xargs -r firefox] none + # pipe-command-output=[wl-copy] none # Copy last command's output to the clipboard + # show-urls-launch=Control+Shift+o + # show-urls-copy=none + # show-urls-persistent=none + # prompt-prev=Control+Shift+z + # prompt-next=Control+Shift+x + # unicode-input=Control+Shift+u + # color-theme-switch-1=none + # color-theme-switch-2=none + # color-theme-toggle=none + # noop=none + # quit=none + + [search-bindings] + # cancel=Control+g Control+c Escape + # commit=Return KP_Enter + # find-prev=Control+r + # find-next=Control+s + # cursor-left=Left Control+b + # cursor-left-word=Control+Left Mod1+b + # cursor-right=Right Control+f + # cursor-right-word=Control+Right Mod1+f + # cursor-home=Home Control+a + # cursor-end=End Control+e + # delete-prev=BackSpace + # delete-prev-word=Mod1+BackSpace Control+BackSpace + # delete-next=Delete + # delete-next-word=Mod1+d Control+Delete + # delete-to-start=Control+u + # delete-to-end=Control+k + # extend-char=Shift+Right + # extend-to-word-boundary=Control+w Control+Shift+Right + # extend-to-next-whitespace=Control+Shift+w + # extend-line-down=Shift+Down + # extend-backward-char=Shift+Left + # extend-backward-to-word-boundary=Control+Shift+Left + # extend-backward-to-next-whitespace=none + # extend-line-up=Shift+Up + # clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste + # primary-paste=Shift+Insert + # unicode-input=none + # scrollback-up-page=Shift+Page_Up Shift+KP_Page_Up + # scrollback-up-half-page=none + # scrollback-up-line=none + # scrollback-down-page=Shift+Page_Down Shift+KP_Page_Down + # scrollback-down-half-page=none + # scrollback-down-line=none + # scrollback-home=none + # scrollback-end=none + + [url-bindings] + # cancel=Control+g Control+c Control+d Escape + # toggle-url-visible=t + + [text-bindings] + # \x03=Mod4+c # Map Super+c -> Ctrl+c + + [mouse-bindings] + # scrollback-up-mouse=BTN_WHEEL_BACK + # scrollback-down-mouse=BTN_WHEEL_FORWARD + # font-increase=Control+BTN_WHEEL_BACK + # font-decrease=Control+BTN_WHEEL_FORWARD + # selection-override-modifiers=Shift + # primary-paste=BTN_MIDDLE + # select-begin=BTN_LEFT + # select-begin-block=Control+BTN_LEFT + # select-extend=BTN_RIGHT + # select-extend-character-wise=Control+BTN_RIGHT + # select-word=BTN_LEFT-2 + # select-word-whitespace=Control+BTN_LEFT-2 + # select-quote = BTN_LEFT-3 + # select-row=BTN_LEFT-4 + + # vim: ft=dosini ''; } diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index 8ed7e97..2f5690a 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -66,7 +66,7 @@ "debug:disable_scale_checks" = true; monitor = if (host == "sakura") then - "eDP-1, 2256x1504@60, 0x0, 1.5" + "eDP-1, 2256x1504@60, 0x0, 1.0" else if (host == "zinnia") then "eDP-1, 1920x1080@60, 0x0, 1.0" else diff --git a/modules/home/hyprland/displays.conf b/modules/home/hyprland/displays.conf index bc693c8..0655e3a 100644 --- a/modules/home/hyprland/displays.conf +++ b/modules/home/hyprland/displays.conf @@ -1,4 +1,8 @@ # monitor=HDMI-A-1,1920x1080@165,0x0,1,transform,0 -monitor=DP-1, 3440x1440@144,0x0,1,transform,0 -monitor=DP-2, 3440x1440@144,1504x0,1,transform,0 -monitor=CMT GM34-CWQ CMI231700118,3440x1440@144,1504x0,1,transform,0 +monitor=DP-1, 3440x1440@144,0x0,1,transform,0 +monitor=DP-2, 3440x1440@144,2256x0,1,transform,0 +monitor=CMT GM34-CWQ CMI231700118, 3440x1440@144,2256x0,1,transform,0 + + +monitor=Samsung Electric Company C49HG9x HTJJB00245,3840x1080@144,2256x0,1,transform,0 +monitor=Acer Technologies PM161Q B1 945100B203X00,1920x1080@60,3200x1080,1,transform,0 diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix index 905cbf1..9b7562b 100644 --- a/modules/home/waybar/default.nix +++ b/modules/home/waybar/default.nix @@ -114,7 +114,7 @@ "custom/devices": { "interval": 60, - "font-size": 14, + "font-size": 18, // "return-type": "json", "exec": "~/.local/bin/waybar-devices", }, @@ -374,7 +374,7 @@ border-radius: 0; font-family: 'GohuFont 11 Nerd Font Mono'; font-weight: 400; - font-size: 11px; + font-size: 14px; min-height: 26px; /* margin: 0 0px; */ }