diff --git a/flake.lock b/flake.lock index a7cc779..cc42d2c 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1736090999, - "narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=", + "lastModified": 1744557573, + "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=", "owner": "aylur", "repo": "ags", - "rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c", + "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6", "type": "github" }, "original": { @@ -31,11 +31,32 @@ ] }, "locked": { - "lastModified": 1735172721, - "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=", + "lastModified": 1742571008, + "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=", "owner": "aylur", "repo": "astal", - "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2", + "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "astal", + "type": "github" + } + }, + "astal_2": { + "inputs": { + "nixpkgs": [ + "hyprpanel", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748416910, + "narHash": "sha256-FEQcs58HL8Fe4i7XlqVEUwthjxwvRvgX15gTTfW17sU=", + "owner": "aylur", + "repo": "astal", + "rev": "c1bd89a47c81c66ab5fc6872db5a916c0433fb89", "type": "github" }, "original": { @@ -62,16 +83,15 @@ }, "firefox-addons": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1742773104, - "narHash": "sha256-dAhrL+gEjNN5U/Sosy7IrX0Y0qPA0U7Gp9TBhqEliNU=", + "lastModified": 1749009805, + "narHash": "sha256-eRv4m89aPJvIAX9mZQcJM+l3sYG+OJvcLsiHvAvXalg=", "owner": "rycee", "repo": "nur-expressions", - "rev": "d74460da63a8c08a69a1f143b04f2ab1a6b2f5c2", + "rev": "622c38d004cdded682d9a5ab7323181dc6efb0c1", "type": "gitlab" }, "original": { @@ -84,11 +104,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -121,11 +141,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -143,11 +163,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -163,11 +183,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -177,21 +197,6 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1629284811, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -206,7 +211,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -224,17 +229,35 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "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" + } + }, "foundry": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1742980214, - "narHash": "sha256-UzazRioiBdQvMlLN6xTF07yLqYQX/Pnvk6O2kv+83do=", + "lastModified": 1750929040, + "narHash": "sha256-IS8bTX6K/k46sRVZ1FnEEyNKomcQVT81OH45DtgHyqI=", "owner": "shazow", "repo": "foundry.nix", - "rev": "11a0e6d9c17fc1aecb2bfd77aa66bbdd90783754", + "rev": "11cfe26ad2a2944f12ab3d774587a7fb60e7b59f", "type": "github" }, "original": { @@ -253,11 +276,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -290,11 +313,11 @@ }, "hardware": { "locked": { - "lastModified": 1742806253, - "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", + "lastModified": 1748942041, + "narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", + "rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853", "type": "github" }, "original": { @@ -313,11 +336,11 @@ ] }, "locked": { - "lastModified": 1742014779, - "narHash": "sha256-I6fG1zrfdLFcp/imGZElig0BJO3YU0QEXLgvwWoOpJ8=", + "lastModified": 1748000383, + "narHash": "sha256-EaAJhwfJGBncgIV/0NlJviid2DP93cTMc9h0q6P6xXk=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "524637ef84c177661690b924bf64a1ce18072a2c", + "rev": "231726642197817d20310b9d39dd4afb9e899489", "type": "github" }, "original": { @@ -333,11 +356,11 @@ ] }, "locked": { - "lastModified": 1742957044, - "narHash": "sha256-gwW0tBIA77g6qq45y220drTy0DmThF3fJMwVFUtYV9c=", + "lastModified": 1748979197, + "narHash": "sha256-mKYwYcO9RmA2AcAFIXGDBOw5iv/fbjw6adWvMbnfIuk=", "owner": "nix-community", "repo": "home-manager", - "rev": "ce287a5cd3ef78203bc78021447f937a988d9f6f", + "rev": "34a13086148cbb3ae65a79f753eb451ce5cac3d3", "type": "github" }, "original": { @@ -373,7 +396,7 @@ "rose-pine-hyprcursor", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_4" }, "locked": { "lastModified": 1709914708, @@ -392,16 +415,17 @@ "hyprpanel": { "inputs": { "ags": "ags", + "astal": "astal_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1742881618, - "narHash": "sha256-4C5Zzo4S9zD+4ZL7MKLE7FqJEMVkOTvfIV9uEBQ8fDY=", + "lastModified": 1750618016, + "narHash": "sha256-wn6XV23Sz/nsDPI+1FGjtyMfAWJWcXRpNcryS47DJdY=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "7b5c339e9363187e249fa2f6eadbb295b0e8c6ff", + "rev": "2c0c66a8ddcdff69b2ff694fefbcd8df4387a9e7", "type": "github" }, "original": { @@ -424,16 +448,16 @@ ] }, "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "lastModified": 1748294338, + "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.6", + "ref": "v0.0.8", "repo": "ixx", "type": "github" } @@ -449,11 +473,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1742947725, - "narHash": "sha256-3tX7EDFhwAM6ppWQ1vLWTWYYjoq5z53ldbPr0xPGzr4=", + "lastModified": 1750983411, + "narHash": "sha256-g10hXUUZ8FwMFAKsjWjHaJAzxyORR1kxA1DAyXrFMFg=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "8c4d5795d13829d9a9a269e02ee2d0036bc2f05c", + "rev": "97dddd4fc14547ee389b432b6525b7650f261253", "type": "github" }, "original": { @@ -465,11 +489,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1742945712, - "narHash": "sha256-/UgJvBhMp/1qMtof3y3czSLB91KrN5W3E4e/tqT1dPg=", + "lastModified": 1750976841, + "narHash": "sha256-NLKBKM9sapcb4IrNLmK/s++7oD8trZDond7Cb1aQFv8=", "owner": "neovim", "repo": "neovim", - "rev": "6b00c9acfde954a3e992a2932eca9fa5902a1298", + "rev": "2b4c1127ad1c8cff38f562d71f411c35ec6ba8d6", "type": "github" }, "original": { @@ -499,11 +523,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1627814220, - "narHash": "sha256-P+MDgdZw2CBk9X1ZZaUgHgN+32pTfLFf3XVIBOXirI4=", + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab5b6828af26215bf2646c31961da5d3749591ef", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "type": "github" }, "original": { @@ -544,11 +568,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742800061, - "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", + "lastModified": 1750865895, + "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", + "rev": "61c0f513911459945e2cb8bf333dc849f1b976ff", "type": "github" }, "original": { @@ -560,11 +584,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1743964447, - "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", "type": "github" }, "original": { @@ -576,11 +600,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1742800061, - "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", + "lastModified": 1750811787, + "narHash": "sha256-rD/978c35JXz6JLAzciTIOCMenPumF6zrQOj4rVZeHE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", + "rev": "992f916556fcfaa94451ebc7fc6e396134bbf5b1", "type": "github" }, "original": { @@ -626,14 +650,15 @@ "inputs": { "flake-parts": "flake-parts_3", "nixpkgs": "nixpkgs_5", - "nuschtosSearch": "nuschtosSearch" + "nuschtosSearch": "nuschtosSearch", + "systems": "systems_2" }, "locked": { - "lastModified": 1743362786, - "narHash": "sha256-XbXIRDbb8/vLBX1M096l7lM5wfzBTp1ZXfUl9bUhVGU=", + "lastModified": 1751018463, + "narHash": "sha256-WJub9XhzGVkS4Ismz6jFRAl2vQJvSciemfhhkV13eVw=", "owner": "nix-community", "repo": "nixvim", - "rev": "d81f37256d0a8691b837b74979d27bf89be8ecdd", + "rev": "a473ef658a8611cfbb48bb9bd7d0f2eed2fe038a", "type": "github" }, "original": { @@ -644,7 +669,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -652,11 +677,11 @@ ] }, "locked": { - "lastModified": 1742659553, - "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", + "lastModified": 1749730855, + "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", "owner": "NuschtOS", "repo": "search", - "rev": "508752835128a3977985a4d5225ff241f7756181", + "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", "type": "github" }, "original": { @@ -668,11 +693,11 @@ "nvchad-starter": { "flake": false, "locked": { - "lastModified": 1744022214, - "narHash": "sha256-a7hawK5HaP8um+BkdTYwp0Rp55FkfIMXzS0gSpBxATg=", + "lastModified": 1751028259, + "narHash": "sha256-d01UFhRq8jTBvG3BL7TGkzO1usQELWHMAHy18ILAu/c=", "owner": "naps62", "repo": "nvchad-starter", - "rev": "6b7dbbe070129d38b3d1aabba1dd249cfd3b9932", + "rev": "bb2d57364786065b95b21649d0dfef1caa8ee5ab", "type": "github" }, "original": { @@ -683,6 +708,7 @@ }, "nvchad4nix": { "inputs": { + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], @@ -691,11 +717,11 @@ ] }, "locked": { - "lastModified": 1743220344, - "narHash": "sha256-dEl75fQN/WYQMsztDrkFXAn+L3WUpbuPxNi0l5IkpkM=", + "lastModified": 1750944016, + "narHash": "sha256-brpa9vvfEjux4MtbuZiFkeJF7gTdejUDykLlhm3ncW4=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "5c103820a3b9fb8ade34cec4fe81e377b6a568a8", + "rev": "20006d3a11d666c7a916cc90bba81672a7ce24cb", "type": "github" }, "original": { @@ -704,6 +730,26 @@ "type": "github" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749972148, + "narHash": "sha256-asty75gVovgIuspKv7i4KfaZ4Z/QE1lKOOpQinmdfHI=", + "ref": "refs/heads/master", + "rev": "ea0387ffa01fabe57117dec48f88615b3302a095", + "revCount": 579, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, "root": { "inputs": { "firefox-addons": "firefox-addons", @@ -717,8 +763,9 @@ "nixvim": "nixvim", "nvchad-starter": "nvchad-starter", "nvchad4nix": "nvchad4nix", + "quickshell": "quickshell", "rose-pine-hyprcursor": "rose-pine-hyprcursor", - "systems": "systems_4", + "systems": "systems_6", "utils": "utils_2", "zen-browser": "zen-browser" } @@ -730,11 +777,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1740132177, - "narHash": "sha256-gNc20APKMefFdH5RONBuHhOps14aiMdgIT0I6RaSN64=", + "lastModified": 1748096947, + "narHash": "sha256-ouuA8LVBXzrbYwPW2vNjh7fC9H2UBud/1tUiIM5vPvM=", "owner": "ndom91", "repo": "rose-pine-hyprcursor", - "rev": "568067f35a85932192bd43ddf64fc05eff850f9f", + "rev": "4b02963d0baf0bee18725cf7c5762b3b3c1392f1", "type": "github" }, "original": { @@ -760,16 +807,16 @@ }, "systems_2": { "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" } }, @@ -818,6 +865,36 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -826,11 +903,11 @@ ] }, "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "lastModified": 1750931469, + "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", + "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", "type": "github" }, "original": { @@ -841,7 +918,7 @@ }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -859,7 +936,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_7" }, "locked": { "lastModified": 1731533236, @@ -881,11 +958,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1744280439, - "narHash": "sha256-oiLN1kt71v19w5/4muZhXf9SGb7mkMjvLAi7wJQA2ms=", + "lastModified": 1750998539, + "narHash": "sha256-lmyIs/tlMtRq92NYPAix8iwN85oCrcqIXzOAo9gqYl0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5667f0661aa52587f1f86ed7206ddf87327616a9", + "rev": "ea8a9b6b32027a1eeba7fcef4a3368d7f867c110", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 02e3460..00f9685 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,10 @@ }; zen-browser.url = "github:0xc000022070/zen-browser-flake"; + quickshell = { + url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix index 1b06194..c6e9952 100644 --- a/home/arrakis/default.nix +++ b/home/arrakis/default.nix @@ -12,6 +12,7 @@ inputs.nixvim.homeManagerModules.nixvim ../common/programs/default.nix ../common/programs/desktop + ../common/programs/zen-browser.nix ../common/programs/hyprland ../common/programs/ghostty.nix ../common/programs/syncthing.nix @@ -45,7 +46,7 @@ ]; }; - programs.hyprpanel.layout = { + programs.hyprpanel.settings.layout = { "bar.layouts" = { "0" = { "left" = [ diff --git a/home/arrakis/monitors.nix b/home/arrakis/monitors.nix index 52c5209..c4ee7f5 100644 --- a/home/arrakis/monitors.nix +++ b/home/arrakis/monitors.nix @@ -14,7 +14,10 @@ in wayland.windowManager.hyprland.settings = { monitor = [ "eDP-1, preferred, 0x0, 1, bitdepth, 8" - "DP-3, preferred, 0x-2160, 1.2" + "DP-1, preferred, auto-up, 1" + "DP-2, preferred, auto-up, 1" + "DP-3, preferred, auto-up, 1" + "DP-4, preferred, auto-up, 1" # "DP-3, 1920x1200, 0x0, 1, mirror, eDP-1" ]; }; diff --git a/home/common/programs/cpp.nix b/home/common/programs/cpp.nix new file mode 100644 index 0000000..60fc774 --- /dev/null +++ b/home/common/programs/cpp.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + esphome + clang-tools + ]; +} diff --git a/home/common/programs/default.nix b/home/common/programs/default.nix index 7069053..c4903d0 100644 --- a/home/common/programs/default.nix +++ b/home/common/programs/default.nix @@ -10,6 +10,7 @@ ./solidity.nix ./dev.nix ./aider.nix + ./cpp.nix ]; programs = { diff --git a/home/common/programs/desktop/darkman.nix b/home/common/programs/desktop/darkman.nix index e98fa85..9086dd4 100644 --- a/home/common/programs/desktop/darkman.nix +++ b/home/common/programs/desktop/darkman.nix @@ -10,13 +10,21 @@ gtk-theme = '' ${pkgs.dconf}/bin/dconf write\ /org/gnome/desktop/interface/color-scheme "'prefer-dark'" + ${pkgs.dconf}/bin/dconf write\ + /org/gnome/desktop/interface/gtk-theme "'Orchis-Dark-Compact'" ''; }; lightModeScripts = { gtk-theme = '' ${pkgs.dconf}/bin/dconf write\ /org/gnome/desktop/interface/color-scheme "'prefer-light'" + ${pkgs.dconf}/bin/dconf write\ + /org/gnome/desktop/interface/gtk-theme "'Orchis-Compact'" ''; }; }; + + xdg.configFile."darkman/config.yaml".text = '' + usegeoclue: true + ''; } diff --git a/home/common/programs/dev.nix b/home/common/programs/dev.nix index 60bf620..69a5b47 100644 --- a/home/common/programs/dev.nix +++ b/home/common/programs/dev.nix @@ -19,5 +19,7 @@ aider-chat inotify-tools devenv + # bruno + zed-editor ]; } diff --git a/home/common/programs/gpg.nix b/home/common/programs/gpg.nix index 03db2a0..f855714 100644 --- a/home/common/programs/gpg.nix +++ b/home/common/programs/gpg.nix @@ -14,20 +14,8 @@ services.gpg-agent = { enable = true; - pinentryPackage = pkgs.pinentry-gnome3; + pinentry.package = pkgs.pinentry-gnome3; }; - # pinentry = { - # enable = true; - # pinentryFlavor = "gnome3"; - # }; - # settings = { - # keyserver = "hkps://keys.openpgp.org"; - # use-agent = true; - # use-agent-extra = true; - # no-greeting = true; - # verbose = true; - # }; - # }; programs.password-store = { enable = true; diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index 65efbe4..7320e7b 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -8,6 +8,7 @@ in ./dunst.nix ./cursor.nix ./hyprpanel.nix + ./quickshell.nix ]; home.packages = with pkgs; [ diff --git a/home/common/programs/hyprland/quickshell.nix b/home/common/programs/hyprland/quickshell.nix new file mode 100644 index 0000000..b2304a8 --- /dev/null +++ b/home/common/programs/hyprland/quickshell.nix @@ -0,0 +1,13 @@ +{ + config, + pkgs, + inputs, + ... +}: +{ + home.packages = with pkgs; [ + inputs.quickshell.packages.x86_64-linux.quickshell + ]; + + xdg.configFile."quickshell".source = ./quickshell; +} diff --git a/home/common/programs/hyprland/quickshell/Bar.qml b/home/common/programs/hyprland/quickshell/Bar.qml new file mode 100644 index 0000000..820cc10 --- /dev/null +++ b/home/common/programs/hyprland/quickshell/Bar.qml @@ -0,0 +1,28 @@ +import Quickshell +import Quickshell.Io +import QtQuick + +Scope { + Variants { + model: Quickshell.screens; + + delegate: Component { + PanelWindow { + property var modelData + screen: modelData + + anchors { + top: true + left: true + right: true + } + + implicitHeight: 30 + + ClockWidget { + anchors.centerIn: parent + } + } + } + } +} diff --git a/home/common/programs/hyprland/quickshell/ClockWidget.qml b/home/common/programs/hyprland/quickshell/ClockWidget.qml new file mode 100644 index 0000000..10d8c98 --- /dev/null +++ b/home/common/programs/hyprland/quickshell/ClockWidget.qml @@ -0,0 +1,5 @@ +import QtQuick + +Text { + text: Time.time +} diff --git a/home/common/programs/hyprland/quickshell/Time.qml b/home/common/programs/hyprland/quickshell/Time.qml new file mode 100644 index 0000000..d707174 --- /dev/null +++ b/home/common/programs/hyprland/quickshell/Time.qml @@ -0,0 +1,26 @@ +pragma Singleton + +import Quickshell +import Quickshell.Io +import QtQuick + +Singleton { + id: root + property string time + + Process { + id: dateProc + command: ["date"] + running: true + stdout: StdioCollector { + onStreamFinished: root.time = this.text + } + } + + Timer { + interval: 1000 + running: true + repeat: true + onTriggered: dateProc.running = true + } +} diff --git a/home/common/programs/hyprland/quickshell/shell.qml b/home/common/programs/hyprland/quickshell/shell.qml new file mode 100644 index 0000000..400c8af --- /dev/null +++ b/home/common/programs/hyprland/quickshell/shell.qml @@ -0,0 +1,6 @@ +import Quickshell + +Scope { + Bar {} +} + diff --git a/home/common/programs/zsh.nix b/home/common/programs/zsh.nix index 7a4788e..61e7cc4 100644 --- a/home/common/programs/zsh.nix +++ b/home/common/programs/zsh.nix @@ -70,6 +70,7 @@ [[ -f ~/.secrets.zsh ]] && source ~/.secrets.zsh export PATH="$HOME/.bin:$PATH" + export FOUNDRY_DISABLE_NIGHTLY_WARNING=true # export PKG_CONFIG_PATH=$(nix eval --raw nixpkgs.openssl.dev)/lib/pkgconfig:$PKG_CONFIG_PATH # export LIBRARY_PATH=$(nix eval --raw nixpkgs.openssl.dev)/lib:$LIBRARY_PATH # export LD_LIBRARY_PATH=$(nix eval --raw nixpkgs.openssl.dev)/lib:$LD_LIBRARY_PATH diff --git a/home/desktop/default.nix b/home/desktop/default.nix index bcff423..0365f7b 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -66,7 +66,7 @@ }; }; - programs.hyprpanel.layout = { + programs.hyprpanel.settings.layout = { "bar.layouts" = { "0" = { "left" = [ diff --git a/home/desktop/monitors.nix b/home/desktop/monitors.nix index ec05d4f..ca71649 100644 --- a/home/desktop/monitors.nix +++ b/home/desktop/monitors.nix @@ -29,10 +29,11 @@ in "DP-2, 3840x2160, 2880x180, 1.333333, transform, 1" ]; workspace = [ - "1, monitor=DP-3" - "2, monitor=DP-2" - "3, monitor=HDMI-A-1" - "4, monitor=DP-3" + "1, monitor=DP-2" + "2, monitor=DP-3" + "3, monitor=DP-2" + "4, monitor=HDMI-A-1" + "5, monitor=HDMI-A-1" ]; }; diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index 2be5a9d..ca42098 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -42,6 +42,7 @@ "input" "wheel" "docker" + "dialout" ]; shell = pkgs.zsh; initialHashedPassword = "$y$j9T$uRTzF/sBdrqVGZTRhPuR00$wgLgEGlq.lEmlCPiy69jkbtfC9HKpyaVPDHDdBGtE5D"; @@ -49,7 +50,7 @@ let authorizedKeys = pkgs.fetchurl { url = "https://github.com/naps62.keys"; - sha256 = "sha256-xVrGO4Cultc3tPcnLFKLa98btLh7EAl3tLM1MTvwmn8="; + sha256 = "sha256-QKVtVXIVxYUqpnNCJAfRow3RG4j2jkQSFOwTeDgwO7s="; }; in pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys); diff --git a/hosts/common/features/networking.nix b/hosts/common/features/networking.nix index 49d7255..df5d507 100644 --- a/hosts/common/features/networking.nix +++ b/hosts/common/features/networking.nix @@ -4,5 +4,21 @@ networkmanager = { enable = true; }; + }; + + services.avahi = { + enable = true; + nssmdns = true; + openFirewall = true; + }; + + # environment.etc.nsswitch.text = { + # hosts = [ + # "files" + # "mdns4_minimal" + # "[NOTFOUND=return]" + # "dns" + # ]; + # }; } diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix index c82babb..320bc5d 100644 --- a/hosts/common/global/default.nix +++ b/hosts/common/global/default.nix @@ -32,4 +32,5 @@ }; services.dbus.packages = with pkgs; [ gcr ]; + services.geoclue2.enable = true; } diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index d7b8daa..beefa94 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -41,6 +41,7 @@ "input" "wheel" "docker" + "dialout" ]; shell = pkgs.zsh; initialHashedPassword = "$y$j9T$uRTzF/sBdrqVGZTRhPuR00$wgLgEGlq.lEmlCPiy69jkbtfC9HKpyaVPDHDdBGtE5D"; @@ -48,7 +49,7 @@ let authorizedKeys = pkgs.fetchurl { url = "https://github.com/naps62.keys"; - sha256 = "sha256-xVrGO4Cultc3tPcnLFKLa98btLh7EAl3tLM1MTvwmn8="; + sha256 = "sha256-O5JbzK5ulPob0HIrO8DT1MxfkC9bnfBw/0GR8Xu1tjw="; }; in pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys); diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index 0d25c6e..b78254b 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -20,6 +20,7 @@ "ahci" "nvme" "thunderbolt" + "virtio-pci" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; @@ -31,8 +32,10 @@ }; boot.initrd.luks.devices = { - "luks-51347cdc-de81-4132-b21c-f1d089e387eb".device = "/dev/disk/by-uuid/51347cdc-de81-4132-b21c-f1d089e387eb"; - "luks-9ffb64c6-54c2-46f2-9df5-e42c33a52d1a".device = "/dev/disk/by-uuid/9ffb64c6-54c2-46f2-9df5-e42c33a52d1a"; + "luks-51347cdc-de81-4132-b21c-f1d089e387eb".device = + "/dev/disk/by-uuid/51347cdc-de81-4132-b21c-f1d089e387eb"; + "luks-9ffb64c6-54c2-46f2-9df5-e42c33a52d1a".device = + "/dev/disk/by-uuid/9ffb64c6-54c2-46f2-9df5-e42c33a52d1a"; }; fileSystems."/boot" = {