From 8521e7d0b4816eebe24af9a280605ee27a5e5222 Mon Sep 17 00:00:00 2001 From: Nathan Date: Sun, 12 Jan 2025 10:38:22 -0600 Subject: [PATCH] migration to default.nix success --- flake.lock | 1454 ++--------------- flake.nix | 11 +- home-manager/dotfiles/default.nix | 12 +- .../configuration/homebox/default.nix | 3 +- system-config/default.nix | 1 + system-config/programs/ags/default.nix | 19 +- 6 files changed, 181 insertions(+), 1319 deletions(-) diff --git a/flake.lock b/flake.lock index d84357b..cba1b78 100644 --- a/flake.lock +++ b/flake.lock @@ -2,30 +2,15 @@ "nodes": { "ags": { "inputs": { - "ags": "ags_2" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-eQe222E4aSj06ElqbLLR01OUnKe1tRlHSbffhQGUdrc=", - "path": "/nix/store/pbjir320xm60vq1bcyrracrdimckmhri-source/ags", - "type": "path" - }, - "original": { - "path": "/nix/store/pbjir320xm60vq1bcyrracrdimckmhri-source/ags", - "type": "path" - } - }, - "ags_2": { - "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "systems": "systems" }, "locked": { - "lastModified": 1731591309, - "narHash": "sha256-2qL6CAoQjCJLsxpy0Ac/9pLFoItf3L9KMCSLpoJ6jSw=", + "lastModified": 1735346349, + "narHash": "sha256-n/VeEnc6fra2SPgm2ppzwQ52ggYDhpzmBnIBrVD/f+0=", "owner": "Aylur", "repo": "ags", - "rev": "67b0e31ded361934d78bddcfc01f8c3fcf781aad", + "rev": "237601999d65a4663bcbab934f4f6ce1f579d728", "type": "github" }, "original": { @@ -38,85 +23,28 @@ "aquamarine": { "inputs": { "hyprutils": [ - "nathan", - "prgms", - "hyprland", "hyprland", "hyprutils" ], "hyprwayland-scanner": [ - "nathan", - "prgms", - "hyprland", "hyprland", "hyprwayland-scanner" ], "nixpkgs": [ - "nathan", - "prgms", - "hyprland", "hyprland", "nixpkgs" ], "systems": [ - "nathan", - "prgms", - "hyprland", "hyprland", "systems" ] }, "locked": { - "lastModified": 1731774881, - "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=", + "lastModified": 1736102453, + "narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b31a6a4da8199ae3489057db7d36069a70749a56", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, - "aquamarine_2": { - "inputs": { - "hyprutils": [ - "system", - "prgms", - "hyprland", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "system", - "prgms", - "hyprland", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "system", - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "system", - "prgms", - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1731774881, - "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "b31a6a4da8199ae3489057db7d36069a70749a56", + "rev": "4846091641f3be0ad7542086d52769bb7932bde6", "type": "github" }, "original": { @@ -128,8 +56,6 @@ "devshell": { "inputs": { "nixpkgs": [ - "nathan", - "prgms", "nixvim", "nixvim", "nixpkgs" @@ -149,41 +75,6 @@ "type": "github" } }, - "devshell_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", - "owner": "numtide", - "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "digital": { - "flake": false, - "locked": { - "lastModified": 1725393562, - "narHash": "sha256-xukWBh9LuxlfHcmlScEY49j/M+rhJoEaoWPXT4bWfSM=", - "type": "tarball", - "url": "https://github.com/hneemann/Digital/releases/latest/download/Digital.zip" - }, - "original": { - "type": "tarball", - "url": "https://github.com/hneemann/Digital/releases/latest/download/Digital.zip" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -204,22 +95,6 @@ "type": "github" } }, - "external": { - "inputs": { - "digital": "digital", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-sdsD7OzeWyBdSRpf90GeDM/xCoNIdAVh1OsPnqLdlkU=", - "path": "/nix/store/ynh1nw14bmgm2nifp6iz5b08h51vfwm3-source/external", - "type": "path" - }, - "original": { - "path": "/nix/store/ynh1nw14bmgm2nifp6iz5b08h51vfwm3-source/external", - "type": "path" - } - }, "firefox-addons": { "inputs": { "flake-utils": "flake-utils", @@ -260,20 +135,6 @@ } }, "flake-compat_2": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -289,7 +150,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -303,22 +164,6 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -338,48 +183,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nathan", - "prgms", - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -420,24 +223,6 @@ "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" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -452,9 +237,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -473,50 +258,11 @@ "git-hooks": { "inputs": { "flake-compat": [ - "nathan", - "prgms", "nixvim", "nixvim", "flake-compat" ], "gitignore": "gitignore_2", - "nixpkgs": [ - "nathan", - "prgms", - "nixvim", - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nathan", - "prgms", - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { - "inputs": { - "flake-compat": [ - "nixvim", - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore_3", "nixpkgs": [ "nixvim", "nixvim", @@ -545,9 +291,6 @@ "gitignore": { "inputs": { "nixpkgs": [ - "nathan", - "prgms", - "hyprland", "hyprland", "pre-commit-hooks", "nixpkgs" @@ -570,8 +313,6 @@ "gitignore_2": { "inputs": { "nixpkgs": [ - "nathan", - "prgms", "nixvim", "nixvim", "git-hooks", @@ -592,54 +333,6 @@ "type": "github" } }, - "gitignore_3": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "git-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_4": { - "inputs": { - "nixpkgs": [ - "system", - "prgms", - "hyprland", - "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" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -662,52 +355,6 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nathan", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.05", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { - "inputs": { - "nixpkgs": [ - "nathan", - "prgms", - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1731887066, - "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_4": { "inputs": { "nixpkgs": [ "nixvim", @@ -732,33 +379,24 @@ "hyprcursor": { "inputs": { "hyprlang": [ - "nathan", - "prgms", - "hyprland", "hyprland", "hyprlang" ], "nixpkgs": [ - "nathan", - "prgms", - "hyprland", "hyprland", "nixpkgs" ], "systems": [ - "nathan", - "prgms", - "hyprland", "hyprland", "systems" ] }, "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", + "lastModified": 1734906540, + "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", + "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", "type": "github" }, "original": { @@ -767,140 +405,56 @@ "type": "github" } }, - "hyprcursor_2": { + "hyprgraphics": { "inputs": { - "hyprlang": [ - "system", - "prgms", + "hyprutils": [ "hyprland", - "hyprland", - "hyprlang" + "hyprutils" ], "nixpkgs": [ - "system", - "prgms", - "hyprland", "hyprland", "nixpkgs" ], "systems": [ - "system", - "prgms", - "hyprland", "hyprland", "systems" ] }, "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", + "lastModified": 1736115290, + "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", + "repo": "hyprgraphics", + "rev": "52202272d89da32a9f866c0d10305a5e3d954c50", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprcursor", + "repo": "hyprgraphics", "type": "github" } }, "hyprland": { - "inputs": { - "hyprland": "hyprland_2" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-Np+6rlFj1UaiFZKO03Y3p8HaS9lXalRI8nhvwH6DqR8=", - "path": "/nix/store/pbjir320xm60vq1bcyrracrdimckmhri-source/hyprland", - "type": "path" - }, - "original": { - "path": "/nix/store/pbjir320xm60vq1bcyrracrdimckmhri-source/hyprland", - "type": "path" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "nathan", - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "nathan", - "prgms", - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-protocols_2": { - "inputs": { - "nixpkgs": [ - "system", - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "system", - "prgms", - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland_2": { "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1732100541, - "narHash": "sha256-vFeNbKUstvSZbe9TD4bDYozZd+A/bKD+fxCye+p/Mp8=", + "lastModified": 1736613484, + "narHash": "sha256-gYlminxNivqjOur5Zp6xDOh1U3VesO7/t+fNlV1WFH8=", "ref": "refs/heads/main", - "rev": "940f7aa990dbc99815bab8d355999d8277534b17", - "revCount": 5484, + "rev": "2778aff08fba59a34b404751039d7acb6bfb3bdf", + "revCount": 5665, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -911,118 +465,81 @@ "url": "https://github.com/hyprwm/Hyprland" } }, - "hyprland_3": { + "hyprland-protocols": { "inputs": { - "hyprland": "hyprland_4" + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] }, "locked": { - "lastModified": 1, - "narHash": "sha256-2oL/f1CsvMoNo++D6/MCUxpSwaaFcldWpCgIkH4wJEI=", - "path": "/nix/store/9p3i8akh8fq9r09xzr63x644fzc824ds-source/hyprland", - "type": "path" + "lastModified": 1735774328, + "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", + "type": "github" }, "original": { - "path": "/nix/store/9p3i8akh8fq9r09xzr63x644fzc824ds-source/hyprland", - "type": "path" + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" } }, - "hyprland_4": { + "hyprland-qtutils": { "inputs": { - "aquamarine": "aquamarine_2", - "hyprcursor": "hyprcursor_2", - "hyprland-protocols": "hyprland-protocols_2", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_12", - "pre-commit-hooks": "pre-commit-hooks_2", - "systems": "systems_6", - "xdph": "xdph_2" + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] }, "locked": { - "lastModified": 1732100541, - "narHash": "sha256-vFeNbKUstvSZbe9TD4bDYozZd+A/bKD+fxCye+p/Mp8=", - "ref": "refs/heads/main", - "rev": "940f7aa990dbc99815bab8d355999d8277534b17", - "revCount": 5484, - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" + "lastModified": 1736114838, + "narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "6997fe382dcf396704227d2b98ffdd5066da6959", + "type": "github" }, "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" } }, "hyprlang": { "inputs": { "hyprutils": [ - "nathan", - "prgms", - "hyprland", "hyprland", "hyprutils" ], "nixpkgs": [ - "nathan", - "prgms", - "hyprland", "hyprland", "nixpkgs" ], "systems": [ - "nathan", - "prgms", - "hyprland", "hyprland", "systems" ] }, "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", + "lastModified": 1735393019, + "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { - "inputs": { - "hyprutils": [ - "system", - "prgms", - "hyprland", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "system", - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "system", - "prgms", - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", + "rev": "55608efdaa387af7bfdc0eddb404c409958efa43", "type": "github" }, "original": { @@ -1034,57 +551,20 @@ "hyprutils": { "inputs": { "nixpkgs": [ - "nathan", - "prgms", - "hyprland", "hyprland", "nixpkgs" ], "systems": [ - "nathan", - "prgms", - "hyprland", "hyprland", "systems" ] }, "locked": { - "lastModified": 1731702627, - "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", + "lastModified": 1736164519, + "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "system", - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "system", - "prgms", - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1731702627, - "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", + "rev": "3c895da64b0eb19870142196fa48c07090b441c4", "type": "github" }, "original": { @@ -1096,57 +576,20 @@ "hyprwayland-scanner": { "inputs": { "nixpkgs": [ - "nathan", - "prgms", - "hyprland", "hyprland", "nixpkgs" ], "systems": [ - "nathan", - "prgms", - "hyprland", "hyprland", "systems" ] }, "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwayland-scanner_2": { - "inputs": { - "nixpkgs": [ - "system", - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "system", - "prgms", - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "type": "github" }, "original": { @@ -1171,40 +614,6 @@ } }, "ixx": { - "inputs": { - "flake-utils": [ - "nathan", - "prgms", - "nixvim", - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nathan", - "prgms", - "nixvim", - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, - "ixx_2": { "inputs": { "flake-utils": [ "nixvim", @@ -1234,49 +643,7 @@ "type": "github" } }, - "nathan": { - "inputs": { - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs", - "packages": "packages", - "prgms": "prgms" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-HSYFDPOXOhUZo5sGuJAGHcTX9BR1TyxAtJjo9mjDy7I=", - "path": "/nix/store/phghfyac73jp4msvi1smz8vwgndxfapi-source/home-manager", - "type": "path" - }, - "original": { - "path": "/nix/store/phghfyac73jp4msvi1smz8vwgndxfapi-source/home-manager", - "type": "path" - } - }, "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nathan", - "prgms", - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1731885500, - "narHash": "sha256-ZrztYfSOS33J+ewq5alBOSdnIyZ0/sr1iy7FyBe9zIg=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "c60b5c924c6188a0b3ca2e139ead3d0f92ae5db5", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, - "nix-darwin_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -1300,9 +667,9 @@ }, "nix-minecraft": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_8" + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1732672456, @@ -1320,16 +687,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", - "owner": "nixos", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-24.05", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1346,83 +713,7 @@ "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-us": { - "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-us_2": { - "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-us_3": { "locked": { "lastModified": 1732521221, "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", @@ -1438,81 +729,33 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { - "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", - "owner": "nixos", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-24.05", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", - "owner": "NixOS", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1520,16 +763,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", - "owner": "NixOS", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -1566,54 +809,6 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts", @@ -1637,10 +832,10 @@ "nixvim_2": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_6", "nuschtosSearch": "nuschtosSearch", @@ -1660,59 +855,11 @@ "type": "github" } }, - "nixvim_3": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_10", - "nixvim": "nixvim_4" - }, - "locked": { - "lastModified": 1732083712, - "narHash": "sha256-z2dKLuUHnJ8tlsZf6l+z+vbnpnb8nYBVFgwjxu609+U=", - "ref": "refs/heads/master", - "rev": "ee443227054f76f7d5177f7fe82bc58e3566760e", - "revCount": 4, - "type": "git", - "url": "file:///home/nathan/Projects/Nixvim" - }, - "original": { - "type": "git", - "url": "file:///home/nathan/Projects/Nixvim" - } - }, - "nixvim_4": { - "inputs": { - "devshell": "devshell_2", - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_4", - "git-hooks": "git-hooks_2", - "home-manager": "home-manager_4", - "nix-darwin": "nix-darwin_2", - "nixpkgs": "nixpkgs_11", - "nuschtosSearch": "nuschtosSearch_2", - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1732035679, - "narHash": "sha256-J03v1XnxvsrrvHmzKVBZiwik8678IXfkH1/ZR954ujk=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "929bb0cd1cffb9917ab14be9cdb3f27efd6f505f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "ixx": "ixx", "nixpkgs": [ - "nathan", - "prgms", "nixvim", "nixvim", "nixpkgs" @@ -1732,65 +879,21 @@ "type": "github" } }, - "nuschtosSearch_2": { - "inputs": { - "flake-utils": "flake-utils_4", - "ixx": "ixx_2", - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1731936508, - "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", - "owner": "NuschtOS", - "repo": "search", - "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, - "packages": { - "inputs": { - "external": "external", - "nixpkgs-us": "nixpkgs-us" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-cH3HQcn3tmOZOhhwoJEjvNVkXthsysieoIu+0GhNW68=", - "path": "/nix/store/s5yn86sfb5irm84gnb6az4inmc8ad8zd-source/packages", - "type": "path" - }, - "original": { - "path": "/nix/store/s5yn86sfb5irm84gnb6az4inmc8ad8zd-source/packages", - "type": "path" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", "gitignore": "gitignore", "nixpkgs": [ - "nathan", - "prgms", - "hyprland", "hyprland", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -1799,139 +902,22 @@ "type": "github" } }, - "pre-commit-hooks_2": { - "inputs": { - "flake-compat": "flake-compat_5", - "gitignore": "gitignore_4", - "nixpkgs": [ - "system", - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "prgms": { - "inputs": { - "ags": "ags", - "hyprland": "hyprland", - "nixvim": "nixvim", - "pywal": "pywal", - "rofi": "rofi" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-rsB6/yung6vfjgKxzMv2u+/N2Fja6YlGzkq7624LmtI=", - "path": "/nix/store/s5yn86sfb5irm84gnb6az4inmc8ad8zd-source/programs", - "type": "path" - }, - "original": { - "path": "/nix/store/s5yn86sfb5irm84gnb6az4inmc8ad8zd-source/programs", - "type": "path" - } - }, - "prgms_2": { - "inputs": { - "hyprland": "hyprland_3" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-QahOuoQdXshu38W5uO7hLhG/yFkT7S2l8Dxicq0wdGk=", - "path": "/nix/store/0yr903rwrzgq5p5i12g2kq6kry5p5bl2-source/programs", - "type": "path" - }, - "original": { - "path": "/nix/store/0yr903rwrzgq5p5i12g2kq6kry5p5bl2-source/programs", - "type": "path" - } - }, - "pywal": { - "inputs": { - "nixpkgs-us": "nixpkgs-us_2", - "themecord": "themecord" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-/zp1Px5eFO2VuHk5YDhRPE3Ne+YsWyr6rJnns5aXrjI=", - "path": "/nix/store/pbjir320xm60vq1bcyrracrdimckmhri-source/pywal", - "type": "path" - }, - "original": { - "path": "/nix/store/pbjir320xm60vq1bcyrracrdimckmhri-source/pywal", - "type": "path" - } - }, - "repo": { - "flake": false, - "locked": { - "lastModified": 1686823900, - "narHash": "sha256-JRVVzyefqR2L3UrEK2iWyhUKfPMUNUnfRZmwdz05wL0=", - "owner": "siddrs", - "repo": "tokyo-night-sddm", - "rev": "320c8e74ade1e94f640708eee0b9a75a395697c6", - "type": "github" - }, - "original": { - "owner": "siddrs", - "repo": "tokyo-night-sddm", - "type": "github" - } - }, - "rofi": { - "locked": { - "lastModified": 1, - "narHash": "sha256-TsMqdRC5Rsop/6ASLtAFJc0Spt9NI8iQBk6dXxJ8mYA=", - "path": "/nix/store/pbjir320xm60vq1bcyrracrdimckmhri-source/rofi", - "type": "path" - }, - "original": { - "path": "/nix/store/pbjir320xm60vq1bcyrracrdimckmhri-source/rofi", - "type": "path" - } - }, "root": { "inputs": { + "ags": "ags", "disko": "disko", "firefox-addons": "firefox-addons", "home-manager": "home-manager", + "hyprland": "hyprland", "impermanence": "impermanence", - "nathan": "nathan", "nix-minecraft": "nix-minecraft", - "nixpkgs": "nixpkgs_9", - "nixpkgs-us": "nixpkgs-us_3", - "nixvim": "nixvim_3", + "nixpkgs": "nixpkgs_4", + "nixpkgs-us": "nixpkgs-us", + "nixvim": "nixvim", "sops-nix": "sops-nix", - "system": "system" - } - }, - "sddm": { - "inputs": { - "theme": "theme" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-I6ghmdRBD4NEY/LjlhgRS07iOUPez/ByIcmtbYPQIzo=", - "path": "/nix/store/0yr903rwrzgq5p5i12g2kq6kry5p5bl2-source/services/sddm", - "type": "path" - }, - "original": { - "path": "/nix/store/0yr903rwrzgq5p5i12g2kq6kry5p5bl2-source/services/sddm", - "type": "path" + "sugar-dark-sddm": "sugar-dark-sddm", + "themecord": "themecord", + "tokyo-night-sddm": "tokyo-night-sddm" } }, "sops-nix": { @@ -1954,20 +940,20 @@ "type": "github" } }, - "system": { - "inputs": { - "prgms": "prgms_2", - "sddm": "sddm" - }, + "sugar-dark-sddm": { + "flake": false, "locked": { - "lastModified": 1, - "narHash": "sha256-eKPjHpXuB1vGlkNsrKMkLldmy6i9vJVeQ2DqaKZ1NyI=", - "path": "/nix/store/phghfyac73jp4msvi1smz8vwgndxfapi-source/system-config", - "type": "path" + "lastModified": 1661321743, + "narHash": "sha256-flOspjpYezPvGZ6b4R/Mr18N7N3JdytCSwwu6mf4owQ=", + "owner": "MarianArlt", + "repo": "sddm-sugar-dark", + "rev": "ceb2c455663429be03ba62d9f898c571650ef7fe", + "type": "github" }, "original": { - "path": "/nix/store/phghfyac73jp4msvi1smz8vwgndxfapi-source/system-config", - "type": "path" + "owner": "MarianArlt", + "repo": "sddm-sugar-dark", + "type": "github" } }, "systems": { @@ -2030,94 +1016,43 @@ "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": { - "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" - } - }, - "theme": { - "inputs": { - "repo": "repo" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-eXmGZXA4mlXGERWWjh2QZCQV8GphWPf+yKt+Fg16OOI=", - "path": "/nix/store/6gcqlw7697845x6w5mzms24g9fh4fsmf-source/themes/tokyo-night", - "type": "path" - }, - "original": { - "path": "/nix/store/6gcqlw7697845x6w5mzms24g9fh4fsmf-source/themes/tokyo-night", - "type": "path" - } - }, "themecord": { - "inputs": { - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1730423227, - "narHash": "sha256-l6GrzdZIyoTTLeRChcwNU1aF2thkoc4BmfAGD6FoVSo=", - "owner": "danihek", - "repo": "themecord", - "rev": "2fbcd5bcdd21d373103fae73b68516bbe8cb44f4", - "type": "github" - }, - "original": { - "owner": "danihek", - "repo": "themecord", - "type": "github" - } - }, - "treefmt-nix": { "inputs": { "nixpkgs": [ - "nathan", - "prgms", - "nixvim", - "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1731944360, - "narHash": "sha256-sJxPh+V0vUkBhlA58ok/y0o96AtfqiEF0O8qsdolI6o=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "579b9a2fd0020cd9cd81a4ef4eab2dca4d20c94c", + "lastModified": 1733064124, + "narHash": "sha256-X0wVMcN2EE965ei3vrMN6Ym7GPubIvcKFWp16ZZL9uo=", + "owner": "danihek", + "repo": "themecord", + "rev": "895462d8c03359cddb5e6ccb9270fefcc7d3437c", "type": "github" }, "original": { - "owner": "numtide", - "repo": "treefmt-nix", + "owner": "danihek", + "repo": "themecord", "type": "github" } }, - "treefmt-nix_2": { + "tokyo-night-sddm": { + "flake": false, + "locked": { + "lastModified": 1686823900, + "narHash": "sha256-JRVVzyefqR2L3UrEK2iWyhUKfPMUNUnfRZmwdz05wL0=", + "owner": "siddrs", + "repo": "tokyo-night-sddm", + "rev": "320c8e74ade1e94f640708eee0b9a75a395697c6", + "type": "github" + }, + "original": { + "owner": "siddrs", + "repo": "tokyo-night-sddm", + "type": "github" + } + }, + "treefmt-nix": { "inputs": { "nixpkgs": [ "nixvim", @@ -2142,113 +1077,36 @@ "xdph": { "inputs": { "hyprland-protocols": [ - "nathan", - "prgms", - "hyprland", "hyprland", "hyprland-protocols" ], "hyprlang": [ - "nathan", - "prgms", - "hyprland", "hyprland", "hyprlang" ], "hyprutils": [ - "nathan", - "prgms", - "hyprland", "hyprland", "hyprutils" ], "hyprwayland-scanner": [ - "nathan", - "prgms", - "hyprland", "hyprland", "hyprwayland-scanner" ], "nixpkgs": [ - "nathan", - "prgms", - "hyprland", "hyprland", "nixpkgs" ], "systems": [ - "nathan", - "prgms", - "hyprland", "hyprland", "systems" ] }, "locked": { - "lastModified": 1731703417, - "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", + "lastModified": 1734907020, + "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8070f36deec723de71e7557441acb17e478204d3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, - "xdph_2": { - "inputs": { - "hyprland-protocols": [ - "system", - "prgms", - "hyprland", - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "system", - "prgms", - "hyprland", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "system", - "prgms", - "hyprland", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "system", - "prgms", - "hyprland", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "system", - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "system", - "prgms", - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1731703417, - "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "8070f36deec723de71e7557441acb17e478204d3", + "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b3af11b..409759f 100644 --- a/flake.nix +++ b/flake.nix @@ -55,8 +55,7 @@ }; - outputs = { nixpkgs, ... } @ inputs: - { + outputs = { self, nixpkgs, ... } @ inputs: { tokyo-night-sddm-theme = { pkgs }: pkgs.stdenv.mkDerivation { @@ -85,9 +84,15 @@ nixosConfigurations.homebox = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; }; + specialArgs = { + inputs = inputs // { + nathan-home-manager = import ./home-manager/default.nix; + tokyo-night-sddm-theme = self.tokyo-night-sddm-theme; + }; + }; modules = [ ./system-config/configuration/homebox + ./system-config ]; }; diff --git a/home-manager/dotfiles/default.nix b/home-manager/dotfiles/default.nix index 19bfae9..504a6f0 100644 --- a/home-manager/dotfiles/default.nix +++ b/home-manager/dotfiles/default.nix @@ -1,12 +1,12 @@ { config, lib, ... }: { home.file = { - ".config/ags" = { source = ./dotfiles/ags; recursive = true; }; - ".config/hypr" = { source = ./dotfiles/hypr; recursive = true; }; - ".config/swaylock" = { source = ./dotfiles/swaylock; recursive = true; }; - ".config/wal/templates" = { source = ./dotfiles/wal/templates; recursive = true; }; - ".config/wayvnc" = { source = ./dotfiles/wayvnc; recursive = true; }; - "Pictures/Wallpaper" = { source = ./dotfiles/Wallpaper; recursive = true; }; + ".config/ags" = { source = ./ags; recursive = true; }; + ".config/hypr" = { source = ./hypr; recursive = true; }; + ".config/swaylock" = { source = ./swaylock; recursive = true; }; + ".config/wal/templates" = { source = ./wal/templates; recursive = true; }; + ".config/wayvnc" = { source = ./wayvnc; recursive = true; }; + "Pictures/Wallpaper" = { source = ./Wallpaper; recursive = true; }; }; } diff --git a/system-config/configuration/homebox/default.nix b/system-config/configuration/homebox/default.nix index 56c0c49..cdfb36a 100644 --- a/system-config/configuration/homebox/default.nix +++ b/system-config/configuration/homebox/default.nix @@ -15,7 +15,6 @@ inputs.home-manager.nixosModules.default - inputs.system.nixosModule ]; boot = { @@ -206,7 +205,7 @@ extraSpecialArgs = {inherit inputs;}; users = { "nathan" = lib.mkMerge [ - inputs.nathan.homeManagerModule + inputs.nathan-home-manager { config.homeconfig = { impermanence.enable = true; diff --git a/system-config/default.nix b/system-config/default.nix index 080c7cb..4ac8ab6 100755 --- a/system-config/default.nix +++ b/system-config/default.nix @@ -5,4 +5,5 @@ ./packages ./programs ]; + } diff --git a/system-config/programs/ags/default.nix b/system-config/programs/ags/default.nix index 099f4fc..9d5f2d8 100644 --- a/system-config/programs/ags/default.nix +++ b/system-config/programs/ags/default.nix @@ -1,16 +1,15 @@ { config, lib, pkgs, ... }: { - options.sysconfig.opts.ags.enable = lib.options.mkOption { - - type = lib.types.bool; - default = false; + options.sysconfig.opts.ags.enable = lib.options.mkOption { + type = lib.types.bool; + default = false; }; - config = lib.mkIf config.sysconfig.opts.ags.enable { - services = { - upower.enable = true; - gvfs.enable = true; - power-profiles-daemon.enable = true; - }; + config = lib.mkIf config.sysconfig.opts.ags.enable { + services = { + upower.enable = true; + gvfs.enable = true; + power-profiles-daemon.enable = true; }; + }; }