From 611796f02e0993b092ca3959159b785e1f4cee47 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 15 Jul 2024 17:12:20 +0200 Subject: [PATCH] move nixos modules to nixos-modules --- flake.lock | 224 +++++++++++++++++- flake.nix | 8 +- {modules => nixos-modules}/asf/default.nix | 0 {modules => nixos-modules}/audio/default.nix | 0 .../audio/sennheiser-hd660s.nix | 0 .../auto-update/default.nix | 0 .../bluetooth/default.nix | 0 {modules => nixos-modules}/boot/default.nix | 0 .../boot/systemd/default.nix | 0 {modules => nixos-modules}/default.nix | 0 {modules => nixos-modules}/doc/default.nix | 0 .../events/37c3/default.nix | 0 {modules => nixos-modules}/events/default.nix | 0 .../keyboard/default.nix | 0 {modules => nixos-modules}/kodi/default.nix | 0 {modules => nixos-modules}/local/default.nix | 0 .../minecraft-server/default.nix | 0 .../moodle-dl/default.nix | 0 {modules => nixos-modules}/nix/default.nix | 0 {modules => nixos-modules}/plasma/default.nix | 0 .../printing/default.nix | 0 .../repo-sync/default.nix | 0 {modules => nixos-modules}/ssh/default.nix | 0 {modules => nixos-modules}/steam/default.nix | 0 {modules => nixos-modules}/sway/default.nix | 0 {modules => nixos-modules}/users/default.nix | 0 .../users/jopejoe1/default.nix | 0 .../users/root/default.nix | 0 .../zerotierone/default.nix | 0 29 files changed, 225 insertions(+), 7 deletions(-) rename {modules => nixos-modules}/asf/default.nix (100%) rename {modules => nixos-modules}/audio/default.nix (100%) rename {modules => nixos-modules}/audio/sennheiser-hd660s.nix (100%) rename {modules => nixos-modules}/auto-update/default.nix (100%) rename {modules => nixos-modules}/bluetooth/default.nix (100%) rename {modules => nixos-modules}/boot/default.nix (100%) rename {modules => nixos-modules}/boot/systemd/default.nix (100%) rename {modules => nixos-modules}/default.nix (100%) rename {modules => nixos-modules}/doc/default.nix (100%) rename {modules => nixos-modules}/events/37c3/default.nix (100%) rename {modules => nixos-modules}/events/default.nix (100%) rename {modules => nixos-modules}/keyboard/default.nix (100%) rename {modules => nixos-modules}/kodi/default.nix (100%) rename {modules => nixos-modules}/local/default.nix (100%) rename {modules => nixos-modules}/minecraft-server/default.nix (100%) rename {modules => nixos-modules}/moodle-dl/default.nix (100%) rename {modules => nixos-modules}/nix/default.nix (100%) rename {modules => nixos-modules}/plasma/default.nix (100%) rename {modules => nixos-modules}/printing/default.nix (100%) rename {modules => nixos-modules}/repo-sync/default.nix (100%) rename {modules => nixos-modules}/ssh/default.nix (100%) rename {modules => nixos-modules}/steam/default.nix (100%) rename {modules => nixos-modules}/sway/default.nix (100%) rename {modules => nixos-modules}/users/default.nix (100%) rename {modules => nixos-modules}/users/jopejoe1/default.nix (100%) rename {modules => nixos-modules}/users/root/default.nix (100%) rename {modules => nixos-modules}/zerotierone/default.nix (100%) diff --git a/flake.lock b/flake.lock index 40f8d38..2d4d5de 100644 --- a/flake.lock +++ b/flake.lock @@ -84,6 +84,28 @@ "url": "https://git.clan.lol/clan/data-mesher/archive/main.tar.gz" } }, + "devshell": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "owner": "numtide", + "repo": "devshell", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -150,6 +172,20 @@ } }, "flake-compat": { + "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_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -165,7 +201,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -246,6 +282,27 @@ } }, "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "prismlauncher", @@ -281,7 +338,77 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "nixvim", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720524665, + "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { + "inputs": { + "nixpkgs": [ + "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_2": { "inputs": { "nixpkgs": [ "prismlauncher", @@ -399,6 +526,27 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720845312, + "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -571,13 +719,42 @@ "type": "indirect" } }, + "nixvim": { + "inputs": { + "devshell": "devshell", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts_4", + "git-hooks": "git-hooks", + "home-manager": [ + "home-manager" + ], + "nix-darwin": "nix-darwin", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix_4" + }, + "locked": { + "lastModified": 1721042250, + "narHash": "sha256-CEOGzI9WFGezwJ3lok0F//1UEq5crzE2kZDLQK2EtfE=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "b9ed90003273f0a75151b32948e16b44891f403c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": [ "prismlauncher", "flake-compat" ], - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "prismlauncher", "nixpkgs" @@ -603,8 +780,8 @@ }, "prismlauncher": { "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts_4", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_5", "libnbtplusplus": "libnbtplusplus", "nixpkgs": [ "nixpkgs" @@ -638,6 +815,7 @@ "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "nixvim": "nixvim", "prismlauncher": "prismlauncher", "snm": "snm", "sops-nix": "sops-nix_2", @@ -648,7 +826,7 @@ "snm": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ], @@ -737,6 +915,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tela-icon-theme": { "flake": false, "locked": { @@ -816,6 +1009,27 @@ "repo": "treefmt-nix", "type": "github" } + }, + "treefmt-nix_4": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720818892, + "narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ee1bf7a..ae436ab 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; catppuccin.url = "github:catppuccin/nix"; + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; + }; # Packages tela-icon-theme = { @@ -63,14 +68,13 @@ url = "github:nix-community/nixos-anywhere"; inputs.nixpkgs.follows = "nixpkgs"; inputs.disko.follows = "disko"; - }; }; outputs = inputs@{ self, nixpkgs, ... }: { - nixosModules.default = import ./modules; + nixosModules.default = import ./nixos-modules; homeManagerModules.default = import ./home-modules; nixosConfigurations = import ./systems { inherit self inputs nixpkgs; }; packages = nixpkgs.lib.attrsets.genAttrs nixpkgs.lib.systems.flakeExposed ( diff --git a/modules/asf/default.nix b/nixos-modules/asf/default.nix similarity index 100% rename from modules/asf/default.nix rename to nixos-modules/asf/default.nix diff --git a/modules/audio/default.nix b/nixos-modules/audio/default.nix similarity index 100% rename from modules/audio/default.nix rename to nixos-modules/audio/default.nix diff --git a/modules/audio/sennheiser-hd660s.nix b/nixos-modules/audio/sennheiser-hd660s.nix similarity index 100% rename from modules/audio/sennheiser-hd660s.nix rename to nixos-modules/audio/sennheiser-hd660s.nix diff --git a/modules/auto-update/default.nix b/nixos-modules/auto-update/default.nix similarity index 100% rename from modules/auto-update/default.nix rename to nixos-modules/auto-update/default.nix diff --git a/modules/bluetooth/default.nix b/nixos-modules/bluetooth/default.nix similarity index 100% rename from modules/bluetooth/default.nix rename to nixos-modules/bluetooth/default.nix diff --git a/modules/boot/default.nix b/nixos-modules/boot/default.nix similarity index 100% rename from modules/boot/default.nix rename to nixos-modules/boot/default.nix diff --git a/modules/boot/systemd/default.nix b/nixos-modules/boot/systemd/default.nix similarity index 100% rename from modules/boot/systemd/default.nix rename to nixos-modules/boot/systemd/default.nix diff --git a/modules/default.nix b/nixos-modules/default.nix similarity index 100% rename from modules/default.nix rename to nixos-modules/default.nix diff --git a/modules/doc/default.nix b/nixos-modules/doc/default.nix similarity index 100% rename from modules/doc/default.nix rename to nixos-modules/doc/default.nix diff --git a/modules/events/37c3/default.nix b/nixos-modules/events/37c3/default.nix similarity index 100% rename from modules/events/37c3/default.nix rename to nixos-modules/events/37c3/default.nix diff --git a/modules/events/default.nix b/nixos-modules/events/default.nix similarity index 100% rename from modules/events/default.nix rename to nixos-modules/events/default.nix diff --git a/modules/keyboard/default.nix b/nixos-modules/keyboard/default.nix similarity index 100% rename from modules/keyboard/default.nix rename to nixos-modules/keyboard/default.nix diff --git a/modules/kodi/default.nix b/nixos-modules/kodi/default.nix similarity index 100% rename from modules/kodi/default.nix rename to nixos-modules/kodi/default.nix diff --git a/modules/local/default.nix b/nixos-modules/local/default.nix similarity index 100% rename from modules/local/default.nix rename to nixos-modules/local/default.nix diff --git a/modules/minecraft-server/default.nix b/nixos-modules/minecraft-server/default.nix similarity index 100% rename from modules/minecraft-server/default.nix rename to nixos-modules/minecraft-server/default.nix diff --git a/modules/moodle-dl/default.nix b/nixos-modules/moodle-dl/default.nix similarity index 100% rename from modules/moodle-dl/default.nix rename to nixos-modules/moodle-dl/default.nix diff --git a/modules/nix/default.nix b/nixos-modules/nix/default.nix similarity index 100% rename from modules/nix/default.nix rename to nixos-modules/nix/default.nix diff --git a/modules/plasma/default.nix b/nixos-modules/plasma/default.nix similarity index 100% rename from modules/plasma/default.nix rename to nixos-modules/plasma/default.nix diff --git a/modules/printing/default.nix b/nixos-modules/printing/default.nix similarity index 100% rename from modules/printing/default.nix rename to nixos-modules/printing/default.nix diff --git a/modules/repo-sync/default.nix b/nixos-modules/repo-sync/default.nix similarity index 100% rename from modules/repo-sync/default.nix rename to nixos-modules/repo-sync/default.nix diff --git a/modules/ssh/default.nix b/nixos-modules/ssh/default.nix similarity index 100% rename from modules/ssh/default.nix rename to nixos-modules/ssh/default.nix diff --git a/modules/steam/default.nix b/nixos-modules/steam/default.nix similarity index 100% rename from modules/steam/default.nix rename to nixos-modules/steam/default.nix diff --git a/modules/sway/default.nix b/nixos-modules/sway/default.nix similarity index 100% rename from modules/sway/default.nix rename to nixos-modules/sway/default.nix diff --git a/modules/users/default.nix b/nixos-modules/users/default.nix similarity index 100% rename from modules/users/default.nix rename to nixos-modules/users/default.nix diff --git a/modules/users/jopejoe1/default.nix b/nixos-modules/users/jopejoe1/default.nix similarity index 100% rename from modules/users/jopejoe1/default.nix rename to nixos-modules/users/jopejoe1/default.nix diff --git a/modules/users/root/default.nix b/nixos-modules/users/root/default.nix similarity index 100% rename from modules/users/root/default.nix rename to nixos-modules/users/root/default.nix diff --git a/modules/zerotierone/default.nix b/nixos-modules/zerotierone/default.nix similarity index 100% rename from modules/zerotierone/default.nix rename to nixos-modules/zerotierone/default.nix