diff --git a/flake.lock b/flake.lock index 68bcefa..60e1841 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1759499898, - "narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=", + "lastModified": 1755946532, + "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "655e067f96fd44b3f5685e17f566b0e4d535d798", + "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", "type": "github" }, "original": { @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1760130406, - "narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=", + "lastModified": 1759337100, + "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", "owner": "nix-community", "repo": "home-manager", - "rev": "d305eece827a3fe317a2d70138f53feccaf890a1", + "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", "type": "github" }, "original": { @@ -253,11 +253,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1759613406, - "narHash": "sha256-PzgQJydp+RlKvwDi807pXPlURdIAVqLppZDga3DwPqg=", + "lastModified": 1759238633, + "narHash": "sha256-4/AtRCQKXuU49ozZZouWuC+T7vCjQh9HAz3N8Tt5OZE=", "owner": "hyprwm", "repo": "contrib", - "rev": "32e1a75b65553daefb419f0906ce19e04815aa3a", + "rev": "513d71d3f42c05d6a38e215382c5a6ce971bd77d", "type": "github" }, "original": { @@ -311,11 +311,11 @@ ] }, "locked": { - "lastModified": 1759490292, - "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=", + "lastModified": 1758192433, + "narHash": "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "9431db625cd9bb66ac55525479dce694101d6d7a", + "rev": "c44e749dd611521dee940d00f7c444ee0ae4cfb7", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1760143218, - "narHash": "sha256-nHgQ3UTtQXzaOBwGqOFJ/zc69IGaT+U1ddFv4CpSjtU=", + "lastModified": 1759399554, + "narHash": "sha256-FB8+mdeMOOCL6JzJ4J7zfsg/lDB/rtxO27tlKtYJIxo=", "ref": "refs/heads/main", - "rev": "d599513d4a72d66ac62ffdedc41d6653fa81b39e", - "revCount": 6493, + "rev": "3bcfa94ee4189faaa4daf661949e88cf28c00d94", + "revCount": 6473, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -462,11 +462,11 @@ ] }, "locked": { - "lastModified": 1759080228, - "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=", + "lastModified": 1757694755, + "narHash": "sha256-j+w5QUUr2QT/jkxgVKecGYV8J7fpzXCMgzEEr6LG9ug=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", + "rev": "5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c", "type": "github" }, "original": { @@ -491,11 +491,11 @@ ] }, "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "lastModified": 1756810301, + "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", "type": "github" }, "original": { @@ -564,11 +564,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1759530592, - "narHash": "sha256-Yk6nDzCXrOehX3At8qdZ0cLr1kPySqACsihMYuP6T8w=", + "lastModified": 1758839867, + "narHash": "sha256-OznWoHDPooORBTueDL0SWkmfvUSHQdHvT7S0z/YVeIs=", "owner": "hyprwm", "repo": "hyprsunset", - "rev": "057feb7a724b7fc0f3a406d6db08b59734db006a", + "rev": "2b50ac5f5c0867fac5aba210d38ec4de4ff1798c", "type": "github" }, "original": { @@ -589,11 +589,11 @@ ] }, "locked": { - "lastModified": 1759619523, - "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=", + "lastModified": 1756117388, + "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef", + "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0", "type": "github" }, "original": { @@ -759,11 +759,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760106635, - "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", + "lastModified": 1759261527, + "narHash": "sha256-wPd5oGvBBpUEzMF0kWnXge0WITNsITx/aGI9qLHgJ4g=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", + "rev": "e087756cf4abbe1a34f3544c480fc1034d68742f", "type": "github" }, "original": { @@ -805,11 +805,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1759570798, - "narHash": "sha256-kbkzsUKYzKhuvMOuxt/aTwWU2mnrwoY964yN3Y4dE98=", + "lastModified": 1758976413, + "narHash": "sha256-hEIDTaIqvW1NMfaNgz6pjhZPZKTmACJmXxGr/H6isIg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d4f673a88f8405ae14484e6a1ea870e0ba4ca26", + "rev": "e3a3b32cc234f1683258d36c6232f150d57df015", "type": "github" }, "original": { @@ -885,11 +885,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1760038930, - "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -933,11 +933,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1760038930, - "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -993,11 +993,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1760182743, - "narHash": "sha256-LKNVE4NOzdOoA820RDJW7TdZvJpriZTCZ/Te/6y/4Mc=", + "lastModified": 1759505545, + "narHash": "sha256-bU6SF7RlOKfCDEMKbxI86uE2KAWNJSKeX67ar3nDX4M=", "owner": "nix-community", "repo": "NUR", - "rev": "38b28652317ec6a2e184bf5a904a7a5b5ea7a87e", + "rev": "c7efa84d747fb3949e4a19f30c10c7ad09bee7da", "type": "github" }, "original": { @@ -1091,11 +1091,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1759635238, - "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=", + "lastModified": 1759188042, + "narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133", + "rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d", "type": "github" }, "original": { diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix index 0343137..f901a81 100644 --- a/hosts/sakura/default.nix +++ b/hosts/sakura/default.nix @@ -57,8 +57,6 @@ 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 7c0f4b8..552b7fd 100644 --- a/modules/home/foot.nix +++ b/modules/home/foot.nix @@ -3,109 +3,19 @@ home.file.".config/foot/foot.ini".text = '' # -*- conf -*- - # 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= + # font=GohuFont 14 Nerd Font Mono:size=9 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 @@ -134,186 +44,5 @@ 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 2f5690a..8ed7e97 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.0" + "eDP-1, 2256x1504@60, 0x0, 1.5" 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 0655e3a..bc693c8 100644 --- a/modules/home/hyprland/displays.conf +++ b/modules/home/hyprland/displays.conf @@ -1,8 +1,4 @@ # monitor=HDMI-A-1,1920x1080@165,0x0,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 +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 diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix index 9b7562b..905cbf1 100644 --- a/modules/home/waybar/default.nix +++ b/modules/home/waybar/default.nix @@ -114,7 +114,7 @@ "custom/devices": { "interval": 60, - "font-size": 18, + "font-size": 14, // "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: 14px; + font-size: 11px; min-height: 26px; /* margin: 0 0px; */ } diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index 38e10dd..6dd6ccc 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -25,7 +25,7 @@ in ROOT_URL = "https://${srv.DOMAIN}/"; HTTP_PORT = 3050; DISABLE_SSH = false; - SSH_PORT = 9123; + SSH_PORT = 2222; }; # You can temporarily allow registration to create an admin user. service.DISABLE_REGISTRATION = true;