default modules declared in flake.nix, big cleanup

8 files changed, 14 insertions, 68 deletions

diff --git a/machines/betsy/default.nix b/machines/betsy/default.nix
index f56d4ba..5627b72 100644
--- a/machines/betsy/default.nix
+++ b/machines/betsy/default.nix
@@ -10,15 +10,9 @@
       ./hardware-configuration.nix
 
       ../../modules/nixos/bluetooth.nix
-      ../../modules/nixos/nix-common.nix
-      ../../modules/nixos/environment.nix
-      ../../modules/nixos/tailscale.nix
-      ../../modules/nixos/system-packages.nix
       ../../modules/nixos/services.nix
       ../../modules/nixos/kde-connect.nix
 
-      ../../modules/users/defin.nix
-      ../../modules/users/root.nix
       ../../modules/users/jerry.nix
     ];
   boot = {
diff --git a/machines/biski/default.nix b/machines/biski/default.nix
index b999aaa..594957a 100644
--- a/machines/biski/default.nix
+++ b/machines/biski/default.nix
@@ -7,19 +7,11 @@
 {
   imports =
     [ # Include the results of the hardware scan.
-      # /home/defin/hardware-configuration.nix
       ./hardware-configuration.nix
       # /tmp/etc/nixos/hardware-configuartion.nix
       ./disko.nix
 
-      ../../modules/nixos/nix-common.nix
-      ../../modules/nixos/environment.nix
-      ../../modules/nixos/tailscale.nix
-      ../../modules/nixos/system-packages.nix
-
-      ../../modules/users/defin.nix
       ../../modules/users/git.nix
-      ../../modules/users/root.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
diff --git a/machines/bosco/default.nix b/machines/bosco/default.nix
index bb2867f..621710f 100644
--- a/machines/bosco/default.nix
+++ b/machines/bosco/default.nix
@@ -10,14 +10,8 @@
       ./hardware-configuration.nix
       ./reverse-proxy.nix
 
-      ../../modules/nixos/nix-common.nix
-      ../../modules/nixos/environment.nix
-      ../../modules/nixos/tailscale.nix
       ../../modules/nixos/headscale.nix
       ../../modules/nixos/cgit.nix
-      ../../modules/nixos/system-packages.nix
-      ../../modules/users/defin.nix
-      ../../modules/users/root.nix
     ];
 
   # Use the GRUB 2 boot loader.
diff --git a/machines/doretta/default.nix b/machines/doretta/default.nix
index 7b08338..59422b3 100644
--- a/machines/doretta/default.nix
+++ b/machines/doretta/default.nix
@@ -12,19 +12,12 @@
       # ./website.nix
       ../../modules/nixos/binary-cache.nix
 
-      ../../modules/nixos/nix-common.nix
-      ../../modules/nixos/environment.nix
-      ../../modules/nixos/tailscale.nix
-      ../../modules/nixos/system-packages.nix
-
       # microvm host
       ../vm/foolcreek/default.nix
 
       ../../modules/nixos/minecraft-server.nix
 
-      ../../modules/users/defin.nix
       ../../modules/users/git.nix
-      ../../modules/users/root.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
diff --git a/machines/khad/default.nix b/machines/khad/default.nix
index 67a6f26..b2ab71e 100644
--- a/machines/khad/default.nix
+++ b/machines/khad/default.nix
@@ -9,20 +9,13 @@
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
 
-    ../../modules/users/defin.nix
-    ../../modules/users/root.nix
-
     ../../modules/nixos/hyprland.nix
 
     ../../modules/nixos/bluetooth.nix
-    ../../modules/nixos/environment.nix
     ../../modules/nixos/kde-connect.nix
-    ../../modules/nixos/nix-common.nix
     ../../modules/nixos/services.nix
-    ../../modules/nixos/tailscale.nix
     ../../modules/nixos/steam.nix
     # ../../modules/nixos/sway.nix
-    ../../modules/nixos/system-packages.nix
   ];
 
   # Use the systemd-boot EFI boot loader.
diff --git a/machines/picast/default.nix b/machines/picast/default.nix
index 305a70d..2576769 100644
--- a/machines/picast/default.nix
+++ b/machines/picast/default.nix
@@ -8,13 +8,6 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-
-      ../../modules/nixos/nix-common.nix
-      ../../modules/nixos/environment.nix
-      ../../modules/nixos/tailscale.nix
-      ../../modules/nixos/system-packages.nix
-      ../../modules/users/defin.nix
-      ../../modules/users/root.nix
     ];
 
   # Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
@@ -30,6 +23,18 @@
   # Set your time zone.
   time.timeZone = "America/Denver";
 
+  users.extraUsers.kodi = {
+    isNormalUser = true;
+    extraGroups = [ "video" "cdrom" "audio" "render" "plugdev" "users" "dialout" "dip" "input" ];
+  };
+  services.cage = {
+    package = pkgs-old.cage;
+    enable = true;
+    user = "kodi";
+    program = "${pkgs.kodi-wayland.withPackages (kodiPkgs: with kodiPkgs;
+       [ sponsorblock sendtokodi ])}/bin/kodi-standalone";
+  };  
+
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
@@ -45,18 +50,6 @@
   # Enable the X11 windowing system.
   # services.xserver.enable = true;
 
-  users.extraUsers.kodi = {
-    isNormalUser = true;
-    extraGroups = [ "video" "cdrom" "audio" "render" "plugdev" "users" "dialout" "dip" "input" ];
-  };
-  services.cage = {
-    package = pkgs-old.cage;
-    enable = true;
-    user = "kodi";
-    program = "${pkgs.kodi-wayland.withPackages (kodiPkgs: with kodiPkgs;
-       [ sponsorblock sendtokodi ])}/bin/kodi-standalone";
-  };  
-
   # Configure keymap in X11
   # services.xserver.xkb.layout = "us";
   # services.xserver.xkb.options = "eurosign:e,caps:escape";
diff --git a/machines/vm/foolcreek/default.nix b/machines/vm/foolcreek/default.nix
index e69ed98..e38bb56 100644
--- a/machines/vm/foolcreek/default.nix
+++ b/machines/vm/foolcreek/default.nix
@@ -1,4 +1,4 @@
-{ microvm, config, pkgs, ... }:
+{ microvm, config, pkgs, lib, ... }:
 # let
 #   language ;
 # in
@@ -6,13 +6,6 @@
   microvm.vms.foolcreek.config = {
   imports = [
     # ./hardware-configuration.nix
-
-    ../../../modules/nixos/nix-common.nix
-    ../../../modules/nixos/environment.nix
-    # ../../../modules/nixos/system-packages.nix
-
-    ../../../modules/users/defin.nix
-    ../../../modules/users/root.nix
   ];
   networking.hostName = "foolcreek";
 
@@ -74,6 +67,7 @@
     enable = true;
     ports = [22];
   };
+  services.tailscale.enable = lib.mkForce false;
   environment.systemPackages = with pkgs; [
     cowsay
     lolcat
diff --git a/machines/zenbook/default.nix b/machines/zenbook/default.nix
index 8352802..1276105 100644
--- a/machines/zenbook/default.nix
+++ b/machines/zenbook/default.nix
@@ -8,21 +8,14 @@
   imports = [
     ./hardware-configuration.nix
 
-    ../../modules/users/defin.nix
-    ../../modules/users/root.nix
-
     ../../modules/nixos/hyprland.nix
 
     ../../modules/nixos/asus-numpad-touchpad.nix
     ../../modules/nixos/bluetooth.nix
-    ../../modules/nixos/environment.nix
     ../../modules/nixos/kde-connect.nix
-    ../../modules/nixos/nix-common.nix
     ../../modules/nixos/services.nix
-    ../../modules/nixos/tailscale.nix
     ../../modules/nixos/steam.nix
     # ../..modules/nixos/sway.nix
-    ../../modules/nixos/system-packages.nix
   ];
 
   # Use the systemd-boot EFI boot loader.