diff --git a/flake.lock b/flake.lock index e0ae06e..5c856bf 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1774186997, - "narHash": "sha256-hyNVlhAqmwcBPl7XRkxbGcMt1BfCOdvuEfBDUf0k8Oo=", + "lastModified": 1778493762, + "narHash": "sha256-PG7vz7Dk3U3hB8OXtIS3bJ4QmJEw08ycFprJuAO7YS0=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "546e95f7ec74892a31f883a10b1723c35f2c2edd", + "rev": "75aac6845b47e913b53c2a0af7fd124fdb8fe84a", "type": "github" }, "original": { @@ -23,7 +23,7 @@ "ags": { "inputs": { "astal": "astal", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1744557573, @@ -132,11 +132,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1760703920, - "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", + "lastModified": 1776754714, + "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "d646af9b7d14bff08824538164af99d0c521b185", + "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", "type": "github" }, "original": { @@ -165,11 +165,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1776136500, + "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7", "type": "github" }, "original": { @@ -218,11 +218,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -290,20 +290,18 @@ "gnome-shell": { "flake": false, "locked": { - "host": "gitlab.gnome.org", "lastModified": 1767737596, "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "gitlab" + "type": "github" }, "original": { - "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "gnome-49", "repo": "gnome-shell", - "type": "gitlab" + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "type": "github" } }, "home-manager": { @@ -313,11 +311,11 @@ ] }, "locked": { - "lastModified": 1774647770, - "narHash": "sha256-UNNi14XiqRWWjO8ykbFwA5wRwx7EscsC+GItOVpuGjc=", + "lastModified": 1778954430, + "narHash": "sha256-oaNyOr05lblaQdtbkbN1wO0b2KLIL2O1LkmwDgdQp4I=", "owner": "nix-community", "repo": "home-manager", - "rev": "02371c05a04a2876cf92e2d67a259e8f87399068", + "rev": "26aaab785b0bab4af60a2c42b22760fa906ef22a", "type": "github" }, "original": { @@ -395,7 +393,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" @@ -478,11 +476,11 @@ ] }, "locked": { - "lastModified": 1771865848, - "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=", + "lastModified": 1778926589, + "narHash": "sha256-IX6e5ggQi60UChhDJx6wsczbPRCEE8WZbEtlDMazLmU=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960", + "rev": "f1569efa6a939fd68cee605d2a34d0db3af5d879", "type": "github" }, "original": { @@ -678,11 +676,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770841267, - "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -710,11 +708,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1774388614, - "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=", + "lastModified": 1778737229, + "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e", + "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", "type": "github" }, "original": { @@ -725,22 +723,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1743583204, "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", @@ -756,7 +738,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1772542754, "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", @@ -772,29 +754,29 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1774386573, - "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "lastModified": 1776718653, + "narHash": "sha256-eU5yaR3OY3jrvxpQlKUWyGzYovBZ0UB4EdZelq1Hq1g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "rev": "5a5f98738120adbb3d2753087b17839a45701cbe", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "5a5f98738120adbb3d2753087b17839a45701cbe", "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { - "lastModified": 1773840656, - "narHash": "sha256-9tpvMGFteZnd3gRQZFlRCohVpqooygFuy9yjuyRL2C0=", + "lastModified": 1775888245, + "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9cf7092bdd603554bd8b63c216e8943cf9b12512", + "rev": "13043924aaa7375ce482ebe2494338e058282925", "type": "github" }, "original": { @@ -804,13 +786,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { - "lastModified": 1767767207, - "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -820,13 +802,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { - "lastModified": 1772419343, - "narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=", + "lastModified": 1776329215, + "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9", + "rev": "b86751bc4085f48661017fa226dee99fab6c651b", "type": "github" }, "original": { @@ -848,11 +830,11 @@ ] }, "locked": { - "lastModified": 1767810917, - "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", + "lastModified": 1777598946, + "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=", "owner": "nix-community", "repo": "NUR", - "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", + "rev": "5d55af01c0f86be583931fe99207fc56c14134b3", "type": "github" }, "original": { @@ -891,42 +873,46 @@ "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-pinned": "nixpkgs-pinned", "nixpkgs-stable": "nixpkgs-stable", "russia-blocked-geoip": "russia-blocked-geoip", "sops-nix": "sops-nix", "stylix": "stylix", - "yazi": "yazi" + "yazi": "yazi", + "yazi-plugins": "yazi-plugins" } }, "russia-blocked-geoip": { "flake": false, "locked": { - "lastModified": 1774691120, - "narHash": "sha256-iy2Uvqrr/7nOLznDNdyV5T5aee7Y+3nMNmoGIjpeUFE=", + "lastModified": 1777481212, + "narHash": "sha256-NCkYOw4OM3xBv/TCmhGCm7lH+QkpetbUOYbQnOs9nRg=", "owner": "runetfreedom", "repo": "russia-blocked-geoip", - "rev": "433641f6807cdaa56c731125b5a367da512987e4", + "rev": "bbe32b96712342ae479ac598fb1a939b59d586c2", "type": "github" }, "original": { "owner": "runetfreedom", - "ref": "release", "repo": "russia-blocked-geoip", + "rev": "bbe32b96712342ae479ac598fb1a939b59d586c2", "type": "github" } }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "aagl", + "nixpkgs" + ] }, "locked": { - "lastModified": 1770952264, - "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=", + "lastModified": 1777605393, + "narHash": "sha256-Hjp0VOOHgHcTrX23iVvnfAudPcuCmfkfpQNFwv2v/ks=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188", + "rev": "ff88db34cfa486fc4964a6991cab1678d82eee8c", "type": "github" }, "original": { @@ -943,11 +929,11 @@ ] }, "locked": { - "lastModified": 1772420823, - "narHash": "sha256-q3oVwz1Rx41D1D+F6vg41kpOkk3Zi3KwnkHEZp7DCGs=", + "lastModified": 1776741231, + "narHash": "sha256-k9G98qzn+7npROUaks8VqCFm7cFtEG8ulQLBBo5lItg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "458eea8d905c609e9d889423e6b8a1c7bc2f792c", + "rev": "02061303f7c4c964f7b4584dabd9e985b4cd442b", "type": "github" }, "original": { @@ -958,14 +944,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1774303811, - "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -983,21 +969,20 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nur": "nur", "systems": "systems_2", - "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1774124764, - "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=", + "lastModified": 1778776709, + "narHash": "sha256-YhnEcpiY6+l3RFA+cPmdTaeODGvNRuqE8B7VBjPVIxo=", "owner": "danth", "repo": "stylix", - "rev": "e31c79f571c5595a155f84b9d77ce53a84745494", + "rev": "e8ea85b4f7dddda9603e0f1ac86cd92cee3b2819", "type": "github" }, "original": { @@ -1051,23 +1036,6 @@ "type": "github" } }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, "tinted-kitty": { "flake": false, "locked": { @@ -1087,11 +1055,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767710407, - "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", + "lastModified": 1777041405, + "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=", "owner": "tinted-theming", "repo": "schemes", - "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", + "rev": "5f868b3a338b6904c47f3833b9c411be641983a8", "type": "github" }, "original": { @@ -1103,11 +1071,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1777169200, + "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac", "type": "github" }, "original": { @@ -1119,11 +1087,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1777463218, + "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae", "type": "github" }, "original": { @@ -1176,15 +1144,15 @@ "yazi": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1774567340, - "narHash": "sha256-skKD1hvAvilKkK406RgNl6X/YJgkSsoZmtHmdfeoyWI=", + "lastModified": 1778801438, + "narHash": "sha256-TtawbMZ+tgKAiDpkJJw7m2OLOJHUbRZB0xLDXBxTPck=", "owner": "sxyazi", "repo": "yazi", - "rev": "935eb6b2989f8a7ce219a2a71a539365c8dccfbb", + "rev": "3f5cc47a4852cbffbd8536507ae7499d3da1f0b7", "type": "github" }, "original": { @@ -1192,6 +1160,22 @@ "repo": "yazi", "type": "github" } + }, + "yazi-plugins": { + "flake": false, + "locked": { + "lastModified": 1778691457, + "narHash": "sha256-cZlnrlgv8+SFeNgIW69q//i/apcpvAv41q5W8bJwVaI=", + "owner": "yazi-rs", + "repo": "plugins", + "rev": "5d5c4803dd12bab4e4f19d606f8db0c871e6bec5", + "type": "github" + }, + "original": { + "owner": "yazi-rs", + "repo": "plugins", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7e5270a..6b936a1 100644 --- a/flake.nix +++ b/flake.nix @@ -20,13 +20,18 @@ inputs = { aagl.url = "github:ezKEa/aagl-gtk-on-nix"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/5a5f98738120adbb3d2753087b17839a45701cbe"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-pinned.url = "github:nixos/nixpkgs/2d293cbfa5a793b4c50d17c05ef9e385b90edf6c"; sops-nix.url = "github:Mic92/sops-nix"; stylix.url = "github:danth/stylix"; ags.url = "github:Aylur/ags/3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6"; + yazi.url = "github:sxyazi/yazi"; + yazi-plugins = { + url = "github:yazi-rs/plugins"; + flake = false; + }; hyprland.url = "github:hyprwm/Hyprland/v0.54.2-b"; hyprland-plugins = { @@ -40,7 +45,7 @@ }; russia-blocked-geoip = { - url = "github:runetfreedom/russia-blocked-geoip/release"; + url = "github:runetfreedom/russia-blocked-geoip/bbe32b96712342ae479ac598fb1a939b59d586c2"; flake = false; }; }; diff --git a/modules/user/ags.nix b/modules/user/ags.nix index 81bae25..b2b28a2 100644 --- a/modules/user/ags.nix +++ b/modules/user/ags.nix @@ -6,7 +6,7 @@ configDir = null; - extraPackages = with inputs.ags.packages.${pkgs.system}; [ + extraPackages = with inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}; [ battery mpris hyprland diff --git a/modules/user/hyprland.nix b/modules/user/hyprland.nix index 87b8d32..417233f 100644 --- a/modules/user/hyprland.nix +++ b/modules/user/hyprland.nix @@ -15,16 +15,18 @@ in { wl-clipboard wl-clip-persist xclip + awww ]; wayland.windowManager.hyprland = let colors = config.lib.stylix.colors; in { enable = true; + configType = "hyprlang"; xwayland.enable = true; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; - plugins = with inputs.hyprland-plugins.packages.${pkgs.system}; [ + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + plugins = with inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}; [ # hyprbars # Version mismatch ]; @@ -113,7 +115,7 @@ in { exec-once = lib.mkBefore [ "systemctl --user start plasma-polkit-agent" - "${lib.getExe' pkgs.swww "swww-daemon"}" + "awww-daemon" "wl-clip-persist --clipboard both" "clipse -listen" "${lib.getExe' pkgs.udiskie "udiskie"}" diff --git a/modules/user/packages/desktop.nix b/modules/user/packages/desktop.nix index 28b99b6..df69576 100644 --- a/modules/user/packages/desktop.nix +++ b/modules/user/packages/desktop.nix @@ -1,6 +1,6 @@ -{ pkgs, pkgs-pinned, inputs, ... }: { +{ pkgs, ... }: { home.packages = with pkgs; [ - pkgs-pinned.ayugram-desktop + ayugram-desktop vesktop obs-studio mpv diff --git a/modules/user/yazi.nix b/modules/user/yazi.nix index a26004d..543a35e 100644 --- a/modules/user/yazi.nix +++ b/modules/user/yazi.nix @@ -25,7 +25,7 @@ }; plugin = { preloaders = [ - { name = "*.crdownload"; run = "noop"; } + { url = "*.crdownload"; run = "noop"; } ]; prepend_previewers = [ @@ -37,28 +37,51 @@ ]; prepend_fetchers = [ - { id = "git"; mime = "*"; run = "git"; } + { group = "git"; url = "*"; run = "git"; } ]; }; }; - plugins = with pkgs.yaziPlugins; { + plugins = let + yaziPlugin = name: pkgs.stdenvNoCC.mkDerivation { + pname = "${name}.yazi"; + version = "unstable"; + src = inputs.yazi-plugins; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r ${name}.yazi/* $out/ + rm -f $out/LICENSE + cp LICENSE $out/LICENSE + runHook postInstall + ''; + }; + in with pkgs.yaziPlugins; { inherit chmod ouch - full-border - starship mount - git toggle-pane - ; + ; + + full-border = { + package = yaziPlugin "full-border"; + setup = true; + }; + + starship = { + package = starship; + setup = true; + }; + + git = { + package = git; + setup = true; + }; }; initLua = '' - require("git"):setup() - require("full-border"):setup() - require("starship"):setup() - Status:children_add(function() local h = cx.active.current.hovered if not h or ya.target_family() ~= "unix" then @@ -83,7 +106,7 @@ } { on = "Y"; - run = ''shell -- for path in "$@"; do echo "file://$path"; done | wl-copy -t text/uri-list''; + run = ''shell -- for path in %s; do echo "file://$path"; done | wl-copy -t text/uri-list''; desc = "Copy files into system clipboard"; } { diff --git a/user/chest/modules/style.nix b/user/chest/modules/style.nix index 3b5c3f7..df13b72 100644 --- a/user/chest/modules/style.nix +++ b/user/chest/modules/style.nix @@ -80,6 +80,8 @@ in { stylix = { enable = true; + overlays.enable = false; + targets = { hyprland.enable = false; waybar.enable = false; diff --git a/user/common.nix b/user/common.nix index e9f0abb..e085b3b 100644 --- a/user/common.nix +++ b/user/common.nix @@ -57,7 +57,7 @@ services.greetd = let tuigreet = lib.getExe pkgs.tuigreet; - session = lib.getExe' inputs.hyprland.packages.${pkgs.system}.default "start-hyprland"; + session = lib.getExe' inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.default "start-hyprland"; in { enable = true; settings = { diff --git a/user/sweetbread/modules/hyprland.nix b/user/sweetbread/modules/hyprland.nix index 37a78b3..7f666e2 100644 --- a/user/sweetbread/modules/hyprland.nix +++ b/user/sweetbread/modules/hyprland.nix @@ -49,7 +49,7 @@ filename = choice(listdir(folder)) finally: - system(f"${lib.getExe pkgs.swww} img {folder}/{filename} --transition-type center") + system(f"awww img {folder}/{filename} --transition-type center") ''; in { settings = { diff --git a/user/sweetbread/modules/style.nix b/user/sweetbread/modules/style.nix index 413ae6c..9aa63f3 100644 --- a/user/sweetbread/modules/style.nix +++ b/user/sweetbread/modules/style.nix @@ -83,6 +83,8 @@ in { # { stylix = { enable = true; + overlays.enable = false; + targets = { hyprpaper.enable = lib.mkForce false; waybar.enable = false;