aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock31
-rw-r--r--flake.nix1
-rw-r--r--nixos/machine/adm-mpd.nix11
-rw-r--r--nixos/machine/adm-omnia.nix1
-rw-r--r--nixos/machine/dean.nix9
-rw-r--r--nixos/machine/spt-mox.nix40
-rw-r--r--nixos/machine/spt-mox2.nix4
-rw-r--r--nixos/modules/desktop.nix4
-rw-r--r--nixos/modules/generic.nix1
9 files changed, 70 insertions, 32 deletions
diff --git a/flake.lock b/flake.lock
index 2c84497..f6b3edb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -44,11 +44,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1663133271,
- "narHash": "sha256-juBxlETvfMetD/pUFLtdDLQ8BOayxROra8d5Hg6Zg1M=",
+ "lastModified": 1663229557,
+ "narHash": "sha256-1uU4nsDLXKG0AHc/VCsNBAEPkTA/07juYhcEWRb1O1E=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "93580fca1000c37e382d7e2c19c78c1c3852482d",
+ "rev": "a0df6cd6e199df4a78c833c273781ea92fa62cfb",
"type": "github"
},
"original": {
@@ -58,11 +58,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1663202367,
- "narHash": "sha256-62sI03nVTWKMULPnjUC+Ig952PqPDnkCSJ56MLoFvDI=",
+ "lastModified": 1664235386,
+ "narHash": "sha256-hlkYFCJ9VKZPRW50vtpHHq4h1PJrptD5BbdLOEp4Lyc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e731e6638c7726241c352c74bc7f860872e4cbd2",
+ "rev": "ea4a87537cfdc83eebcd1804a5ec51057018784f",
"type": "github"
},
"original": {
@@ -107,14 +107,17 @@
]
},
"locked": {
- "lastModified": 1660980319,
- "narHash": "sha256-pS2wmG0hJIK/t+X0eO1+qtJJr1rSbFiOrcMLqgNrg54=",
+ "lastModified": 1664266910,
+ "narHash": "sha256-G6NbV6xY4YuuRo2qUTdcwTyliO+dAwuG1wGyfiaiMXs=",
+ "ref": "refs/heads/master",
+ "rev": "ff1073d03d303d3b15e66d03dc4a5a479a387fa7",
+ "revCount": 39,
"type": "git",
- "url": "file:///home/cynerd/projects/nixturris"
+ "url": "https://git.cynerd.cz/nixturris"
},
"original": {
"type": "git",
- "url": "file:///home/cynerd/projects/nixturris"
+ "url": "https://git.cynerd.cz/nixturris"
}
},
"personal-secret": {
@@ -149,11 +152,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1660311780,
- "narHash": "sha256-7JqQp+1vTpIkySsRic6CQUQlIFKjUGe4n8y9YsUwShQ=",
+ "lastModified": 1664264492,
+ "narHash": "sha256-OgyxaGAG0PWUj3ZLjYPJ6Gnva+3oJTLvbSRV79U/++s=",
"ref": "refs/heads/master",
- "rev": "5cf55617aa4e51401743ff8a8b5d86ab10e136cb",
- "revCount": 66,
+ "rev": "7a90b467f6ac04afc0a2ee581f451d319613070e",
+ "revCount": 71,
"type": "git",
"url": "https://git.cynerd.cz/shellrc"
},
diff --git a/flake.nix b/flake.nix
index af6346d..73ec2ed 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,6 +6,7 @@
personal-secret.url = "git+ssh://git@cynerd.cz/nixos-personal-secret";
nixturris = {
url = "git+https://git.cynerd.cz/nixturris";
+ #url = "/home/cynerd/projects/nixturris";
inputs.nixpkgs.follows = "nixpkgs";
};
diff --git a/nixos/machine/adm-mpd.nix b/nixos/machine/adm-mpd.nix
index aa85445..45855e1 100644
--- a/nixos/machine/adm-mpd.nix
+++ b/nixos/machine/adm-mpd.nix
@@ -27,10 +27,15 @@ with lib;
userControlled.enable = true;
};
- services.pipewire = {
+ #services.pipewire = {
+ #enable = true;
+ #alsa.enable = true;
+ #pulse.enable = true;
+ #};
+ hardware.pulseaudio = {
enable = true;
- alsa.enable = true;
- pulse.enable = true;
+ systemWide = true;
+ zeroconf.publish.enable = true;
};
services.spotifyd = {
diff --git a/nixos/machine/adm-omnia.nix b/nixos/machine/adm-omnia.nix
index 48af6fa..71104e9 100644
--- a/nixos/machine/adm-omnia.nix
+++ b/nixos/machine/adm-omnia.nix
@@ -8,7 +8,6 @@ with lib;
cynerd = {
#openvpn.oldpersonal = true;
};
- boot.kernelPackages = pkgs.linuxPackages;
networking = {
# TODO we need vlan filtering to filter out guest and adm network
diff --git a/nixos/machine/dean.nix b/nixos/machine/dean.nix
index f2d5459..aef3c04 100644
--- a/nixos/machine/dean.nix
+++ b/nixos/machine/dean.nix
@@ -11,15 +11,6 @@ with lib;
};
};
- #boot.kernelPatches = [{
- # name = "rwtm";
- # patch = null;
- # extraConfig = ''
- # TURRIS_MOX_RWTM y
- # ARMADA_37XX_RWTM_MBOX y
- # '';
- #}];
-
networking = {
bridges = {
brlan = {
diff --git a/nixos/machine/spt-mox.nix b/nixos/machine/spt-mox.nix
index bb0ac5e..84f610e 100644
--- a/nixos/machine/spt-mox.nix
+++ b/nixos/machine/spt-mox.nix
@@ -5,6 +5,43 @@ with lib;
{
config = {
+
+ boot.initrd.kernelModules = [
+ "armada_37xx_wdt"
+ "mv88e6xxx" "dsa_core" "tag_dsa" "bridge" "hsr"
+ ];
+
+ networking.wirelessAP = {
+ enable = true;
+ environmentFile = "/run/secrets/hostapd.env";
+ interfaces = {
+ #"mlan0" = {
+ #countryCode = "CZ";
+ #ssid = "TurrisRules";
+ #wpa = true;
+ #wpaPassphrase = "@PASS_TURRIS_RULES@";
+ #};
+ "wlp1s0" = {
+ countryCode = "CZ";
+ hwMode = "a";
+ channel = 40;
+ ieee80211ac = true;
+ ht_capab = ["HT40+" "LDPC" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "MAX-AMSDU-7935" "DSSS_CCK-40"];
+ vht_capab = ["RXLDPC" "SHORT-GI-80" "TX-STBC-2BY1" "RX-ANTENNA-PATTERN" "TX-ANTENNA-PATTERN" "RX-STBC-1" "MAX-MPDU-11454" "MAX-A-MPDU-LEN-EXP7"];
+ ssid = "TurrisRules5";
+ wpa = true;
+ wpaPassphrase = "@PASS_TURRIS_RULES@";
+ bss = {
+ "wlp1s0host" = {
+ ssid = "KocoviGuest";
+ wpa = true;
+ wpaPassphrase = "@PASS_KOCOVI@";
+ };
+ };
+ };
+ };
+ };
+
networking = {
vlans = {
"eth0.2" = {
@@ -15,7 +52,7 @@ with lib;
bridges = {
brlan = {
interfaces = [
- "eth0" "lan1" "lan2" "lan3" "lan4"
+ "eth0" # "lan1" "lan2" "lan3" "lan4"
];
};
brguest = {
@@ -36,6 +73,7 @@ with lib;
nameservers = [ config.cynerd.hosts.spt.omnia "1.1.1.1" "8.8.8.8" ];
dhcpcd.allowInterfaces = [ "brlan" ];
};
+
};
}
diff --git a/nixos/machine/spt-mox2.nix b/nixos/machine/spt-mox2.nix
index 65748fb..982cc50 100644
--- a/nixos/machine/spt-mox2.nix
+++ b/nixos/machine/spt-mox2.nix
@@ -61,12 +61,12 @@ with lib;
bridges = {
brlan = {
interfaces = [
- "eth0" #"mlan0" "wlp1s0"
+ "eth0" "wlp1s0" #"mlan0"
];
};
brguest = {
interfaces = [
- "eth0.2" #"mlan0host" "wlp1s0host"
+ "eth0.2" "wlp1s0host" #"mlan0host"
];
};
};
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index 898db66..f9056c5 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -69,7 +69,7 @@ in {
vlc mpv youtube-dl
nordic
- delft-icon-theme gnome3.adwaita-icon-theme
+ delft-icon-theme gnome.adwaita-icon-theme
vanilla-dmz
sound-theme-freedesktop
gucharmap
@@ -79,7 +79,7 @@ in {
samba cifs-utils
tigervnc freerdp
- kdeconnect
+ plasma5Packages.kdeconnect-kde
hdparm ethtool multipath-tools
usb-modeswitch
diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix
index 04957b1..ff635cf 100644
--- a/nixos/modules/generic.nix
+++ b/nixos/modules/generic.nix
@@ -23,6 +23,7 @@ in {
"thefloweringash-armv7.cachix.org-1:v+5yzBD2odFKeXbmC+OPWVqx4WVoIVO6UXgnSAWFtso="
"arm.cachix.org-1:K3XjAeWPgWkFtSS9ge5LJSLw3xgnNqyOaG7MDecmTQ8="
];
+ trusted-users = [ "@wheel" ];
};
registry = {
personal.to = {