libkookie: root/tempest: update to use new module trees

1 files changed, 34 insertions, 14 deletions

diff --git a/infra/libkookie/roots/tempest.nix b/infra/libkookie/roots/tempest.nix
index e3ec2c312f72..d418990ed5d8 100644
--- a/infra/libkookie/roots/tempest.nix
+++ b/infra/libkookie/roots/tempest.nix
@@ -2,8 +2,6 @@
  * 
  *    tempest (AMD workstation)
  *
- * This file only contains settings that are specific to this one
- * device (hardware and things outside of nix, like partitions).
  *
  * This file is part of LIBKOOKIE, a collection of nix expressions.
  * LIBKOOKIE is licensed under the GPL-3.0 (or later) -- see LICENSE
@@ -22,22 +20,43 @@ in
   #
   #
 
-  
+
   imports = with klib; [
     # Load base modules required to bootstrap libkookie
-    <home-manager/nixos> <modules>
-
-    # Import desired userspace modules
+    <home-manager/nixos> <modules> <configuration/nix>
+
+    
+    #################################################################
+    # Modules that require NixOS integration
+    #
+    <configuration/workstation/fonts>
+
+    
+    #################################################################
+    # home-manager modules that exist entirely in userspace
+    #
+    (loadModule <configuration/base/fish> "default")
+    
     (loadModule <configuration/workstation/i3> "tempest")
-  ];
-  
+    (loadModule <configuration/workstation/kitty> "default")
+    (loadModule <configuration/workstation/office> "default")
+    (loadModule <configuration/workstation/firefox> "default")
 
-  libkookie.activeUsers = [ (klib.load <configuration/users/spacekookie>) ];
+    # Development tools
+    (loadModule <configuration/workstation/devel> "default")
+  ];
 
   # Configure i3 with the amdgpu driver
   libkookie.ui.i3 = { enable = true;
                       videoDrivers = [ "amdgpu" ]; };
 
+  # Enable fish shell handling on the system
+  libkookie.base.fish.enable = true;
+
+  # Enable desired users
+  libkookie.activeUsers = [ (klib.load <configuration/users/spacekookie>) ];
+
+
   #
   #
   #
@@ -87,23 +106,24 @@ in
   ## From Mass Effect: Andromeda
   networking.hostName = "tempest";
   networking.hostId = "01fd342c";
-  networking.firewall.allowedTCPPorts = [ 9000 ];
+  # networking.firewall.allowedTCPPorts = [ 9000 ]; ?????
   
   networking.useDHCP = false;
   networking.interfaces.enp8s0.useDHCP = true;
-
+  #networking.interfaces.eth0.useDHCP = true;
+  
   # Select internationalisation properties.
   i18n.defaultLocale = "en_GB.UTF-8";
 
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
   
-  programs.sway.enable = true;
   programs.mtr.enable = true;
   programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
   services.openssh.enable = true;
 
-  # users.users.spacekookie.hashedPassword = "$6$rounds=1000000$22ypycQ2AlCCv8iC$RrzyAbCX3D518nCgfR3MTqZhfK.GAclme7EQlKTlqH4oV1YvGd/aHdTfe59iMpf/J18tqEO2aSXsevTVQz2yW.";
+  system.stateVersion = "20.09";
+  
+  # Set a static password for this user
   users.users.spacekookie.hashedPassword = "$6$rounds=1000000$IncTbazL/YhUV5$brzwb3Xa0cmmazpxJGPPo93wfs6jAomL1NYJ7Amw3WSyTjXGXGbedIMmm06nkeCnJfJzoZ.Jd47q88ot3USZi/";
-  system.stateVersion = "19.09";
 }