sora/nixconfig
1
0
Fork 0
Code Issues 1 Pull Requests Actions Releases Activity

Updates and fixes
Some checks failed
Nix Build / build-nixos (push) Failing after 13s
Details

Browse Source
This commit is contained in:
soraefir 2024-05-18 07:55:03 +02:00
parent bf0aa63936
commit 4ea8a40dbd
Signed by: sora
GPG Key ID: A362EA0491E2EEA0
10 changed files with 83 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
flake.lock generated
View File

@ -46,11 +46,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713946171, "lastModified": 1715653378,
"narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", "narHash": "sha256-6kbg/PI3+SBP17f4T0js3CBsMLVtlD0JqJhDKgzk1mQ=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", "rev": "de8b0d60d6fd34f35abffc46adc94ebaa6996ce2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -162,11 +162,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715380449, "lastModified": 1715486357,
"narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=", "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d7682620185f213df384c363288093b486b2883f", "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -216,17 +216,19 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1715468612, "lastModified": 1715811231,
"narHash": "sha256-AF5bXnJqS7sj9ioJ/X6g1vg91nM9rtpf4iMIdPLjrRc=", "narHash": "sha256-CCzrJXD4uPT375nikYdN2C1LXZD6Q5Lpq8ZyMiZBXAE=",
"owner": "hyprwm", "ref": "refs/heads/main",
"repo": "Hyprland", "rev": "7e8c0b7f30817e0fc217ef769d4be7d406fa2374",
"rev": "33a7b7bb6b307d6e4a093f75ffdda0419cd7ffaf", "revCount": 4701,
"type": "github" "submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
}, },
"original": { "original": {
"owner": "hyprwm", "submodules": true,
"repo": "Hyprland", "type": "git",
"type": "github" "url": "https://github.com/hyprwm/Hyprland"
} }
}, },
"hyprland-protocols": { "hyprland-protocols": {
@ -293,11 +295,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715287423, "lastModified": 1715608589,
"narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=", "narHash": "sha256-vimNaLjLcoNIvBhF37GaB6PRYEvKMamY3UnDE9M5MW8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "e2fc1c0eb8b392110588f478cce644348ead7271", "rev": "65c2636484e5cb00583b8a7446c3fb657f568883",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -327,11 +329,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1715266358, "lastModified": 1715534503,
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f1010e0469db743d14519a1efd37e23f8513d714", "rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -358,11 +360,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1715471078, "lastModified": 1715811610,
"narHash": "sha256-r+Ha1S9eJEvFg2l1Fto4eDmWgrtZvVgP5vli/S6r4Qk=", "narHash": "sha256-JOUT1j8/dxpFSALKDu2xUb3hs/mq2JE40GmpypcNiAk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "8400f61e548792303e73595aeee026701813ca9b", "rev": "683871f948814ca2eb681b7e7b3d36639011e874",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +396,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715244550, "lastModified": 1715482972,
"narHash": "sha256-ffOZL3eaZz5Y1nQ9muC36wBCWwS1hSRLhUzlA9hV2oI=", "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "0dc50257c00ee3c65fef3a255f6564cfbfe6eb7f", "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@ -17,7 +17,7 @@
}; };
hyprland = { hyprland = {
url = "github:hyprwm/Hyprland"; url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
sops-nix = { sops-nix = {

7
modules/home/wayland/apps/eww/bar/css/_clock.scss
View File

@ -17,7 +17,8 @@ calendar {
font-weight: bold; font-weight: bold;
} }
.button { label {
font-size: 20pt;
color: $base0C; color: $base0C;
} }
@ -35,9 +36,6 @@ calendar {
margin-top: -4pt; margin-top: -4pt;
} }
.minute, .hour, .day, .month {
font-size: 20pt;
}
.date { .date {
color: $base0C; color: $base0C;
@ -47,5 +45,4 @@ calendar {
.datetime { .datetime {
padding: $gaps-window; padding: $gaps-window;
} }

16
modules/home/wayland/apps/eww/bar/modules/clock.yuck
View File

@ -11,9 +11,13 @@
(box (box
:orientation "v" :orientation "v"
(button (button
:class "hour" hour) :class "hour"
(label :show-truncated false
:text {hour}))
(button (button
:class "minute" minute)) :class "minute"
(label :show-truncated false
:text {minute})))
(revealer (revealer
:reveal date_rev :reveal date_rev
(box (box
@ -22,11 +26,15 @@
(button (button
:onclick "${EWW_CMD} open --toggle calendar" :onclick "${EWW_CMD} open --toggle calendar"
:onrightclick "${EWW_CMD} open --toggle powermenu" :onrightclick "${EWW_CMD} open --toggle powermenu"
:class "day" day) :class "day"
(label :show-truncated "false"
:text {day}))
(button (button
:onclick "${EWW_CMD} open --toggle calendar" :onclick "${EWW_CMD} open --toggle calendar"
:onrightclick "${EWW_CMD} open --toggle powermenu" :onrightclick "${EWW_CMD} open --toggle powermenu"
:class "month" month)) :class "month"
(label :show-truncated "false"
:text {month})))
) )
) )
) )

1
modules/home/wayland/apps/eww/bar/modules/workspaces.yuck
View File

@ -11,6 +11,7 @@
(button (button
:onclick "hyprctl dispatch workspace ${ws.number}" :onclick "hyprctl dispatch workspace ${ws.number}"
(label (label
:show-truncated false
:class "icon-text ${ws.color}" :class "icon-text ${ws.color}"
:text `${ws.focused ? "󰜗" : "󰝥"}` :text `${ws.focused ? "󰜗" : "󰝥"}`
) )

2
modules/home/wayland/apps/eww/bar/scripts/workspaces
View File

@ -64,7 +64,7 @@ done
generate generate
# main loop # 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 case ${line%>>*} in
"workspace") "workspace")
focusedws=${line#*>>} focusedws=${line#*>>}

5
modules/home/wayland/apps/eww/bar/windows/radio.yuck
View File

@ -101,7 +101,10 @@
:orientation "v" :orientation "v"
(button (button
:onclick "${EWW_CMD} open --toggle --no-daemonize radio" :onclick "${EWW_CMD} open --toggle --no-daemonize radio"
(label :class "icon-text" :text "󰝚") (label
:show-truncated false
:class "icon-text"
:text "󰝚")
) )
) )
) )

46
modules/home/wayland/apps/kanshi/default.nix
View File

@ -4,18 +4,20 @@
services.kanshi = { services.kanshi = {
enable = true; enable = true;
systemdTarget = "graphical-session.target"; systemdTarget = "graphical-session.target";
profiles = { settings = [
tower_0 = { {
outputs = [{ profile.name = "tower_0";
profile.outputs = [{
criteria = "CEX CX133 0x00000001"; criteria = "CEX CX133 0x00000001";
mode = "1920x1200@59.972"; mode = "1920x1200@59.972";
position = "0,0"; position = "0,0";
scale = 1.0; scale = 1.0;
status = "enable"; status = "enable";
}]; }];
}; }
tower_1 = { {
outputs = [{ profile.name = "tower_1";
profile.outputs = [{
criteria = "AOC 16G3 1DDP7HA000348"; criteria = "AOC 16G3 1DDP7HA000348";
mode = "1920x1080@144.000"; mode = "1920x1080@144.000";
position = "0,0"; position = "0,0";
@ -23,9 +25,10 @@
scale = 1.0; scale = 1.0;
adaptiveSync = true; adaptiveSync = true;
}]; }];
}; }
tower_2 = { {
outputs = [ profile.name = "tower_2";
profile.outputs = [
{ {
criteria = "AOC 16G3 1DDP7HA000348"; criteria = "AOC 16G3 1DDP7HA000348";
mode = "1920x1080@144.000"; mode = "1920x1080@144.000";
@ -42,18 +45,20 @@
status = "enable"; status = "enable";
} }
]; ];
}; }
laptop_0 = { {
outputs = [{ profile.name = "laptop_0";
profile.outputs = [{
criteria = "LG Display 0x060A Unknown"; criteria = "LG Display 0x060A Unknown";
mode = "1920x1080@60.020"; mode = "1920x1080@60.020";
position = "0,0"; position = "0,0";
scale = 1.0; scale = 1.0;
status = "enable"; status = "enable";
}]; }];
}; }
laptop_1 = { {
outputs = [ profile.name = "laptop_1";
profile.outputs = [
{ {
criteria = "CEX CX133 0x00000001"; criteria = "CEX CX133 0x00000001";
mode = "2560x1600@59.972"; mode = "2560x1600@59.972";
@ -69,9 +74,10 @@
status = "enable"; status = "enable";
} }
]; ];
}; }
laptop_2 = { {
outputs = [ profile.name = "laptop_2";
profile.outputs = [
{ {
criteria = "AOC 16G3 1DDP7HA000348"; criteria = "AOC 16G3 1DDP7HA000348";
mode = "1920x1080@144.000"; mode = "1920x1080@144.000";
@ -88,8 +94,8 @@
status = "enable"; status = "enable";
} }
]; ];
}; }
}; ];
}; };
}; };
} }

4
modules/nixos/system/xdg/default.nix
View File

@ -23,8 +23,8 @@
GDK_BACKEND = "wayland"; GDK_BACKEND = "wayland";
WLR_NO_HARDWARE_CURSORS = "1"; WLR_NO_HARDWARE_CURSORS = "1";
MOZ_ENABLE_WAYLAND = "1"; MOZ_ENABLE_WAYLAND = "1";
WLR_BACKEND = "vulkan"; # WLR_BACKEND = "vulkan";
WLR_RENDERER = "vulkan"; # WLR_RENDERER = "vulkan";
XCURSOR_SIZE = "24"; XCURSOR_SIZE = "24";
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
}; };

6
overlays/eww/default.nix
View File

@ -2,16 +2,16 @@
let old = prev.eww; let old = prev.eww;
in final.rustPlatform.buildRustPackage rec { in final.rustPlatform.buildRustPackage rec {
pname = "eww"; pname = "eww";
version = "ebe5f349d184e79edc33199d064d9ec5f1e4dd9b"; version = "d1fde927d2799211f791e7ea01cffb667c4f2b60";
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
owner = "elkowar"; owner = "elkowar";
repo = "eww"; repo = "eww";
rev = "${version}"; rev = "${version}";
hash = "sha256-WcAWIvIdGE0tcS7WJ6JlbRlUnKvpvut500NozUmJ6jY="; hash = "sha256-deabn4fdNmJsDxkT6bgCbwB354sUHvkuq+DcdWBU6B8=";
}; };
cargoHash = "sha256-8n21FN6uNj/y/PhCDzpB+1ZifIbpjn4d2YPy4vTcVBM="; cargoHash = "sha256-4KobWHQswFuej6ejdrhmDkYzZL72TBhCkR+F+hrg4ok=";
nativeBuildInputs = old.nativeBuildInputs; nativeBuildInputs = old.nativeBuildInputs;
buildInputs = old.buildInputs ++ [ final.libdbusmenu-gtk3 ]; buildInputs = old.buildInputs ++ [ final.libdbusmenu-gtk3 ];