diff --git a/flake.lock b/flake.lock index 248032b..b43e6e1 100644 --- a/flake.lock +++ b/flake.lock @@ -84,7 +84,7 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable" }, @@ -121,11 +121,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -212,10 +212,10 @@ "type": "github" } }, - "home-manager-unstable": { + "home-manager_2": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ] }, "locked": { @@ -232,27 +232,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1702195709, - "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "6761b8188b860f374b457eddfdb05c82eef9752f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-23.11", - "repo": "home-manager", - "type": "github" - } - }, "home-manager_3": { "inputs": { "nixpkgs": [ @@ -325,50 +304,20 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702346276, - "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-22_11": { - "locked": { - "lastModified": 1669558522, - "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-22.11", - "type": "indirect" - } - }, - "nixpkgs-23_05": { - "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.05", - "type": "indirect" - } - }, "nixpkgs-droid": { "locked": { "lastModified": 1702350026, @@ -433,29 +382,13 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1710806803, - "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1670751203, - "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -542,11 +475,9 @@ "disko": "disko", "emacs": "emacs", "home-manager": "home-manager_2", - "home-manager-unstable": "home-manager-unstable", "nix-on-droid": "nix-on-droid", "nixpkgs": "nixpkgs", "nixpkgs-droid": "nixpkgs-droid", - "nixpkgs-unstable": "nixpkgs-unstable", "pre-commit-hooks": "pre-commit-hooks", "snm": "snm" } @@ -556,16 +487,14 @@ "blobs": "blobs", "flake-compat": "flake-compat_2", "nixpkgs": "nixpkgs_2", - "nixpkgs-22_11": "nixpkgs-22_11", - "nixpkgs-23_05": "nixpkgs-23_05", "utils": "utils_2" }, "locked": { - "lastModified": 1703666786, - "narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=", + "lastModified": 1710449465, + "narHash": "sha256-2orO8nfplp6uQJBFqKkj1iyNMC6TysmwbWwbb4osTag=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4", + "rev": "79c8cfcd5873a85559da6201b116fb38b490d030", "type": "gitlab" }, "original": { @@ -605,6 +534,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1659877975, @@ -621,12 +565,15 @@ } }, "utils_2": { + "inputs": { + "systems": "systems_3" + }, "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 43fc420..c3f2842 100644 --- a/flake.nix +++ b/flake.nix @@ -1,20 +1,14 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-23.05"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - home-manager-unstable = { url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; }; # simple mailserver @@ -30,7 +24,7 @@ emacs = { url = "github:nix-community/emacs-overlay"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; }; # simplex-chat = { @@ -48,94 +42,88 @@ disko.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, home-manager, nixpkgs, nixpkgs-unstable, pre-commit-hooks - , ... }@inputs: { - checks."x86_64-linux" = let - system = "x86_64-linux"; - pkgs = import nixpkgs { inherit system; }; - in { - pre-commit-check = pre-commit-hooks.lib.${system}.run { - src = ./.; - settings = { ormolu.defaultExtensions = [ "GHC2021" ]; }; - tools.fourmolu = pkgs.haskellPackages.fourmolu; - hooks = { - nixfmt.enable = true; - fourmolu.enable = true; - hpack.enable = true; - hlint.enable = true; - }; + outputs = { self, home-manager, nixpkgs, pre-commit-hooks, ... }@inputs: { + checks."x86_64-linux" = let + system = "x86_64-linux"; + pkgs = import nixpkgs { inherit system; }; + in { + pre-commit-check = pre-commit-hooks.lib.${system}.run { + src = ./.; + settings = { ormolu.defaultExtensions = [ "GHC2021" ]; }; + tools.fourmolu = pkgs.haskellPackages.fourmolu; + hooks = { + nixfmt.enable = true; + fourmolu.enable = true; + hpack.enable = true; + hlint.enable = true; }; }; - - nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; - modules = let - postfix-overlay = final: prev: { - postfix = nixpkgs-unstable.legacyPackages."x86_64-linux".postfix; - }; - in [ - ({ inputs, lib, ... }: { - nixpkgs = { - config.allowUnfree = true; - overlays = with inputs; [ emacs.overlay postfix-overlay ]; - }; - nix.registry = lib.mapAttrs (_: value: { flake = value; }) inputs; - }) - ./hosts/thrall - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.alex = import ./home/alex/cli.nix; - } - ]; - }; - - nixosConfigurations."dregil" = nixpkgs-unstable.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; - modules = [ ./hosts/dregil ]; - }; - - nixosConfigurations."igor" = nixpkgs-unstable.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; - modules = [ ./hosts/igor ]; - }; - - nixOnDroidConfigurations.default = with inputs; - nix-on-droid.lib.nixOnDroidConfiguration { - modules = [ - ./hosts/redmi - { nix.registry.nixpkgs.flake = nixpkgs-droid; } - { nix.nixPath = [ "nixpkgs=${nixpkgs-droid}" ]; } - ]; - }; - - devShells."x86_64-linux".default = let - system = "x86_64-linux"; - pkgs = import nixpkgs { inherit system; }; - in pkgs.haskellPackages.shellFor { - inherit (self.checks.${system}.pre-commit-check) shellHook; - - packages = p: [ p.xmonad p.xmonad-contrib ]; - - withHoogle = true; - - nativeBuildInputs = with pkgs; [ - haskellPackages.haskell-language-server - haskellPackages.fourmolu - haskellPackages.hspec-discover - haskellPackages.doctest - haskellPackages.xmonad - haskellPackages.xmonad-contrib - cabal-install - ghcid - nixfmt - hpack - hlint - ]; - }; }; + + nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ + ({ inputs, lib, ... }: { + nixpkgs = { + config.allowUnfree = true; + overlays = with inputs; [ emacs.overlay ]; + }; + }) + ./hosts/thrall + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.alex = import ./home/alex/cli.nix; + } + ]; + }; + + nixosConfigurations."dregil" = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ ./hosts/dregil ]; + }; + + nixosConfigurations."igor" = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ ./hosts/igor ]; + }; + + nixOnDroidConfigurations.default = with inputs; + nix-on-droid.lib.nixOnDroidConfiguration { + modules = [ + ./hosts/redmi + { nix.registry.nixpkgs.flake = nixpkgs-droid; } + { nix.nixPath = [ "nixpkgs=${nixpkgs-droid}" ]; } + ]; + }; + + devShells."x86_64-linux".default = let + system = "x86_64-linux"; + pkgs = import nixpkgs { inherit system; }; + in pkgs.haskellPackages.shellFor { + inherit (self.checks.${system}.pre-commit-check) shellHook; + + packages = p: [ p.xmonad p.xmonad-contrib ]; + + withHoogle = true; + + nativeBuildInputs = with pkgs; [ + haskellPackages.haskell-language-server + haskellPackages.fourmolu + haskellPackages.hspec-discover + haskellPackages.doctest + haskellPackages.xmonad + haskellPackages.xmonad-contrib + cabal-install + ghcid + nixfmt + hpack + hlint + ]; + }; + }; } diff --git a/hosts/dregil/default.nix b/hosts/dregil/default.nix index c670933..71b89de 100644 --- a/hosts/dregil/default.nix +++ b/hosts/dregil/default.nix @@ -1,14 +1,10 @@ { lib, config, pkgs, inputs, ... }: { imports = [ - ({ inputs, lib, ... }: { - nixpkgs = { config.allowUnfree = true; }; - nix.registry = - lib.mkForce (lib.mapAttrs (_: value: { flake = value; }) inputs); - }) + ({ ... }: { nixpkgs = { config.allowUnfree = true; }; }) ../../modules/security.nix ../../modules/common-system.nix ./configuration.nix - inputs.home-manager-unstable.nixosModules.home-manager + inputs.home-manager.nixosModules.home-manager ../../home/anne/default.nix ../../home/alex/default.nix ]; diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix index 56cd004..8a031cc 100644 --- a/hosts/thrall/default.nix +++ b/hosts/thrall/default.nix @@ -225,16 +225,15 @@ in { }; # paperless - "${authorityFromUrl config.services.paperless.extraConfig.PAPERLESS_URL}" = - { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = - "http://127.0.0.1:${toString config.services.paperless.port}/"; - proxyWebsockets = true; - }; + "${authorityFromUrl config.services.paperless.settings.PAPERLESS_URL}" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = + "http://127.0.0.1:${toString config.services.paperless.port}/"; + proxyWebsockets = true; }; + }; # hledger "${authorityFromUrl config.services.hledger-web.baseUrl}" = { @@ -280,7 +279,7 @@ in { address = "127.0.0.1"; port = 3002; consumptionDirIsPublic = true; - extraConfig = { + settings = { PAPERLESS_OCR_LANGUAGE = "deu+eng"; PAPERLESS_URL = "https://docs.failco.de"; PAPERLESS_CONSUMER_RECURSIVE = true;