From bc08fcf5aba60f4c0d430403e6665a86d26965c5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 15 Jan 2025 10:17:35 -0600 Subject: [PATCH] WIP ez-configs --- flake-modules/checks.nix | 7 -- flake-modules/configs.nix | 21 ++++ flake-modules/default.nix | 2 +- flake.lock | 195 ++++++++++++++++++++++++-------------- flake.nix | 7 +- 5 files changed, 152 insertions(+), 80 deletions(-) delete mode 100644 flake-modules/checks.nix create mode 100644 flake-modules/configs.nix diff --git a/flake-modules/checks.nix b/flake-modules/checks.nix deleted file mode 100644 index f398687cb..000000000 --- a/flake-modules/checks.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ inputs, self, ... }: -{ - perSystem = - { pkgs, system, ... }: - { - }; -} diff --git a/flake-modules/configs.nix b/flake-modules/configs.nix new file mode 100644 index 000000000..d36c4df53 --- /dev/null +++ b/flake-modules/configs.nix @@ -0,0 +1,21 @@ +{ inputs, ... }: +{ + + imports = [ + inputs.ez-configs.flakeModule + ]; + + ezConfigs = { + root = ../.; + + darwin = { + configurationsDirectory = ../configurations/darwin; + modulesDirectory = ../modules/darwin; + }; + + nixos = { + configurationsDirectory = ../configurations/nixos; + modulesDirectory = ../modules/nixos; + }; + }; +} diff --git a/flake-modules/default.nix b/flake-modules/default.nix index 2c3191181..01bf7883f 100644 --- a/flake-modules/default.nix +++ b/flake-modules/default.nix @@ -6,7 +6,7 @@ }: { imports = [ - ./checks.nix + ./configs.nix ./devshell.nix ./git-hooks.nix ./lib.nix diff --git a/flake.lock b/flake.lock index e53fd1b22..46c7e2759 100644 --- a/flake.lock +++ b/flake.lock @@ -75,8 +75,8 @@ "blink-cmp": { "inputs": { "fenix": "fenix", - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_12" + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1736747056, @@ -276,6 +276,25 @@ "type": "github" } }, + "ez-configs": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1720994547, + "narHash": "sha256-5WmTdtALYr8zSTBEeyKWos08pqNwRJ2SiT/vAnw19TU=", + "owner": "ehllie", + "repo": "ez-configs", + "rev": "563000e533a1b1aa957a4b788bf505cd243e5154", + "type": "github" + }, + "original": { + "owner": "ehllie", + "repo": "ez-configs", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -498,6 +517,27 @@ } }, "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "ez-configs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -515,7 +555,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_3" }, @@ -533,7 +573,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_4" }, @@ -551,7 +591,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_7": { "inputs": { "nixpkgs-lib": [ "khanelivim", @@ -573,7 +613,7 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_8": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -594,7 +634,7 @@ "type": "github" } }, - "flake-parts_8": { + "flake-parts_9": { "inputs": { "nixpkgs-lib": [ "nur", @@ -788,7 +828,7 @@ "inputs": { "flake-compat": "flake-compat_2", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1735882644, @@ -808,7 +848,7 @@ "inputs": { "flake-compat": "flake-compat_4", "gitignore": "gitignore_3", - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1735882644, @@ -996,7 +1036,7 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1736785676, @@ -1057,7 +1097,7 @@ }, "hypr-socket-watch": { "inputs": { - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "rust-overlay": "rust-overlay" }, "locked": { @@ -1142,7 +1182,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_5", "xdph": "xdph" @@ -1359,11 +1399,11 @@ "blink-cmp": "blink-cmp", "blink-compat": "blink-compat", "blink-emoji": "blink-emoji", - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "git-hooks-nix": "git-hooks-nix_2", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_15", "nixpkgs-tree-sitter": "nixpkgs-tree-sitter", "nixvim": "nixvim", "pkgs-by-name-for-flake-parts": "pkgs-by-name-for-flake-parts", @@ -1387,9 +1427,9 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_8", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_18", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay_2" }, @@ -1507,7 +1547,7 @@ }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_18" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1736652904, @@ -1679,6 +1719,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1706487304, "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", @@ -1694,7 +1750,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1736012469, "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", @@ -1710,7 +1766,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1736166416, "narHash": "sha256-U47xeACNBpkSO6IcCm0XvahsVXpJXzjPIQG7TZlOToU=", @@ -1726,7 +1782,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1730768919, "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", @@ -1742,7 +1798,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1736848588, "narHash": "sha256-9B6fQqphF3j9lpcxQnKyIUgp3NyGi7ikb9CjCYqixcY=", @@ -1758,7 +1814,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { "lastModified": 1736344531, "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", @@ -1774,7 +1830,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_17": { "locked": { "lastModified": 1735554305, "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", @@ -1790,7 +1846,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_18": { "locked": { "lastModified": 1717794163, "narHash": "sha256-Ch6ZpFPVvi7Bb6gmmuufpTEFkXqa43pC94XMfU5FEt0=", @@ -1806,7 +1862,7 @@ "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_19": { "locked": { "lastModified": 1736344531, "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", @@ -1822,22 +1878,6 @@ "type": "github" } }, - "nixpkgs_19": { - "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1690031011, @@ -1868,6 +1908,22 @@ } }, "nixpkgs_21": { + "locked": { + "lastModified": 1736798957, + "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_22": { "locked": { "lastModified": 1704290814, "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", @@ -1883,7 +1939,7 @@ "type": "github" } }, - "nixpkgs_22": { + "nixpkgs_23": { "locked": { "lastModified": 1731763621, "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", @@ -1899,7 +1955,7 @@ "type": "github" } }, - "nixpkgs_23": { + "nixpkgs_24": { "locked": { "lastModified": 1735554305, "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", @@ -1915,7 +1971,7 @@ "type": "github" } }, - "nixpkgs_24": { + "nixpkgs_25": { "locked": { "lastModified": 1735471104, "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", @@ -1931,7 +1987,7 @@ "type": "github" } }, - "nixpkgs_25": { + "nixpkgs_26": { "locked": { "lastModified": 1735821806, "narHash": "sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8=", @@ -2012,43 +2068,43 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", + "lastModified": 1699963925, + "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", + "rev": "bf744fe90419885eefced41b3e5ae442d732712d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_8": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1730768919, + "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -2062,11 +2118,11 @@ "inputs": { "devshell": "devshell", "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_7", "git-hooks": "git-hooks", "home-manager": "home-manager_4", "nix-darwin": "nix-darwin_2", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_16", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, @@ -2086,8 +2142,8 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_8", - "nixpkgs": "nixpkgs_20", + "flake-parts": "flake-parts_9", + "nixpkgs": "nixpkgs_21", "treefmt-nix": "treefmt-nix_3" }, "locked": { @@ -2239,7 +2295,8 @@ "catppuccin-cursors": "catppuccin-cursors", "deploy-rs": "deploy-rs", "disko": "disko", - "flake-parts": "flake-parts_3", + "ez-configs": "ez-configs", + "flake-parts": "flake-parts_4", "git-hooks-nix": "git-hooks-nix", "home-manager": "home-manager_2", "hypr-socket-watch": "hypr-socket-watch", @@ -2250,7 +2307,7 @@ "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_20", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "pkgs-by-name-for-flake-parts": "pkgs-by-name-for-flake-parts_2", @@ -2282,7 +2339,7 @@ "rust-overlay": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1714529851, @@ -2347,7 +2404,7 @@ "snowfall-flake": { "inputs": { "flake-compat": "flake-compat_8", - "nixpkgs": "nixpkgs_21", + "nixpkgs": "nixpkgs_22", "snowfall-lib": "snowfall-lib" }, "locked": { @@ -2390,7 +2447,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_22" + "nixpkgs": "nixpkgs_23" }, "locked": { "lastModified": 1736808430, @@ -2550,7 +2607,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_17" }, "locked": { "lastModified": 1736154270, @@ -2589,7 +2646,7 @@ }, "treefmt-nix_4": { "inputs": { - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_24" }, "locked": { "lastModified": 1736154270, @@ -2626,7 +2683,7 @@ "waybar": { "inputs": { "flake-compat": "flake-compat_10", - "nixpkgs": "nixpkgs_24" + "nixpkgs": "nixpkgs_25" }, "locked": { "lastModified": 1736677965, @@ -2648,7 +2705,7 @@ "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", - "nixpkgs": "nixpkgs_25", + "nixpkgs": "nixpkgs_26", "rust-overlay": "rust-overlay_3", "zlib": "zlib" }, diff --git a/flake.nix b/flake.nix index 3a6ff84db..d81c15c4c 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { # Core Inputs + ez-configs.url = "github:ehllie/ez-configs"; flake-parts.url = "github:hercules-ci/flake-parts"; home-manager.url = "github:nix-community/home-manager"; # home-manager.url = "git+file:///home/khaneliman/Documents/github/home-manager"; @@ -61,12 +62,12 @@ }@inputs: flake-parts.lib.mkFlake { inherit inputs; } { systems = [ - "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; - imports = [ ./flake-modules ]; + imports = [ + ./flake-modules + ]; }; }