From bb65103e0dae61bd19ca802892e5cc732ebb30b7 Mon Sep 17 00:00:00 2001 From: unexplrd Date: Mon, 11 May 2026 10:15:54 +0300 Subject: [PATCH] cleanup --- flake.lock | 1036 ++++------------- flake.nix | 18 - modules/home/desktop/default.nix | 1 - modules/home/desktop/hyprland/default.nix | 196 ---- modules/home/desktop/hyprland/hyprland.nix | 458 -------- .../desktop/hyprland/programs/default.nix | 23 - .../hyprland/programs/fuzzel/default.nix | 23 - .../hyprland/programs/hyprlock/default.nix | 94 -- .../hyprland/programs/walker/default.nix | 307 ----- .../hyprland/programs/waybar/default.nix | 331 ------ .../desktop/hyprland/services/default.nix | 65 -- .../hyprland/services/swaync/default.nix | 177 --- modules/homePrograms/ghostty.nix | 8 +- modules/nixos/desktop/default.nix | 1 - modules/nixos/desktop/hyprland/default.nix | 36 - modules/nixos/shared/misc/default.nix | 1 - modules/nixos/shared/nix/substituters.nix | 2 - 17 files changed, 238 insertions(+), 2539 deletions(-) delete mode 100644 modules/home/desktop/hyprland/default.nix delete mode 100644 modules/home/desktop/hyprland/hyprland.nix delete mode 100644 modules/home/desktop/hyprland/programs/default.nix delete mode 100644 modules/home/desktop/hyprland/programs/fuzzel/default.nix delete mode 100644 modules/home/desktop/hyprland/programs/hyprlock/default.nix delete mode 100644 modules/home/desktop/hyprland/programs/walker/default.nix delete mode 100644 modules/home/desktop/hyprland/programs/waybar/default.nix delete mode 100644 modules/home/desktop/hyprland/services/default.nix delete mode 100644 modules/home/desktop/hyprland/services/swaync/default.nix delete mode 100644 modules/nixos/desktop/hyprland/default.nix diff --git a/flake.lock b/flake.lock index 9a351ba..3a7ed2a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,38 +1,5 @@ { "nodes": { - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776702787, - "narHash": "sha256-qc5uwEWbuubzYthmZcfCapooZGXhoYZWfTQ24TozbCQ=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "9a1ca6b8cb4d86a599787a55b78f2ddf809bf945", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -71,11 +38,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": { @@ -130,7 +97,7 @@ "mypackages", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1771437256, @@ -146,40 +113,79 @@ "type": "github" } }, - "chaotic": { + "blueprint_3": { "inputs": { - "flake-schemas": "flake-schemas", - "home-manager": [ - "home-manager" - ], - "jovian": "jovian", "nixpkgs": [ + "t3code", + "llm-agents", "nixpkgs" ], - "rust-overlay": "rust-overlay" + "systems": [ + "t3code", + "llm-agents", + "systems" + ] }, "locked": { - "lastModified": 1765204341, - "narHash": "sha256-7xd45skcuLCu2DHxVvU+W/z+7CUOjyv+QPtT4PLZaIU=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "aacb796ccd42be1555196c20013b9b674b71df75", + "lastModified": 1776249299, + "narHash": "sha256-Dt9t1TGRmJFc0xVYhttNBD6QsAgHOHCArqGa0AyjrJY=", + "owner": "numtide", + "repo": "blueprint", + "rev": "56131e8628f173d24a27f6d27c0215eff57e40dd", "type": "github" }, "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", + "owner": "numtide", + "repo": "blueprint", + "type": "github" + } + }, + "bun2nix": { + "inputs": { + "flake-parts": [ + "t3code", + "llm-agents", + "flake-parts" + ], + "import-tree": "import-tree", + "nixpkgs": [ + "t3code", + "llm-agents", + "nixpkgs" + ], + "systems": [ + "t3code", + "llm-agents", + "systems" + ], + "treefmt-nix": [ + "t3code", + "llm-agents", + "treefmt-nix" + ] + }, + "locked": { + "lastModified": 1777322186, + "narHash": "sha256-CFlRnym0RphrTymMUg7PfQgfdYdMd6BnMZQJhlwv0fI=", + "owner": "nix-community", + "repo": "bun2nix", + "rev": "8985e47786dd0bfa95b7c795f12aeafadd328eb8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "staging-2.1.0", + "repo": "bun2nix", "type": "github" } }, "crane": { "locked": { - "lastModified": 1776635034, - "narHash": "sha256-OEOJrT3ZfwbChzODfIH4GzlNTtOFuZFWPtW7jIeR8xU=", + "lastModified": 1777830388, + "narHash": "sha256-2uoQAqUk2H0ijQtGiWAyNeQYGYc6yfAcRRLlJAz4Gp8=", "owner": "ipetkov", "repo": "crane", - "rev": "dc7496d8ea6e526b1254b55d09b966e94673750f", + "rev": "d459c1350e96ce1a7e3859c513ef5e9869d67d6f", "type": "github" }, "original": { @@ -194,11 +200,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1776835163, - "narHash": "sha256-je71tN9Oa/oIshsLVkGhnifRM3gAMOWTPW/Vl7OaCE0=", + "lastModified": 1778480974, + "narHash": "sha256-FVkuMaSg7pu8JSGadrMuIh5zS9oNcQpyQH9UWyHdUB0=", "owner": "ninelore", "repo": "flake", - "rev": "bdce57268349cdc78eabafe0abf63e7966792e3d", + "rev": "764e2d267243c905f6ef178d71a14d65ca338d6e", "type": "github" }, "original": { @@ -237,11 +243,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1776950906, - "narHash": "sha256-jiPj3d62hEgIaZSA4jW+12DGs0Up/SKBZt0sEb7uVCY=", + "lastModified": 1778464035, + "narHash": "sha256-rmTyj80jZQcNuP2SMw36Z0UqTAp3tMkXk2Tck5Rrm2s=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "f4c11bc2ffc1c6fd8ac3307d6054b88f3e1156d9", + "rev": "c7d44cfb12e21efd81595e0e85db4ef23ee517bd", "type": "github" }, "original": { @@ -253,11 +259,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1775176642, - "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", + "lastModified": 1776136500, + "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "179704030c5286c729b5b0522037d1d51341022c", + "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7", "type": "github" }, "original": { @@ -285,52 +291,20 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { "flake": false, "locked": { "lastModified": 1746162366, @@ -367,23 +341,31 @@ "type": "github" } }, - "flake-schemas": { + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "t3code", + "llm-agents", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1721999734, - "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", - "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", - "revCount": 75, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" } }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -401,7 +383,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -451,56 +433,7 @@ "type": "github" } }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat_2", - "home-manager": [ - "home-manager" - ], - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems", - "zig": "zig", - "zon2nix": "zon2nix" - }, - "locked": { - "lastModified": 1777006226, - "narHash": "sha256-mZjoK+Sr8vbAqYsFCgPESN5R+FVLaFENWoWMe3UTOeg=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "b0d359cbbd945f9f3807327526ef79fcaf0477df", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", - "type": "github" - } - }, "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": [ "lanzaboote", @@ -568,11 +501,11 @@ ] }, "locked": { - "lastModified": 1777004352, - "narHash": "sha256-SV+9PgNwZ8jHVCjK6YaCBzaheLSW7cDnm5DpOYrD8Vw=", + "lastModified": 1778444552, + "narHash": "sha256-f18pIiR9q/p1vHY93gmAum7aHhQOG49oGvAB9+lptRo=", "owner": "nix-community", "repo": "home-manager", - "rev": "6012cf1fed3eba66115f3fd117b9be6bd2a15b2f", + "rev": "dcebe66f958673729896eec2de4abfd86ef22d21", "type": "github" }, "original": { @@ -581,366 +514,18 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, + "import-tree": { "locked": { - "lastModified": 1776511930, - "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "39435900785d0c560c6ae8777d29f28617d031ef", + "lastModified": 1773693634, + "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=", + "owner": "vic", + "repo": "import-tree", + "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1", "type": "github" }, "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776426399, - "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-guiutils": "hyprland-guiutils", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "hyprwire": "hyprwire", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": "pre-commit-hooks", - "systems": [ - "systems" - ], - "xdph": "xdph" - }, - "locked": { - "lastModified": 1776947531, - "narHash": "sha256-DBE9ECXz4ItAyIZ0NCfccpjFjpLALvDbkLd62xDZPQI=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "b65714e3b8e123fb2febd507905d25fa6abd0400", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-guiutils": { - "inputs": { - "aquamarine": [ - "hyprland", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprtoolkit": "hyprtoolkit", - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776426575, - "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=", - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "rev": "a968d211048e3ed538e47b84cb3649299578f19d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1772460177, - "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776426736, - "narHash": "sha256-rl7i4aY+9p8LysJp7o8uRWahCkpFznCgGHXszlTw7b0=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "7833ff33b2e82d3406337b5dcf0d1cec595d83e9", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprsunset": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776428662, - "narHash": "sha256-n983I/fo3HO08cKkUc0H9W7hvPsl5ZZRBEUEt+oPsjU=", - "owner": "hyprwm", - "repo": "hyprsunset", - "rev": "eae013234fe812e906436e24d1b226cf34e35ea6", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprsunset", - "type": "github" - } - }, - "hyprtoolkit": { - "inputs": { - "aquamarine": [ - "hyprland", - "hyprland-guiutils", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprland-guiutils", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprland-guiutils", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-guiutils", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprland-guiutils", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "hyprland-guiutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-guiutils", - "systems" - ] - }, - "locked": { - "lastModified": 1772462885, - "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", - "owner": "hyprwm", - "repo": "hyprtoolkit", - "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprtoolkit", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776428866, - "narHash": "sha256-XfRlBolGtjvalTHJp3XvvpYLBjkMhaZLLU0WqZ91Fcg=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "eedd60805cd96d4442586f2ba5fe51d549b12674", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776430932, - "narHash": "sha256-Yv3RPiUvl7CAsJgwIVsqcj7akn1gLyJP1F/mocof5hA=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "4c2fcc06dc9722c97dbb54ba649c69b18ce83d2e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwire": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776728575, - "narHash": "sha256-z9eGphrArEBpl1O/GCH0wlY6z4K9vA6yWh2gAS6qytU=", - "owner": "hyprwm", - "repo": "hyprwire", - "rev": "f3a80888783702a39691b684d099e16b83ed4702", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwire", + "owner": "vic", + "repo": "import-tree", "type": "github" } }, @@ -1002,28 +587,6 @@ "type": "github" } }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764922999, - "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -1031,14 +594,14 @@ "nixpkgs" ], "pre-commit": "pre-commit", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1776797459, - "narHash": "sha256-utv296Xwk0PwjONe9dsyKx+9Z5xAB70aAsMI//aakpg=", + "lastModified": 1777882242, + "narHash": "sha256-9Ynx+ort1aSwReiCfkbgMS3Q6y+MPcekDoUWx9N3a7A=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "4eda91dd5abd2157a2c7bfb33142fc64da668b0a", + "rev": "04723d4fd6bde2665fef3b25856aeebbd4013c16", "type": "github" }, "original": { @@ -1047,6 +610,29 @@ "type": "github" } }, + "llm-agents": { + "inputs": { + "blueprint": "blueprint_3", + "bun2nix": "bun2nix", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_3", + "systems": "systems_6", + "treefmt-nix": "treefmt-nix_3" + }, + "locked": { + "lastModified": 1777354680, + "narHash": "sha256-jtMZ7U79JYGoE8NYIu8Y4bNr+EoQW5i6zMP6Mig7tCU=", + "owner": "numtide", + "repo": "llm-agents.nix", + "rev": "efa749415e2ee5015db3fda1d3d6d7484d8aa64c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "llm-agents.nix", + "type": "github" + } + }, "mypackages": { "inputs": { "blueprint": "blueprint_2", @@ -1101,11 +687,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1777018640, - "narHash": "sha256-jUGMya3cKXG+DoAqtRsnHnLpwNx/mFRy5IvCfc2IMU0=", + "lastModified": 1778392415, + "narHash": "sha256-UbEC8dOIWwCG4mww7SGhYMgM1yi8ewgKLi8O3uhX33M=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "95f30b5df47a82779178bb96172bc63ad00dd8ed", + "rev": "670859bacca122ec1158c882b4cf2828930b3669", "type": "github" }, "original": { @@ -1134,11 +720,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1777013567, - "narHash": "sha256-EifUuSU7UeQ8v59aCGg8wCBOVqt2NCYy6M686iaWd5c=", + "lastModified": 1778389445, + "narHash": "sha256-9NyDMVf8ydUZGTzcPcLMQf0o1B3bte/00UGbuXHNWh8=", "owner": "YaLTeR", "repo": "niri", - "rev": "8d583fe854647951ff83a370c87c823589276e5f", + "rev": "38191826cb1e5fb9051a7e141fefe4941a2b4bed", "type": "github" }, "original": { @@ -1194,11 +780,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1776625032, - "narHash": "sha256-edvwHiFhgOiwywt6/Iwe+sSn6ybhU3WZGnIoiGcKjfQ=", + "lastModified": 1777402031, + "narHash": "sha256-6gkfl9y3+ti0Z6dgby8/R4/DRT8sWU0I0TLCIxwWtjk=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "479e19f1decb390aa5b75cae13ddf87d763c74cc", + "rev": "22a3adbe7c5c8c8a10a635d32c9ef7fc01a6e4b8", "type": "github" }, "original": { @@ -1207,29 +793,6 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "chaotic", - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -1238,11 +801,11 @@ ] }, "locked": { - "lastModified": 1776829403, - "narHash": "sha256-oHVcvP2Ahhj1KUsEzp+2BQF55/r5VSa3QxdPdwE1p00=", + "lastModified": 1778393439, + "narHash": "sha256-mOtQxUjtKaPHLeoLOY/YEDctmud1X9KwJr4kE1MJ3Wc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "c43246d4e9e506178b69baed075d797ec2d873e2", + "rev": "01466c414c7357ae2ce32be4a272a7c69e94ab5f", "type": "github" }, "original": { @@ -1258,11 +821,11 @@ ] }, "locked": { - "lastModified": 1776829403, - "narHash": "sha256-oHVcvP2Ahhj1KUsEzp+2BQF55/r5VSa3QxdPdwE1p00=", + "lastModified": 1778393439, + "narHash": "sha256-mOtQxUjtKaPHLeoLOY/YEDctmud1X9KwJr4kE1MJ3Wc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "c43246d4e9e506178b69baed075d797ec2d873e2", + "rev": "01466c414c7357ae2ce32be4a272a7c69e94ab5f", "type": "github" }, "original": { @@ -1273,14 +836,14 @@ }, "nixos-cosmic": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ], "nixpkgs-stable": [ "nixpkgs-stable" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1751591814, @@ -1298,11 +861,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776548001, - "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -1314,11 +877,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1776734388, - "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=", + "lastModified": 1778003029, + "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac", + "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", "type": "github" }, "original": { @@ -1330,11 +893,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1776548001, - "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -1344,6 +907,22 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1776949667, + "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": [ @@ -1356,11 +935,11 @@ ] }, "locked": { - "lastModified": 1775228139, - "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", + "lastModified": 1777598946, + "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=", "owner": "nix-community", "repo": "NUR", - "rev": "601971b9c89e0304561977f2c28fa25e73aa7132", + "rev": "5d55af01c0f86be583931fe99207fc56c14134b3", "type": "github" }, "original": { @@ -1417,33 +996,10 @@ }, "pre-commit": { "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore_2", - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1775585728, - "narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "580633fa3fe5fc0379905986543fd7495481913d", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ - "hyprland", + "lanzaboote", "nixpkgs" ] }, @@ -1451,13 +1007,13 @@ "lastModified": 1776796298, "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", "owner": "cachix", - "repo": "git-hooks.nix", + "repo": "pre-commit-hooks.nix", "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", "type": "github" }, "original": { "owner": "cachix", - "repo": "git-hooks.nix", + "repo": "pre-commit-hooks.nix", "type": "github" } }, @@ -1469,16 +1025,16 @@ ] }, "locked": { - "lastModified": 1766725085, - "narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=", + "lastModified": 1776854048, + "narHash": "sha256-lLbV66V3RMNp1l8/UelmR4YzoJ5ONtgvEtiUMJATH/o=", "ref": "refs/heads/master", - "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", - "revCount": 715, + "rev": "783c953987dc56ff0601abe6845ed96f1d00495a", + "revCount": 806, "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell" }, "original": { - "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", + "rev": "783c953987dc56ff0601abe6845ed96f1d00495a", "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell" } @@ -1486,14 +1042,10 @@ "root": { "inputs": { "blueprint": "blueprint", - "chaotic": "chaotic", "cros": "cros", "disko": "disko", "dms": "dms", - "ghostty": "ghostty", "home-manager": "home-manager", - "hyprland": "hyprland", - "hyprsunset": "hyprsunset", "lanzaboote": "lanzaboote", "mypackages": "mypackages", "mysecrets": "mysecrets", @@ -1506,7 +1058,7 @@ "nixpkgs-stable": "nixpkgs-stable", "sops-nix": "sops-nix", "stylix": "stylix", - "systems": "systems_6", + "systems": "systems_5", "t3code": "t3code", "vicinae": "vicinae", "zmx": "zmx" @@ -1515,16 +1067,16 @@ "rust-overlay": { "inputs": { "nixpkgs": [ - "chaotic", + "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1765075567, - "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", + "lastModified": 1777778183, + "narHash": "sha256-Lqv9MZO0XAGcMbXJU+ULBSMD41Pf391uJehylUQKe7Y=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", + "rev": "dbba5f888c82ef3ce594c451c33ac2474eb80847", "type": "github" }, "original": { @@ -1534,27 +1086,6 @@ } }, "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1776741231, - "narHash": "sha256-k9G98qzn+7npROUaks8VqCFm7cFtEG8ulQLBBo5lItg=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "02061303f7c4c964f7b4584dabd9e985b4cd442b", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "nixpkgs": [ "nixos-cosmic", @@ -1582,11 +1113,11 @@ ] }, "locked": { - "lastModified": 1776771786, - "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "mic92", "repo": "sops-nix", - "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -1617,11 +1148,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1776893932, - "narHash": "sha256-AFD5cf9eNqXq1brHS63xeZy2xKZMgG9J86XJ9I2eLn8=", + "lastModified": 1778104276, + "narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=", "owner": "danth", "repo": "stylix", - "rev": "84971726c7ef0bb3669a5443e151cc226e65c518", + "rev": "18ed8d270231e067fe2739998479ed5d7c659c2c", "type": "github" }, "original": { @@ -1631,7 +1162,6 @@ } }, "systems": { - "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1738,17 +1268,18 @@ }, "t3code": { "inputs": { + "llm-agents": "llm-agents", "nixpkgs": [ "nixpkgs" ], "t3code": "t3code_2" }, "locked": { - "lastModified": 1777062365, - "narHash": "sha256-RPEnxELIpeIa6h/zL2QiY8H9sxQpHDKESP28KP9V468=", + "lastModified": 1777380437, + "narHash": "sha256-/EEHM581hte5Ayz4Zy5m6LpmR9iywj1JlF6kAjR0+4k=", "ref": "refs/heads/main", - "rev": "94864cb5e414095c2d5aae43fcc656f8151257e5", - "revCount": 8, + "rev": "6763181b949b77d35c785e6b418e10a25d9949c5", + "revCount": 22, "type": "git", "url": "https://gitea.linerds.us/unexplrd/t3code-flake" }, @@ -1792,11 +1323,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1772661346, - "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", + "lastModified": 1777041405, + "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=", "owner": "tinted-theming", "repo": "schemes", - "rev": "13b5b0c299982bb361039601e2d72587d6846294", + "rev": "5f868b3a338b6904c47f3833b9c411be641983a8", "type": "github" }, "original": { @@ -1808,11 +1339,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1772934010, - "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", + "lastModified": 1777169200, + "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", + "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac", "type": "github" }, "original": { @@ -1824,11 +1355,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1772909925, - "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", + "lastModified": 1777463218, + "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", + "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae", "type": "github" }, "original": { @@ -1878,9 +1409,31 @@ "type": "github" } }, + "treefmt-nix_3": { + "inputs": { + "nixpkgs": [ + "t3code", + "llm-agents", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -1906,11 +1459,11 @@ ] }, "locked": { - "lastModified": 1776954236, - "narHash": "sha256-phxwfQQxNcmsOy/stSh+3KNDrClzsy1kz3pmoGB+5cY=", + "lastModified": 1778454292, + "narHash": "sha256-umR6mAJKSnjZZdwJQYmZVvn6qKtnVe3Rp+LSiQLHYJM=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "5969d68c024e5d37fca35a5e0f415243b1423d4c", + "rev": "0a46ab50557c8ecd19a1e7cbf0f837f48802fc8a", "type": "github" }, "original": { @@ -1919,47 +1472,6 @@ "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": 1776608502, - "narHash": "sha256-UH8YoQxx4hFOm6qjMdjRQNRvSejFIR/wBZ8fW1p9sME=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "4a293523d36dfa367e67ec304cc718ea66a8fec2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "xwayland-satellite-stable": { "flake": false, "locked": { @@ -2014,35 +1526,6 @@ "type": "github" } }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty", - "flake-compat" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs" - ], - "systems": [ - "ghostty", - "systems" - ] - }, - "locked": { - "lastModified": 1776789209, - "narHash": "sha256-G6B7Q4TXn7MZ1mB+f9rymjsYF5PLWoSvmbxijb/99bw=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "14fe971844e841297ddd2ce9783d6892b467af39", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, "zig2nix": { "inputs": { "flake-utils": "flake-utils_3", @@ -2064,28 +1547,6 @@ "type": "github" } }, - "zig_2": { - "inputs": { - "nixpkgs": [ - "ghostty", - "zon2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1776888758, - "narHash": "sha256-OlQexlc8pMXAPhGrT89MtDcPCJv8MsFJcxFPMibRBho=", - "ref": "refs/heads/main", - "rev": "a380ec6969faf5fae32f08b96f8529a3bca55d42", - "revCount": 1672, - "type": "git", - "url": "https://codeberg.org/jcollie/zig-overlay.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/jcollie/zig-overlay.git" - } - }, "zmx": { "inputs": { "zig2nix": "zig2nix" @@ -2103,29 +1564,6 @@ "repo": "zmx", "type": "github" } - }, - "zon2nix": { - "inputs": { - "nixpkgs": [ - "ghostty", - "nixpkgs" - ], - "zig": "zig_2" - }, - "locked": { - "lastModified": 1776999674, - "narHash": "sha256-dEuWd2li80+H7f0k7RA25/Od49G91Pn3El3TcbEpONw=", - "owner": "jcollie", - "repo": "zon2nix", - "rev": "fe860f11b076bba30708d1efb4830459ecf85f0d", - "type": "github" - }, - "original": { - "owner": "jcollie", - "ref": "main", - "repo": "zon2nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7f61ae3..e18c5f0 100644 --- a/flake.nix +++ b/flake.nix @@ -3,15 +3,11 @@ inputs = { blueprint.url = "github:numtide/blueprint"; - chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; cros.url = "github:ninelore/flake"; dms.url = "github:AvengeMedia/DankMaterialShell"; # TODO: remove disko disko.url = "github:nix-community/disko/latest"; - ghostty.url = "github:ghostty-org/ghostty"; home-manager.url = "github:nix-community/home-manager"; - hyprland.url = "github:hyprwm/Hyprland"; - hyprsunset.url = "github:hyprwm/hyprsunset"; lanzaboote.url = "github:nix-community/lanzaboote"; mypackages.url = "git+https://gitea.linerds.us/unexplrd/packages-blueprint"; mysecrets.url = "git+ssh://gitea@gitea.linerds.us/unexplrd/nix-secrets"; @@ -23,7 +19,6 @@ # nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - # nixpkgs.url = "github:NixOS/nixpkgs?rev=ce031847d1052b833760206f59d6f9e93b24d3a4"; sops-nix.url = "github:mic92/sops-nix"; stylix.url = "github:danth/stylix"; systems.url = "github:nix-systems/default"; @@ -34,22 +29,9 @@ # the absolute horror of input deduplication blueprint.inputs.nixpkgs.follows = "nixpkgs"; blueprint.inputs.systems.follows = "systems"; - chaotic.inputs.home-manager.follows = "home-manager"; - chaotic.inputs.nixpkgs.follows = "nixpkgs"; dms.inputs.nixpkgs.follows = "nixpkgs"; disko.inputs.nixpkgs.follows = "nixpkgs"; - ghostty.inputs.flake-utils.inputs.systems.follows = "systems"; - ghostty.inputs.home-manager.follows = "home-manager"; - ghostty.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - hyprland.inputs.nixpkgs.follows = "nixpkgs"; - hyprland.inputs.systems.follows = "systems"; - hyprsunset.inputs.hyprland-protocols.follows = "hyprland/hyprland-protocols"; - hyprsunset.inputs.hyprlang.follows = "hyprland/hyprlang"; - hyprsunset.inputs.hyprutils.follows = "hyprland/hyprutils"; - hyprsunset.inputs.hyprwayland-scanner.follows = "hyprland/hyprwayland-scanner"; - hyprsunset.inputs.nixpkgs.follows = "nixpkgs"; - hyprsunset.inputs.systems.follows = "hyprland/systems"; lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; mypackages.inputs.nixpkgs.follows = "nixpkgs"; mysecrets.flake = false; diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix index 98693c5..a5cba64 100644 --- a/modules/home/desktop/default.nix +++ b/modules/home/desktop/default.nix @@ -16,7 +16,6 @@ in { ./cosmic # ./dms # ./gnome - ./hyprland ./niri ./plasma ] diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix deleted file mode 100644 index ba996b1..0000000 --- a/modules/home/desktop/hyprland/default.nix +++ /dev/null @@ -1,196 +0,0 @@ -{ - config, - inputs, - lib, - osConfig, - perSystem, - pkgs, - ... -}: let - inherit (config.lib.stylix) colors; - inherit (lib) mkIf mkEnableOption mkForce getExe; - cfg = config.desktop.hyprland; - hostname = osConfig.networking.hostName; - cursorSize = config.stylix.cursor.size; - ifLaptop = mkIf (hostname != "dunamis"); - launcher = getExe pkgs.walker; - lockscreen = getExe pkgs.hyprlock; -in { - options = { - desktop.hyprland.enable = - mkEnableOption "enable hyprland desktop"; - }; - config = mkIf cfg.enable { - stylix.targets = { - waybar.enable = false; - hyprland.enable = false; - hyprlock.enable = false; - qt.enable = false; - }; - home.pointerCursor.hyprcursor = { - enable = true; - size = cursorSize; - }; - dconf.settings = { - "org/gnome/desktop/wm/preferences" = { - button-layout = "icon:close"; - }; - "org/gnome/desktop/interface" = { - icon-theme = config.gtk.iconTheme.name; - color-scheme = - if config.stylix.polarity == "dark" - then lib.mkDefault "prefer-dark" - else lib.mkDefault "prefer-light"; - }; - }; - gtk = { - enable = true; - iconTheme = let - name = - if (lib.strings.hasPrefix "gruvbox" osConfig.module.stylix.theme) - then "Gruvbox-Plus-Dark" - else if config.stylix.polarity == "dark" - then "Papirus-Dark" - else "Papirus-Light"; - package = - if (lib.strings.hasPrefix "gruvbox" osConfig.module.stylix.theme) - then pkgs.gruvbox-plus-icons - else if (lib.strings.hasPrefix "rose-pine" osConfig.module.stylix.theme) - then pkgs.papirus-icon-theme.override {color = "indigo";} - else if (lib.strings.hasPrefix "nord" osConfig.module.stylix.theme) - then pkgs.papirus-icon-theme.override {color = "nordic";} - else pkgs.papirus-icon-theme; - in {inherit name package;}; - }; - qt = { - enable = true; - platformTheme.name = "gtk3"; - }; - - # programs.walker = import ./programs/walker {inherit config inputs pkgs;}; - programs.waybar = import ./programs/waybar {inherit config colors getExe ifLaptop pkgs;}; - wayland.windowManager.hyprland = import ./hyprland.nix {inherit config osConfig perSystem launcher lockscreen;}; - services = import ./services {inherit pkgs lockscreen getExe perSystem;}; - - home.packages = with pkgs; - [ - # gui libadwaita apps - celluloid # mpv gui in libadwaita - gnome-text-editor - helvum # pipewire patchbay in rust - junction # app chooser - loupe # image viewer and editor in rust - mission-center # task manager in rust (partly) - nautilus # file manager - overskride # bluetooth gui in rust - papers # pdf reader in rust - pika-backup # borg gui in rust - pwvucontrol # pipewire gui in rust - sonusmix # pipewire routing tool in rust - wdisplays # wlroots display configurator - ] - ++ [ - # misc utils - (ifLaptop brightnessctl) - grim - slurp - hyprshot - dconf - libnotify - playerctl - wl-clipboard-rs # wl-clipboard in rust - ]; - xdg = { - mime.enable = true; - mimeApps = { - enable = true; - defaultApplications = let - file_manager = ["org.gnome.Nautilus.desktop"]; - image_viewer = ["org.gnome.Loupe.desktop"]; - pdf_reader = ["org.gnome.Papers.desktop"]; - video_player = ["io.github.celluloid_player.Celluloid.desktop"]; - web_browser = ["re.sonny.Junction.desktop"]; - in { - "application/pdf" = pdf_reader; - "image/jpeg" = image_viewer; - "image/png" = image_viewer; - "inode/directory" = file_manager; - "text/html" = web_browser; - "video/mp4" = video_player; - "video/mpeg" = video_player; - "video/x-matroska" = video_player; - "video/x-mpeg" = video_player; - "x-scheme-handler/about" = web_browser; - "x-scheme-handler/http" = web_browser; - "x-scheme-handler/https" = web_browser; - "x-scheme-handler/unknown" = web_browser; - }; - }; - # desktopEntries = { - # zen-browser-profile = { - # name = "Zen Browser (Choose profile)"; - # icon = "app.zen_browser.zen"; - # exec = "flatpak run --branch=stable --arch=x86_64 --command=launch-script.sh --file-forwarding app.zen_browser.zen --ProfileManager @@u %u @@"; - # }; - # logseq-wayland = { - # name = "Logseq Desktop (Wayland)"; - # icon = "com.logseq.Logseq"; - # exec = "flatpak run --branch=stable --arch=x86_64 --command=run.sh --file-forwarding com.logseq.Logseq @@u %U @@ --enable-features=UseOzonePlatform --ozone-platform=wayland --enable-features=WaylandWindowDecorations"; - # }; - # }; - }; - systemd.user = { - settings.Manager.DefaultEnvironment = { - QT_QPA_PLATFORM = "wayland"; - }; - targets.tray.Unit.Description = "Home Manager System Tray"; # workaround for udiskie - services = let - mkGraphicalService = config: graphicalService // config; - graphicalService = { - Install.WantedBy = ["hyprland-session.target"]; - Unit = { - Requisite = ["graphical-session.target"]; - PartOf = ["graphical-session.target"]; - After = ["graphical-session.target"]; - }; - Service = { - Restart = "on-failure"; - TimeoutStopSec = 10; - RestartSec = 1; - }; - }; - in { - copyq = mkGraphicalService { - Service = - graphicalService.Service - // { - Environment = mkForce "QT_QPA_PLATFORM=wayland"; - }; - }; - hyprpolkitagent = mkGraphicalService { - Service = - graphicalService.Service - // { - Type = "simple"; - ExecStart = "${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent"; - }; - }; - hyprsunset = mkGraphicalService { - Unit = - graphicalService.Unit - // { - ConditionEnvironment = "WAYLAND_DISPLAY"; - }; - Service = - graphicalService.Service - // { - Type = "simple"; - Slice = "session.slice"; - ExecStart = "${getExe perSystem.hyprsunset.hyprsunset} -t 6500"; - }; - }; - # walker = mkGraphicalService {}; - }; - }; - }; -} diff --git a/modules/home/desktop/hyprland/hyprland.nix b/modules/home/desktop/hyprland/hyprland.nix deleted file mode 100644 index ef443cc..0000000 --- a/modules/home/desktop/hyprland/hyprland.nix +++ /dev/null @@ -1,458 +0,0 @@ -{ - config, - osConfig, - perSystem, - launcher, - lockscreen, - # pkgs, - # lib, - ... -}: let - inherit (config.lib.stylix) colors; - # inherit (lib) mkIf; - hostname = osConfig.networking.hostName; - cursorSize = config.stylix.cursor.size; - fontName = config.stylix.fonts.sansSerif.name; - keyboard = - if hostname == "eldrid" - then "chromeos" - else "platform"; - xdgPictures = - config.xdg.userDirs.pictures; - # ifLaptop = mkIf (hostname != "dunamis"); -in { - enable = true; - systemd = { - enable = true; - variables = [ - "--all" - ]; - }; - package = perSystem.hyprland.hyprland; - portalPackage = perSystem.hyprland.xdg-desktop-portal-hyprland; - # plugins = with pkgs.hyprlandPlugins; [ - # hyprspace - # hy3 - # hyprscroller - # ]; - settings = { - input = { - kb_layout = "us,ua"; - resolve_binds_by_sym = - if hostname == "dunamis" - then 0 - else 1; - repeat_rate = 50; - repeat_delay = 300; - # mouse - accel_profile = "flat"; - sensitivity = 0; - }; - device = [ - { - name = "ite-tech.-inc.-ite-device(8910)-keyboard"; - kb_variant = "colemak_dh,"; - } - { - name = "at-translated-set-2-keyboard"; - kb_variant = "colemak_dh,"; - } - { - name = "keyd-virtual-keyboard"; - kb_variant = "colemak_dh,"; - } - ]; - xwayland.force_zero_scaling = true; - monitor = [ - ", preferred, auto, 1" - "desc:AOC 27V2G5 0x0000026C, addreserved, 0, 300, 0, 0" - "desc:Samsung Electric Company S24R65x H4TMA03291, preferred, 0x0, 1, bitdepth, 10, vrr, 1" - "desc:Philips Consumer Electronics Company 27M2N5500 UK02418033254, 2560x1440@180.00Hz, 0x0, 1.3333333, bitdepth, 10, vrr, 1" - "desc:BOE 0x08E8, preferred, 1920x0, 1.2, bitdepth, 10" - "desc:LG Display 0x068B, preferred, 1920x0, 1.2, bitdepth, 10" - "desc:Chimei Innolux Corporation 0x1406, preferred, 1920x0, 1.2" - "desc:KDC 0x0000, preferred, 1920x0, 1.25" - ]; - env = [ - "ELECTRON_OZONE_PLATFORM_HINT,auto" - "QT_QPA_PLATFORM,wayland" - "QT_QPA_PLATFORMTHEME,gtk3" - "XCURSORSIZE,${toString cursorSize}" - "GSK_RENDERER,ngl" - ]; - decoration = { - shadow.enabled = false; - # drop_shadow = false; - blur = { - size = 8; - passes = 3; - }; - # shadow_offset = "0 5"; - # "col.shadow" = "rgba(00000099)"; - rounding = 12; - }; - misc = { - font_family = fontName; - disable_splash_rendering = true; - disable_hyprland_logo = true; - # vfr = true; - }; - bezier = [ - "easeOutQuad, 0.25, 0.46, 0.45, 0.94" - "easeOutExpo, 0.19, 1, 0.22, 1" - ]; - animation = [ - "workspaces, 1, 3, easeOutExpo, slidefade 20%" - "windows, 1, 3, easeOutExpo, popin 80%" - "layers, 1, 2, easeOutExpo, fade" - ]; - plugin = [ - { - overview = { - gapsIn = 12; - gapsOut = 24; - exitOnClick = true; - centerAligned = true; - showNewWorkspace = false; - showEmptyWorkspace = false; - affectStrut = false; - }; - hyprexpo = { - columns = 3; - gap_size = 8; - #bg_col = "rgb(111111)"; - workspace_method = "first 1"; # [center/first] [workspace] e.g. first 1 or center m+1 - enable_gesture = true; # laptop touchpad - gesture_fingers = 3; # 3 or 4 - gesture_distance = 400; # how far is the "max" - gesture_positive = false; # positive = swipe down. Negative = swipe up.; - }; - } - { - hy3 = { - autotile = true; - tab_first_window = false; - tabs = { - render_text = true; - height = 24; - padding = 8; - rounding = 8; - text_height = 14; - text_center = true; - text_font = fontName; - - "col.active" = "0xff${colors.base00}"; - "col.inactive" = "0xff${colors.base00}"; - "col.urgent" = "0xff${colors.base00}"; - "col.active.text" = "0xff${colors.base0D}"; - "col.inactive.text" = "0xff${colors.base05}"; - "col.urgent.text" = "0xff${colors.base09}"; - "col.active.border" = "0xff${colors.base00}"; - "col.inactive.border" = "0xff${colors.base00}"; - "col.urgent.border" = "0xff${colors.base00}"; - }; - }; - } - { - scroller = { - column_widths = "onethird onehalf twothirds one"; - window_heights = "onethird onehalf twothirds one"; - gesture_scroll_fingers = 3; - gesture_overview_fingers = 3; - jump_labels_font = fontName; - jump_labels_color = "0xff${colors.base0A}"; - }; - } - ]; - - dwindle = { - force_split = 2; - default_split_ratio = 1.2; - }; - master = { - mfact = 0.6; - }; - - "$mod" = "SUPER"; - "$modShift" = "$mod SHIFT"; - "$modCtrl" = "$mod CTRL"; - "$modShiftCtrl" = "$mod SHIFT CTRL"; - - "$left" = "N"; - "$down" = "E"; - "$up" = "I"; - "$right" = "O"; - - "$terminal" = "ghostty"; - "$launcher" = launcher; - "$screenLocker" = lockscreen; - "$webBrowser" = "io.github.zen_browser.zen"; - "$clipboardManager" = "copyq menu"; - - general = { - "col.active_border" = "0xff${colors.base0D}"; - "col.inactive_border" = "0xff${colors.base03}"; - gaps_in = 4; - gaps_out = 8; - border_size = 3; - allow_tearing = true; - layout = "dwindle"; - }; - group = { - "col.border_active" = "0xff${colors.base0D}"; - "col.border_inactive" = "0xff${colors.base03}"; - "col.border_locked_active" = "0xff${colors.base0A}"; - "col.border_locked_inactive" = "0xff${colors.base0F}"; - groupbar = { - height = 16; - rounding = 0; - indicator_height = 0; - gradient_rounding = 4; - font_size = 14; - gradients = true; - font_family = fontName; - "text_color" = "0xff${colors.base00}"; - "col.active" = "0xff${colors.base0D}"; - "col.inactive" = "0xff${colors.base03}"; - }; - }; - binds.scroll_event_delay = 0; - cursor.persistent_warps = true; - - bind = [ - "$mod, Return, exec, $terminal" - "$mod, Space, exec, $launcher" - # "$modShift, Space, exec, $launcher" - "$modCtrl, Q, killactive" - "$modCtrl, M, fullscreen" - "$modCtrl, G, togglefloating" - "$mod, G, pin" - - "$mod, T, togglegroup" - "$mod, period, changegroupactive, f" - "$mod, comma, changegroupactive, b" - "$modCtrl, period, movewindoworgroup, r" - "$modCtrl, comma, movewindoworgroup, l" - - "$mod, Tab, cyclenext," - "$modShift, Tab, cyclenext, prev" - "$mod, Tab, bringactivetotop," - - "$modShift, U, focusurgentorlast" - - "$modCtrl, L, exec, $screenLocker" - "$modCtrl, B, exec, $webBrowser" - "$modCtrl, V, exec, $clipboardManager" - "$modCtrl, K, focuswindow, title:(Meet:.*)" - - # ", Print, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -o -r -c '\#\#00000000')\" -t ppm - | ${pkgs.satty}/bin/satty --filename - --fullscreen --output-filename ${xdgPictures}/screenshots/satty-$(date '+%Y%m%d-%H:%M:%S').png" - ", Print, exec, hyprshot -z -m region -o ${xdgPictures}/screenshots -f screenshot-$(date '+%Y%m%d-%H:%M:%S').png" - "CTRL, Print, exec, hyprshot -z -m window -o ${xdgPictures}/screenshots -f screenshot-$(date '+%Y%m%d-%H:%M:%S').png" - "SHIFT, Print, exec, hyprshot -z -m output -o ${xdgPictures}/screenshots -f screenshot-$(date '+%Y%m%d-%H:%M:%S').png" - ## navigation - "$mod, $left, movefocus, l" - "$mod, $down, movefocus, d" - "$mod, $up, movefocus, u" - "$mod, $right, movefocus, r" - "$modShift, $left, workspace, e-1" - "$modShift, $right, workspace, e+1" - "$mod, left, movefocus, l" - "$mod, up, movefocus, u" - "$mod, down, movefocus, d" - "$mod, right, movefocus, r" - "$modShift, W, focuscurrentorlast" - "$mod, mouse_down, workspace, e-1" - "$mod, mouse_up, workspace, e+1" - "$modShift, left, workspace, e-1" - "$modShift, right, workspace, e+1" - - "$modCtrl, $left, movewindow, l" - "$modCtrl, $down, movewindow, d" - "$modCtrl, $up, movewindow, u" - "$modCtrl, $right, movewindow, r" - "$modCtrl, left, movewindow, l" - "$modCtrl, up, movewindow, u" - "$modCtrl, down, movewindow, d" - "$modCtrl, right, movewindow, r" - # workspaces - "$mod, 1, workspace, 1" - "$mod, 2, workspace, 2" - "$mod, 3, workspace, 3" - "$mod, 4, workspace, 4" - "$mod, 5, workspace, 5" - "$mod, 6, workspace, 6" - "$mod, 7, workspace, 7" - "$mod, 8, workspace, 8" - "$mod, 9, workspace, 9" - "$mod, 0, togglespecialworkspace" - - "$modShiftCtrl, 1, movetoworkspace, 1" - "$modShiftCtrl, 2, movetoworkspace, 2" - "$modShiftCtrl, 3, movetoworkspace, 3" - "$modShiftCtrl, 4, movetoworkspace, 4" - "$modShiftCtrl, 5, movetoworkspace, 5" - "$modShiftCtrl, 6, movetoworkspace, 6" - "$modShiftCtrl, 7, movetoworkspace, 7" - "$modShiftCtrl, 8, movetoworkspace, 8" - "$modShiftCtrl, 9, movetoworkspace, 9" - "$modShiftCtrl, 0, movetoworkspace, special" - - "$mod, Q, workspace, 1" - "$mod, W, workspace, 2" - "$mod, F, workspace, 3" - "$mod, P, workspace, 4" - "$mod, B, workspace, 5" - "$mod, J, workspace, 6" - "$mod, L, workspace, 7" - "$mod, U, workspace, 8" - "$mod, Y, workspace, 9" - "$mod, apostrophe, togglespecialworkspace" - - "$modShiftCtrl, Q, movetoworkspace, 1" - "$modShiftCtrl, W, movetoworkspace, 2" - "$modShiftCtrl, F, movetoworkspace, 3" - "$modShiftCtrl, P, movetoworkspace, 4" - "$modShiftCtrl, B, movetoworkspace, 5" - "$modShiftCtrl, J, movetoworkspace, 6" - "$modShiftCtrl, L, movetoworkspace, 7" - "$modShiftCtrl, U, movetoworkspace, 8" - "$modShiftCtrl, Y, movetoworkspace, 9" - "$modShiftCtrl, apostrophe, movetoworkspace, special" - - "$modShiftCtrl, $left, movetoworkspace, e-1" - "$modShiftCtrl, $right, movetoworkspace, e+1" - "$modShiftCtrl, left, movetoworkspace, e-1" - "$modShiftCtrl, right, movetoworkspace, e+1" - - ''$mod ALT, mouse_down, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 1.25}')"'' - ''$mod ALT, mouse_up, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 1.25}')"'' - "$mod ALT, mouse:274, exec, hyprctl keyword cursor:zoom_factor 1" # middle wheel click - ]; - # binde = [ - # "$mod, comma, resizeactive, -10 0" - # "$mod, period, resizeactive, 10 0" - # "$modShift, comma, resizeactive, 0 -10" - # "$modShift, period, resizeactive, 0 10" - # ]; - bindl = [ - "$mod, Escape, exec, hyprctl switchxkblayout all next" - ", switch:on:Lid Switch, exec, hyprctl keyword monitor 'eDP-1, disable'" - ", switch:off:Lid Switch, exec, hyprctl keyword monitor 'eDP-1, preferred, 1920x0, 1.2'" - ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" - ", XF86AudioPlay, exec, playerctl play-pause" - ", XF86AudioPrev, exec, playerctl previous" - ", XF86AudioNext, exec, playerctl next" - "$modShiftCtrl ALT, Q, exit" - ]; - binde = [ - ", XF86MonBrightnessUp, exec, brightnessctl s 5%+" - ", XF86MonBrightnessDown, exec, brightnessctl s 5%-" - "ALT, XF86MonBrightnessUp, exec, brightnessctl s 5%+ -d ${keyboard}::kbd_backlight" - "ALT, XF86MonBrightnessDown, exec, brightnessctl s 5%- -d ${keyboard}::kbd_backlight" - ", XF86KbdBrightnessUp, exec, brightnessctl s 5%+ -d ${keyboard}::kbd_backlight" - ", XF86KbdBrightnessDown, exec, brightnessctl s 5%- -d ${keyboard}::kbd_backlight" - ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+" - ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" - ]; - bindm = [ - "$mod, mouse:272, movewindow" - "$mod, mouse:273, resizewindow" - "$mod ALT, mouse:272, resizewindow" - ]; - gestures = { - workspace_swipe = true; - workspace_swipe_fingers = 3; - workspace_swipe_distance = 300; - }; - - workspace = [ - "1, defaultName:general" - "2, defaultName:web" - "3, defaultName:chat" - "4, defaultName:code" - "5, defaultName:uni" - "6, defaultName:games" - "7, defaultName:system" - "8, defaultName:media" - "9, defaultName:tray" - # "10, defaultName:" - ]; - windowrulev2 = [ - ## tray/misc utilities - # file picker - "float, class:xdg-desktop-portal-gtk" - "size <50% <90%, class:xdg-desktop-portal-gtk" - "center 1, class:xdg-desktop-portal-gtk" - # xdp-hyprland stream picker - "float, initialTitle:MainPicker" - # general apps - "float, class:(com.saivert.pwvucontrol)" - "float, class:(re.sonny.Junction)" - "float, class:(com.github.hluk.copyq)" - "float, class:(nm-connection-editor)" - "float, class:(.blueman-manager-wrapped)" - # telegram - "maximize, initialTitle:Медіапереглядач" - "noborder, title:TelegramDesktop" - "keepaspectratio, title:TelegramDesktop" - "noblur, title:TelegramDesktop" - "float, title:TelegramDesktop" - "pin, title:TelegramDesktop" - # any chromium-based - "noborder, title:Картинка в картинці" - "keepaspectratio, title:Картинка в картинці" - "noblur, title:Картинка в картинці" - "float, title:Картинка в картинці" - "pin, title:Картинка в картинці" - # and firefox - "noborder, title:Picture-in-Picture" - "keepaspectratio, title:Picture-in-Picture" - "noblur, title:Picture-in-Picture" - "float, title:Picture-in-Picture" - "pin, title:Picture-in-Picture" - # screenshot editor - "noanim, class:com.gabm.satty" - "float, class:com.gabm.satty" - "rounding 0, class:com.gabm.satty" - "size 100% 100%, class:com.gabm.satty" - "move 0 0, class:com.gabm.satty" - "pin, class:com.gabm.satty" - ## games - "float, class:(com.mojang.minecraft.java-edition)" - "immediate, class:(com.mojang.minecraft.java-edition)" - # cs2 - "immediate, class:(cs2)" - # deadlock - # "float, class:(steam_app_1422450)" - "fullscreen, class:(steam_app_1422450)" - "immediate, class:(steam_app_1422450)" - "immediate, initialTitle:(Ghostrunner)" - # dead by daylight - "immediate, class:deadbydaylight-egs-shipping.exe" - ## workspace assignments - "workspace name:chat, class:org.telegram.desktop" - "workspace name:chat, class:org.signal.Signal" - "workspace name:chat, class:im.riot.Riot" - "workspace name:chat, class:WebCord" - - "workspace name:games, class:com.heroicgameslauncher.hgl" - "workspace name:games, class:net.lutris.Lutris" - "workspace name:games, class:steam" - # "workspace name:game, class:" - ]; - }; - extraConfig = '' - bind = $modShift, R, submap, resize - submap = resize - binde = , right, resizeactive, 10 0 - binde = , left, resizeactive, -10 0 - binde = , up, resizeactive, 0 -10 - binde = , down, resizeactive, 0 10 - binde = , $right, resizeactive, 10 0 - binde = , $left, resizeactive, -10 0 - binde = , $up, resizeactive, 0 -10 - binde = , $down, resizeactive, 0 10 - bind = , escape, submap, reset - submap = reset - ''; -} diff --git a/modules/home/desktop/hyprland/programs/default.nix b/modules/home/desktop/hyprland/programs/default.nix deleted file mode 100644 index 7c2a5d0..0000000 --- a/modules/home/desktop/hyprland/programs/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - osConfig, - config, - inputs, - pkgs, - lib, - ... -}: let - inherit (lib) mkIf mkDefault getExe; - inherit (config.lib.stylix) colors; - inherit (osConfig.networking) hostName; - ifLaptop = mkIf (hostName != "dunamis"); -in { - imports = with inputs; [ - walker.homeManagerModules.default - ]; - options = config.desktop.hyprland.enable { - # programs.fuzzel = import ./fuzzel {inherit config mkDefault;}; - programs.walker = import ./walker {inherit config inputs pkgs;}; - programs.waybar = import ./waybar {inherit colors config getExe ifLaptop pkgs;}; - programs.hyprlock = import ./hyprlock {inherit config pkgs;}; - }; -} diff --git a/modules/home/desktop/hyprland/programs/fuzzel/default.nix b/modules/home/desktop/hyprland/programs/fuzzel/default.nix deleted file mode 100644 index 392d616..0000000 --- a/modules/home/desktop/hyprland/programs/fuzzel/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - config, - mkDefault, -}: { - enable = true; - settings = { - main = { - terminal = "$TERMINAL -e"; - fields = "filename,name,generic,keywords,categories,exec"; - dpi-aware = false; - width = 20; - horizontal-pad = 12; - vertical-pad = 12; - show-actions = true; - match-mode = "fuzzy"; - icon-theme = config.dconf.settings."org/gnome/desktop/interface".icon-theme; - }; - border = mkDefault { - width = 3; - radius = 12; - }; - }; -} diff --git a/modules/home/desktop/hyprland/programs/hyprlock/default.nix b/modules/home/desktop/hyprland/programs/hyprlock/default.nix deleted file mode 100644 index be8ce29..0000000 --- a/modules/home/desktop/hyprland/programs/hyprlock/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - config, - pkgs, - ... -}: let - inherit (config.stylix) colors; -in { - enable = true; - settings = { - general = { - disable_loading_bar = true; - #grace = 300; - hide_cursor = true; - no_fade_in = false; - }; - - background = [ - { - path = "screenshot"; - blur_passes = 4; - blur_size = 8; - } - ]; - - input-field = [ - { - size = "274, 50"; - rounding = 12; - outline_thickness = 3; - position = "0, 0"; - monitor = ""; - dots_center = true; - fade_on_empty = false; - font_family = "${config.stylix.fonts.serif.name}"; - font_color = "rgb(${colors.base05})"; - inner_color = "rgb(${colors.base00})"; - outer_color = "rgb(${colors.base0D})"; - check_color = "rgb(${colors.base0A})"; - fail_color = "rgb(${colors.base08})"; - placeholder_text = "locked..."; - fail_text = "wrong"; - shadow_passes = 0; - } - ]; - shape = [ - { - rounding = 12; - #border_size = 3; - size = "274, 50"; - color = "rgb(${colors.base00})"; - border_color = "rgb(${colors.base0D})"; - position = "0, 60"; - halign = "center"; - valign = "center"; - } - { - rounding = 12; - #border_size = 3; - size = "274, 50"; - color = "rgb(${colors.base00})"; - border_color = "rgb(${colors.base0D})"; - position = "0, -60"; - halign = "center"; - valign = "center"; - } - ]; - label = [ - { - monitor = ""; - text = "$LAYOUT"; #"cmd[update:1000] ${pkgs.uutils-coreutils-noprefix}/bin/echo $(${pkgs.uutils-coreutils-noprefix}/bin/date +%H:%M:%S)"; - text_align = "center"; - font_size = 16; - font_family = "${config.stylix.fonts.serif.name}"; - outer_color = "rgb(${colors.base00})"; - color = "rgb(${colors.base05})"; - position = "0, 60"; - halign = "center"; - valign = "center"; - } - { - monitor = ""; - text = "cmd[update:1000] ${pkgs.uutils-coreutils-noprefix}/bin/echo $(${pkgs.uutils-coreutils-noprefix}/bin/date +'%m/%d %a %T')"; - text_align = "center"; - font_size = 16; - font_family = "${config.stylix.fonts.serif.name}"; - outer_color = "rgb(${colors.base00})"; - color = "rgb(${colors.base05})"; - position = "0, -60"; - halign = "center"; - valign = "center"; - } - ]; - }; -} diff --git a/modules/home/desktop/hyprland/programs/walker/default.nix b/modules/home/desktop/hyprland/programs/walker/default.nix deleted file mode 100644 index a318f7b..0000000 --- a/modules/home/desktop/hyprland/programs/walker/default.nix +++ /dev/null @@ -1,307 +0,0 @@ -{ - config, - pkgs, - ... -}: { - enable = true; - package = pkgs.walker; - runAsService = true; - config = { - activation_mode.labels = "neiotsra"; - as_window = false; - disabled = [ - "bookmarks" - "clipboard" - "custom_commands" - "translation" - "websearch" - ]; - builtins = { - applications = { - actions.enabled = true; - context_aware = true; - name = "applications"; - placeholder = "Applications"; - prioritize_new = true; - refresh = true; - show_generic = true; - show_icon_when_single = true; - show_sub_when_single = true; - weight = 10; - }; - calc = { - icon = "accessories-calculator"; - min_chars = 4; - name = "calc"; - placeholder = "Calculator"; - weight = 5; - }; - clipboard = { - image_height = 300; - max_entries = 10; - name = "clipboard"; - placeholder = "Clipboard"; - switcher_only = true; - weight = 5; - }; - commands = { - icon = "utilities-terminal"; - name = "commands"; - placeholder = "Commands"; - switcher_only = true; - weight = 8; - }; - custom_commands = { - icon = "utilities-terminal"; - name = "custom_commands"; - placeholder = "Custom Commands"; - weight = 5; - }; - dmenu = { - name = "dmenu"; - placeholder = "Dmenu"; - switcher_only = true; - weight = 5; - }; - emojis = { - history = true; - name = "emojis"; - placeholder = "Emojis"; - switcher_only = true; - typeahead = true; - weight = 5; - }; - finder = { - concurrency = 8; - icon = "folder"; - ignore_gitignore = true; - name = "finder"; - placeholder = "Finder"; - refresh = true; - switcher_only = true; - weight = 5; - }; - runner = { - generic_entry = false; - history = true; - icon = "utilities-terminal"; - name = "runner"; - placeholder = "Runner"; - refresh = true; - typeahead = true; - weight = 5; - }; - ssh = { - history = true; - icon = "preferences-system-network"; - name = "ssh"; - placeholder = "SSH"; - refresh = true; - switcher_only = true; - weight = 5; - }; - switcher = { - name = "switcher"; - placeholder = "Switcher"; - prefix = "/"; - weight = 5; - }; - websearch = { - icon = "applications-internet"; - name = "websearch"; - placeholder = "Websearch"; - weight = 5; - }; - windows = { - icon = "view-restore"; - name = "windows"; - placeholder = "Windows"; - weight = 10; - }; - }; - disable_click_to_close = false; - force_keyboard_focus = true; - list = { - max_entries = 50; - show_initial_entries = true; - single_click = true; - }; - search = { - delay = 0; - force_keyboard_focus = true; - history = true; - placeholder = "Search..."; - }; - }; - theme = { - layout = { - ui = { - anchors = { - bottom = false; - left = false; - right = false; - top = false; - }; - window = { - h_align = "center"; - v_align = "center"; - box = { - width = 450; - h_align = "center"; - v_align = "center"; - # spacing = 12; - orientation = "vertical"; - search = { - margins = { - start = 8; - top = 8; - end = 8; - bottom = 0; - }; - h_align = "top"; - }; - scroll = { - overlay_scrolling = true; - list = { - margins = { - bottom = 8; - top = 4; - start = 8; - end = 8; - }; - item = { - icon.theme = "${config.gtk.iconTheme.name}"; - spacing = 4; - activation_label = { - x_align = 0.5; - y_align = 0.5; - width = 32; - }; - text = { - h_align = "start"; - h_expand = true; - revert = true; - wrap = true; - }; - }; - }; - }; - }; - }; - }; - }; - style = let - inherit (config.lib.stylix) colors; - in '' - @define-color base00 #${colors.base00}; - @define-color base01 #${colors.base01}; - @define-color base02 #${colors.base02}; - @define-color base03 #${colors.base03}; - @define-color base04 #${colors.base04}; - @define-color base05 #${colors.base05}; - @define-color base06 #${colors.base06}; - @define-color base07 #${colors.base07}; - @define-color base08 #${colors.base08}; - @define-color base09 #${colors.base09}; - @define-color base0A #${colors.base0A}; - @define-color base0B #${colors.base0B}; - @define-color base0C #${colors.base0C}; - @define-color base0D #${colors.base0D}; - @define-color base0E #${colors.base0E}; - @define-color base0F #${colors.base0F}; - - #window, - #box, - #search, - #password, - #input, - #typeahead, - #spinner, - #list, - child, - scrollbar, - slider, - #item, - #text, - #label, - #sub, - #activationlabel { - all: unset; - } - - #window { - background: @base00; - color: @base05; - border-radius: 20px; - border: 3px solid @base0D; - } - - #box { - background: @base00; - } - - #search { - background: @base01; - border-radius: 12px 12px 6px 6px; - padding: 8px; - } - - #password, - #input, - #typeahead { - background: none; - box-shadow: none; - border-radius: 12px; - } - - #input > *:first-child, - #typeahead > *:first-child { - margin-right: 12px; - border-radius: 0px; - } - - #typeahead { - color: @base05; - } - - #input placeholder { - opacity: 0.5; - } - - #list { - padding: 8px; - border-radius: 6px 6px 12px 12px; - background: @base01; - } - - child { - box-shadow: none; - } - - child:selected, - child:hover { - box-shadow: none; - border-radius: 8px; - background: @base02; - } - - #item { - padding: 4px; - } - - #sub { - font-size: smaller; - opacity: 0.5; - } - - #activationlabel { - opacity: 0.5; - } - - .activation #activationlabel { - opacity: 1; - color: @base05; - } - ''; - }; -} diff --git a/modules/home/desktop/hyprland/programs/waybar/default.nix b/modules/home/desktop/hyprland/programs/waybar/default.nix deleted file mode 100644 index 637b735..0000000 --- a/modules/home/desktop/hyprland/programs/waybar/default.nix +++ /dev/null @@ -1,331 +0,0 @@ -{ - colors, - config, - getExe, - ifLaptop, - pkgs, - ... -}: { - enable = true; - systemd = { - enable = true; - target = "graphical-session.target"; - }; - settings = { - bar-0 = { - # layer = "top"; - position = "bottom"; - height = 24; - spacing = 6; - # margin-left = 33 + 3; - # margin-right = 33 + 3; - margin-left = 8; - margin-right = 8; - margin-bottom = 8; - reload_style_on_change = true; - modules-left = [ - "hyprland/language" - "hyprland/workspaces" - "wlr/taskbar" - ]; - modules-center = ["clock"]; - modules-right = [ - (ifLaptop "group/laptop") - "wireplumber" - "tray" - "privacy" - (ifLaptop "power-profiles-daemon") - "idle_inhibitor" - "custom/notification" - ]; - "niri/workspaces" = { - format = "{icon}"; - format-icons = { - "1" = "൧"; - "2" = "൨"; - "3" = "൩"; - "4" = "൪"; - "5" = "൫"; - "6" = "൬"; - "7" = "൭"; - "8" = "൮"; - "9" = "൯"; - "10" = "൰"; - general = "󰘧"; - web = "󰖟"; - chat = "󰻞"; - code = "󰅩"; - uni = "󱆀"; - games = "󰺶"; - system = "󰢻"; - media = "󱜐"; - tray = "󱊖"; - }; - }; - "niri/language" = { - format = "{}"; - format-en = "🇺🇸"; - format-uk = "🇺🇦"; - }; - "custom/separator" = { - format = "󰝠"; - interval = "once"; - tooltip = false; - }; - "group/laptop" = { - orientation = "inherit"; - modules = [ - "battery" - "backlight" - ]; - }; - "backlight" = { - format = "{icon} {percent}%"; - format-icons = [ - "󰃚" - "󰃛" - "󰃜" - "󰃝" - "󰃞" - "󰃟" - "󰃠" - ]; - }; - "idle_inhibitor" = { - format = "{icon}"; - format-icons = { - activated = "󰅶"; - deactivated = "󰾪"; - }; - }; - "tray" = { - icon-size = 20; - spacing = 6; - }; - "clock" = { - interval = 1; - format = "{:%H:%M:%S}"; - tooltip-format = "{:%d.%m.%Y}"; - }; - battery = { - states = { - good = 95; - warning = 30; - critical = 15; - }; - format = "{icon} {capacity}%"; - format-full = "󱟢 {capacity}%"; - format-charging = "󰂄 {capacity}%"; - format-plugged = "󰚥 {capacity}%"; - format-alt = "{icon} {time}"; - format-icons = ["󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"]; - }; - mpris = { - format = "{player_icon} {dynamic}"; - format-paused = "{status_icon} {dynamic}"; - playing-len = 30; - playing-paused = 30; - player-icons = { - default = "▶"; - mpv = "🎵"; - }; - status-icons = {paused = "⏸";}; - }; - "upower" = { - icon-size = 16; - format = "{percentage}"; - hide-if-empty = true; - tooltip = true; - tooltip-spacing = 20; - }; - "power-profiles-daemon" = { - format = "{icon}"; - tooltip-format = "Power profile: {profile}\nDriver: {driver}"; - tooltip = true; - format-icons = { - default = "󱡮"; - performance = "󱡮"; - balanced = ""; - power-saver = ""; - }; - }; - "wireplumber" = { - scroll-step = 3; - format = "{icon} {volume}%"; - format-muted = "󰖁"; - format-icons = ["󰕿" "󰖀" "󰕾"]; - on-click = getExe pkgs.pwvucontrol; - on-click-right = "wpctl set-mute @DEFAULT_SINK@ toggle"; - }; - "custom/notification" = { - tooltip = false; - format = "{icon}"; - format-icons = { - notification = "󱅫"; - none = "󰂚"; - dnd-notification = "󰂛"; - dnd-none = "󰂛"; - }; - return-type = "json"; - exec-if = "which swaync-client"; - exec = "swaync-client -swb"; - on-click = "swaync-client -t -sw"; - on-click-right = "swaync-client -d -sw"; - escape = true; - }; - "privacy" = { - icon-spacing = 2; - icon-size = 16; - transition-duration = 250; - screenshare = { - type = "screenshare"; - tooltip = true; - tooltip-icon-size = 24; - }; - audio-in = { - type = "audio-in"; - tooltip = true; - tooltip-icon-size = 24; - }; - }; - "wlr/taskbar" = { - format = "{icon}"; - icon-size = 20; - icon-theme = "${config.dconf.settings."org/gnome/desktop/interface".icon-theme}"; - tooltip-format = "{title}"; - on-click = "activate"; - }; - }; - }; - style = '' - @define-color base00 #${colors.base00}; - @define-color base01 #${colors.base01}; - @define-color base02 #${colors.base02}; - @define-color base03 #${colors.base03}; - @define-color base04 #${colors.base04}; - @define-color base05 #${colors.base05}; - @define-color base06 #${colors.base06}; - @define-color base07 #${colors.base07}; - @define-color base08 #${colors.base08}; - @define-color base09 #${colors.base09}; - @define-color base0A #${colors.base0A}; - @define-color base0B #${colors.base0B}; - @define-color base0C #${colors.base0C}; - @define-color base0D #${colors.base0D}; - @define-color base0E #${colors.base0E}; - @define-color base0F #${colors.base0F}; - * { - font-family: ${config.stylix.fonts.sansSerif.name}, FontAwesome; - font-weight: 500; - font-size: 100%; - } - window#waybar { - background-color: transparent; - color: @base05; - } - .modules-center { - background-color: transparent; - } - .mpris.stopped { - background-color: transparent; - } - .modules-left, - .modules-center, - .modules-right { - /* border-bottom-left-radius: 12px; - border-bottom-right-radius: 12px; - border-top-left-radius: 0px; - border-top-right-radius: 0px; */ - background-color: @base00; - border-radius: 24px; - border: 3px solid @base0D; - color: @base05; - padding: 0 0.4em; - } - tooltip { - background: @base01; - border: 1px solid @base0E; - } - tooltip label { - color: @base05; - } - button { - box-shadow: inset 0 -3px transparent; - border-radius: 16px; - } - button:hover { - background: inherit; - box-shadow: inset 0 -3px transparent; - } - #mode { - background-color: rgba(0, 0, 0, 0.2); - box-shadow: inset 0 -3px @base05; - } - #battery, - #backlight, - /* #workspaces, - #taskbar, - #privacy, */ - #taskbar button, - #language, - #clock, - #battery, - #backlight, - #wireplumber, - #workspaces button, - #custom-notification, - #idle_inhibitor, - #power-profiles-daemon, - #privacy-item, - #custom-separator { - padding: 0 0.3em; - } - #tray button { - padding: 0 0.3em; - margin: 0 0.2em; - } - #workspaces button.active { - color: @base0D; - } - #taskbar button:hover { - box-shadow: transparent; - } - #taskbar.empty, - window#empty { - background-color: transparent; - } - #battery.critical:not(.charging) { - color: @base09; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: steps(12); - animation-iteration-count: infinite; - animation-direction: alternate; - } - #power-profiles-daemon.performance { - color: @base0D; - } - #power-profiles-daemon.balanced { - color: @base0B; - } - #power-profiles-daemon.power-saver { - color: @base0A; - } - label:focus { - background-color: #000000; - } - #tray > .passive { - -gtk-icon-effect: dim; - } - #tray > .needs-attention { - -gtk-icon-effect: highlight; - background-color: @base08; - } - #privacy-item.screenshare { - color: @base0C; - } - #privacy-item.audio-in { - color: @base0E; - } - ''; -} diff --git a/modules/home/desktop/hyprland/services/default.nix b/modules/home/desktop/hyprland/services/default.nix deleted file mode 100644 index b974069..0000000 --- a/modules/home/desktop/hyprland/services/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - # getExe, - perSystem, - # pkgs, - lockscreen, - ... -}: { - swaync = import ./swaync; - network-manager-applet.enable = true; - blueman-applet.enable = true; - playerctld.enable = true; - wpaperd.enable = true; - hyprpaper.enable = true; - copyq = { - enable = true; - package = perSystem.nixpkgs-stable.copyq; - }; - gnome-keyring = { - enable = true; - components = ["secrets"]; - }; - gammastep = { - enable = true; - provider = "manual"; - latitude = 49.6; - longitude = 36.1; - tray = true; - temperature = { - day = 6500; - night = 3000; - }; - }; - swayosd = { - enable = true; - topMargin = 0.8; - }; - udiskie = { - enable = true; - automount = false; - notify = true; - tray = "auto"; - }; - hypridle = { - enable = true; - settings = { - general = { - before_sleep_cmd = "loginctl lock-session"; - after_sleep_cmd = "hyprctl dispatch dpms on"; - lock_cmd = "pidof hyprlock || hyprlock"; - # unlock_cmd = "loginctl unlock-session"; - }; - listener = [ - { - timeout = 600; - on-timeout = "pidof ${lockscreen} || ${lockscreen}"; - } - { - timeout = 601; - on-timeout = "hyprctl dispatch dpms off"; - on-resume = "hyprctl dispatch dpms on"; - } - ]; - }; - }; -} diff --git a/modules/home/desktop/hyprland/services/swaync/default.nix b/modules/home/desktop/hyprland/services/swaync/default.nix deleted file mode 100644 index fc2b35c..0000000 --- a/modules/home/desktop/hyprland/services/swaync/default.nix +++ /dev/null @@ -1,177 +0,0 @@ -{ - enable = true; - settings = { - cssPriority = "user"; - image-visibility = "when-available"; - keyboard-shortcut = true; - relative-timestamps = true; - timeout = 5; - timeout-low = 5; - timeout-critical = 0; - script-fail-notify = true; - transition-time = 200; - - # Layer settings - layer-shell = true; - layer = "overlay"; - control-center-layer = "overlay"; - - # Notification settings - positionX = "right"; - positionY = "top"; - notification-2fa-action = true; - notification-inline-replies = false; - notification-icon-size = 32; - notification-body-image-height = 100; - notification-body-image-width = 200; - notification-window-width = 400; - - # Control center settings - control-center-positionX = "right"; - control-center-positionY = "top"; - control-center-width = 500; - control-center-exclusive-zone = true; - fit-to-screen = true; - hide-on-action = true; - hide-on-clear = false; - - # Widget settings - widgets = [ - "title" - "dnd" - "notifications" - "mpris" - ]; - - widget-config = { - title = { - text = "Notifications"; - clear-all-button = true; - button-text = "Clear All"; - }; - dnd = { - text = "Do Not Disturb"; - }; - mpris = { - image-size = 96; - image-radius = 12; - blur = true; - }; - }; - }; - style = '' - /*** Global ***/ - progress, - progressbar, - trough { - border-radius: 16px; - } - - .app-icon, - .image { - -gtk-icon-effect: none; - } - - .notification-action { - border-radius: 12px; - margin: 0.5rem; - } - - .close-button { - margin: 24px; - padding: 0.2rem; - border-radius: 16px; - } - - /*** Notifications ***/ - .notification-group.collapsed - .notification-row:not(:last-child) - .notification-action, - .notification-group.collapsed - .notification-row:not(:last-child) - .notification-default-action { - opacity: 0; - } - - .trough { - margin: 4px; - border-radius: 7px; - } - - .notification, - .notification.low, - .notification.normal, - .notification.critical, - .control-center { - margin: 16px; - border-radius: 7px; - } - - .floating-notifications, - .notification-content { - border-radius: 7px; - } - - .control-center-list { - background: transparent; - } - - /*** Widgets ***/ - /* Title widget */ - .widget-title { - margin: 0.5rem; - } - - .widget-title > label { - font-weight: bold; - } - - .widget-title > button { - border-radius: 16px; - padding: 0.5rem; - } - - /* DND Widget */ - .widget-dnd { - margin: 0.5rem; - } - - .widget-dnd > label { - font-weight: bold; - } - - .widget-dnd > switch { - border-radius: 16px; - } - - .widget-dnd > switch slider { - border-radius: 16px; - padding: 0.25rem; - } - - /* Mpris widget */ - .widget-mpris .widget-mpris-player { - border-radius: 16px; - margin: 0.5rem; - padding: 0.5rem; - } - - .widget-mpris .widget-mpris-player .widget-mpris-album-art { - border-radius: 16px; - } - - .widget-mpris .widget-mpris-player .widget-mpris-title { - font-weight: bold; - } - - .widget-mpris .widget-mpris-player .widget-mpris-subtitle { - font-weight: normal; - } - - .widget-mpris .widget-mpris-player > box > button { - border: 1px solid transparent; - border-radius: 16px; - padding: 0.25rem; - } - ''; -} diff --git a/modules/homePrograms/ghostty.nix b/modules/homePrograms/ghostty.nix index 2c57496..e69a5a4 100644 --- a/modules/homePrograms/ghostty.nix +++ b/modules/homePrograms/ghostty.nix @@ -1,12 +1,6 @@ -{ - config, - lib, - perSystem, - ... -}: { +{}: { programs.ghostty.enable = true; programs.ghostty = { - package = perSystem.ghostty.ghostty; settings = { gtk-single-instance = true; window-decoration = "client"; diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 7f05925..bca2027 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -4,7 +4,6 @@ ./cosmic ./dms ./gnome - # ./hyprland # ./niri # ./plasma ]; diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix deleted file mode 100644 index 9d702db..0000000 --- a/modules/nixos/desktop/hyprland/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - perSystem, - config, - pkgs, - lib, - ... -}: let - inherit (lib) mkEnableOption mkIf; - inherit (perSystem) hyprland; - cfg = config.desktop.hyprland; -in { - options = { - desktop.hyprland.enable = - mkEnableOption "enable hyprland desktop"; - }; - config = mkIf cfg.enable { - module.desktop.displayManager = "greetd"; - module.desktop.gnome-keyring.enable = true; - sound.pipewire.enable = true; - - programs.hyprland = { - enable = true; - package = hyprland.hyprland; - portalPackage = hyprland.xdg-desktop-portal-hyprland; - }; - security.pam.services.hyprlock = {}; - xdg.portal = { - enable = true; - extraPortals = [ - hyprland.xdg-desktop-portal-hyprland - pkgs.xdg-desktop-portal-gtk - ]; - config.hyprland.default = ["hyprland" "gtk"]; - }; - }; -} diff --git a/modules/nixos/shared/misc/default.nix b/modules/nixos/shared/misc/default.nix index 8079efc..85f7bf9 100644 --- a/modules/nixos/shared/misc/default.nix +++ b/modules/nixos/shared/misc/default.nix @@ -5,7 +5,6 @@ ... }: { imports = [ - # inputs.chaotic.nixosModules.default ./slim.nix ./uutils.nix ]; diff --git a/modules/nixos/shared/nix/substituters.nix b/modules/nixos/shared/nix/substituters.nix index 19ea112..28a5429 100644 --- a/modules/nixos/shared/nix/substituters.nix +++ b/modules/nixos/shared/nix/substituters.nix @@ -2,14 +2,12 @@ nix.settings = { substituters = [ "https://cache.nixos.org/" - "https://chaotic-nyx.cachix.org/" "https://cosmic.cachix.org/" "https://nix-community.cachix.org/" "https://vicinae.cachix.org" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="