default modules declared in flake.nix, big cleanup

1 files changed, 12 insertions, 19 deletions

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";