diff --git a/flake.lock b/flake.lock index 6b4f057..d34b8d6 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1774211390, - "narHash": "sha256-sTtAgCCaX8VNNZlQFACd3i1IQ+DB0Wf3COgiFS152ds=", + "lastModified": 1776876344, + "narHash": "sha256-Ubqb/agkuMJK+k19gjQgHux/eOYRc1sRGoOZOho8+VY=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "f62a4dbfa4e5584f14ad4c62afedf6e4b433cf70", + "rev": "648a13d0ee1e03a843b3e145b8ece15393058701", "type": "github" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1767714506, - "narHash": "sha256-WaTs0t1CxhgxbIuvQ97OFhDTVUGd1HA+KzLZUZBhe0s=", + "lastModified": 1774017633, + "narHash": "sha256-CWhnwL2M83/ItapPVeJqCevRoQttesYxJ1h0Mo6ZCXs=", "owner": "cachix", "repo": "cachix", - "rev": "894c649f0daaa38bbcfb21de64be47dfa7cd0ec9", + "rev": "e8be573b417f3daa3dd4cb9052178f848e0c9d1d", "type": "github" }, "original": { @@ -161,11 +161,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1774098279, - "narHash": "sha256-OoQRoQmwCuBBXObi82F6C+eYV1lYCt5Va5k/VckJ6vo=", + "lastModified": 1777734189, + "narHash": "sha256-kbIhdhDPaTP6gxAPkcRYeB+cqPFDpTM/bnw+m+26vkI=", "owner": "catppuccin", "repo": "nix", - "rev": "cb374516af3ccc3aa0c6ef518292bf4ae417a60e", + "rev": "e68cf5deaf1a7afed2e548835dba2ae99f5a3ccb", "type": "github" }, "original": { @@ -179,7 +179,7 @@ "cachix": "cachix_2", "crate2nix_stable": "crate2nix_stable", "devshell": "devshell_2", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", "nix-test-runner": "nix-test-runner_2", "nixpkgs": [ @@ -189,16 +189,17 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1773440526, - "narHash": "sha256-OcX1MYqUdoalY3/vU67PEx8m6RvqGxX0LwKonjzXn7I=", - "owner": "nix-community", + "lastModified": 1772186516, + "narHash": "sha256-8s28pzmQ6TOIUzznwFibtW1CMieMUl1rYJIxoQYor58=", + "owner": "rossng", "repo": "crate2nix", - "rev": "e697d3049c909580128caa856ab8eb709556a97b", + "rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "rossng", "repo": "crate2nix", + "rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e", "type": "github" } }, @@ -211,7 +212,7 @@ "crate2nix_stable" ], "devshell": "devshell", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "nix-test-runner": "nix-test-runner", "nixpkgs": "nixpkgs_4", @@ -234,44 +235,65 @@ }, "dankMaterialShell": { "inputs": { + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs-unstable" ], "quickshell": "quickshell" }, "locked": { - "lastModified": 1768575133, - "narHash": "sha256-P//moH3z9r4PXirTzXVsccQINsK5AIlF9RWOBwK3vLc=", + "lastModified": 1777675128, + "narHash": "sha256-2zuDs9Lju99dg8MsSPf1frKPPgCRakDn+CEGX71cHJ0=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "a7cdb39b0b89b9af86160ad4e847a7d14ea44512", + "rev": "c1cbd0994f5a3585dded85069f2c9103c54f5285", "type": "github" }, "original": { "owner": "AvengeMedia", - "ref": "v1.2.3", "repo": "DankMaterialShell", "type": "github" } }, + "danksearch": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1777084764, + "narHash": "sha256-qSwgvkWSh8Er0TfeYfDxVC5J6ClE1ehu0wf3sxhI6xk=", + "owner": "AvengeMedia", + "repo": "danksearch", + "rev": "18591ecaa4b87acb222391f9aedd2fbbef9c087f", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "repo": "danksearch", + "type": "github" + } + }, "devenv": { "inputs": { "cachix": "cachix", "crate2nix": "crate2nix", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_3", + "ghostty": "ghostty", "git-hooks": "git-hooks_3", "nix": "nix", "nixd": "nixd", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1774261302, - "narHash": "sha256-P5noO+IXXDBL7l8dEVcig94OXfzLiN1K1KT0COjPcTU=", + "lastModified": 1777679510, + "narHash": "sha256-uG8LPb1useAwa0cjO5sEkYhCSPjbWiCH3DyNxQLVSck=", "owner": "cachix", "repo": "devenv", - "rev": "406f2ed97937995234c5d3de43cf77f31c42ca2b", + "rev": "bc8b21628907c726c74094cedc439c10a455cdb7", "type": "github" }, "original": { @@ -332,11 +354,11 @@ ] }, "locked": { - "lastModified": 1771868032, - "narHash": "sha256-l8+LOd+QJuapv/21+juetZeedrlYY1QNXwcI27ACgiI=", + "lastModified": 1776181116, + "narHash": "sha256-aUNKF+jzGY+jRlR7Bp82v/zNHdI9bFELLuYYWbaM6fo=", "owner": "AvengeMedia", "repo": "dgop", - "rev": "361b4f7041cd27381ee3eeb36774faf10747e0c3", + "rev": "e2078a7c5620be2e4897e7dabc08ade6dac9a454", "type": "github" }, "original": { @@ -352,11 +374,11 @@ ] }, "locked": { - "lastModified": 1773889306, - "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", + "lastModified": 1777713215, + "narHash": "sha256-8GzXDOXckDWwST8TY5DbwYFjdvQLlP7K9CLSVx6iTTo=", "owner": "nix-community", "repo": "disko", - "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", + "rev": "63b4e7e6cf75307c1d26ac3762b886b5b0247267", "type": "github" }, "original": { @@ -366,20 +388,54 @@ } }, "flake-compat": { + "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" } }, "flake-compat_10": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_11": { + "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_12": { "flake": false, "locked": { "lastModified": 1696426674, @@ -410,19 +466,17 @@ } }, "flake-compat_3": { - "flake": false, "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, "flake-compat_4": { @@ -430,13 +484,13 @@ "locked": { "lastModified": 1767039857, "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", + "owner": "edolstra", "repo": "flake-compat", "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } @@ -444,15 +498,15 @@ "flake-compat_5": { "flake": false, "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } @@ -474,16 +528,17 @@ } }, "flake-compat_7": { + "flake": false, "locked": { "lastModified": 1767039857, "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -493,29 +548,28 @@ "locked": { "lastModified": 1767039857, "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } }, "flake-compat_9": { - "flake": false, "locked": { "lastModified": 1767039857, "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", + "owner": "edolstra", "repo": "flake-compat", "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } @@ -573,11 +627,11 @@ ] }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -591,11 +645,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1777678872, + "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16", "type": "github" }, "original": { @@ -609,11 +663,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1777678872, + "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16", "type": "github" }, "original": { @@ -622,6 +676,48 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "ghostty": { + "inputs": { + "flake-compat": "flake-compat_5", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs_5", + "systems": "systems", + "zig": "zig", + "zon2nix": "zon2nix" + }, + "locked": { + "lastModified": 1776365871, + "narHash": "sha256-lAFTUeJy7AT4V+t8/HlMM7O5z6W+G4eUhzRoh3ZdZu8=", + "owner": "cachix", + "repo": "ghostty", + "rev": "d882f9106d15c213239b8916083835263d4fb9bc", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "cachix-upstream", + "repo": "ghostty", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -697,11 +793,11 @@ ] }, "locked": { - "lastModified": 1772893680, - "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", + "lastModified": 1775585728, + "narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", + "rev": "580633fa3fe5fc0379905986543fd7495481913d", "type": "github" }, "original": { @@ -712,18 +808,18 @@ }, "git-hooks_4": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_6", "gitignore": "gitignore_6", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1774104215, - "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", + "lastModified": 1776796298, + "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f799ae951fde0627157f40aec28dec27b22076d0", + "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", "type": "github" }, "original": { @@ -734,7 +830,7 @@ }, "git-hooks_5": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_8", "gitignore": "gitignore_8", "nixpkgs": [ "nix-gaming", @@ -742,11 +838,11 @@ ] }, "locked": { - "lastModified": 1774104215, - "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", + "lastModified": 1776796298, + "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f799ae951fde0627157f40aec28dec27b22076d0", + "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", "type": "github" }, "original": { @@ -768,11 +864,11 @@ ] }, "locked": { - "lastModified": 1774104215, - "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", + "lastModified": 1775585728, + "narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f799ae951fde0627157f40aec28dec27b22076d0", + "rev": "580633fa3fe5fc0379905986543fd7495481913d", "type": "github" }, "original": { @@ -1010,11 +1106,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1774028838, - "narHash": "sha256-1zylMvReaWs4ICEq773PvJFXglsEq5BC2YKv0fNa81k=", + "lastModified": 1777776915, + "narHash": "sha256-okg6j5wIwTZmdrNhB1TOxpyLtJN9/fV6qXobWGpp+Y8=", "owner": "helix-editor", "repo": "helix", - "rev": "3d68e0a32617d1844543219f6790a2b3fa169170", + "rev": "87d5c05c4432a079d3b7aaa10cda1cfe1803c18c", "type": "github" }, "original": { @@ -1026,15 +1122,37 @@ "home-manager": { "inputs": { "nixpkgs": [ + "devenv", + "ghostty", "nixpkgs" ] }, "locked": { - "lastModified": 1774274572, - "narHash": "sha256-YtpNRYSv0CQn+MjhHHqFcIR5L0Urex2tTwS42kP6nuc=", + "lastModified": 1770586272, + "narHash": "sha256-Ucci8mu8QfxwzyfER2DQDbvW9t1BnTUJhBmY7ybralo=", "owner": "nix-community", "repo": "home-manager", - "rev": "90913f831383a599c556cba59eac8cae9b5195a9", + "rev": "b1f916ba052341edc1f80d4b2399f1092a4873ca", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1777780644, + "narHash": "sha256-CYpc+mk28rmcQWGygeM8CA+Z8SZYy8BOyQtiW18spao=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "b9311028044a9e9b2cf27db15ef0a87d464e212d", "type": "github" }, "original": { @@ -1044,7 +1162,7 @@ "type": "github" } }, - "home-manager_2": { + "home-manager_3": { "inputs": { "nixpkgs": [ "zen-browser", @@ -1052,11 +1170,11 @@ ] }, "locked": { - "lastModified": 1773422513, - "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", + "lastModified": 1776184304, + "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", + "rev": "3c7524c68348ef79ce48308e0978611a050089b2", "type": "github" }, "original": { @@ -1072,11 +1190,11 @@ ] }, "locked": { - "lastModified": 1773983528, - "narHash": "sha256-N9GzKLIVR0nF92IQSoD6VXU0JZLsGluiHYr7UYt52xg=", + "lastModified": 1775435678, + "narHash": "sha256-gh1o8cIWY+2Z8Qh9GDU3Z6oGnv+MqZqAlQCN9yEOa1g=", "owner": "outfoxxed", "repo": "hy3", - "rev": "5b0bc5213b135a4e064ac714c1ef7d95b44fe1b2", + "rev": "76010d97fe69498557ac6426a7ec6b989ac14343", "type": "github" }, "original": { @@ -1089,14 +1207,15 @@ "inputs": { "nix": "nix_2", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_8", + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1773946232, - "narHash": "sha256-GMghkvx6E+klBk3Q1S9DvL2+WAvM1J15eBPU+oJnA2Q=", + "lastModified": 1777786631, + "narHash": "sha256-04PSKRM8KL35ttX44v/f9I5hloo5G4X5DeN+s6rClkU=", "owner": "NixOS", "repo": "hydra", - "rev": "aedf068ef3f4319d690dd57a9a1ccb4391756ea3", + "rev": "d50ea33049162b1e9c1ba4dc3d4a3384f3b25fca", "type": "github" }, "original": { @@ -1121,11 +1240,11 @@ ] }, "locked": { - "lastModified": 1772461003, - "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=", + "lastModified": 1776511930, + "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7", + "rev": "39435900785d0c560c6ae8777d29f28617d031ef", "type": "github" }, "original": { @@ -1150,11 +1269,11 @@ ] }, "locked": { - "lastModified": 1772461523, - "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=", + "lastModified": 1776426399, + "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804", + "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84", "type": "github" }, "original": { @@ -1207,15 +1326,15 @@ "nixpkgs-unstable" ], "pre-commit-hooks": "pre-commit-hooks_3", - "systems": "systems", + "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1774270522, - "narHash": "sha256-v3+29zRU210u9LB4eDc4iLE9+jN4xsRgmZKyOjufoaw=", + "lastModified": 1777759969, + "narHash": "sha256-7KSqSehOHNHQfM0sRAcGQbfz0vDuItox8i61X8/nzYw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "64a2e4e26388f017fd9198a6d70424f1f251a5a0", + "rev": "6ec0228c38a6203e4789fe7e7e793a558521c109", "type": "github" }, "original": { @@ -1257,11 +1376,11 @@ ] }, "locked": { - "lastModified": 1772467975, - "narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=", + "lastModified": 1776426575, + "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507", + "rev": "a968d211048e3ed538e47b84cb3649299578f19d", "type": "github" }, "original": { @@ -1287,11 +1406,11 @@ ] }, "locked": { - "lastModified": 1771865848, - "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=", + "lastModified": 1777392029, + "narHash": "sha256-iTtzJsp4hXp7/Y+2kVaosPPNBeUJbFiqQcZVRUtC+dM=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960", + "rev": "473804b3594dd829295484f1f479a560b8114f2d", "type": "github" }, "original": { @@ -1341,11 +1460,11 @@ ] }, "locked": { - "lastModified": 1772459629, - "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", + "lastModified": 1776426736, + "narHash": "sha256-rl7i4aY+9p8LysJp7o8uRWahCkpFznCgGHXszlTw7b0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", + "rev": "7833ff33b2e82d3406337b5dcf0d1cec595d83e9", "type": "github" }, "original": { @@ -1392,14 +1511,14 @@ "nixpkgs": [ "nixpkgs-unstable" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { - "lastModified": 1774282873, - "narHash": "sha256-1PEKXrIfc4qIDo6Ut1D3aK2dK3HRnIso2SPopKNN2nA=", + "lastModified": 1777485540, + "narHash": "sha256-znLBBK0uKUHBxpIhNKlE1oVVs8uMgjRRbdxdTSZIutw=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "768ade88a8a8b79acdec4b7cc92a32cbc4cdae19", + "rev": "37f615cff706e5af736e46128e304ffd9617e0e7", "type": "github" }, "original": { @@ -1472,11 +1591,11 @@ ] }, "locked": { - "lastModified": 1774211405, - "narHash": "sha256-6KNwP4ojUzv3YBlZU5BqCpTrWHcix1Jo01BISsTT0xk=", + "lastModified": 1777492286, + "narHash": "sha256-PwuoEJQcjSKJNP5T55qhfDwIP0tw5zxEhfu8GDfKfeg=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "cb4e152dc72095a2af422956c6b689590572231a", + "rev": "ec5c0c709706bad5b82f667fd8758eae442577ce", "type": "github" }, "original": { @@ -1522,11 +1641,11 @@ ] }, "locked": { - "lastModified": 1772459835, - "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", + "lastModified": 1777148232, + "narHash": "sha256-Uv0WZLhu89SafuSOmYDA7akrPt4wBRmsa1ucasO5aXg=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", + "rev": "fec9cf1abcc1011e46f0a0986f46bf93c6bf8b92", "type": "github" }, "original": { @@ -1576,11 +1695,11 @@ ] }, "locked": { - "lastModified": 1773074819, - "narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=", + "lastModified": 1776728575, + "narHash": "sha256-z9eGphrArEBpl1O/GCH0wlY6z4K9vA6yWh2gAS6qytU=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "f68afd0e73687598cc2774804fedad76693046f0", + "rev": "f3a80888783702a39691b684d099e16b83ed4702", "type": "github" }, "original": { @@ -1591,14 +1710,14 @@ }, "hytale-launcher": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1773947929, - "narHash": "sha256-flpkAPM3zpMpWoqvVkMTo3ptuBF0QKNi6Raa8rnIq7o=", + "lastModified": 1777394001, + "narHash": "sha256-FNHydw2We/qvxBJ2cMNc/eGcxSZkvOXZn2WYGiH6WfE=", "owner": "JPyke3", "repo": "hytale-launcher-nix", - "rev": "a8d0a974b187f0997c03c23000dea552194edf39", + "rev": "822e54c97348a6fbc28dfac563e5bbe9fe1783b8", "type": "github" }, "original": { @@ -1651,11 +1770,11 @@ "rust-overlay": [] }, "locked": { - "lastModified": 1773130184, - "narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=", + "lastModified": 1777733745, + "narHash": "sha256-1TlpdT0WYyBGtUS3PH4oXHUmdno2EUh2TfHadK2BmJo=", "owner": "YaLTeR", "repo": "niri", - "rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea", + "rev": "1f07cffa9f355298a31d7efe1b400ede93a97728", "type": "github" }, "original": { @@ -1678,11 +1797,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1774283383, - "narHash": "sha256-3aCfmL8hOcdIl783LTnK+lHcjMGCnc+2zQ98xUyefCU=", + "lastModified": 1777737732, + "narHash": "sha256-k5mLtKOpLNdhMHY1TPGcAFefnWDctZsYQ6X4YDvLFhU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8a583029606cf072cc01c7e2f4298cc75a7ada28", + "rev": "73b10d69d6c8b3836ff6581004024282f0a4cd15", "type": "github" }, "original": { @@ -1694,11 +1813,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1773130184, - "narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=", + "lastModified": 1777733745, + "narHash": "sha256-1TlpdT0WYyBGtUS3PH4oXHUmdno2EUh2TfHadK2BmJo=", "owner": "YaLTeR", "repo": "niri", - "rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea", + "rev": "1f07cffa9f355298a31d7efe1b400ede93a97728", "type": "github" }, "original": { @@ -1733,16 +1852,16 @@ ] }, "locked": { - "lastModified": 1774103430, - "narHash": "sha256-MRNVInSmvhKIg3y0UdogQJXe+omvKijGszFtYpd5r9k=", + "lastModified": 1776511668, + "narHash": "sha256-g2KEBuHpc3a56c+jPcg0+w6LSuIj6f+zzdztLCOyIhc=", "owner": "cachix", "repo": "nix", - "rev": "e127c1c94cefe02d8ca4cca79ef66be4c527510e", + "rev": "42d4b7de21c15f28c568410f4383fa06a8458a40", "type": "github" }, "original": { "owner": "cachix", - "ref": "devenv-2.32", + "ref": "devenv-2.34", "repo": "nix", "type": "github" } @@ -1773,11 +1892,11 @@ ] }, "locked": { - "lastModified": 1774233978, - "narHash": "sha256-rT9wnIfbI1gjl0gq4nN8/5ZvFWn+K6QLwlyy6Gx8FDc=", + "lastModified": 1777780138, + "narHash": "sha256-h+rOIsVR2rK4w2rZaQSq98dvgGXixQ+J5Tu3e5t7pDY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "4a583dd427ccf7d912282909a2702a6a547d8560", + "rev": "57ab0906ff3b5de6297072d5ea20b02f2463be40", "type": "github" }, "original": { @@ -1821,11 +1940,11 @@ "nix_2": { "flake": false, "locked": { - "lastModified": 1772966630, - "narHash": "sha256-qzVtneydMSjNZXzNbxQG9VvJc490keS9RNlbUCfiQas=", + "lastModified": 1777325645, + "narHash": "sha256-+fPubqkJvJxvynNIkz8NyaAY0DKxgGpxo6idri0ZeoA=", "owner": "NixOS", "repo": "nix", - "rev": "26842787496f2293c676fb36db38dacfd63497e0", + "rev": "ee1ce8842a745530036bce2aee52b405c03a00cd", "type": "github" }, "original": { @@ -1841,18 +1960,15 @@ "devenv", "flake-parts" ], - "nixpkgs": [ - "devenv", - "nixpkgs" - ], + "nixpkgs": "nixpkgs_6", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773634079, - "narHash": "sha256-49qb4QNMv77VOeEux+sMd0uBhPvvHgVc0r938Bulvbo=", + "lastModified": 1776341634, + "narHash": "sha256-L//ltP2o5+BnuK+KEulbi2gGeDpyyex6SkXLZcGQ/Ac=", "owner": "nix-community", "repo": "nixd", - "rev": "8ecf93d4d93745e05ea53534e8b94f5e9506e6bd", + "rev": "951e98e2025c47614f5249556ecf509b0ea35b51", "type": "github" }, "original": { @@ -1863,11 +1979,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1774018263, - "narHash": "sha256-HHYEwK1A22aSaxv2ibhMMkKvrDGKGlA/qObG4smrSqc=", + "lastModified": 1776983936, + "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "2d4b4717b2534fad5c715968c1cece04a172b365", + "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61", "type": "github" }, "original": { @@ -1929,7 +2045,7 @@ "nixos-raspberrypi": { "inputs": { "argononed": "argononed", - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_9", "nixos-images": "nixos-images_2", "nixpkgs": [ "nixpkgs-unstable" @@ -1952,17 +2068,17 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_10", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1773882647, - "narHash": "sha256-VzcOcE0LLpEnyoxLuMuptZ9ZWCkSBn99bTgEQoz5Viw=", + "lastModified": 1777732699, + "narHash": "sha256-2uX/XtOWZ/oy2rerRynVhqVA//ZXZ3Fo60PikLHEPQc=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "fd0eae98d1ecee31024271f8d64676250a386ee7", + "rev": "5482f113fd31ebac131d1ebeb2ae90bf0d5e41f5", "type": "github" }, "original": { @@ -1973,11 +2089,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -1989,11 +2105,11 @@ }, "nixpkgs-latest-factorio": { "locked": { - "lastModified": 1774288423, - "narHash": "sha256-09tqm1iAn76U3w/wtrtLIjCJ6jqTmM3mA+AS4GSZBaM=", + "lastModified": 1777783353, + "narHash": "sha256-c3cP1Ac02Mj0Jb7KvzF1QKoYBfGq5Y5bUuVwSqf3HDs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62fa25e532e628fda6fb64f52f7fb27fae2dcb5b", + "rev": "f2add98a4f20bdaf06056077f0db72112cdbff33", "type": "github" }, "original": { @@ -2005,11 +2121,11 @@ }, "nixpkgs-latest-minecraft": { "locked": { - "lastModified": 1774288423, - "narHash": "sha256-09tqm1iAn76U3w/wtrtLIjCJ6jqTmM3mA+AS4GSZBaM=", + "lastModified": 1777783353, + "narHash": "sha256-c3cP1Ac02Mj0Jb7KvzF1QKoYBfGq5Y5bUuVwSqf3HDs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62fa25e532e628fda6fb64f52f7fb27fae2dcb5b", + "rev": "f2add98a4f20bdaf06056077f0db72112cdbff33", "type": "github" }, "original": { @@ -2021,11 +2137,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -2036,11 +2152,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -2051,11 +2167,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1774288423, - "narHash": "sha256-09tqm1iAn76U3w/wtrtLIjCJ6jqTmM3mA+AS4GSZBaM=", + "lastModified": 1777783353, + "narHash": "sha256-c3cP1Ac02Mj0Jb7KvzF1QKoYBfGq5Y5bUuVwSqf3HDs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62fa25e532e628fda6fb64f52f7fb27fae2dcb5b", + "rev": "f2add98a4f20bdaf06056077f0db72112cdbff33", "type": "github" }, "original": { @@ -2084,11 +2200,11 @@ "nixpkgs-src": { "flake": false, "locked": { - "lastModified": 1773597492, - "narHash": "sha256-hQ284SkIeNaeyud+LS0WVLX+WL2rxcVZLFEaK0e03zg=", + "lastModified": 1775888245, + "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a07d4ce6bee67d7c838a8a5796e75dff9caa21ef", + "rev": "13043924aaa7375ce482ebe2494338e058282925", "type": "github" }, "original": { @@ -2100,11 +2216,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1774244481, - "narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=", + "lastModified": 1777428379, + "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4590696c8693fea477850fe379a01544293ca4e2", + "rev": "755f5aa91337890c432639c60b6064bb7fe67769", "type": "github" }, "original": { @@ -2116,11 +2232,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1774244481, - "narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=", + "lastModified": 1777428379, + "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4590696c8693fea477850fe379a01544293ca4e2", + "rev": "755f5aa91337890c432639c60b6064bb7fe67769", "type": "github" }, "original": { @@ -2148,11 +2264,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1774106199, - "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "lastModified": 1777578337, + "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", "type": "github" }, "original": { @@ -2164,11 +2280,43 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1773840656, - "narHash": "sha256-9tpvMGFteZnd3gRQZFlRCohVpqooygFuy9yjuyRL2C0=", + "lastModified": 1777578337, + "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1776475594, + "narHash": "sha256-mxLieVl5lqjd+QUvgHbvpVrvb9d8zox7m+MiRO6FHu8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9cf7092bdd603554bd8b63c216e8943cf9b12512", + "rev": "9a3a5b8400951b3497d2ef8f239f8451175cf3a1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1775888245, + "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "13043924aaa7375ce482ebe2494338e058282925", "type": "github" }, "original": { @@ -2178,7 +2326,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_13": { "locked": { "lastModified": 1770107345, "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", @@ -2194,13 +2342,13 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_14": { "locked": { - "lastModified": 1773389992, - "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", "type": "github" }, "original": { @@ -2259,15 +2407,41 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1772963539, + "narHash": "sha256-G4+9cEu8XSqEWYUB6iRgDfrg53av6yyRwAKhSeKbUVw=", + "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre960399.9dcb002ca169/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1772963539, + "narHash": "sha256-G4+9cEu8XSqEWYUB6iRgDfrg53av6yyRwAKhSeKbUVw=", + "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre960399.9dcb002ca169/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs_7": { "inputs": { "nixpkgs-src": "nixpkgs-src" }, "locked": { - "lastModified": 1773704619, - "narHash": "sha256-LKtmit8Sr81z8+N2vpIaN/fyiQJ8f7XJ6tMSKyDVQ9s=", + "lastModified": 1776771808, + "narHash": "sha256-FRpraDgknF5zoCYTi9CitoIaUYb/XGiXUuVqPg9AYB4=", "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "906534d75b0e2fe74a719559dfb1ad3563485f43", + "rev": "3a3d4ac6ea3dbf2534ef988086348b7e140b92ad", "type": "github" }, "original": { @@ -2277,13 +2451,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { - "lastModified": 1768332487, - "narHash": "sha256-Q0bSMhDIhb/S7r+XRyuPy58kEXa0rmpw5j99ubJzovg=", + "lastModified": 1777339890, + "narHash": "sha256-/8cNnAn4FMZgIEEWf9chqo2ffH6bu/vDoJR8mnaNjtM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6b0609442afc4ce51ff1466e7db555c2e2fc28d4", + "rev": "fcf51609c44b7781822f4258feb16f15085ff47d", "type": "github" }, "original": { @@ -2293,50 +2467,18 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1774106199, - "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_9": { "locked": { - "lastModified": 1774192288, - "narHash": "sha256-vHqcv1WQvmR4hRz0/dUqlA8LjIHtZvWtWrzIX3YTxzQ=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2cb1420c66c8e634314ce0abf70680208177f5b4", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -2401,7 +2543,7 @@ }, "pre-commit-hooks_3": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_7", "gitignore": "gitignore_7", "nixpkgs": [ "hyprland", @@ -2409,11 +2551,11 @@ ] }, "locked": { - "lastModified": 1774104215, - "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", + "lastModified": 1776796298, + "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f799ae951fde0627157f40aec28dec27b22076d0", + "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", "type": "github" }, "original": { @@ -2430,16 +2572,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" } @@ -2448,6 +2590,7 @@ "inputs": { "catppuccin": "catppuccin", "dankMaterialShell": "dankMaterialShell", + "danksearch": "danksearch", "devenv": "devenv", "dgop": "dgop", "disko": "disko", @@ -2455,7 +2598,7 @@ "git-hooks": "git-hooks_4", "gpg-base-conf": "gpg-base-conf", "helix": "helix", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "hy3": "hy3", "hydra-ci": "hydra-ci", "hyprland": "hyprland", @@ -2471,7 +2614,7 @@ "nixos-images": "nixos-images", "nixos-raspberrypi": "nixos-raspberrypi", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_10", "nixpkgs-latest-factorio": "nixpkgs-latest-factorio", "nixpkgs-latest-minecraft": "nixpkgs-latest-minecraft", "nixpkgs-master": "nixpkgs-master", @@ -2481,8 +2624,9 @@ "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix", - "systems": "systems_3", - "treefmt-nix": "treefmt-nix_2", + "systems": "systems_4", + "titrack": "titrack", + "treefmt-nix": "treefmt-nix_3", "zen-browser": "zen-browser", "zig-overlay": "zig-overlay", "zls": "zls" @@ -2496,11 +2640,11 @@ ] }, "locked": { - "lastModified": 1773630837, - "narHash": "sha256-zJhgAGnbVKeBMJOb9ctZm4BGS/Rnrz+5lfSXTVah4HQ=", + "lastModified": 1776741231, + "narHash": "sha256-k9G98qzn+7npROUaks8VqCFm7cFtEG8ulQLBBo5lItg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f600ea449c7b5bb596fa1cf21c871cc5b9e31316", + "rev": "02061303f7c4c964f7b4584dabd9e985b4cd442b", "type": "github" }, "original": { @@ -2517,11 +2661,11 @@ ] }, "locked": { - "lastModified": 1759631821, - "narHash": "sha256-V8A1L0FaU/aSXZ1QNJScxC12uP4hANeRBgI4YdhHeRM=", + "lastModified": 1775358767, + "narHash": "sha256-f2eC+WIfhjevCPQILuV08i/kmKZzYZpUvkom/33VxCA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe", + "rev": "20fd44bc663daa53a2575e01293e24e681d62244", "type": "github" }, "original": { @@ -2533,16 +2677,16 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_9", + "flake-compat": "flake-compat_11", "git-hooks": "git-hooks_6", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1774268581, - "narHash": "sha256-azZqiV4L+Ef3Mu4M0NAObAfNIn8rDlsTcfti2W5/oZ4=", + "lastModified": 1777287493, + "narHash": "sha256-Fj7S91TuZm6+DG/v6SFme/p+sWrYMQICGX6yQ5KD43Q=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "86d256870b3a18ac751e12936419bf697d3544e8", + "rev": "e33fbde199eaad513ef5d0746db19d5878150232", "type": "gitlab" }, "original": { @@ -2553,14 +2697,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1774154798, - "narHash": "sha256-zsTuloDSdKf+PrI1MsWx5z/cyGEJ8P3eERtAfdP8Bmg=", + "lastModified": 1777338324, + "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3e0d543e6ba6c0c48117a81614e90c6d8c425170", + "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5", "type": "github" }, "original": { @@ -2570,17 +2714,18 @@ } }, "systems": { + "flake": false, "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -2615,6 +2760,36 @@ } }, "systems_4": { + "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_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": { "flake": false, "locked": { "lastModified": 1681028828, @@ -2630,6 +2805,27 @@ "type": "github" } }, + "titrack": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1776728279, + "narHash": "sha256-GbodTGiaMYI21N0iqa0SVo4b2l69w+vl9QXgO2AbD1Q=", + "owner": "Daholli", + "repo": "TiTrack", + "rev": "e7fc8645ba089d5b2e6d86cc0549b82e62dfa178", + "type": "github" + }, + "original": { + "owner": "Daholli", + "repo": "TiTrack", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -2639,11 +2835,11 @@ ] }, "locked": { - "lastModified": 1772660329, - "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { @@ -2654,14 +2850,35 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": [ + "hydra-ci", + "nixpkgs" + ] }, "locked": { - "lastModified": 1773297127, - "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { + "inputs": { + "nixpkgs": "nixpkgs_13" + }, + "locked": { + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { @@ -2698,11 +2915,11 @@ ] }, "locked": { - "lastModified": 1773601989, - "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=", + "lastModified": 1777035886, + "narHash": "sha256-m1TNuBoSXUBSKhD9UVMkU90M0wFTPTfvIOOltO8IM8A=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d", + "rev": "ecfcdcc781f48821d83e1e2a0e30d7beca0eeb5e", "type": "github" }, "original": { @@ -2746,15 +2963,15 @@ }, "zen-browser": { "inputs": { - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_12" + "home-manager": "home-manager_3", + "nixpkgs": "nixpkgs_14" }, "locked": { - "lastModified": 1774242250, - "narHash": "sha256-pchbnY7KVnH26g4O3LZO8vpshInqNj937gAqlPob1Mk=", + "lastModified": 1777564084, + "narHash": "sha256-O9VRkxg+2j+sh+c73wi4VeIBECoqW2PlnCR9Qe1nQKA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f19c3e6683c2d2f3fcfcb88fb691931a104bc47c", + "rev": "d93443c0f6fdb3b179bed68856f322dba4842612", "type": "github" }, "original": { @@ -2763,20 +2980,30 @@ "type": "github" } }, - "zig-overlay": { + "zig": { "inputs": { - "flake-compat": "flake-compat_10", + "flake-compat": [ + "devenv", + "ghostty", + "flake-compat" + ], "nixpkgs": [ + "devenv", + "ghostty", "nixpkgs" ], - "systems": "systems_4" + "systems": [ + "devenv", + "ghostty", + "systems" + ] }, "locked": { - "lastModified": 1774140580, - "narHash": "sha256-4V/DZzhyomuNjIIr0OFLUUf0TdgYWo7H6TZeF5op4Nc=", + "lastModified": 1773145353, + "narHash": "sha256-dE8zx8WA54TRmFFQBvA48x/sXGDTP7YaDmY6nNKMAYw=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "487e301b84fdf86d5561f4aa24e50c5308004b67", + "rev": "8666155d83bf792956a7c40915508e6d4b2b8716", "type": "github" }, "original": { @@ -2785,21 +3012,85 @@ "type": "github" } }, + "zig-flake": { + "inputs": { + "nixpkgs": [ + "zls", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1776620537, + "narHash": "sha256-ZHAzWbLwhw7lvDLhtmnQk+hIUWOUcWO2r2tLvCQzhVc=", + "owner": "silversquirl", + "repo": "zig-flake", + "rev": "34923b3e8c670a5819efc737f8d0fc9fefbfc0fd", + "type": "github" + }, + "original": { + "owner": "silversquirl", + "repo": "zig-flake", + "type": "github" + } + }, + "zig-overlay": { + "inputs": { + "flake-compat": "flake-compat_12", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_6" + }, + "locked": { + "lastModified": 1777770397, + "narHash": "sha256-YYYqxFAy8YWHPKSvM5t+RyResdlOYtvCXzb3XNV8KvA=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "b6ecef40d73e40bda9d40884676333d8799328e2", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } + }, + "zig_2": { + "inputs": { + "nixpkgs": [ + "devenv", + "ghostty", + "zon2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1776208985, + "narHash": "sha256-IOuRFpbeQ9jSk54OURX5yvjoC759ujgSNjkMKpChdDA=", + "ref": "refs/heads/main", + "rev": "e8ee348125247e7bd74932cc42ac92df90961d5b", + "revCount": 1666, + "type": "git", + "url": "https://codeberg.org/jcollie/zig-overlay.git" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/jcollie/zig-overlay.git" + } + }, "zls": { "inputs": { "nixpkgs": [ "nixpkgs" ], - "zig-overlay": [ - "zig-overlay" - ] + "zig-flake": "zig-flake" }, "locked": { - "lastModified": 1774282899, - "narHash": "sha256-yYEGuoMDAFfvv0aqZVRnM+HAenr4rYmgdguTMwVWDlg=", + "lastModified": 1777491393, + "narHash": "sha256-jDi5U/oHt38JIx41OMguyIDFzmVRDOaaLcilrtANnxE=", "owner": "zigtools", "repo": "zls", - "rev": "12a2039db278455a1023b4902043f78a0d947952", + "rev": "113f79a1d120cfda4cf758bc41273d8d15b4e46a", "type": "github" }, "original": { @@ -2807,6 +3098,30 @@ "repo": "zls", "type": "github" } + }, + "zon2nix": { + "inputs": { + "nixpkgs": [ + "devenv", + "ghostty", + "nixpkgs" + ], + "zig": "zig_2" + }, + "locked": { + "lastModified": 1776269939, + "narHash": "sha256-tOGsI1d1Xk1PYapQJ/ByG0utbWXJasIna/fUib+/b5A=", + "owner": "jcollie", + "repo": "zon2nix", + "rev": "cc467a77c2ebcd9aab84024196abfc37eaf1007d", + "type": "github" + }, + "original": { + "owner": "jcollie", + "ref": "main", + "repo": "zon2nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 03ed5d8..6621e92 100644 --- a/flake.nix +++ b/flake.nix @@ -65,6 +65,11 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + titrack = { + url = "github:Daholli/TiTrack"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + ### # hyprland stuff hyprland = { @@ -95,12 +100,17 @@ }; dankMaterialShell = { - url = "github:AvengeMedia/DankMaterialShell/v1.2.3"; + url = "github:AvengeMedia/DankMaterialShell"; inputs = { nixpkgs.follows = "nixpkgs-unstable"; }; }; + danksearch = { + url = "github:AvengeMedia/danksearch"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + dgop = { url = "github:AvengeMedia/dgop"; inputs.nixpkgs.follows = "nixpkgs-unstable"; diff --git a/modules/desktop/addons/dms/default.nix b/modules/desktop/addons/dms/default.nix index 2c39347..b2e5b84 100644 --- a/modules/desktop/addons/dms/default.nix +++ b/modules/desktop/addons/dms/default.nix @@ -11,6 +11,7 @@ imports = [ inputs.dankMaterialShell.homeModules.dank-material-shell inputs.dankMaterialShell.homeModules.niri + inputs.danksearch.homeModules.dsearch ]; config = lib.mkIf osConfig.programs.niri.enable { @@ -40,6 +41,8 @@ enableAudioWavelength = false; enableCalendarEvents = false; }; + + programs.dsearch.enable = true; }; }; } diff --git a/modules/desktop/addons/dms/settings.json b/modules/desktop/addons/dms/settings.json index 9b0183f..056932d 100644 --- a/modules/desktop/addons/dms/settings.json +++ b/modules/desktop/addons/dms/settings.json @@ -9,12 +9,15 @@ } }, "matugenScheme": "scheme-tonal-spot", + "matugenContrast": 0, "runUserMatugenTemplates": true, "matugenTargetMonitor": "", "popupTransparency": 1, "dockTransparency": 1, "widgetBackgroundColor": "sch", "widgetColorMode": "default", + "controlCenterTileColorMode": "primary", + "buttonColorMode": "primary", "cornerRadius": 12, "niriLayoutGapsOverride": -1, "niriLayoutRadiusOverride": -1, @@ -25,12 +28,35 @@ "mangoLayoutGapsOverride": -1, "mangoLayoutRadiusOverride": -1, "mangoLayoutBorderSize": -1, + "firstDayOfWeek": -1, + "showWeekNumber": true, "use24HourClock": true, "showSeconds": false, + "padHours12Hour": false, "useFahrenheit": false, + "windSpeedUnit": "kmh", "nightModeEnabled": false, "animationSpeed": 1, "customAnimationDuration": 500, + "syncComponentAnimationSpeeds": true, + "popoutAnimationSpeed": 1, + "popoutCustomAnimationDuration": 150, + "modalAnimationSpeed": 1, + "modalCustomAnimationDuration": 150, + "enableRippleEffects": true, + "m3ElevationEnabled": true, + "m3ElevationIntensity": 12, + "m3ElevationOpacity": 30, + "m3ElevationColorMode": "default", + "m3ElevationLightDirection": "top", + "m3ElevationCustomColor": "#000000", + "modalElevationEnabled": true, + "popoutElevationEnabled": true, + "barElevationEnabled": true, + "blurEnabled": false, + "blurBorderColor": "outline", + "blurBorderCustomColor": "#ffffff", + "blurBorderOpacity": 1, "wallpaperFillMode": "Fill", "blurredWallpaperLayer": false, "blurWallpaperOnOverview": false, @@ -115,13 +141,17 @@ "showWorkspacePadding": false, "workspaceScrolling": false, "showWorkspaceApps": true, + "workspaceDragReorder": true, "maxWorkspaceIcons": 3, + "workspaceAppIconSizeOffset": 0, "groupWorkspaceApps": true, "workspaceFollowFocus": false, "showOccupiedWorkspacesOnly": true, "reverseScrolling": false, "dwlShowAllTags": false, + "workspaceActiveAppHighlightEnabled": false, "workspaceColorMode": "default", + "workspaceOccupiedColorMode": "none", "workspaceUnfocusedColorMode": "sc", "workspaceUrgentColorMode": "default", "workspaceFocusedBorderEnabled": false, @@ -130,14 +160,26 @@ "workspaceNameIcons": {}, "waveProgressEnabled": true, "scrollTitleEnabled": true, + "mediaAdaptiveWidthEnabled": true, "audioVisualizerEnabled": true, "audioScrollMode": "volume", + "audioWheelScrollAmount": 5, "clockCompactMode": false, "focusedWindowCompactMode": false, "runningAppsCompactMode": true, + "barMaxVisibleApps": 0, + "barMaxVisibleRunningApps": 0, + "barShowOverflowBadge": true, + "appsDockHideIndicators": false, + "appsDockColorizeActive": false, + "appsDockActiveColorMode": "primary", + "appsDockEnlargeOnHover": false, + "appsDockEnlargePercentage": 125, + "appsDockIconSizePercentage": 100, "keyboardLayoutNameCompactMode": false, "runningAppsCurrentWorkspace": true, "runningAppsGroupByApp": false, + "runningAppsCurrentMonitor": false, "appIdSubstitutions": [ { "pattern": "Spotify", @@ -168,20 +210,43 @@ "centeringMode": "index", "clockDateFormat": "yyyy-MM-dd", "lockDateFormat": "", + "greeterRememberLastSession": true, + "greeterRememberLastUser": true, + "greeterEnableFprint": false, + "greeterEnableU2f": false, + "greeterWallpaperPath": "/home/cholli/Pictures/horizon-zero-dawn-aloy.jpg", + "greeterUse24HourClock": true, + "greeterShowSeconds": false, + "greeterPadHours12Hour": false, + "greeterLockDateFormat": "", + "greeterFontFamily": "", + "greeterWallpaperFillMode": "", "mediaSize": 1, "appLauncherViewMode": "list", "spotlightModalViewMode": "list", + "browserPickerViewMode": "grid", + "browserUsageHistory": {}, + "appPickerViewMode": "grid", + "filePickerUsageHistory": {}, "sortAppsAlphabetically": false, "appLauncherGridColumns": 4, "spotlightCloseNiriOverview": true, + "rememberLastQuery": false, + "spotlightSectionViewModes": {}, + "appDrawerSectionViewModes": {}, "niriOverviewOverlayEnabled": true, + "dankLauncherV2Size": "compact", + "dankLauncherV2BorderEnabled": false, + "dankLauncherV2BorderThickness": 2, + "dankLauncherV2BorderColor": "primary", + "dankLauncherV2ShowFooter": true, + "dankLauncherV2UnloadOnClose": false, "useAutoLocation": false, "weatherEnabled": true, "networkPreference": "auto", - "vpnLastConnected": "", "iconTheme": "System Default", "cursorSettings": { - "theme": "System Default", + "theme": "catppuccin-mocha-lavender-cursors", "size": 24, "niri": { "hideWhenTyping": false, @@ -215,6 +280,7 @@ "notepadLastCustomTransparency": 0.7, "soundsEnabled": true, "useSystemSoundTheme": false, + "soundLogin": false, "soundNewNotification": false, "soundVolumeChanged": true, "soundPluggedIn": true, @@ -246,7 +312,11 @@ "gtkThemingEnabled": false, "qtThemingEnabled": false, "syncModeWithPortal": true, - "terminalsAlwaysDark": false, + "terminalsAlwaysDark": true, + "muxType": "tmux", + "muxUseCustomCommand": false, + "muxCustomCommand": "", + "muxSessionFilter": "", "runDmsMatugenTemplates": true, "matugenTemplateGtk": true, "matugenTemplateNiri": true, @@ -268,9 +338,24 @@ "matugenTemplateDgop": true, "matugenTemplateKcolorscheme": true, "matugenTemplateVscode": true, + "matugenTemplateEmacs": true, + "matugenTemplateZed": true, + "matugenTemplateNeovimSettings": { + "dark": { + "baseTheme": "github_dark", + "harmony": 0.5 + }, + "light": { + "baseTheme": "github_light", + "harmony": 0.5 + } + }, + "matugenTemplateNeovimSetBackground": true, "showDock": false, "dockAutoHide": false, + "dockSmartAutoHide": false, "dockGroupByApp": false, + "dockRestoreSpecialWorkspaceOnClick": false, "dockOpenOnOverview": false, "dockPosition": 1, "dockSpacing": 4, @@ -283,7 +368,19 @@ "dockBorderOpacity": 1, "dockBorderThickness": 1, "dockIsolateDisplays": false, - "notificationOverlayEnabled": false, + "dockLauncherEnabled": false, + "dockLauncherLogoMode": "apps", + "dockLauncherLogoCustomPath": "", + "dockLauncherLogoColorOverride": "", + "dockLauncherLogoSizeOffset": 0, + "dockLauncherLogoBrightness": 0.5, + "dockLauncherLogoContrast": 1, + "dockMaxVisibleApps": 0, + "dockMaxVisibleRunningApps": 0, + "dockShowOverflowBadge": true, + "notificationOverlayEnabled": true, + "notificationPopupShadowEnabled": true, + "notificationPopupPrivacyMode": false, "modalDarkenBackground": true, "lockScreenShowPowerActions": true, "lockScreenShowSystemIcons": true, @@ -291,27 +388,40 @@ "lockScreenShowDate": true, "lockScreenShowProfileImage": true, "lockScreenShowPasswordField": true, + "lockScreenShowMediaPlayer": true, + "lockScreenPowerOffMonitorsOnLock": false, + "lockAtStartup": false, "enableFprint": false, "maxFprintTries": 15, + "enableU2f": false, + "u2fMode": "or", "lockScreenActiveMonitor": "all", "lockScreenInactiveColor": "#000000", "lockScreenNotificationMode": 0, + "lockScreenVideoEnabled": false, + "lockScreenVideoPath": "", + "lockScreenVideoCycling": false, "hideBrightnessSlider": false, "notificationTimeoutLow": 5000, "notificationTimeoutNormal": 5000, "notificationTimeoutCritical": 0, "notificationCompactMode": false, "notificationPopupPosition": 0, + "notificationAnimationSpeed": 1, + "notificationCustomAnimationDuration": 400, "notificationHistoryEnabled": true, "notificationHistoryMaxCount": 50, "notificationHistoryMaxAgeDays": 7, "notificationHistorySaveLow": true, "notificationHistorySaveNormal": true, "notificationHistorySaveCritical": true, - "osdAlwaysShowValue": false, + "notificationRules": [], + "notificationFocusedMonitor": false, + "osdAlwaysShowValue": true, "osdPosition": 5, "osdVolumeEnabled": true, "osdMediaVolumeEnabled": true, + "osdMediaPlaybackEnabled": false, "osdBrightnessEnabled": true, "osdIdleInhibitorEnabled": true, "osdMicMuteEnabled": true, @@ -385,6 +495,11 @@ }, "niriOutputSettings": {}, "hyprlandOutputSettings": {}, + "displayProfiles": {}, + "activeDisplayProfile": {}, + "displayProfileAutoSelect": false, + "displayShowDisconnected": false, + "displaySnapToEdge": true, "barConfigs": [ { "id": "default", @@ -549,5 +664,8 @@ "trigger": "?" } }, + "clipboardEnterToPaste": false, + "launcherPluginVisibility": {}, + "launcherPluginOrder": [], "configVersion": 5 } \ No newline at end of file diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 02d600e..42a4668 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -13,22 +13,25 @@ in { - security.pam.services.gdm.enableGnomeKeyring = true; - services.displayManager.gdm = { - enable = true; - wayland = true; - }; - environment = { systemPackages = with pkgs; [ zenbrowser sourcegit + + (pkgs.catppuccin-kvantum.override { + accent = "lavender"; + variant = "mocha"; + }) + pkgs.adwaita-icon-theme ]; sessionVariables = { DEFAULT_BROWSER = "${zenbrowser}/bin/zen-beta"; BROWSER = "zen-beta"; + + QT_QPA_PLATFORMTHEME = "kvantum"; + QS_ICON_THEME = "adwaita"; }; etc = lib.mkIf config.programs._1password.enable { @@ -57,11 +60,19 @@ # }; # }; - # qt = { - # enable = true; - # platformTheme.name = "gnome"; - # style.name = "adwaita-dark"; - # }; + qt = { + enable = true; + platformTheme = "qtct"; + style = { + package = ( + pkgs.catppuccin-kvantum.override { + accent = "lavender"; + variant = "mocha"; + } + ); + name = "kvantum"; + }; + }; systemd.user.sessionVariables = osConfig.home-manager.users.cholli.home.sessionVariables; diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix index 482bd28..3a9c73d 100644 --- a/modules/desktop/niri.nix +++ b/modules/desktop/niri.nix @@ -3,11 +3,32 @@ nixos.niri = { inputs, pkgs, ... }: { + imports = [ + inputs.dankMaterialShell.nixosModules.greeter + ]; + programs.niri = { enable = true; package = inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.niri-unstable; }; + programs.dank-material-shell = { + greeter = { + enable = true; + compositor.name = "niri"; + + configHome = "/home/cholli"; + }; + }; + + security = { + pam = { + services.greetd.enableGnomeKeyring = true; + }; + }; + + services.accounts-daemon.enable = true; + environment.systemPackages = with pkgs; [ kitty @@ -220,6 +241,15 @@ open-on-output = "DP-1"; } + { + matches = [ + { + app-id = "zen-beta"; + } + ]; + + open-on-workspace = "01-zen"; + } { matches = [ { @@ -233,7 +263,9 @@ { matches = [ { - app-id = "obsidian"; + app-id = "electron"; + title = "Obsidian"; + at-startup = true; } { app-id = "teams-for-linux"; @@ -258,13 +290,14 @@ open-on-workspace = "02-games"; default-column-width.proportion = 1.0; default-window-height.proportion = 1.0; - min-width = 3440; - min-height = 1440; } { matches = [ { - app-id = "discord"; + app-id = "Element"; + } + { + app-id = "vesktop"; } { app-id = "steam"; @@ -293,7 +326,10 @@ app-id = "1Password"; } { - app-id = "discord"; + app-id = "vesktop"; + } + { + app-id = "Element"; } { app-id = "steam"; @@ -415,6 +451,7 @@ "Mod+R".action = actions.switch-preset-column-width; "Mod+Shift+R".action = actions.switch-preset-window-height; "Mod+Ctrl+R".action = actions.reset-window-height; + "Mod+G".action = actions.toggle-window-floating; "Mod+F".action = actions.maximize-column; "Mod+Shift+F".action = actions.fullscreen-window; "Mod+Ctrl+F".action = actions.expand-column-to-available-width; @@ -436,7 +473,8 @@ spawn-at-startup = [ { argv = [ "zen-beta" ]; } { argv = [ "obsidian" ]; } - { argv = [ "discord" ]; } + { argv = [ "element-desktop" ]; } + { argv = [ "vesktop" ]; } { argv = [ "1password" ]; } { sh = "sleep 1 && steam"; } ]; diff --git a/modules/games/communication.nix b/modules/games/communication.nix index 3ef9199..3f4b407 100644 --- a/modules/games/communication.nix +++ b/modules/games/communication.nix @@ -3,8 +3,9 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ - discord + vesktop teamspeak6-client + element-desktop ]; programs.obs-studio = { diff --git a/modules/games/various-games.nix b/modules/games/various-games.nix index ab97c78..285b128 100644 --- a/modules/games/various-games.nix +++ b/modules/games/various-games.nix @@ -2,6 +2,10 @@ flake.modules.nixos.games = { inputs, pkgs, ... }: { + imports = [ + inputs.titrack.nixosModules.default + ]; + environment.systemPackages = with pkgs; [ prismlauncher starsector @@ -10,5 +14,9 @@ pyfa inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.rusty-path-of-building ]; + + services.titrack = { + enable = true; + }; }; } diff --git a/modules/hosts/loptland/default.nix b/modules/hosts/loptland/default.nix index 44a3104..48e6a06 100644 --- a/modules/hosts/loptland/default.nix +++ b/modules/hosts/loptland/default.nix @@ -31,7 +31,7 @@ topLevel: { forgejo-runner # game server - minecraft-server + # minecraft-server factorio-server # apps diff --git a/modules/hosts/loptland/nginx.nix b/modules/hosts/loptland/nginx.nix index 0ceda04..dcd2499 100644 --- a/modules/hosts/loptland/nginx.nix +++ b/modules/hosts/loptland/nginx.nix @@ -59,6 +59,22 @@ }; }; + "cholli.de" = { + forceSSL = true; + useACMEHost = "cholli.de"; + globalRedirect = domainName; + }; + + "~^(?.+)\\.cholli\\.de$" = { + forceSSL = true; + useACMEHost = "cholli.de"; + locations."/" = { + extraConfig = '' + return 301 https://$subdomain.${domainName}$request_uri; + ''; + }; + }; + "_" = { forceSSL = true; useACMEHost = domainName; diff --git a/modules/hosts/yggdrasil/hardware.nix b/modules/hosts/yggdrasil/hardware.nix index 238a1fa..ebd32d8 100644 --- a/modules/hosts/yggdrasil/hardware.nix +++ b/modules/hosts/yggdrasil/hardware.nix @@ -44,7 +44,10 @@ "usb_storage" "sd_mod" ]; - kernelModules = [ "kvm-amd" ]; + kernelModules = [ + "kvm-amd" + "ntsync" + ]; }; diff --git a/modules/server/acme.nix b/modules/server/acme.nix index 81d509f..0aba9d4 100644 --- a/modules/server/acme.nix +++ b/modules/server/acme.nix @@ -54,6 +54,11 @@ topLevel: { dnsResolver = "1.1.1.1:53"; extraDomainNames = [ "*.${domainname}" ]; }; + + certs."cholli.de" = { + dnsResolver = "1.1.1.1:53"; + extraDomainNames = [ "*.cholli.de" ]; + }; }; }; diff --git a/modules/users/cholli/default.nix b/modules/users/cholli/default.nix index 7d8da18..081aa78 100644 --- a/modules/users/cholli/default.nix +++ b/modules/users/cholli/default.nix @@ -58,6 +58,8 @@ topLevel: { "networkmanager" "sound" "tty" + "usb" + "systemd-journal" "wheel" ]; shell = pkgs.fish; @@ -68,6 +70,14 @@ topLevel: { nix.settings.trusted-users = [ topLevel.config.flake.meta.users.cholli.username ]; + systemd.tmpfiles.rules = + let + username = "cholli"; + in + [ + "f+ /var/lib/AccountsService/users/${username} 0600 root root - [User]\\nIcon=/var/lib/AccountsService/icons/${username}\\n" # notice the "\\n" we don't want nix to insert a new line in our string, just pass it as \n to systemd + "L+ /var/lib/AccountsService/icons/${username} - - - - ${./profile.png}" + ]; }; homeManager.cholli =