diff --git a/flake.lock b/flake.lock index f3d119b..543db55 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1732215451, - "narHash": "sha256-P2VVlzRGKBNsiHsN1yMZcSMXpwtIx9ysMFZAqKFJ14o=", + "lastModified": 1733851514, + "narHash": "sha256-fQt/HzF+OBC8xLRYeHiYLSEzjrgOLNWhyd102aY2oLU=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "9d9c0a3a94a91cfed654a18239e27cf56970daa4", + "rev": "b059e1d6e7a94bbeabb4e87d47b5f5097fd61823", "type": "github" }, "original": { @@ -30,65 +30,20 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1732213300, - "narHash": "sha256-4Pv35cnZGiTxe6j2O0F9L9sHzxVIC1SazeAUD5kWeBs=", + "lastModified": 1733849292, + "narHash": "sha256-gJYgrRxytoGHkjeEsiKY/tl06D8XOnZZ9SDpK1WSyUw=", "owner": "goauthentik", "repo": "authentik", - "rev": "527e584699abc93712114b05f70f59c5187caa66", + "rev": "0edd7531a152910e6bdd4f7d3d0cde3ed5fdd956", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2024.10.4", + "ref": "version/2024.10.5", "repo": "authentik", "type": "github" } }, - "chaotic": { - "inputs": { - "flake-schemas": "flake-schemas", - "home-manager": "home-manager", - "jovian": "jovian", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1733232506, - "narHash": "sha256-fR5gmVLx6va03cndBC6YTJqXBLqCXwVyLdGS3kNkdJQ=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "bf1bf34c2f2a4c9c7a758dff2950e566f436e162", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", - "type": "github" - } - }, - "cosmic": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "nixpkgs-stable": "nixpkgs-stable", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1733194713, - "narHash": "sha256-zGy98Hs0AUeeHrB1qnohLhOjrBKjA9hTd26QNR5ZI5c=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "9edb4815049cf8d7db652915e0555531abc89fa3", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": [ @@ -127,22 +82,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -158,7 +97,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "locked": { "lastModified": 1688025799, "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", @@ -212,20 +151,6 @@ "type": "github" } }, - "flake-schemas": { - "locked": { - "lastModified": 1721999734, - "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", - "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", - "revCount": 75, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" - } - }, "flake-utils": { "inputs": { "systems": [ @@ -288,59 +213,17 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager-stable": { - "inputs": { - "nixpkgs": [ - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1733050161, - "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "lastModified": 1733951607, + "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", "type": "github" }, "original": { @@ -364,39 +247,17 @@ "type": "github" } }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions_2", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732739177, - "narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "8d7b2149e618696d5100c2683af1ffa893f02a75", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_2", "nixpkgs": [ - "nixpkgs-stable" + "nixpkgs-unstable" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1718178907, @@ -441,14 +302,14 @@ }, "nix-darwin": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1733105089, - "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c6b65d946097baf3915dd51373251de98199280d", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -479,41 +340,18 @@ "type": "github" } }, - "nix-github-actions_2": { - "inputs": { - "nixpkgs": [ - "chaotic", - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixos-apple-silicon": { "inputs": { - "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay_3" + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1732994859, - "narHash": "sha256-5s1l2r+txJhmPfRjdV0oOnEDC43qsKTWej3eLgMcMfg=", + "lastModified": 1733377410, + "narHash": "sha256-tZ9JEAaHIs3TPdRZeZzHsnJmUilkcnVaUTvyprbRb1A=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "455b13ef013b4c0e27d6e2f6572350d4cb83162d", + "rev": "e8c07c3ae199b55a8c1c35a7c067c5cef9c7e929", "type": "github" }, "original": { @@ -524,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733217105, - "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", + "lastModified": 1733861262, + "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", + "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", "type": "github" }, "original": { @@ -540,18 +378,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1718149104, + "narHash": "sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "e913ae340076bbb73d9f4d3d065c2bca7caafb16", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-lib": { @@ -567,22 +403,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1732981179, - "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1710695816, "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", @@ -598,29 +418,13 @@ "type": "github" } }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1733120037, - "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -630,43 +434,13 @@ "type": "github" } }, - "nixpkgs-unstable-small": { - "locked": { - "lastModified": 1733205999, - "narHash": "sha256-ospvtfltUSDx1N/Sb2sx+ztyrag9urXZjUXUT/K3sl0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fcc6fd8761d9979517225721b2d4b6e672ff4da3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1718149104, - "narHash": "sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e913ae340076bbb73d9f4d3d065c2bca7caafb16", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -676,7 +450,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1731763621, "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", @@ -734,7 +508,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1717664902, @@ -753,43 +527,17 @@ "root": { "inputs": { "authentik-nix": "authentik-nix", - "chaotic": "chaotic", - "cosmic": "cosmic", - "home-manager": "home-manager_2", - "home-manager-stable": "home-manager-stable", + "home-manager": "home-manager", "impermanence": "impermanence", "lanzaboote": "lanzaboote", "nix-darwin": "nix-darwin", "nixos-apple-silicon": "nixos-apple-silicon", "nixos-hardware": "nixos-hardware", - "nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-unstable": "nixpkgs-unstable", - "nixpkgs-unstable-small": "nixpkgs-unstable-small", "sops-nix": "sops-nix" } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732933841, - "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "flake-utils": [ "lanzaboote", @@ -814,7 +562,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_2": { "flake": false, "locked": { "lastModified": 1686795910, @@ -832,14 +580,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1733128155, - "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", + "lastModified": 1733965552, + "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", + "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2550cf6..3ae4636 100644 --- a/flake.nix +++ b/flake.nix @@ -6,10 +6,10 @@ nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; # nixpkgs-unstable-small - nixpkgs-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + # nixpkgs-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small"; # nixpgs - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; + # nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; # Authentik authentik-nix = { @@ -18,7 +18,7 @@ }; # Chaotic-nix - chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + # chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; # Impermenance impermanence.url = "github:nix-community/impermanence"; @@ -29,15 +29,15 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - home-manager-stable = { - url = "github:nix-community/home-manager/release-24.11"; - inputs.nixpkgs.follows = "nixpkgs-stable"; - }; + # home-manager-stable = { + # url = "github:nix-community/home-manager/release-24.11"; + # inputs.nixpkgs.follows = "nixpkgs-stable"; + # }; # Lanzaboote lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.1"; - inputs.nixpkgs.follows = "nixpkgs-stable"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; # Nix hardware @@ -52,27 +52,27 @@ # nixos-apple-silicon.url = "git+file:///home/matt/nixos-apple-silicon"; nix-darwin.url = "github:LnL7/nix-darwin"; - cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; + # cosmic = { + # url = "github:lilyinstarlight/nixos-cosmic"; + # inputs.nixpkgs.follows = "nixpkgs-unstable"; + # }; }; outputs = { self, nixpkgs-unstable, - nixpkgs-unstable-small, - nixpkgs-stable, - chaotic, + # nixpkgs-unstable-small, + # nixpkgs-stable, + # chaotic, lanzaboote, impermanence, home-manager, - home-manager-stable, + # home-manager-stable, nixos-hardware, nix-darwin, nixos-apple-silicon, - cosmic, + # cosmic, authentik-nix, sops-nix, }@inputs: @@ -84,7 +84,7 @@ nixosConfigurations = { # Desktop - "matt-nixos" = nixpkgs-stable.lib.nixosSystem { + "matt-nixos" = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs outputs; @@ -94,8 +94,8 @@ lanzaboote.nixosModules.lanzaboote ./hosts/desktop/configuration.nix ./share/impermanence - chaotic.nixosModules.default - home-manager-stable.nixosModules.home-manager + # chaotic.nixosModules.default + home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; @@ -110,7 +110,7 @@ sops-nix.nixosModules.sops - cosmic.nixosModules.default + # cosmic.nixosModules.default ]; }; diff --git a/hosts/default.nix b/hosts/default.nix index 2bbd89a..e2eeb6e 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -4,7 +4,6 @@ let in { imports = [ - ../modules ../share ]; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 53eb316..66f2e2e 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -14,18 +14,6 @@ let passwordFile = config.sops.secrets."desktop/matt_password".path; hostname = "matt-nixos"; - resetNetworkScript = pkgs.writeScriptBin "reset-network" '' - #!/usr/bin/env bash - echo "checking network..." - if nmcli -t -f STATE general | grep -q "connected"; then - exit 0 - else - echo "resetting network..." - echo 1 | tee /sys/bus/pci/devices/0000\:09\:00.0/reset - rmmod iwlwifi - modprobe iwlwifi - fi - ''; fixWifiScript = pkgs.writeScriptBin "fix-wifi" '' #!/usr/bin/env python3 @@ -105,6 +93,7 @@ in { imports = [ # Include the results of the hardware scan. + ../../modules/apps/discover-wrapped ./hardware-configuration.nix ./boot.nix ./filesystems.nix @@ -113,7 +102,7 @@ in ../../share/amd # specialisations # ./cosmic - ./hyprland + # ./hyprland ./gnome ]; diff --git a/hosts/nas/apps.nix b/hosts/nas/apps.nix index e10a5dc..740dd2a 100644 --- a/hosts/nas/apps.nix +++ b/hosts/nas/apps.nix @@ -1,6 +1,7 @@ { config, ... }: { imports = [ + ../../modules # ../../modules/apps/caddy ../../modules/apps/jellyfin/jellyfin.nix ../../modules/apps/paperless diff --git a/hosts/nas/configuration.nix b/hosts/nas/configuration.nix index 2ace4bc..7f0fd06 100755 --- a/hosts/nas/configuration.nix +++ b/hosts/nas/configuration.nix @@ -147,6 +147,13 @@ in permittedInsecurePackages = [ # ... + "authentik-2024.6.4" # todo: remove these + "python3.12-authentik-django-2024.6.4" + "authentik-webui-2024.6.4" + "authentik-client-api-2024.6.4" + "authentik-website-2024.6.4" + "authentik-proxy-2024.6.4" + "aspnetcore-runtime-wrapped-6.0.36" ]; }; }; diff --git a/modules/apps/arrs/default.nix b/modules/apps/arrs/default.nix index 6518ea3..56f9bf7 100644 --- a/modules/apps/arrs/default.nix +++ b/modules/apps/arrs/default.nix @@ -23,12 +23,12 @@ in localAddress = "10.0.1.51"; config = { config, pkgs, lib, ... }: { - nixpkgs.config.permittedInsecurePackages = [ - "aspnetcore-runtime-6.0.36" - "aspnetcore-runtime-wrapped-6.0.36" - "dotnet-sdk-6.0.428" - "dotnet-sdk-wrapped-6.0.428" - ]; + nixpkgs.config.permittedInsecurePackages = [ + "aspnetcore-runtime-6.0.36" + "aspnetcore-runtime-wrapped-6.0.36" + "dotnet-sdk-6.0.428" + "dotnet-sdk-wrapped-6.0.428" + ]; nixpkgs.config.allowUnfree = true;