diff --git a/flake.lock b/flake.lock index 6585a364..6e1a789b 100644 --- a/flake.lock +++ b/flake.lock @@ -361,16 +361,16 @@ }, "nixos-stable": { "locked": { - "lastModified": 1682303062, - "narHash": "sha256-x+KAADp27lbxeoPXLUMxKcRsUUHDlg+qVjt5PjgBw9A=", + "lastModified": 1682453498, + "narHash": "sha256-WoWiAd7KZt5Eh6n+qojcivaVpnXKqBsVgpixpV2L9CE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5364316e314436f6b9c8fd50592b18920ab18f9", + "rev": "c8018361fa1d1650ee8d4b96294783cf564e8a7f", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.11", + "ref": "nixos-unstable", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 2d619e6f..d2409b4a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixos-unstable.url = "nixpkgs/nixos-unstable"; - nixos-stable.url = "nixpkgs/nixos-22.11"; + nixos-stable.url = "nixpkgs/nixos-unstable"; secrets = { url = "git+ssh://git@hera.m-0.eu/config-secrets"; inputs.nixpkgs.follows = ""; diff --git a/home-manager/roles/desktop.nix b/home-manager/roles/desktop.nix index b8f30810..71c34682 100644 --- a/home-manager/roles/desktop.nix +++ b/home-manager/roles/desktop.nix @@ -104,7 +104,7 @@ }; theme = { name = "Catppuccin-Mocha-Compact-Blue-Dark"; - package = pkgs.unstable.catppuccin-gtk.override { + package = pkgs.catppuccin-gtk.override { variant = "mocha"; size = "compact"; tweaks = ["rimless"]; diff --git a/nixos/flake-module.nix b/nixos/flake-module.nix index 6159cd3b..a1622cbc 100644 --- a/nixos/flake-module.nix +++ b/nixos/flake-module.nix @@ -18,35 +18,9 @@ (import (./. + "/machines/${name}/configuration.nix") inputs) inputs.secrets.nixosModules.default inputs.impermanence.nixosModules.impermanence - inputs.self.nixosModules.unstableNFTables ]; }; in lib.genAttrs machines makeSystem); - nixosModules.unstableNFTables = _: { - # Only until 23.05. - networking.nftables.checkRuleset = false; - disabledModules = [ - "services/networking/firewall.nix" - "services/networking/nftables.nix" - "services/networking/nat.nix" - "services/networking/redsocks.nix" - "services/networking/miniupnpd.nix" - "services/audio/roon-server.nix" - "services/audio/roon-bridge.nix" - ]; - imports = let - networkingModule = name: "${inputs.nixos-unstable}/nixos/modules/services/networking/${name}.nix"; - in [ - # nftables using module not available in 22.11. - (networkingModule "firewall-iptables") - (networkingModule "firewall-nftables") - (networkingModule "firewall") - (networkingModule "nat-iptables") - (networkingModule "nat-nftables") - (networkingModule "nat") - (networkingModule "nftables") - ]; - }; }; } diff --git a/nixos/machines/apollo/configuration.nix b/nixos/machines/apollo/configuration.nix index 4d51401b..658bb785 100644 --- a/nixos/machines/apollo/configuration.nix +++ b/nixos/machines/apollo/configuration.nix @@ -4,8 +4,6 @@ flake-inputs: { pkgs, ... }: let - wireguard = import ../../../common/wireguard.nix; - inherit (config.m-0) hosts prefix; inherit (import ../../../common/common.nix {inherit pkgs;}) syncthing; in { imports = [ diff --git a/nixos/machines/hera/cloud.nix b/nixos/machines/hera/cloud.nix index ee326467..dc54e6f6 100644 --- a/nixos/machines/hera/cloud.nix +++ b/nixos/machines/hera/cloud.nix @@ -79,7 +79,7 @@ config = _: { imports = [ ../../roles - pkgs.flake-inputs.self.nixosModules.unstableNFTables + #pkgs.flake-inputs.self.nixosModules.unstableNFTables ]; nixpkgs = {inherit pkgs;}; diff --git a/nixos/machines/hera/configuration.nix b/nixos/machines/hera/configuration.nix index 85ba8ba6..fc95dd09 100644 --- a/nixos/machines/hera/configuration.nix +++ b/nixos/machines/hera/configuration.nix @@ -12,7 +12,6 @@ in { (flake-inputs.secrets.lib.vpn "hera") (import ../../roles/home-manager.nix flake-inputs) (import ./mail.nix flake-inputs) - (import ../../roles/headscale.nix flake-inputs) ../../roles ../../roles/blog.nix ../../roles/coturn.nix @@ -22,6 +21,7 @@ in { ../../roles/git.nix ../../roles/go-neb.nix ../../roles/goatcounter.nix + ../../roles/headscale.nix ../../roles/laminar ../../roles/mailman.nix ../../roles/mathechor.de.nix diff --git a/nixos/machines/zeus/configuration.nix b/nixos/machines/zeus/configuration.nix index a683687e..ebfafecc 100644 --- a/nixos/machines/zeus/configuration.nix +++ b/nixos/machines/zeus/configuration.nix @@ -4,8 +4,6 @@ flake-inputs: { lib, ... }: let - wireguard = import ../../../common/wireguard.nix; - inherit (config.m-0) hosts prefix; inherit (import ../../../common/common.nix {inherit pkgs;}) syncthing; in { imports = [ diff --git a/nixos/machines/zeus/hardware-configuration.nix b/nixos/machines/zeus/hardware-configuration.nix index f7fc2546..1ad253e0 100644 --- a/nixos/machines/zeus/hardware-configuration.nix +++ b/nixos/machines/zeus/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { @@ -60,7 +59,5 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; nix.settings.max-jobs = lib.mkDefault 12; } diff --git a/nixos/roles/headscale.nix b/nixos/roles/headscale.nix index 190e36f3..84dbf391 100644 --- a/nixos/roles/headscale.nix +++ b/nixos/roles/headscale.nix @@ -1,4 +1,4 @@ -flake-inputs: { +{ config, lib, ... @@ -8,12 +8,6 @@ flake-inputs: { zone = "maralorn.de"; derp_port = 3479; in { - disabledModules = [ - "services/networking/headscale.nix" - ]; - imports = [ - "${flake-inputs.nixos-unstable}/nixos/modules/services/networking/headscale.nix" - ]; m-0.monitoring = [ { name = "hera-headscale"; diff --git a/nixos/roles/home-assistant/default.nix b/nixos/roles/home-assistant/default.nix index 59502856..9595b3c1 100644 --- a/nixos/roles/home-assistant/default.nix +++ b/nixos/roles/home-assistant/default.nix @@ -66,13 +66,7 @@ flake-inputs: { ]; homeAssistantDir = "/disk/persist/home-assistant"; in { - imports = [ - ./hexa-cards.nix - "${flake-inputs.nixos-unstable}/nixos/modules/services/home-automation/home-assistant.nix" - ]; - disabledModules = [ - "services/home-automation/home-assistant.nix" - ]; + imports = [./hexa-cards.nix]; systemd.tmpfiles.rules = [ "d ${homeAssistantDir} - - - - -" diff --git a/overlays/previews.nix b/overlays/previews.nix index 07eb2912..a683c83a 100644 --- a/overlays/previews.nix +++ b/overlays/previews.nix @@ -7,14 +7,5 @@ self: super: { (self.unstable) nix # Always good for early nom problem detection. nil # Because old nil with new nix does not get cached. - home-assistant # hexa says that’s better than stable - emanote # Haskell - cabal2nix # Haskell - chrysalis # Only until 23.05 - helix # until 23.05: Various features - headscale # until 23.05: Required for correct hostnames and Android compat - lklWithFirewall # until 23.05: To Fix firewall checks - nix-diff - musescore # version 4.0 for 22.11 ; } diff --git a/overlays/unfree.nix b/overlays/unfree.nix index d123fe3c..a21c087d 100644 --- a/overlays/unfree.nix +++ b/overlays/unfree.nix @@ -6,11 +6,6 @@ self: super: let android_sdk.accept_license = true; }; }; - unstableUnfree = import self.flake-inputs.nixos-unstable { - config.allowUnfree = true; - inherit (self) system; - }; in { - inherit (unfree) discord zoom-us minecraft teamviewer steam androidsdk_9_0; - inherit (unstableUnfree) factorio minecraft-server; + inherit (unfree) discord zoom-us minecraft teamviewer steam androidsdk_9_0 factorio minecraft-server; }