aboutsummaryrefslogtreecommitdiff
path: root/hosts
diff options
context:
space:
mode:
authorMiran Bastaja <miran.bastaja04@gmail.com>2024-07-04 22:58:28 +0200
committerMiran Bastaja <miran.bastaja04@gmail.com>2024-07-04 22:58:28 +0200
commit333f134ec64739abf0c3e46e59a4a8ad88b883b5 (patch)
tree5c41313437176f100116883b353c7efd4b9b7ab3 /hosts
parent430d063f50824b0b268e73c8577705dc2c4fc318 (diff)
formatting
Diffstat (limited to 'hosts')
-rw-r--r--hosts/sagittarius/default.nix3
-rw-r--r--hosts/sagittarius/home.nix4
-rw-r--r--hosts/sagittarius/web/matrix.nix3
-rw-r--r--hosts/underworld/default.nix25
-rw-r--r--hosts/underworld/home.nix1
-rw-r--r--hosts/wonderland/default.nix31
-rw-r--r--hosts/wonderland/home.nix4
7 files changed, 13 insertions, 58 deletions
diff --git a/hosts/sagittarius/default.nix b/hosts/sagittarius/default.nix
index 12e25ab..946ecc7 100644
--- a/hosts/sagittarius/default.nix
+++ b/hosts/sagittarius/default.nix
@@ -1,5 +1,4 @@
-{ ... }:
-{
+{ ... }: {
imports = [
# Include the results of the hardware scan.
./hardware.nix
diff --git a/hosts/sagittarius/home.nix b/hosts/sagittarius/home.nix
index 11d2b06..accbd5d 100644
--- a/hosts/sagittarius/home.nix
+++ b/hosts/sagittarius/home.nix
@@ -2,9 +2,7 @@
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
- sharedModules = [
- { imports = [ (flakeRoot + /share/home/minimal.nix) ]; }
- ];
+ sharedModules = [{ imports = [ (flakeRoot + /share/home/minimal.nix) ]; }];
users = {
root.home.stateVersion = "23.05";
diff --git a/hosts/sagittarius/web/matrix.nix b/hosts/sagittarius/web/matrix.nix
index 1d0ecf5..d230edc 100644
--- a/hosts/sagittarius/web/matrix.nix
+++ b/hosts/sagittarius/web/matrix.nix
@@ -19,8 +19,7 @@ let
}
}
'';
-in
-{
+in {
imports = [ ./acme.nix ];
networking.firewall.allowedTCPPorts = [ 80 443 8448 ];
diff --git a/hosts/underworld/default.nix b/hosts/underworld/default.nix
index e47fe65..81af671 100644
--- a/hosts/underworld/default.nix
+++ b/hosts/underworld/default.nix
@@ -1,9 +1,4 @@
-{ pkgs
-, flakeRoot
-, inputs
-, ...
-}:
-{
+{ pkgs, flakeRoot, inputs, ... }: {
imports = [
# Include the results of the hardware scan.
./hardware.nix
@@ -12,11 +7,7 @@
./home.nix
(flakeRoot + /share/system/client-common.nix)
#(flakeRoot + /share/system/spotifyd.nix)
- {
- _module.args = {
- inherit inputs;
- };
- }
+ { _module.args = { inherit inputs; }; }
];
programs.fish.enable = true;
@@ -38,19 +29,11 @@
users.users = {
osiris = {
isNormalUser = true;
- extraGroups = [
- "wheel"
- "video"
- "network"
- "podman"
- ];
+ extraGroups = [ "wheel" "video" "network" "podman" ];
};
guest = {
isNormalUser = true;
- extraGroups = [
- "video"
- "network"
- ];
+ extraGroups = [ "video" "network" ];
};
};
diff --git a/hosts/underworld/home.nix b/hosts/underworld/home.nix
index bd41e89..90a85e5 100644
--- a/hosts/underworld/home.nix
+++ b/hosts/underworld/home.nix
@@ -18,6 +18,5 @@
home.stateVersion = "23.11";
};
-
home-manager.users.root.home.stateVersion = "23.11";
}
diff --git a/hosts/wonderland/default.nix b/hosts/wonderland/default.nix
index 037f787..130feab 100644
--- a/hosts/wonderland/default.nix
+++ b/hosts/wonderland/default.nix
@@ -1,10 +1,4 @@
-{ config
-, pkgs
-, flakeRoot
-, inputs
-, ...
-}:
-{
+{ config, pkgs, flakeRoot, inputs, ... }: {
imports = [
# Include the results of the hardware scan.
./hardware.nix
@@ -16,11 +10,7 @@
})
(flakeRoot + /share/system/client-common.nix)
#(flakeRoot + /share/system/spotifyd.nix)
- {
- _module.args = {
- inherit inputs;
- };
- }
+ { _module.args = { inherit inputs; }; }
];
programs.fish.enable = true;
@@ -91,26 +81,15 @@
users.users = {
alice = {
isNormalUser = true;
- extraGroups = [
- "wheel"
- "video"
- "network"
- "podman"
- ];
+ extraGroups = [ "wheel" "video" "network" "podman" ];
};
madhatter = {
isNormalUser = true;
- extraGroups = [
- "video"
- "network"
- ];
+ extraGroups = [ "video" "network" ];
};
guest = {
isNormalUser = true;
- extraGroups = [
- "video"
- "network"
- ];
+ extraGroups = [ "video" "network" ];
};
};
diff --git a/hosts/wonderland/home.nix b/hosts/wonderland/home.nix
index 556391c..43611b9 100644
--- a/hosts/wonderland/home.nix
+++ b/hosts/wonderland/home.nix
@@ -2,9 +2,7 @@
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
- sharedModules = [{
- imports = [ (flakeRoot + /share/cfg) ];
- }];
+ sharedModules = [{ imports = [ (flakeRoot + /share/cfg) ]; }];
extraSpecialArgs = { inherit inputs; };
};