Jump to unstable
This commit is contained in:
parent
adf23df7cb
commit
0ba66cf899
|
@ -361,16 +361,16 @@
|
||||||
},
|
},
|
||||||
"nixos-stable": {
|
"nixos-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1682303062,
|
"lastModified": 1682453498,
|
||||||
"narHash": "sha256-x+KAADp27lbxeoPXLUMxKcRsUUHDlg+qVjt5PjgBw9A=",
|
"narHash": "sha256-WoWiAd7KZt5Eh6n+qojcivaVpnXKqBsVgpixpV2L9CE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "f5364316e314436f6b9c8fd50592b18920ab18f9",
|
"rev": "c8018361fa1d1650ee8d4b96294783cf564e8a7f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"id": "nixpkgs",
|
||||||
"ref": "nixos-22.11",
|
"ref": "nixos-unstable",
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixos-unstable.url = "nixpkgs/nixos-unstable";
|
nixos-unstable.url = "nixpkgs/nixos-unstable";
|
||||||
nixos-stable.url = "nixpkgs/nixos-22.11";
|
nixos-stable.url = "nixpkgs/nixos-unstable";
|
||||||
secrets = {
|
secrets = {
|
||||||
url = "git+ssh://git@hera.m-0.eu/config-secrets";
|
url = "git+ssh://git@hera.m-0.eu/config-secrets";
|
||||||
inputs.nixpkgs.follows = "";
|
inputs.nixpkgs.follows = "";
|
||||||
|
|
|
@ -104,7 +104,7 @@
|
||||||
};
|
};
|
||||||
theme = {
|
theme = {
|
||||||
name = "Catppuccin-Mocha-Compact-Blue-Dark";
|
name = "Catppuccin-Mocha-Compact-Blue-Dark";
|
||||||
package = pkgs.unstable.catppuccin-gtk.override {
|
package = pkgs.catppuccin-gtk.override {
|
||||||
variant = "mocha";
|
variant = "mocha";
|
||||||
size = "compact";
|
size = "compact";
|
||||||
tweaks = ["rimless"];
|
tweaks = ["rimless"];
|
||||||
|
|
|
@ -18,35 +18,9 @@
|
||||||
(import (./. + "/machines/${name}/configuration.nix") inputs)
|
(import (./. + "/machines/${name}/configuration.nix") inputs)
|
||||||
inputs.secrets.nixosModules.default
|
inputs.secrets.nixosModules.default
|
||||||
inputs.impermanence.nixosModules.impermanence
|
inputs.impermanence.nixosModules.impermanence
|
||||||
inputs.self.nixosModules.unstableNFTables
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
lib.genAttrs machines makeSystem);
|
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")
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,8 +4,6 @@ flake-inputs: {
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
wireguard = import ../../../common/wireguard.nix;
|
|
||||||
inherit (config.m-0) hosts prefix;
|
|
||||||
inherit (import ../../../common/common.nix {inherit pkgs;}) syncthing;
|
inherit (import ../../../common/common.nix {inherit pkgs;}) syncthing;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
@ -79,7 +79,7 @@
|
||||||
config = _: {
|
config = _: {
|
||||||
imports = [
|
imports = [
|
||||||
../../roles
|
../../roles
|
||||||
pkgs.flake-inputs.self.nixosModules.unstableNFTables
|
#pkgs.flake-inputs.self.nixosModules.unstableNFTables
|
||||||
];
|
];
|
||||||
nixpkgs = {inherit pkgs;};
|
nixpkgs = {inherit pkgs;};
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,6 @@ in {
|
||||||
(flake-inputs.secrets.lib.vpn "hera")
|
(flake-inputs.secrets.lib.vpn "hera")
|
||||||
(import ../../roles/home-manager.nix flake-inputs)
|
(import ../../roles/home-manager.nix flake-inputs)
|
||||||
(import ./mail.nix flake-inputs)
|
(import ./mail.nix flake-inputs)
|
||||||
(import ../../roles/headscale.nix flake-inputs)
|
|
||||||
../../roles
|
../../roles
|
||||||
../../roles/blog.nix
|
../../roles/blog.nix
|
||||||
../../roles/coturn.nix
|
../../roles/coturn.nix
|
||||||
|
@ -22,6 +21,7 @@ in {
|
||||||
../../roles/git.nix
|
../../roles/git.nix
|
||||||
../../roles/go-neb.nix
|
../../roles/go-neb.nix
|
||||||
../../roles/goatcounter.nix
|
../../roles/goatcounter.nix
|
||||||
|
../../roles/headscale.nix
|
||||||
../../roles/laminar
|
../../roles/laminar
|
||||||
../../roles/mailman.nix
|
../../roles/mailman.nix
|
||||||
../../roles/mathechor.de.nix
|
../../roles/mathechor.de.nix
|
||||||
|
|
|
@ -4,8 +4,6 @@ flake-inputs: {
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
wireguard = import ../../../common/wireguard.nix;
|
|
||||||
inherit (config.m-0) hosts prefix;
|
|
||||||
inherit (import ../../../common/common.nix {inherit pkgs;}) syncthing;
|
inherit (import ../../../common/common.nix {inherit pkgs;}) syncthing;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
|
||||||
modulesPath,
|
modulesPath,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
@ -60,7 +59,5 @@
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
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;
|
nix.settings.max-jobs = lib.mkDefault 12;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
flake-inputs: {
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
|
@ -8,12 +8,6 @@ flake-inputs: {
|
||||||
zone = "maralorn.de";
|
zone = "maralorn.de";
|
||||||
derp_port = 3479;
|
derp_port = 3479;
|
||||||
in {
|
in {
|
||||||
disabledModules = [
|
|
||||||
"services/networking/headscale.nix"
|
|
||||||
];
|
|
||||||
imports = [
|
|
||||||
"${flake-inputs.nixos-unstable}/nixos/modules/services/networking/headscale.nix"
|
|
||||||
];
|
|
||||||
m-0.monitoring = [
|
m-0.monitoring = [
|
||||||
{
|
{
|
||||||
name = "hera-headscale";
|
name = "hera-headscale";
|
||||||
|
|
|
@ -66,13 +66,7 @@ flake-inputs: {
|
||||||
];
|
];
|
||||||
homeAssistantDir = "/disk/persist/home-assistant";
|
homeAssistantDir = "/disk/persist/home-assistant";
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [./hexa-cards.nix];
|
||||||
./hexa-cards.nix
|
|
||||||
"${flake-inputs.nixos-unstable}/nixos/modules/services/home-automation/home-assistant.nix"
|
|
||||||
];
|
|
||||||
disabledModules = [
|
|
||||||
"services/home-automation/home-assistant.nix"
|
|
||||||
];
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
"d ${homeAssistantDir} - - - - -"
|
"d ${homeAssistantDir} - - - - -"
|
||||||
|
|
|
@ -7,14 +7,5 @@ self: super: {
|
||||||
(self.unstable)
|
(self.unstable)
|
||||||
nix # Always good for early nom problem detection.
|
nix # Always good for early nom problem detection.
|
||||||
nil # Because old nil with new nix does not get cached.
|
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
|
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,11 +6,6 @@ self: super: let
|
||||||
android_sdk.accept_license = true;
|
android_sdk.accept_license = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
unstableUnfree = import self.flake-inputs.nixos-unstable {
|
|
||||||
config.allowUnfree = true;
|
|
||||||
inherit (self) system;
|
|
||||||
};
|
|
||||||
in {
|
in {
|
||||||
inherit (unfree) discord zoom-us minecraft teamviewer steam androidsdk_9_0;
|
inherit (unfree) discord zoom-us minecraft teamviewer steam androidsdk_9_0 factorio minecraft-server;
|
||||||
inherit (unstableUnfree) factorio minecraft-server;
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue