aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiran Bastaja <miran.bastaja04@gmail.com>2024-09-07 04:21:01 +0200
committerMiran Bastaja <miran.bastaja04@gmail.com>2024-09-07 04:21:01 +0200
commit477c546ff2d9dc6448d5783bfdb69b7208e28f98 (patch)
tree1135cc31eff829efcda7e37afd5b9c10a8dbc66d
parentb25ca11c202d690f65bc3896dbdb40ca2e8685cc (diff)
Update flake.lock, switch to iwd, enable guix
-rw-r--r--flake.lock36
-rw-r--r--hosts/wonderland/default.nix55
-rw-r--r--share/system/client-common.nix7
3 files changed, 26 insertions, 72 deletions
diff --git a/flake.lock b/flake.lock
index 57d8b6e..6bb8660 100644
--- a/flake.lock
+++ b/flake.lock
@@ -27,11 +27,11 @@
]
},
"locked": {
- "lastModified": 1724895876,
- "narHash": "sha256-GSqAwa00+vRuHbq9O/yRv7Ov7W/pcMLis3HmeHv8a+Q=",
+ "lastModified": 1725377834,
+ "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=",
"owner": "nix-community",
"repo": "disko",
- "rev": "511388d837178979de66d14ca4a2ebd5f7991cd3",
+ "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe",
"type": "github"
},
"original": {
@@ -121,11 +121,11 @@
]
},
"locked": {
- "lastModified": 1724435763,
- "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
+ "lastModified": 1725628988,
+ "narHash": "sha256-Y6TBMTGu4bddUwszGjlcOuN0soVc1Gv43hp+1sT/GNI=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
+ "rev": "127ccc3eb7e36fa75e8c3fbd8a343154f66cc1c6",
"type": "github"
},
"original": {
@@ -187,11 +187,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1724819573,
- "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
+ "lastModified": 1725432240,
+ "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+ "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
"type": "github"
},
"original": {
@@ -393,11 +393,11 @@
]
},
"locked": {
- "lastModified": 1724984647,
- "narHash": "sha256-BC6MUq0CTdmAu/cueVcdWTI+S95s0mJcn19SoEgd7gU=",
+ "lastModified": 1725589472,
+ "narHash": "sha256-+OB00N6Yql/ZRQQkQ0PNnxfW2tH89DHnv29hBS7tXMM=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "87b6cffc276795b46ef544d7ed8d7fed6ad9c8e4",
+ "rev": "2b00881d2ff72174cffdc007238cb6bedd6e1d8e",
"type": "github"
},
"original": {
@@ -450,11 +450,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1723501126,
- "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
+ "lastModified": 1725540166,
+ "narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
+ "rev": "d9d781523a1463965cd1e1333a306e70d9feff07",
"type": "github"
},
"original": {
@@ -530,11 +530,11 @@
]
},
"locked": {
- "lastModified": 1724833132,
- "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
+ "lastModified": 1725271838,
+ "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
+ "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
"type": "github"
},
"original": {
diff --git a/hosts/wonderland/default.nix b/hosts/wonderland/default.nix
index a4a0998..87df419 100644
--- a/hosts/wonderland/default.nix
+++ b/hosts/wonderland/default.nix
@@ -1,5 +1,4 @@
{
- config,
pkgs,
flakeRoot,
inputs,
@@ -36,45 +35,7 @@
networking = {
hostName = "wonderland";
- wireless = {
- enable = true;
- environmentFile = config.sops.secrets."wireless.env".path;
- userControlled.enable = true;
- networks = {
- "@HOME_WIFI_SSID@".psk = "@HOME_WIFI_PSK@";
- "@PHONE_HOTSPOT_SSID@" = {
- psk = "@PHONE_HOTSPOT_PSK@";
- hidden = true;
- };
- "eduroam" = {
- authProtocols = [ "WPA-EAP" ];
- auth = ''
- pairwise=CCMP TKIP
- eap=TTLS PEAP TLS
- group=CCMP TKIP
- identity="mbastaja@tvz.hr"
- altsubject_match="DNS:freeradius.tvz.hr"
- phase1="peaplabel=0"
- phase2="auth=PAP"
- password="@EDUROAM_PASS@"
- anonymous_identity="anonymous@tvz.hr"
- '';
- };
- "Students-TVZ" = {
- authProtocols = [ "WPA-EAP" ];
- auth = ''
- pairwise=CCMP TKIP
- eap=PEAP
- group=CCMP TKIP
- identity="mbastaja@tvz.hr"
- phase1="peaplabel=0"
- phase2="auth=MSCHAPV2"
- password="@EDUROAM_PASS@"
- '';
- };
- "mizu by praguedays.com".psk = "@MIZU_PSK@";
- };
- };
+ wireless.iwd.enable = true;
};
time.timeZone = "Europe/Zagreb";
@@ -99,20 +60,6 @@
"podman"
];
};
- madhatter = {
- isNormalUser = true;
- extraGroups = [
- "video"
- "network"
- ];
- };
- guest = {
- isNormalUser = true;
- extraGroups = [
- "video"
- "network"
- ];
- };
};
nix.settings.trusted-users = [ "alice" ];
diff --git a/share/system/client-common.nix b/share/system/client-common.nix
index 4151cbd..9a742ac 100644
--- a/share/system/client-common.nix
+++ b/share/system/client-common.nix
@@ -28,6 +28,13 @@
randomizedDelaySec = "15min";
options = ''--delete-older-than 7d'';
};
+ services.guix = {
+ enable = true;
+ gc = {
+ enable = true;
+ dates = "daily";
+ };
+ };
networking = {
useNetworkd = true;