diff --git a/flake.lock b/flake.lock index fdd5b56..257a092 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1713946171, - "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", + "lastModified": 1715653378, + "narHash": "sha256-6kbg/PI3+SBP17f4T0js3CBsMLVtlD0JqJhDKgzk1mQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", + "rev": "de8b0d60d6fd34f35abffc46adc94ebaa6996ce2", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1715380449, - "narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=", + "lastModified": 1715486357, + "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7682620185f213df384c363288093b486b2883f", + "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", "type": "github" }, "original": { @@ -216,17 +216,19 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1715468612, - "narHash": "sha256-AF5bXnJqS7sj9ioJ/X6g1vg91nM9rtpf4iMIdPLjrRc=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "33a7b7bb6b307d6e4a093f75ffdda0419cd7ffaf", - "type": "github" + "lastModified": 1715811231, + "narHash": "sha256-CCzrJXD4uPT375nikYdN2C1LXZD6Q5Lpq8ZyMiZBXAE=", + "ref": "refs/heads/main", + "rev": "7e8c0b7f30817e0fc217ef769d4be7d406fa2374", + "revCount": 4701, + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" }, "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" } }, "hyprland-protocols": { @@ -293,11 +295,11 @@ ] }, "locked": { - "lastModified": 1715287423, - "narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=", + "lastModified": 1715608589, + "narHash": "sha256-vimNaLjLcoNIvBhF37GaB6PRYEvKMamY3UnDE9M5MW8=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "e2fc1c0eb8b392110588f478cce644348ead7271", + "rev": "65c2636484e5cb00583b8a7446c3fb657f568883", "type": "github" }, "original": { @@ -327,11 +329,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -358,11 +360,11 @@ }, "nur": { "locked": { - "lastModified": 1715471078, - "narHash": "sha256-r+Ha1S9eJEvFg2l1Fto4eDmWgrtZvVgP5vli/S6r4Qk=", + "lastModified": 1715811610, + "narHash": "sha256-JOUT1j8/dxpFSALKDu2xUb3hs/mq2JE40GmpypcNiAk=", "owner": "nix-community", "repo": "nur", - "rev": "8400f61e548792303e73595aeee026701813ca9b", + "rev": "683871f948814ca2eb681b7e7b3d36639011e874", "type": "github" }, "original": { @@ -394,11 +396,11 @@ ] }, "locked": { - "lastModified": 1715244550, - "narHash": "sha256-ffOZL3eaZz5Y1nQ9muC36wBCWwS1hSRLhUzlA9hV2oI=", + "lastModified": 1715482972, + "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0dc50257c00ee3c65fef3a255f6564cfbfe6eb7f", + "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9ded8b8..c8ae309 100755 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ }; hyprland = { - url = "github:hyprwm/Hyprland"; + url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { diff --git a/modules/home/wayland/apps/eww/bar/css/_clock.scss b/modules/home/wayland/apps/eww/bar/css/_clock.scss index 95f8ad0..726f2d1 100644 --- a/modules/home/wayland/apps/eww/bar/css/_clock.scss +++ b/modules/home/wayland/apps/eww/bar/css/_clock.scss @@ -17,7 +17,8 @@ calendar { font-weight: bold; } - .button { + label { + font-size: 20pt; color: $base0C; } @@ -35,9 +36,6 @@ calendar { margin-top: -4pt; } -.minute, .hour, .day, .month { - font-size: 20pt; -} .date { color: $base0C; @@ -47,5 +45,4 @@ calendar { .datetime { padding: $gaps-window; - } \ No newline at end of file diff --git a/modules/home/wayland/apps/eww/bar/modules/clock.yuck b/modules/home/wayland/apps/eww/bar/modules/clock.yuck index ba5a46e..9963d82 100644 --- a/modules/home/wayland/apps/eww/bar/modules/clock.yuck +++ b/modules/home/wayland/apps/eww/bar/modules/clock.yuck @@ -10,10 +10,14 @@ (overlay (box :orientation "v" - (button - :class "hour" hour) - (button - :class "minute" minute)) + (button + :class "hour" + (label :show-truncated false + :text {hour})) + (button + :class "minute" + (label :show-truncated false + :text {minute}))) (revealer :reveal date_rev (box @@ -22,11 +26,15 @@ (button :onclick "${EWW_CMD} open --toggle calendar" :onrightclick "${EWW_CMD} open --toggle powermenu" - :class "day" day) + :class "day" + (label :show-truncated "false" + :text {day})) (button :onclick "${EWW_CMD} open --toggle calendar" :onrightclick "${EWW_CMD} open --toggle powermenu" - :class "month" month)) + :class "month" + (label :show-truncated "false" + :text {month}))) ) ) ) diff --git a/modules/home/wayland/apps/eww/bar/modules/workspaces.yuck b/modules/home/wayland/apps/eww/bar/modules/workspaces.yuck index dc4ac18..130d870 100644 --- a/modules/home/wayland/apps/eww/bar/modules/workspaces.yuck +++ b/modules/home/wayland/apps/eww/bar/modules/workspaces.yuck @@ -11,6 +11,7 @@ (button :onclick "hyprctl dispatch workspace ${ws.number}" (label + :show-truncated false :class "icon-text ${ws.color}" :text `${ws.focused ? "󰜗" : "󰝥"}` ) diff --git a/modules/home/wayland/apps/eww/bar/scripts/workspaces b/modules/home/wayland/apps/eww/bar/scripts/workspaces index 359a7f1..7ef1fc3 100755 --- a/modules/home/wayland/apps/eww/bar/scripts/workspaces +++ b/modules/home/wayland/apps/eww/bar/scripts/workspaces @@ -64,7 +64,7 @@ done generate # main loop -socat -u UNIX-CONNECT:/tmp/hypr/"$HYPRLAND_INSTANCE_SIGNATURE"/.socket2.sock - | rg --line-buffered "workspace|mon(itor)?" | while read -r line; do +socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/"$HYPRLAND_INSTANCE_SIGNATURE"/.socket2.sock - | rg --line-buffered "workspace|mon(itor)?" | while read -r line; do case ${line%>>*} in "workspace") focusedws=${line#*>>} diff --git a/modules/home/wayland/apps/eww/bar/windows/radio.yuck b/modules/home/wayland/apps/eww/bar/windows/radio.yuck index eb0825c..08b8aae 100644 --- a/modules/home/wayland/apps/eww/bar/windows/radio.yuck +++ b/modules/home/wayland/apps/eww/bar/windows/radio.yuck @@ -101,7 +101,10 @@ :orientation "v" (button :onclick "${EWW_CMD} open --toggle --no-daemonize radio" - (label :class "icon-text" :text "󰝚") + (label + :show-truncated false + :class "icon-text" + :text "󰝚") ) ) ) diff --git a/modules/home/wayland/apps/kanshi/default.nix b/modules/home/wayland/apps/kanshi/default.nix index 3813f31..b2af793 100644 --- a/modules/home/wayland/apps/kanshi/default.nix +++ b/modules/home/wayland/apps/kanshi/default.nix @@ -4,18 +4,20 @@ services.kanshi = { enable = true; systemdTarget = "graphical-session.target"; - profiles = { - tower_0 = { - outputs = [{ + settings = [ + { + profile.name = "tower_0"; + profile.outputs = [{ criteria = "CEX CX133 0x00000001"; mode = "1920x1200@59.972"; position = "0,0"; scale = 1.0; status = "enable"; }]; - }; - tower_1 = { - outputs = [{ + } + { + profile.name = "tower_1"; + profile.outputs = [{ criteria = "AOC 16G3 1DDP7HA000348"; mode = "1920x1080@144.000"; position = "0,0"; @@ -23,9 +25,10 @@ scale = 1.0; adaptiveSync = true; }]; - }; - tower_2 = { - outputs = [ + } + { + profile.name = "tower_2"; + profile.outputs = [ { criteria = "AOC 16G3 1DDP7HA000348"; mode = "1920x1080@144.000"; @@ -42,18 +45,20 @@ status = "enable"; } ]; - }; - laptop_0 = { - outputs = [{ + } + { + profile.name = "laptop_0"; + profile.outputs = [{ criteria = "LG Display 0x060A Unknown"; mode = "1920x1080@60.020"; position = "0,0"; scale = 1.0; status = "enable"; }]; - }; - laptop_1 = { - outputs = [ + } + { + profile.name = "laptop_1"; + profile.outputs = [ { criteria = "CEX CX133 0x00000001"; mode = "2560x1600@59.972"; @@ -69,9 +74,10 @@ status = "enable"; } ]; - }; - laptop_2 = { - outputs = [ + } + { + profile.name = "laptop_2"; + profile.outputs = [ { criteria = "AOC 16G3 1DDP7HA000348"; mode = "1920x1080@144.000"; @@ -88,8 +94,8 @@ status = "enable"; } ]; - }; - }; + } + ]; }; }; } diff --git a/modules/nixos/system/xdg/default.nix b/modules/nixos/system/xdg/default.nix index 595c201..5f0355e 100644 --- a/modules/nixos/system/xdg/default.nix +++ b/modules/nixos/system/xdg/default.nix @@ -23,8 +23,8 @@ GDK_BACKEND = "wayland"; WLR_NO_HARDWARE_CURSORS = "1"; MOZ_ENABLE_WAYLAND = "1"; - WLR_BACKEND = "vulkan"; - WLR_RENDERER = "vulkan"; + # WLR_BACKEND = "vulkan"; + # WLR_RENDERER = "vulkan"; XCURSOR_SIZE = "24"; NIXOS_OZONE_WL = "1"; }; diff --git a/overlays/eww/default.nix b/overlays/eww/default.nix index 5f383db..61d5ca5 100644 --- a/overlays/eww/default.nix +++ b/overlays/eww/default.nix @@ -2,16 +2,16 @@ let old = prev.eww; in final.rustPlatform.buildRustPackage rec { pname = "eww"; - version = "ebe5f349d184e79edc33199d064d9ec5f1e4dd9b"; + version = "d1fde927d2799211f791e7ea01cffb667c4f2b60"; src = prev.fetchFromGitHub { owner = "elkowar"; repo = "eww"; rev = "${version}"; - hash = "sha256-WcAWIvIdGE0tcS7WJ6JlbRlUnKvpvut500NozUmJ6jY="; + hash = "sha256-deabn4fdNmJsDxkT6bgCbwB354sUHvkuq+DcdWBU6B8="; }; - cargoHash = "sha256-8n21FN6uNj/y/PhCDzpB+1ZifIbpjn4d2YPy4vTcVBM="; + cargoHash = "sha256-4KobWHQswFuej6ejdrhmDkYzZL72TBhCkR+F+hrg4ok="; nativeBuildInputs = old.nativeBuildInputs; buildInputs = old.buildInputs ++ [ final.libdbusmenu-gtk3 ];