diff --git a/flake.lock b/flake.lock index e69d731..9e03233 100755 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,38 @@ { "nodes": { + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1738456976, + "narHash": "sha256-cufyHbOMnSt9V4w4OVSzNcpJ+8DwzRZRJaca2Q89KVI=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "257b2050790ab3b1eb389e0f8bdc400eb9510139", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "buildbot-nix": { "inputs": { "flake-parts": "flake-parts_2", @@ -39,6 +72,21 @@ "type": "github" } }, + "crane_2": { + "locked": { + "lastModified": 1736898272, + "narHash": "sha256-D10wlrU/HCpSRcb3a7yk+bU3ggpMD1kGbseKtO+7teo=", + "owner": "ipetkov", + "repo": "crane", + "rev": "6a589f034202a7c6e10bce6c5d1d392d7bc0f340", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "dream2nix": { "inputs": { "nixpkgs": [ @@ -128,6 +176,37 @@ }, "flake-compat_5": { "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_7": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -243,7 +322,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -282,7 +361,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -321,11 +400,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1738275804, - "narHash": "sha256-n9cSCLlWjc8Bc5QyZYLo5+c6MfTZjgDpUGx/FGxBiY8=", + "lastModified": 1738619868, + "narHash": "sha256-q4h4SY1kVkZG4t/59CmJvaKjlx+xjojhdU1HqxiQhrQ=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "c5508e7d1922842ecd3160ea73b97da1282168b3", + "rev": "f0d276062b78658fc1f3857e9ea104788f1f4e58", "type": "github" }, "original": { @@ -335,6 +414,28 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "hyprland", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "ngipkgs", @@ -356,7 +457,7 @@ "type": "github" } }, - "gitignore_2": { + "gitignore_3": { "inputs": { "nixpkgs": [ "pre-commit-hooks-nix", @@ -387,11 +488,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1738547365, - "narHash": "sha256-4GrVwyIZKx14eVG8TZMKmgyw8v3TuETPrLvYkFNqlyc=", + "lastModified": 1738625866, + "narHash": "sha256-0GibVm6Pfm99Lu5fcH68YGa3jO0zUdoO+V3DqmAcJTc=", "owner": "helix-editor", "repo": "helix", - "rev": "066e938ba083c0259ff411b681eca7bad30980df", + "rev": "8995ccaae25b1af2e052d0d78ed74e7d225dec5a", "type": "github" }, "original": { @@ -434,11 +535,11 @@ ] }, "locked": { - "lastModified": 1738448366, - "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", + "lastModified": 1738610386, + "narHash": "sha256-yb6a5efA1e8xze1vcdN2HBxqYr340EsxFMrDUHL3WZM=", "owner": "nix-community", "repo": "home-manager", - "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", + "rev": "066ba0c5cfddbc9e0dddaec73b1561ad38aa8abe", "type": "github" }, "original": { @@ -447,6 +548,396 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1738178255, + "narHash": "sha256-+D6Nu2ewXbMTFzx/Q4jDOo+LAOUPr0cxQJg5k33daIE=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "dcadd3398abe146d60c67e0d9ee6e27b301cae82", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1738437059, + "narHash": "sha256-J+8ecqaP3zD9GHeN8Y4hUapoELSoggp0IZI8laTFt/0=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "5ac80e3686a4dfa55d2bd15c81a266b89594a295", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, + "hyprland": { + "inputs": { + "aquamarine": "aquamarine", + "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", + "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks", + "systems": "systems_3", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1738622170, + "narHash": "sha256-M9lm/lbT10cOXcfMMEzRFLehDlVWnkiy38xVDPWyqk4=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "5e7292434a9189d0550187f8a6fb687848194a41", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-portal": { + "inputs": { + "hyprland-protocols": "hyprland-protocols_2", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner_2", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_4" + }, + "locked": { + "lastModified": 1737634991, + "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-protocols_2": { + "inputs": { + "nixpkgs": [ + "hyprland-portal", + "nixpkgs" + ], + "systems": [ + "hyprland-portal", + "systems" + ] + }, + "locked": { + "lastModified": 1737556638, + "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-qt-support": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1737634706, + "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "rev": "8810df502cdee755993cb803eba7b23f189db795", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "type": "github" + } + }, + "hyprland-qtutils": { + "inputs": { + "hyprland-qt-support": "hyprland-qt-support", + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-qtutils", + "hyprlang", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1737981711, + "narHash": "sha256-lh6cL5D8nPplB3WovCQjLUZ7k7MViiBrMlpkfm4R7/c=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "96bf0677fa9cd13508294e3d4559dfbbc8beff73", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, + "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { + "inputs": { + "hyprutils": [ + "hyprland-portal", + "hyprutils" + ], + "nixpkgs": [ + "hyprland-portal", + "nixpkgs" + ], + "systems": [ + "hyprland-portal", + "systems" + ] + }, + "locked": { + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1737978343, + "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprland-portal", + "nixpkgs" + ], + "systems": [ + "hyprland-portal", + "systems" + ] + }, + "locked": { + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "hyprland-portal", + "nixpkgs" + ], + "systems": [ + "hyprland-portal", + "systems" + ] + }, + "locked": { + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "lix": { "flake": false, "locked": { @@ -489,9 +980,9 @@ "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable_2", - "pre-commit-hooks": "pre-commit-hooks", + "pre-commit-hooks": "pre-commit-hooks_2", "sops-nix": "sops-nix", - "systems": "systems_4" + "systems": "systems_6" }, "locked": { "lastModified": 1738530522, @@ -573,11 +1064,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1738546358, + "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914", "type": "github" }, "original": { @@ -627,8 +1118,53 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks-nix": { + "inputs": { + "flake-compat": "flake-compat_5", + "gitignore": "gitignore_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_4", + "gitignore": "gitignore_2", "nixpkgs": [ "ngipkgs", "nixpkgs" @@ -648,31 +1184,9 @@ "type": "github" } }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "purescript-overlay": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "nixpkgs": [ "ngipkgs", "dream2nix", @@ -717,15 +1231,18 @@ "ghostty": "ghostty", "helix": "helix", "home-manager": "home-manager", + "hyprland": "hyprland", + "hyprland-portal": "hyprland-portal", "lix-module": "lix-module", "ngipkgs": "ngipkgs", "nixpkgs": "nixpkgs_2", "nur": "nur", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "sops-nix": "sops-nix_2", - "systems": "systems_5", + "systems": "systems_7", "waybar": "waybar", - "yazi": "yazi" + "yazi": "yazi", + "zed-editor": "zed-editor" } }, "rust-overlay": { @@ -770,6 +1287,27 @@ "type": "github" } }, + "rust-overlay_3": { + "inputs": { + "nixpkgs": [ + "zed-editor", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737166965, + "narHash": "sha256-vlDROBAgq+7PEVM0vaS2zboY6DXs3oKK0qW/1dVuFs4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "fc839c9d5d1ebc789b4657c43c4d54838c7c01de", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "slimlock": { "inputs": { "nixpkgs": [ @@ -866,16 +1404,16 @@ }, "systems_3": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -895,6 +1433,36 @@ } }, "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_7": { "locked": { "lastModified": 1680978846, "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", @@ -909,7 +1477,7 @@ "type": "github" } }, - "systems_6": { + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -969,7 +1537,7 @@ }, "waybar": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "nixpkgs": [ "nixpkgs" ] @@ -988,6 +1556,47 @@ "type": "github" } }, + "xdph": { + "inputs": { + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1737634991, + "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } + }, "yazi": { "inputs": { "flake-utils": "flake-utils_5", @@ -995,11 +1604,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1738314122, - "narHash": "sha256-lyA97h4cKYgX/RX2IDw1J3XWCj9rC4v2yW70nEX2wYo=", + "lastModified": 1738657731, + "narHash": "sha256-TfqSe8oywhZEIBs//PI7WXy+PtfkJTEbmFJ5tfXHvcM=", "owner": "sxyazi", "repo": "yazi", - "rev": "c41f2e21e039c068d4ae1d286f2a8a9eef182895", + "rev": "4e96341f512522d948977f5dc97a32c0c88f447b", "type": "github" }, "original": { @@ -1008,6 +1617,29 @@ "type": "github" } }, + "zed-editor": { + "inputs": { + "crane": "crane_2", + "flake-compat": "flake-compat_7", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1738656328, + "narHash": "sha256-bxFVQC8OuL2pdz4DYb8s0y+1pSftXGc375PDO0ZQRtk=", + "owner": "zed-industries", + "repo": "zed", + "rev": "386cfacb25aae8e89d337f2893f5f8ec14cfee6b", + "type": "github" + }, + "original": { + "owner": "zed-industries", + "repo": "zed", + "type": "github" + } + }, "zig": { "inputs": { "flake-compat": [ diff --git a/flake.nix b/flake.nix index 88e74d6..9044be5 100755 --- a/flake.nix +++ b/flake.nix @@ -41,8 +41,19 @@ url = "github:Alexays/Waybar"; inputs.nixpkgs.follows = "nixpkgs"; }; + hyprland = { + url = "github:hyprwm/Hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hyprland-portal = { + url = "github:hyprwm/xdg-desktop-portal-hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + zed-editor = { + url = "github:zed-industries/zed"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } { @@ -65,6 +76,7 @@ ./profiles/user1 config.nixosModules.desktop config.nixosModules.hyprland + config.nixosModules.wayland config.nixosModules.personal config.nixosModules.shared config.nixosModules.sops diff --git a/home/default.nix b/home/default.nix index f61d53d..b27c8f2 100755 --- a/home/default.nix +++ b/home/default.nix @@ -50,7 +50,9 @@ in messaging sharing tools - hypr + hyprland + wayland + theming ; }; }; diff --git a/home/modules/gui/apps/code/cursor/default.nix b/home/modules/gui/apps/code/cursor/default.nix new file mode 100755 index 0000000..d723b2a --- /dev/null +++ b/home/modules/gui/apps/code/cursor/default.nix @@ -0,0 +1,11 @@ +{ + pkgs, + ... +}: +{ + home.packages = builtins.attrValues { + inherit (pkgs) + code-cursor + ; + }; +} diff --git a/home/modules/gui/apps/code/zed/default.nix b/home/modules/gui/apps/code/zed/default.nix index 2eca104..7d2d81f 100755 --- a/home/modules/gui/apps/code/zed/default.nix +++ b/home/modules/gui/apps/code/zed/default.nix @@ -18,10 +18,12 @@ let ; }; extraPackagesPath = import (configPath + /extraPackages) { inherit pkgs; }; + packagePath = flake.inputs.zed-editor.packages.${pkgs.system}.default; in { programs.zed-editor = { enable = true; + # package = packagePath; extraPackages = extraPackagesPath; extensions = extensionsPath; userKeymaps = userKeymapsPath; diff --git a/home/modules/gui/apps/messaging/discord/default.nix b/home/modules/gui/apps/messaging/discord/default.nix index 29513ac..f106bc5 100755 --- a/home/modules/gui/apps/messaging/discord/default.nix +++ b/home/modules/gui/apps/messaging/discord/default.nix @@ -1,11 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in { - pkgs, - ... -}: -{ - home.packages = builtins.attrValues { - inherit (pkgs) - discord - ; - }; + imports = importList; } diff --git a/home/modules/gui/apps/messaging/discord/discordCanary/default.nix b/home/modules/gui/apps/messaging/discord/discordCanary/default.nix new file mode 100644 index 0000000..35e1320 --- /dev/null +++ b/home/modules/gui/apps/messaging/discord/discordCanary/default.nix @@ -0,0 +1,11 @@ +{ + pkgs, + ... +}: +{ + home.packages = builtins.attrValues { + inherit (pkgs) + discord-canary + ; + }; +} diff --git a/home/modules/gui/apps/messaging/discord/discordOfficial/default.nix b/home/modules/gui/apps/messaging/discord/discordOfficial/default.nix new file mode 100755 index 0000000..29513ac --- /dev/null +++ b/home/modules/gui/apps/messaging/discord/discordOfficial/default.nix @@ -0,0 +1,11 @@ +{ + pkgs, + ... +}: +{ + home.packages = builtins.attrValues { + inherit (pkgs) + discord + ; + }; +} diff --git a/home/modules/gui/apps/messaging/vesktop/default.nix b/home/modules/gui/apps/messaging/discord/vesktop/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/vesktop/default.nix rename to home/modules/gui/apps/messaging/discord/vesktop/default.nix diff --git a/home/modules/gui/apps/messaging/discord/webcord/default.nix b/home/modules/gui/apps/messaging/discord/webcord/default.nix new file mode 100644 index 0000000..136b7d0 --- /dev/null +++ b/home/modules/gui/apps/messaging/discord/webcord/default.nix @@ -0,0 +1,11 @@ +{ + pkgs, + ... +}: +{ + home.packages = builtins.attrValues { + inherit (pkgs) + webcord + ; + }; +} diff --git a/home/modules/gui/apps/messaging/matrix/default.nix b/home/modules/gui/apps/messaging/matrix/default.nix new file mode 100755 index 0000000..f106bc5 --- /dev/null +++ b/home/modules/gui/apps/messaging/matrix/default.nix @@ -0,0 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in +{ + imports = importList; +} diff --git a/home/modules/gui/apps/messaging/element/default.nix b/home/modules/gui/apps/messaging/matrix/element/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/element/default.nix rename to home/modules/gui/apps/messaging/matrix/element/default.nix diff --git a/home/modules/gui/apps/messaging/nheko/default.nix b/home/modules/gui/apps/messaging/matrix/nheko/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/nheko/default.nix rename to home/modules/gui/apps/messaging/matrix/nheko/default.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/bind.nix b/home/modules/gui/desktop/hypr/hyprland/config/bind.nix index 20f79a5..c5d14c7 100755 --- a/home/modules/gui/desktop/hypr/hyprland/config/bind.nix +++ b/home/modules/gui/desktop/hypr/hyprland/config/bind.nix @@ -10,14 +10,14 @@ let superBinds = builtins.map (x: "SUPER, " + x) [ # Apps "Space, exec, rm -r /home/$USER/.cache/tofi* ; tofi-drun" - "C, exec, zed" + "C, exec, zeditor" "A, exec, obsidian" "D, exec, ghostty -e zellij a dotfiles" "E, exec, ghostty -e nu -e y" "T, exec, ghostty" "G, exec, firefox https://cronometer.com/#diary" "B, exec, firefox" - "V, exec, vesktop" + "V, exec, discordcanary" "W, exec, bitwarden" "H, exec, feishin" "Y, exec, scrcpy" diff --git a/home/modules/gui/desktop/hypr/hyprland/config/exec-once.nix b/home/modules/gui/desktop/hypr/hyprland/config/exec-once.nix index 2e2db3d..8a8bb4e 100755 --- a/home/modules/gui/desktop/hypr/hyprland/config/exec-once.nix +++ b/home/modules/gui/desktop/hypr/hyprland/config/exec-once.nix @@ -3,6 +3,13 @@ let inherit (flake.config.aesthetics.themes) cursor ; + scarlettOut = "pactl set-default-sink alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink"; + scarlettIn = "pactl set-default-source alsa_input.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Mic1__source"; + catppuccin = [ + "gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'" + "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'" + "gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}" + ]; in [ "swaylock" @@ -15,15 +22,12 @@ in "waybar" "nm-applet" "blueman-applet" + "rfkill block bluetooth" + "rfkill unblock bluetooth" "easyeffects -r" "emote" "flameshot" - "pactl set-default-sink bluez_output.00_16_94_35_0D_5F.1" - "pactl set-default-source alsa_input.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Mic1__source" - "bluetoothctl power on" - "gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'" - "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'" - "gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}" - # "systemctl --user import-environment PATH" - # "systemctl --user restart xdg-desktop-portal.service" + scarlettIn + scarlettOut ] +++ catppuccin diff --git a/home/modules/gui/desktop/hypr/hyprland/config/windowrulev2.nix b/home/modules/gui/desktop/hypr/hyprland/config/windowrulev2.nix index b1bc723..9c225f4 100755 --- a/home/modules/gui/desktop/hypr/hyprland/config/windowrulev2.nix +++ b/home/modules/gui/desktop/hypr/hyprland/config/windowrulev2.nix @@ -10,6 +10,7 @@ let flameshot = "(flameshot)"; bitwarden = "(.*Bitwarden.*)"; save = "(.*Enter name of file to save to….*)"; + proton = "(.*.protonvpn-app-wrapped.*)"; picture = "(.*Picture-in-Picture.*)"; discord-popout = "(.*Discord Popout.*)"; upload = "(.*File Upload.*)"; @@ -28,10 +29,10 @@ let "maxsize 360 500, class:^${calculator}$" "maxsize 720 400, class:^${easyeffects}$" "maxsize 720 400, class:^${scrcpy}$" - "minsize 720 400, class:^${scrcpy}$" "maxsize 720 400, class:^${mpv}$" "maxsize 720 400, class:^${vlc}$" "maxsize 640 360, class:^${nomacs}$" + "maxsize 1000 600, class:^${proton}$" "maxsize 800 450, title:^${bitwarden}$" "maxsize 720 400, title:^${picture}$" "maxsize 720 400, title:^${save}$" @@ -52,6 +53,8 @@ let "class:^${nomacs}$" "class:^${flameshot}$" "class:^${scrcpy}$" + "class:^${nomacs}$" + "class:^${proton}$" "title:^(${picture})$" "title:^(${discord-popout})$" "title:^${bitwarden}$" diff --git a/home/modules/gui/desktop/hypr/hyprland/default.nix b/home/modules/gui/desktop/hypr/hyprland/default.nix index 589f11f..bcdf9e0 100755 --- a/home/modules/gui/desktop/hypr/hyprland/default.nix +++ b/home/modules/gui/desktop/hypr/hyprland/default.nix @@ -1,21 +1,18 @@ { flake, config, + pkgs, ... }: let - # hostname = config.networking.hostName; - # inherit (flake.config.machines.devices) desktop laptop; + configPath = ./config; configImports = { animations = import (configPath + /animations.nix); bind = import (configPath + /bind.nix) { inherit flake config; }; bindm = import (configPath + /bindm.nix); binds = import (configPath + /binds.nix); - # bindl = - # if hostname == laptop.name - # then import (configPath + /bindl.nix) - # else null; + # bindl = import (configPath + /bindl.nix); decoration = import (configPath + /decoration.nix); dwindle = import (configPath + /dwindle.nix); exec-once = import (configPath + /exec-once.nix) { inherit flake; }; @@ -28,6 +25,8 @@ in { wayland.windowManager.hyprland = { enable = true; + package = null; + portalPackage = null; xwayland.enable = true; systemd = { enable = true; diff --git a/home/modules/gui/desktop/river/config/map.nix b/home/modules/gui/desktop/river/config/map.nix new file mode 100755 index 0000000..6443090 --- /dev/null +++ b/home/modules/gui/desktop/river/config/map.nix @@ -0,0 +1,21 @@ +{ + # "Super Space" = "rm -r /home/$USER/.cache/tofi* ; tofi-drun"; + "Super C" = "zed"; + "Super A" = "obsidian"; + # "Super D" = "ghostty -e zellij a dotfiles"; + # "Super E" = "ghostty -e nu -e y"; + "Super T" = "ghostty"; + # "Super G" = "firefox https://cronometer.com/#diary"; + "Super B" = "firefox"; + "Super V" = "vesktop"; + "Super W" = "bitwarden"; + "Super H" = "feishin"; + "Super Y" = "scrcpy"; + # "Super R" = "ghostty -e nu -e btm"; + "Super N" = "signal-desktop"; + "Super M" = "element-desktop"; + # "Super Home" = "sudo protonvpn c --cc CA"; + "Super End" = "exit"; + "Super S" = "steam"; + "Super period" = "emote"; +} diff --git a/home/modules/gui/desktop/river/config/spawn.nix b/home/modules/gui/desktop/river/config/spawn.nix new file mode 100755 index 0000000..60d1e3d --- /dev/null +++ b/home/modules/gui/desktop/river/config/spawn.nix @@ -0,0 +1,28 @@ +{ flake, ... }: +let + inherit (flake.config.aesthetics.themes) + cursor + ; +in +[ + "swaylock" + "hypridle" + "wl-clipboard" + "wpaperd" + "gammastep" + "dunst" + "playerctrld" + "waybar" + "nm-applet" + "blueman-applet" + "easyeffects -r" + "emote" + "flameshot" + "pactl set-default-sink bluez_output.00_16_94_35_0D_5F.1" + "pactl set-default-source alsa_input.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Mic1__source" + "bluetoothctl power on" + "gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'" + "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'" + "gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}" + "nmcli connection delete pvpn-killswitch-ipv6" +] diff --git a/home/modules/gui/desktop/river/default.nix b/home/modules/gui/desktop/river/default.nix new file mode 100755 index 0000000..5746df6 --- /dev/null +++ b/home/modules/gui/desktop/river/default.nix @@ -0,0 +1,77 @@ +{ + flake, + config, + pkgs, + ... +}: +let + inherit (flake.config.aesthetics.themes) cursor; + configPath = ./config; + settingsPath = { + spawn = import (configPath + /spawn.nix) { inherit config flake; }; + map = import (configPath + /map.nix); + }; +in +{ + home.packages = builtins.attrValues { + inherit (pkgs) + rivercarro + ; + }; + + services.kanshi = { + enable = true; + systemdTarget = "river-session.target"; + }; + + wayland.windowManager.river = { + enable = true; + xwayland.enable = true; + settings = { + border-width = 4; + declare-mode = [ + "locked" + "normal" + "passthrough" + ]; + input = { + pointer-foo-bar = { + accel-profile = "flat"; + events = true; + pointer-accel = -0.3; + tap = false; + }; + }; + rule-add = { + "-app-id" = { + "'bar'" = "csd"; + "'float*'" = { + "-title" = { + "'foo'" = "float"; + }; + }; + }; + }; + set-cursor-warp = "on-output-change"; + set-repeat = "50 300"; + map-pointer = { + normal = { + "Alt BTN_LEFT" = "move-view"; + "Super BTN_LEFT" = "resize-view"; + "Super F" = "toggle-float"; + }; + }; + default-layout = "rivercarro"; + attach-mode = "bottom"; + map.normal = settingsPath.map; + spawn = settingsPath.spawn; + }; + systemd = { + enable = true; + extraCommands = [ + "systemctl --user stop river-session.target" + "systemctl --user start river-session.target" + ]; + }; + }; +} diff --git a/home/modules/gui/desktop/theming/default.nix b/home/modules/gui/desktop/theming/default.nix new file mode 100755 index 0000000..f106bc5 --- /dev/null +++ b/home/modules/gui/desktop/theming/default.nix @@ -0,0 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in +{ + imports = importList; +} diff --git a/home/modules/gui/apps/tools/gtk/config/cursorTheme.nix b/home/modules/gui/desktop/theming/gtk/config/cursorTheme.nix similarity index 100% rename from home/modules/gui/apps/tools/gtk/config/cursorTheme.nix rename to home/modules/gui/desktop/theming/gtk/config/cursorTheme.nix diff --git a/home/modules/gui/apps/tools/gtk/config/gtk3.nix b/home/modules/gui/desktop/theming/gtk/config/gtk3.nix similarity index 100% rename from home/modules/gui/apps/tools/gtk/config/gtk3.nix rename to home/modules/gui/desktop/theming/gtk/config/gtk3.nix diff --git a/home/modules/gui/apps/tools/gtk/config/homeCursor.nix b/home/modules/gui/desktop/theming/gtk/config/homeCursor.nix similarity index 100% rename from home/modules/gui/apps/tools/gtk/config/homeCursor.nix rename to home/modules/gui/desktop/theming/gtk/config/homeCursor.nix diff --git a/home/modules/gui/apps/tools/gtk/config/iconTheme.nix b/home/modules/gui/desktop/theming/gtk/config/iconTheme.nix similarity index 100% rename from home/modules/gui/apps/tools/gtk/config/iconTheme.nix rename to home/modules/gui/desktop/theming/gtk/config/iconTheme.nix diff --git a/home/modules/gui/apps/tools/gtk/config/theme.nix b/home/modules/gui/desktop/theming/gtk/config/theme.nix similarity index 100% rename from home/modules/gui/apps/tools/gtk/config/theme.nix rename to home/modules/gui/desktop/theming/gtk/config/theme.nix diff --git a/home/modules/gui/apps/tools/gtk/default.nix b/home/modules/gui/desktop/theming/gtk/default.nix similarity index 100% rename from home/modules/gui/apps/tools/gtk/default.nix rename to home/modules/gui/desktop/theming/gtk/default.nix diff --git a/home/modules/gui/desktop/theming/qt/default.nix b/home/modules/gui/desktop/theming/qt/default.nix new file mode 100755 index 0000000..aecc6a2 --- /dev/null +++ b/home/modules/gui/desktop/theming/qt/default.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +{ + qt = { + enable = true; + style = { + package = pkgs.catppuccin-qt5ct; + }; + }; +} diff --git a/home/modules/gui/desktop/wayland/default.nix b/home/modules/gui/desktop/wayland/default.nix new file mode 100755 index 0000000..f106bc5 --- /dev/null +++ b/home/modules/gui/desktop/wayland/default.nix @@ -0,0 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in +{ + imports = importList; +} diff --git a/home/modules/gui/desktop/hypr/dunst/config/settings.nix b/home/modules/gui/desktop/wayland/dunst/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/hypr/dunst/config/settings.nix rename to home/modules/gui/desktop/wayland/dunst/config/settings.nix diff --git a/home/modules/gui/desktop/hypr/dunst/default.nix b/home/modules/gui/desktop/wayland/dunst/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/dunst/default.nix rename to home/modules/gui/desktop/wayland/dunst/default.nix diff --git a/home/modules/gui/desktop/hypr/easyEffects/default.nix b/home/modules/gui/desktop/wayland/easyEffects/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/easyEffects/default.nix rename to home/modules/gui/desktop/wayland/easyEffects/default.nix diff --git a/home/modules/gui/desktop/hypr/gammastep/default.nix b/home/modules/gui/desktop/wayland/gammastep/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/gammastep/default.nix rename to home/modules/gui/desktop/wayland/gammastep/default.nix diff --git a/home/modules/gui/desktop/hypr/network/default.nix b/home/modules/gui/desktop/wayland/network/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/network/default.nix rename to home/modules/gui/desktop/wayland/network/default.nix diff --git a/home/modules/gui/desktop/hypr/nwgLook/default.nix b/home/modules/gui/desktop/wayland/nwgLook/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/nwgLook/default.nix rename to home/modules/gui/desktop/wayland/nwgLook/default.nix diff --git a/home/modules/gui/desktop/hypr/plasmaNm/default.nix b/home/modules/gui/desktop/wayland/plasmaNm/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/plasmaNm/default.nix rename to home/modules/gui/desktop/wayland/plasmaNm/default.nix diff --git a/home/modules/gui/desktop/hypr/swaylock/config/settings.nix b/home/modules/gui/desktop/wayland/swaylock/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/hypr/swaylock/config/settings.nix rename to home/modules/gui/desktop/wayland/swaylock/config/settings.nix diff --git a/home/modules/gui/desktop/hypr/swaylock/default.nix b/home/modules/gui/desktop/wayland/swaylock/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/swaylock/default.nix rename to home/modules/gui/desktop/wayland/swaylock/default.nix diff --git a/home/modules/gui/desktop/hypr/tofi/config/settings.nix b/home/modules/gui/desktop/wayland/tofi/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/hypr/tofi/config/settings.nix rename to home/modules/gui/desktop/wayland/tofi/config/settings.nix diff --git a/home/modules/gui/desktop/hypr/tofi/default.nix b/home/modules/gui/desktop/wayland/tofi/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/tofi/default.nix rename to home/modules/gui/desktop/wayland/tofi/default.nix diff --git a/home/modules/gui/desktop/hypr/udiskie/default.nix b/home/modules/gui/desktop/wayland/udiskie/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/udiskie/default.nix rename to home/modules/gui/desktop/wayland/udiskie/default.nix diff --git a/home/modules/gui/desktop/hypr/wallet/default.nix b/home/modules/gui/desktop/wayland/wallet/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/wallet/default.nix rename to home/modules/gui/desktop/wayland/wallet/default.nix diff --git a/home/modules/gui/desktop/hypr/waybar/config/scripts/get_weather.sh b/home/modules/gui/desktop/wayland/waybar/config/scripts/get_weather.sh similarity index 100% rename from home/modules/gui/desktop/hypr/waybar/config/scripts/get_weather.sh rename to home/modules/gui/desktop/wayland/waybar/config/scripts/get_weather.sh diff --git a/home/modules/gui/desktop/hypr/waybar/config/settings.nix b/home/modules/gui/desktop/wayland/waybar/config/settings.nix similarity index 94% rename from home/modules/gui/desktop/hypr/waybar/config/settings.nix rename to home/modules/gui/desktop/wayland/waybar/config/settings.nix index f8416f9..cd3c255 100755 --- a/home/modules/gui/desktop/hypr/waybar/config/settings.nix +++ b/home/modules/gui/desktop/wayland/waybar/config/settings.nix @@ -103,8 +103,8 @@ in tooltip = false; format-muted = " Muted"; on-click = "easyeffects"; - on-scroll-up = "amixer sset Master 5%+"; - on-scroll-down = "amixer sset Master 5%-"; + on-scroll-up = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"; + on-scroll-down = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"; scroll-step = 5; format-icons = { headphone = ""; @@ -151,7 +151,7 @@ in }; "custom/weather" = { - exec = "/home/${user0}/Files/Projects/dotfiles/home/modules/gui/desktop/waybar/config/scripts/get_weather.sh Winnipeg"; + exec = "/home/${user0}/Files/Projects/dotfiles/home/modules/gui/desktop/wayland/waybar/config/scripts/get_weather.sh Winnipeg"; return-type = "json"; format = "{}"; tooltip = true; diff --git a/home/modules/gui/desktop/hypr/waybar/config/style.nix b/home/modules/gui/desktop/wayland/waybar/config/style.nix similarity index 100% rename from home/modules/gui/desktop/hypr/waybar/config/style.nix rename to home/modules/gui/desktop/wayland/waybar/config/style.nix diff --git a/home/modules/gui/desktop/hypr/waybar/default.nix b/home/modules/gui/desktop/wayland/waybar/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/waybar/default.nix rename to home/modules/gui/desktop/wayland/waybar/default.nix diff --git a/home/modules/gui/desktop/hypr/wlClipboard/default.nix b/home/modules/gui/desktop/wayland/wlClipboard/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/wlClipboard/default.nix rename to home/modules/gui/desktop/wayland/wlClipboard/default.nix diff --git a/home/modules/gui/desktop/hypr/wpaperd/default.nix b/home/modules/gui/desktop/wayland/wpaperd/default.nix similarity index 88% rename from home/modules/gui/desktop/hypr/wpaperd/default.nix rename to home/modules/gui/desktop/wayland/wpaperd/default.nix index caa674f..8a4bf44 100755 --- a/home/modules/gui/desktop/hypr/wpaperd/default.nix +++ b/home/modules/gui/desktop/wayland/wpaperd/default.nix @@ -3,7 +3,7 @@ enable = true; settings = { "default" = { - path = "~/Files/Projects/dotfiles/home/modules/gui/desktop/hypr/wpaperd/wallpaper"; + path = "~/Files/Projects/dotfiles/home/modules/gui/desktop/wayland/wpaperd/wallpaper"; apply-shadow = true; duration = "1m"; sorting = "random"; diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/pinksky.png b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/pinksky.png similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/pinksky.png rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/pinksky.png diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/u6ne2q214dx71.jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/u6ne2q214dx71.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/u6ne2q214dx71.jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/u6ne2q214dx71.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-0wj757.jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-0wj757.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-0wj757.jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-0wj757.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-2ege2g.jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-2ege2g.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-2ege2g.jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-2ege2g.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-4dj2qo.png b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4dj2qo.png similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-4dj2qo.png rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4dj2qo.png diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-4xq6vv.png b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4xq6vv.png similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-4xq6vv.png rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4xq6vv.png diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-5dyvy3.jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-5dyvy3.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-5dyvy3.jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-5dyvy3.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-735xv3.jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-735xv3.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-735xv3.jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-735xv3.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-8xe25y.jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-8xe25y.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-8xe25y.jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-8xe25y.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-g8ky73.jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-g8ky73.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-g8ky73.jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-g8ky73.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-j8wzvp.jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-j8wzvp.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-j8wzvp.jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-j8wzvp.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-nekxjk.png b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nekxjk.png similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-nekxjk.png rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nekxjk.png diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-nryz87.jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nryz87.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-nryz87.jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nryz87.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-r7yey1.jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-r7yey1.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-r7yey1.jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-r7yey1.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-vge32m.jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vge32m.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-vge32m.jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vge32m.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-vgxgem.jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vgxgem.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-vgxgem.jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vgxgem.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg b/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg rename to home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg diff --git a/nixos/default.nix b/nixos/default.nix index e487c96..2a73934 100755 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -98,6 +98,22 @@ in }; }; + river = { + imports = builtins.attrValues { + inherit (modules) + river + ; + }; + }; + + wayland = { + imports = builtins.attrValues { + inherit (modules) + wayland + ; + }; + }; + server = { imports = builtins.attrValues { inherit (modules) diff --git a/nixos/modules/audio.nix b/nixos/modules/audio.nix index f0b90b8..49ea641 100755 --- a/nixos/modules/audio.nix +++ b/nixos/modules/audio.nix @@ -7,6 +7,19 @@ alsa.support32Bit = true; pulse.enable = true; jack.enable = true; + wireplumber.extraConfig.bluetoothEnhancements = { + "monitor.bluez.properties" = { + "bluez5.enable-sbc-xq" = true; + "bluez5.enable-msbc" = true; + "bluez5.enable-hw-volume" = true; + "bluez5.roles" = [ + "hsp_hs" + "hsp_ag" + "hfp_hf" + "hfp_ag" + ]; + }; + }; }; pulseaudio.enable = false; }; diff --git a/nixos/modules/hyprland/default.nix b/nixos/modules/hyprland/default.nix index 7389e7b..96acb58 100755 --- a/nixos/modules/hyprland/default.nix +++ b/nixos/modules/hyprland/default.nix @@ -1,13 +1,6 @@ { imports = map (file: ./${file}.nix) [ - "geoclue2" - "greetd" - "network" "hypridle" "hyprland" - "regreet" - "swaylock" - "thunar" - "wayland" ]; } diff --git a/nixos/modules/hyprland/greetd.nix b/nixos/modules/hyprland/greetd.nix deleted file mode 100755 index cb46a38..0000000 --- a/nixos/modules/hyprland/greetd.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - config, - flake, - lib, - ... -}: let - inherit - (flake.config.people) - user0 - ; -in { - services = { - greetd = { - enable = true; - vt = 7; - settings = let - default_session = { - command = "${lib.meta.getExe config.programs.hyprland.package}"; - user = user0; - }; - in { - inherit - default_session - ; - initial_session = default_session; - }; - }; - }; -} diff --git a/nixos/modules/river.nix b/nixos/modules/river.nix new file mode 100755 index 0000000..0ec2fcc --- /dev/null +++ b/nixos/modules/river.nix @@ -0,0 +1,26 @@ +{ + programs.river = { + enable = true; + xwayland.enable = true; + }; + environment = { + loginShellInit = '' + if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then + exec river + fi + ''; + sessionVariables = { + XDG_CURRENT_DESKTOP = "river"; + XDG_SESSION_TYPE = "wayland"; + XDG_SESSION_DESKTOP = "river"; + QT_AUTO_SCREEN_SCALE_FACTOR = "1"; + QT_QPA_PLATFORM = "wayland;xcb"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + QT_QPA_PLATFORMTHEME = "qt5ct"; + _JAVA_AWT_WM_NONEREPARENTING = "1"; + WLR_DRM_NO_ATOMIC = "1"; + WLR_NO_HARDWARE_CURSORS = "1"; + }; + }; + +} diff --git a/nixos/modules/wayland/default.nix b/nixos/modules/wayland/default.nix new file mode 100755 index 0000000..e45833b --- /dev/null +++ b/nixos/modules/wayland/default.nix @@ -0,0 +1,11 @@ +{ + imports = map (file: ./${file}.nix) [ + "geoclue2" + "greetd" + "network" + "regreet" + "swaylock" + "thunar" + "wayland" + ]; +} diff --git a/nixos/modules/hyprland/geoclue2.nix b/nixos/modules/wayland/geoclue2.nix similarity index 100% rename from nixos/modules/hyprland/geoclue2.nix rename to nixos/modules/wayland/geoclue2.nix diff --git a/nixos/modules/wayland/greetd.nix b/nixos/modules/wayland/greetd.nix new file mode 100755 index 0000000..0441d56 --- /dev/null +++ b/nixos/modules/wayland/greetd.nix @@ -0,0 +1,32 @@ +{ + config, + flake, + lib, + ... +}: +let + inherit (flake.config.people) + user0 + ; +in +{ + services = { + greetd = { + enable = true; + vt = 7; + settings = + let + default_session = { + command = "${lib.meta.getExe config.programs.hyprland.package}"; + user = user0; + }; + in + { + inherit + default_session + ; + initial_session = default_session; + }; + }; + }; +} diff --git a/nixos/modules/hyprland/network.nix b/nixos/modules/wayland/network.nix similarity index 100% rename from nixos/modules/hyprland/network.nix rename to nixos/modules/wayland/network.nix diff --git a/nixos/modules/hyprland/regreet.nix b/nixos/modules/wayland/regreet.nix similarity index 100% rename from nixos/modules/hyprland/regreet.nix rename to nixos/modules/wayland/regreet.nix diff --git a/nixos/modules/hyprland/swaylock.nix b/nixos/modules/wayland/swaylock.nix similarity index 100% rename from nixos/modules/hyprland/swaylock.nix rename to nixos/modules/wayland/swaylock.nix diff --git a/nixos/modules/hyprland/thunar.nix b/nixos/modules/wayland/thunar.nix similarity index 91% rename from nixos/modules/hyprland/thunar.nix rename to nixos/modules/wayland/thunar.nix index 5a1d652..9dc6381 100755 --- a/nixos/modules/hyprland/thunar.nix +++ b/nixos/modules/wayland/thunar.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ programs.thunar = { enable = true; plugins = [ diff --git a/nixos/modules/hyprland/wayland.nix b/nixos/modules/wayland/wayland.nix similarity index 89% rename from nixos/modules/hyprland/wayland.nix rename to nixos/modules/wayland/wayland.nix index 9b71dc6..2c6f2e4 100755 --- a/nixos/modules/hyprland/wayland.nix +++ b/nixos/modules/wayland/wayland.nix @@ -10,7 +10,7 @@ extraPortals = builtins.attrValues { inherit (pkgs) xdg-desktop-portal-gtk - xdg-desktop-portal-hyprland + # xdg-desktop-portal-hyprland xdg-desktop-portal-wlr ; };