OOKNET                             [ /  search the index  ]  
──────────────────────────────────────────────────────────────────────────────────────
[ KB ]    [ GIT ]    [ PROJECTS ]    [ ABOUT ]                                      EN
══════════════════════════════════════════════════════════════════════════════════════
OOKNET   [ /  search  ]  
────────────────────────────────────────────────
[ KB ] [ GIT ] [ PROJECTS ] [ ABOUT ]
════════════════════════════════════════════════
 
HASH      fe58fba331ee
DATE      2025-03-02
SUBJECT   refactor: allow for guest account
FILES     23 CHANGED
HASH      fe58fba331ee
DATE      2025-03-02
SUBJECT   refactor: allow for guest account
FILES     23 CHANGED
 

diff --git a/flake.lock b/flake.lock
index e9781ec..44b1c8e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3893,11 +3893,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738128696,
-        "narHash": "sha256-SY+UKbuhfHrAbAqVpCi3+Z4zSZ7cLJ5z6WXO8JcDmd0=",
+        "lastModified": 1740888627,
+        "narHash": "sha256-hCEcx0AXEs4iZDvhYwr4U2lZL0tTvtEEY5YN8Sgade8=",
         "ref": "refs/heads/master",
-        "rev": "f88c11c910405e489716ca02c9d993aa50572e64",
-        "revCount": 34,
+        "rev": "6d7526b888b662405bf46e1cc58fd8c90d38d2b0",
+        "revCount": 35,
         "type": "git",
         "url": "ssh://[email protected]/ooks-io/kunzen"
       },


diff --git a/flake.lock b/flake.lock
index e9781ec..44b1c8e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3893,11 +3893,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738128696,
-        "narHash": "sha256-SY+UKbuhfHrAbAqV
pCi3+Z4zSZ7cLJ5z6WXO8JcDmd0=",
+        "lastModified": 1740888627,
+        "narHash": "sha256-hCEcx0AXEs4iZDvh
Ywr4U2lZL0tTvtEEY5YN8Sgade8=",
         "ref": "refs/heads/master",
-        "rev": "f88c11c910405e489716ca02c9d
993aa50572e64",
-        "revCount": 34,
+        "rev": "6d7526b888b662405bf46e1cc58
fd8c90d38d2b0",
+        "revCount": 35,
         "type": "git",
         "url": "ssh://[email protected]/ooks-i
o/kunzen"
       },

 

diff --git a/hosts/ooksx1/default.nix b/hosts/ooksx1/default.nix
index 72b4b37..65a5416 100644
--- a/hosts/ooksx1/default.nix
+++ b/hosts/ooksx1/default.nix
@@ -25,9 +25,8 @@
     workstation = {
       environment = "gnome";
       theme = "minimal";
-      profiles = ["media" "communication" "productivity"];
       default = {
-        browser = "chrome";
+        browser = "chromium";
         terminal = "ghostty";
       };
     };
@@ -37,7 +36,7 @@
       multiplexer = "zellij";
     };
   };
-  boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen;
 
   system.stateVersion = lib.mkDefault "24.11";
 }


diff --git a/hosts/ooksx1/default.nix b/host
s/ooksx1/default.nix
index 72b4b37..65a5416 100644
--- a/hosts/ooksx1/default.nix
+++ b/hosts/ooksx1/default.nix
@@ -25,9 +25,8 @@
     workstation = {
       environment = "gnome";
       theme = "minimal";
-      profiles = ["media" "communication" "
productivity"];
       default = {
-        browser = "chrome";
+        browser = "chromium";
         terminal = "ghostty";
       };
     };
@@ -37,7 +36,7 @@
       multiplexer = "zellij";
     };
   };
-  boot.kernelPackages = pkgs.linuxPackages_
xanmod_latest;
+  boot.kernelPackages = pkgs.linuxKernel.pa
ckages.linux_zen;
 
   system.stateVersion = lib.mkDefault "24.1
1";
 }

 

diff --git a/hosts/ooksx1/file-system.nix b/hosts/ooksx1/file-system.nix
index af8d795..837ba29 100644
--- a/hosts/ooksx1/file-system.nix
+++ b/hosts/ooksx1/file-system.nix
@@ -1,39 +1,17 @@
 {
-  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/b5d09a8b-54a9-
4f72-828c-5cceea2ec287";
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
-      fsType = "btrfs";
-      options = ["subvol=root"];
-    };
-
-    "/nix" = {
-      device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
-      fsType = "btrfs";
-      options = ["subvol=nix"];
-    };
-
-    "/persist" = {
-      device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
-      fsType = "btrfs";
-      options = ["subvol=persist"];
-    };
-
-    "/swap" = {
-      device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
-      fsType = "btrfs";
-      options = ["subvol=swap"];
+      device = "/dev/disk/by-uuid/5220a8c9-8a58-48d1-9119-9336a67542e2";
+      fsType = "ext4";
     };
 
     "/boot" = {
-      device = "/dev/disk/by-uuid/1D01-7040";
+      device = "/dev/disk/by-uuid/29FF-35B3";
       fsType = "vfat";
+      options = ["fmask=0077" "dmask=0077"];
     };
   };
   swapDevices = [
-    {
-      device = "/swap/swapfile";
-      size = 8 * 1024;
-    }
+    {device = "/dev/disk/by-uuid/69bd9dce-c7df-4a33-add7-97d4886a3bc0";}
   ];
 }


diff --git a/hosts/ooksx1/file-system.nix b/
hosts/ooksx1/file-system.nix
index af8d795..837ba29 100644
--- a/hosts/ooksx1/file-system.nix
+++ b/hosts/ooksx1/file-system.nix
@@ -1,39 +1,17 @@
 {
-  boot.initrd.luks.devices."cryptroot".devi
ce = "/dev/disk/by-uuid/b5d09a8b-54a9-4f72-8
28c-5cceea2ec287";
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-uuid/629a7421-
24a0-45e6-87af-031574d9d46d";
-      fsType = "btrfs";
-      options = ["subvol=root"];
-    };
-
-    "/nix" = {
-      device = "/dev/disk/by-uuid/629a7421-
24a0-45e6-87af-031574d9d46d";
-      fsType = "btrfs";
-      options = ["subvol=nix"];
-    };
-
-    "/persist" = {
-      device = "/dev/disk/by-uuid/629a7421-
24a0-45e6-87af-031574d9d46d";
-      fsType = "btrfs";
-      options = ["subvol=persist"];
-    };
-
-    "/swap" = {
-      device = "/dev/disk/by-uuid/629a7421-
24a0-45e6-87af-031574d9d46d";
-      fsType = "btrfs";
-      options = ["subvol=swap"];
+      device = "/dev/disk/by-uuid/5220a8c9-
8a58-48d1-9119-9336a67542e2";
+      fsType = "ext4";
     };
 
     "/boot" = {
-      device = "/dev/disk/by-uuid/1D01-7040
";
+      device = "/dev/disk/by-uuid/29FF-35B3
";
       fsType = "vfat";
+      options = ["fmask=0077" "dmask=0077"]
;
     };
   };
   swapDevices = [
-    {
-      device = "/swap/swapfile";
-      size = 8 * 1024;
-    }
+    {device = "/dev/disk/by-uuid/69bd9dce-c
7df-4a33-add7-97d4886a3bc0";}
   ];
 }

 

diff --git a/hosts/ooksx1/hardware.nix b/hosts/ooksx1/hardware.nix
index 64fa886..73dff74 100644
--- a/hosts/ooksx1/hardware.nix
+++ b/hosts/ooksx1/hardware.nix
@@ -1,32 +1,21 @@
 {
   ooknet.hardware = {
-    cpu = {
-      type = "amd";
-      amd.pstate.enable = true;
-      cores = 16;
-    };
-    gpu = {
-      type = "amd";
-      lact.enable = true;
-    };
-    features = ["printing" "ssd" "audio" "video"];
+    cpu.type = "intel";
+    gpu.type = "intel";
+    features = [
+      "bluetooth"
+      "backlight"
+      "battery"
+      "ssd"
+      "audio"
+      "video"
+    ];
     monitors = [
       {
-        name = "DP-1";
         primary = true;
-        width = 2560;
-        height = 1440;
-        refreshRate = 144;
-        x = 1920;
-        y = 100;
-      }
-      {
-        name = "DP-2";
+        name = "eDP-1";
         width = 1920;
         height = 1080;
-        refreshRate = 180;
-        x = 840;
-        transform = 1;
       }
     ];
   };


diff --git a/hosts/ooksx1/hardware.nix b/hos
ts/ooksx1/hardware.nix
index 64fa886..73dff74 100644
--- a/hosts/ooksx1/hardware.nix
+++ b/hosts/ooksx1/hardware.nix
@@ -1,32 +1,21 @@
 {
   ooknet.hardware = {
-    cpu = {
-      type = "amd";
-      amd.pstate.enable = true;
-      cores = 16;
-    };
-    gpu = {
-      type = "amd";
-      lact.enable = true;
-    };
-    features = ["printing" "ssd" "audio" "v
ideo"];
+    cpu.type = "intel";
+    gpu.type = "intel";
+    features = [
+      "bluetooth"
+      "backlight"
+      "battery"
+      "ssd"
+      "audio"
+      "video"
+    ];
     monitors = [
       {
-        name = "DP-1";
         primary = true;
-        width = 2560;
-        height = 1440;
-        refreshRate = 144;
-        x = 1920;
-        y = 100;
-      }
-      {
-        name = "DP-2";
+        name = "eDP-1";
         width = 1920;
         height = 1080;
-        refreshRate = 180;
-        x = 840;
-        transform = 1;
       }
     ];
   };

 

diff --git a/modules/home/base/home-manager.nix b/modules/home/base/home-manager.n
ix
index 5431cc6..2e50ec3 100644
--- a/modules/home/base/home-manager.nix
+++ b/modules/home/base/home-manager.nix
@@ -1,16 +1,8 @@
-{
-  config,
-  osConfig,
-  ...
-}: let
-  inherit (osConfig.ooknet.host) admin;
-in {
+{config, ...}: {
   programs.home-manager.enable = true;
   systemd.user.startServices = "sd-switch";
 
   home = {
-    username = admin.name;
-    homeDirectory = "/home/${config.home.username}";
     stateVersion = "22.05";
     sessionPath = ["${config.home.homeDirectory}/.local/bin"];
   };


diff --git a/modules/home/base/home-manager.
nix b/modules/home/base/home-manager.nix
index 5431cc6..2e50ec3 100644
--- a/modules/home/base/home-manager.nix
+++ b/modules/home/base/home-manager.nix
@@ -1,16 +1,8 @@
-{
-  config,
-  osConfig,
-  ...
-}: let
-  inherit (osConfig.ooknet.host) admin;
-in {
+{config, ...}: {
   programs.home-manager.enable = true;
   systemd.user.startServices = "sd-switch";
 
   home = {
-    username = admin.name;
-    homeDirectory = "/home/${config.home.us
ername}";
     stateVersion = "22.05";
     sessionPath = ["${config.home.homeDirec
tory}/.local/bin"];
   };

 

diff --git a/modules/home/console/tools/multiplexer/zellij/default.nix b/modules/h
ome/console/tools/multiplexer/zellij/default.nix
index 6e13853..acef281 100644
--- a/modules/home/console/tools/multiplexer/zellij/default.nix
+++ b/modules/home/console/tools/multiplexer/zellij/default.nix
@@ -1,13 +1,16 @@
 {
   osConfig,
+  config,
   lib,
   hozen,
+  self',
+  pkgs,
   ...
 }: let
   inherit (hozen) color;
   inherit (osConfig.ooknet) console;
   inherit (osConfig.ooknet.host) admin;
-  inherit (lib) mkIf;
+  inherit (lib) getExe mkIf;
 
   cfg = osConfig.ooknet.console.tools.zellij;
 in {
@@ -64,6 +67,26 @@ in {
               }
             '';
         };
+        music = mkIf config.programs.spotify-player.enable {
+          icon = "?";
+          tabs =
+            # kdl
+            ''
+              tab name="spotify" focus=true {
+                pane name="spotify" {
+                  borderless true
+                  command "${getExe self'.packages.spotify-player}"
+                  focus true
+                }
+                pane name="Visualizer" {
+                  borderless false
+                  split_direction "horizontal"
+                  size "20%"
+                  command "${getExe pkgs.cava}"
+                }
+              }
+            '';
+        };
       };
 
       # keybind configuration


diff --git a/modules/home/console/tools/mult
iplexer/zellij/default.nix b/modules/home/co
nsole/tools/multiplexer/zellij/default.nix
index 6e13853..acef281 100644
--- a/modules/home/console/tools/multiplexer
/zellij/default.nix
+++ b/modules/home/console/tools/multiplexer
/zellij/default.nix
@@ -1,13 +1,16 @@
 {
   osConfig,
+  config,
   lib,
   hozen,
+  self',
+  pkgs,
   ...
 }: let
   inherit (hozen) color;
   inherit (osConfig.ooknet) console;
   inherit (osConfig.ooknet.host) admin;
-  inherit (lib) mkIf;
+  inherit (lib) getExe mkIf;
 
   cfg = osConfig.ooknet.console.tools.zelli
j;
 in {
@@ -64,6 +67,26 @@ in {
               }
             '';
         };
+        music = mkIf config.programs.spotif
y-player.enable {
+          icon = "?";
+          tabs =
+            # kdl
+            ''
+              tab name="spotify" focus=true
 {
+                pane name="spotify" {
+                  borderless true
+                  command "${getExe self'.p
ackages.spotify-player}"
+                  focus true
+                }
+                pane name="Visualizer" {
+                  borderless false
+                  split_direction "horizont
al"
+                  size "20%"
+                  command "${getExe pkgs.ca
va}"
+                }
+              }
+            '';
+        };
       };
 
       # keybind configuration

 

diff --git a/modules/home/workstation/browser/chromium/default.nix b/modules/home/
workstation/browser/chromium/default.nix
index 988c516..b866ba8 100644
--- a/modules/home/workstation/browser/chromium/default.nix
+++ b/modules/home/workstation/browser/chromium/default.nix
@@ -13,9 +13,9 @@ in {
         enable = true;
       };
     })
-    (mkIf default.browser
-      == "chromium" {
-        home.sessionVariables.BROWSER = "chromium";
-      })
+    (mkIf (default.browser
+      == "chromium") {
+      home.sessionVariables.BROWSER = "chromium";
+    })
   ];
 }


diff --git a/modules/home/workstation/browse
r/chromium/default.nix b/modules/home/workst
ation/browser/chromium/default.nix
index 988c516..b866ba8 100644
--- a/modules/home/workstation/browser/chrom
ium/default.nix
+++ b/modules/home/workstation/browser/chrom
ium/default.nix
@@ -13,9 +13,9 @@ in {
         enable = true;
       };
     })
-    (mkIf default.browser
-      == "chromium" {
-        home.sessionVariables.BROWSER = "ch
romium";
-      })
+    (mkIf (default.browser
+      == "chromium") {
+      home.sessionVariables.BROWSER = "chro
mium";
+    })
   ];
 }

 

diff --git a/modules/home/workstation/browser/default.nix b/modules/home/workstati
on/browser/default.nix
index 2e56d1f..3589c6d 100644
--- a/modules/home/workstation/browser/default.nix
+++ b/modules/home/workstation/browser/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
     ./firefox
+    ./chromium
   ];
 }


diff --git a/modules/home/workstation/browse
r/default.nix b/modules/home/workstation/bro
wser/default.nix
index 2e56d1f..3589c6d 100644
--- a/modules/home/workstation/browser/defau
lt.nix
+++ b/modules/home/workstation/browser/defau
lt.nix
@@ -1,5 +1,6 @@
 {
   imports = [
     ./firefox
+    ./chromium
   ];
 }

 

diff --git a/modules/home/workstation/browser/firefox/default.nix b/modules/home/w
orkstation/browser/firefox/default.nix
index 560ed0e..2bdb6ae 100644
--- a/modules/home/workstation/browser/firefox/default.nix
+++ b/modules/home/workstation/browser/firefox/default.nix
@@ -2,12 +2,12 @@
   pkgs,
   lib,
   inputs',
+  config,
   osConfig,
   hozen,
   ...
 }: let
   inherit (lib) mkIf mkMerge;
-  inherit (osConfig.ooknet.host) admin;
   inherit (osConfig.ooknet.appearance) fonts;
   inherit (osConfig.ooknet.workstation) default;
 
@@ -35,7 +35,7 @@ in {
       programs.firefox = {
         enable = true;
         nativeMessagingHosts = [pkgs.tridactyl-native];
-        profiles.${admin.name} = {
+        profiles.${config.home.username} = {
           id = 0;
           isDefault = true;
           extensions = with addons; [


diff --git a/modules/home/workstation/browse
r/firefox/default.nix b/modules/home/worksta
tion/browser/firefox/default.nix
index 560ed0e..2bdb6ae 100644
--- a/modules/home/workstation/browser/firef
ox/default.nix
+++ b/modules/home/workstation/browser/firef
ox/default.nix
@@ -2,12 +2,12 @@
   pkgs,
   lib,
   inputs',
+  config,
   osConfig,
   hozen,
   ...
 }: let
   inherit (lib) mkIf mkMerge;
-  inherit (osConfig.ooknet.host) admin;
   inherit (osConfig.ooknet.appearance) font
s;
   inherit (osConfig.ooknet.workstation) def
ault;
 
@@ -35,7 +35,7 @@ in {
       programs.firefox = {
         enable = true;
         nativeMessagingHosts = [pkgs.tridac
tyl-native];
-        profiles.${admin.name} = {
+        profiles.${config.home.username} = 
{
           id = 0;
           isDefault = true;
           extensions = with addons; [

 

diff --git a/modules/home/workstation/default.nix b/modules/home/workstation/defau
lt.nix
index 084e4ac..707311c 100644
--- a/modules/home/workstation/default.nix
+++ b/modules/home/workstation/default.nix
@@ -11,5 +11,6 @@
     ./creative
     ./binds.nix
     ./gaming
+    ./userDirs.nix
   ];
 }


diff --git a/modules/home/workstation/defaul
t.nix b/modules/home/workstation/default.nix
index 084e4ac..707311c 100644
--- a/modules/home/workstation/default.nix
+++ b/modules/home/workstation/default.nix
@@ -11,5 +11,6 @@
     ./creative
     ./binds.nix
     ./gaming
+    ./userDirs.nix
   ];
 }

 

diff --git a/modules/home/workstation/media/music.nix b/modules/home/workstation/m
edia/music.nix
index 75d32a6..c0a5da5 100644
--- a/modules/home/workstation/media/music.nix
+++ b/modules/home/workstation/media/music.nix
@@ -87,26 +87,5 @@ in {
         };
       };
     };
-
-    programs.zellij.layouts.music = {
-      icon = "?";
-      tabs =
-        # kdl
-        ''
-          tab name="spotify" focus=true {
-            pane name="spotify" {
-              borderless true
-              command "${getExe self'.packages.spotify-player}"
-              focus true
-            }
-            pane name="Visualizer" {
-              borderless false
-              split_direction "horizontal"
-              size "20%"
-              command "${getExe pkgs.cava}"
-            }
-          }
-        '';
-    };
   };
 }


diff --git a/modules/home/workstation/media/
music.nix b/modules/home/workstation/media/m
usic.nix
index 75d32a6..c0a5da5 100644
--- a/modules/home/workstation/media/music.n
ix
+++ b/modules/home/workstation/media/music.n
ix
@@ -87,26 +87,5 @@ in {
         };
       };
     };
-
-    programs.zellij.layouts.music = {
-      icon = "?";
-      tabs =
-        # kdl
-        ''
-          tab name="spotify" focus=true {
-            pane name="spotify" {
-              borderless true
-              command "${getExe self'.packa
ges.spotify-player}"
-              focus true
-            }
-            pane name="Visualizer" {
-              borderless false
-              split_direction "horizontal"
-              size "20%"
-              command "${getExe pkgs.cava}"
-            }
-          }
-        '';
-    };
   };
 }

 

diff --git a/modules/home/base/userDirs.nix b/modules/home/workstation/userDirs.ni
x
similarity index 100%
rename from modules/home/base/userDirs.nix
rename to modules/home/workstation/userDirs.nix


diff --git a/modules/home/base/userDirs.nix 
b/modules/home/workstation/userDirs.nix
similarity index 100%
rename from modules/home/base/userDirs.nix
rename to modules/home/workstation/userDirs.
nix

 

diff --git a/modules/nixos/base/default.nix b/modules/nixos/base/default.nix
index efd876c..26e89df 100644
--- a/modules/nixos/base/default.nix
+++ b/modules/nixos/base/default.nix
@@ -12,5 +12,6 @@
     ./networking.nix
     ./security
     ./syncthing.nix
+    ./guest.nix
   ];
 }


diff --git a/modules/nixos/base/default.nix 
b/modules/nixos/base/default.nix
index efd876c..26e89df 100644
--- a/modules/nixos/base/default.nix
+++ b/modules/nixos/base/default.nix
@@ -12,5 +12,6 @@
     ./networking.nix
     ./security
     ./syncthing.nix
+    ./guest.nix
   ];
 }

 

diff --git a/modules/nixos/base/guest.nix b/modules/nixos/base/guest.nix
index be22d94..5bbde92 100644
--- a/modules/nixos/base/guest.nix
+++ b/modules/nixos/base/guest.nix
@@ -1,14 +1,16 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }: let
+  inherit (lib) mkIf;
   inherit (config.ooknet.host) guest;
   inherit (config.ooknet.secrets) keys;
 
   ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.use
rs.groups) groups;
 in {
-  config = {
+  config = mkIf guest.enable {
     users.users.${guest.name} = {
       isNormalUser = true;
       shell = pkgs.${guest.shell};


diff --git a/modules/nixos/base/guest.nix b/
modules/nixos/base/guest.nix
index be22d94..5bbde92 100644
--- a/modules/nixos/base/guest.nix
+++ b/modules/nixos/base/guest.nix
@@ -1,14 +1,16 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }: let
+  inherit (lib) mkIf;
   inherit (config.ooknet.host) guest;
   inherit (config.ooknet.secrets) keys;
 
   ifTheyExist = groups: builtins.filter (gr
oup: builtins.hasAttr group config.users.gro
ups) groups;
 in {
-  config = {
+  config = mkIf guest.enable {
     users.users.${guest.name} = {
       isNormalUser = true;
       shell = pkgs.${guest.shell};

 

diff --git a/modules/nixos/base/home-manager.nix b/modules/nixos/base/home-manager
.nix
index 3162222..08cb85b 100644
--- a/modules/nixos/base/home-manager.nix
+++ b/modules/nixos/base/home-manager.nix
@@ -9,8 +9,26 @@
   ook,
   ...
 }: let
-  inherit (lib) mkIf;
+  inherit (lib) optionalAttrs mkIf;
   inherit (config.ooknet.host) guest admin;
+
+  mkHomeUser = name: {
+    "${name}" = {
+      programs.home-manager.enable = true;
+      systemd.user.startServices = "sd-switch";
+      home = {
+        username = name;
+        homeDirectory = "/home/${name}";
+        stateVersion = "22.05";
+        sessionPath = ["/home/${name}/.local/bin"];
+      };
+      manual = {
+        html.enable = false;
+        json.enable = false;
+        manpages.enable = false;
+      };
+    };
+  };
 in {
   config = mkIf (admin.homeManager || guest.homeManager) {
     home-manager = {
@@ -19,14 +37,9 @@ in {
       backupFileExtension = "hm.old";
       verbose = true;
       extraSpecialArgs = {inherit ook hozen inputs inputs' self self';};
-      users = {
-        ${admin.name} = mkIf admin.homeManager {
-          imports = ["${self}/modules/home/base"];
-        };
-        ${guest.name} = mkIf guest.homeManager {
-          imports = ["${self}/modules/home/base}"];
-        };
-      };
+      users =
+        (optionalAttrs admin.homeManager (mkHomeUser admin.name))
+        // (optionalAttrs guest.homeManager (mkHomeUser guest.name));
     };
   };
 }


diff --git a/modules/nixos/base/home-manager
.nix b/modules/nixos/base/home-manager.nix
index 3162222..08cb85b 100644
--- a/modules/nixos/base/home-manager.nix
+++ b/modules/nixos/base/home-manager.nix
@@ -9,8 +9,26 @@
   ook,
   ...
 }: let
-  inherit (lib) mkIf;
+  inherit (lib) optionalAttrs mkIf;
   inherit (config.ooknet.host) guest admin;
+
+  mkHomeUser = name: {
+    "${name}" = {
+      programs.home-manager.enable = true;
+      systemd.user.startServices = "sd-swit
ch";
+      home = {
+        username = name;
+        homeDirectory = "/home/${name}";
+        stateVersion = "22.05";
+        sessionPath = ["/home/${name}/.loca
l/bin"];
+      };
+      manual = {
+        html.enable = false;
+        json.enable = false;
+        manpages.enable = false;
+      };
+    };
+  };
 in {
   config = mkIf (admin.homeManager || guest
.homeManager) {
     home-manager = {
@@ -19,14 +37,9 @@ in {
       backupFileExtension = "hm.old";
       verbose = true;
       extraSpecialArgs = {inherit ook hozen
 inputs inputs' self self';};
-      users = {
-        ${admin.name} = mkIf admin.homeMana
ger {
-          imports = ["${self}/modules/home/
base"];
-        };
-        ${guest.name} = mkIf guest.homeMana
ger {
-          imports = ["${self}/modules/home/
base}"];
-        };
-      };
+      users =
+        (optionalAttrs admin.homeManager (m
kHomeUser admin.name))
+        // (optionalAttrs guest.homeManager
 (mkHomeUser guest.name));
     };
   };
 }

 

diff --git a/modules/nixos/console/default.nix b/modules/nixos/console/default.nix
index 66e60f6..c96a183 100644
--- a/modules/nixos/console/default.nix
+++ b/modules/nixos/console/default.nix
@@ -13,7 +13,9 @@ in {
     ./options.nix
   ];
 
-  home-manager.users.${admin.name} = mkIf admin.homeManager {
-    imports = ["${self}/modules/home/console"];
+  home-manager.users = mkIf admin.homeManager {
+    "${admin.name}" = {
+      imports = ["${self}/modules/home/console"];
+    };
   };
 }


diff --git a/modules/nixos/console/default.n
ix b/modules/nixos/console/default.nix
index 66e60f6..c96a183 100644
--- a/modules/nixos/console/default.nix
+++ b/modules/nixos/console/default.nix
@@ -13,7 +13,9 @@ in {
     ./options.nix
   ];
 
-  home-manager.users.${admin.name} = mkIf a
dmin.homeManager {
-    imports = ["${self}/modules/home/consol
e"];
+  home-manager.users = mkIf admin.homeManag
er {
+    "${admin.name}" = {
+      imports = ["${self}/modules/home/cons
ole"];
+    };
   };
 }

 

diff --git a/modules/nixos/hardware/features/battery.nix b/modules/nixos/hardware/
features/battery.nix
index 9e4540d..33ea560 100644
--- a/modules/nixos/hardware/features/battery.nix
+++ b/modules/nixos/hardware/features/battery.nix
@@ -11,7 +11,8 @@ in {
   config = mkIf (elem "battery" features) {
     services = {
       # cpu power usage optimizer
-      auto-cpufreq = {enable = true;};
+      auto-cpufreq.enable = true;
+      power-profiles-daemon.enable = false;
 
       # application interface for power management
       upower = {


diff --git a/modules/nixos/hardware/features
/battery.nix b/modules/nixos/hardware/featur
es/battery.nix
index 9e4540d..33ea560 100644
--- a/modules/nixos/hardware/features/batter
y.nix
+++ b/modules/nixos/hardware/features/batter
y.nix
@@ -11,7 +11,8 @@ in {
   config = mkIf (elem "battery" features) {
     services = {
       # cpu power usage optimizer
-      auto-cpufreq = {enable = true;};
+      auto-cpufreq.enable = true;
+      power-profiles-daemon.enable = false;
 
       # application interface for power man
agement
       upower = {

 

diff --git a/modules/nixos/workstation/default.nix b/modules/nixos/workstation/def
ault.nix
index fe1f519..b31a3b8 100644
--- a/modules/nixos/workstation/default.nix
+++ b/modules/nixos/workstation/default.nix
@@ -4,8 +4,8 @@
   lib,
   ...
 }: let
-  inherit (lib) mkIf;
-  inherit (config.ooknet.host) admin;
+  inherit (lib) optionalAttrs;
+  inherit (config.ooknet.host) admin guest;
 in {
   imports = [
     ./options.nix
@@ -17,7 +17,15 @@ in {
     ./virtualization
   ];
 
-  home-manager.users.${admin.name} = mkIf admin.homeManager {
-    imports = ["${self}/modules/home/workstation"];
-  };
+  home-manager.users =
+    (optionalAttrs admin.homeManager {
+      "${admin.name}" = {
+        imports = ["${self}/modules/home/workstation"];
+      };
+    })
+    // (optionalAttrs guest.homeManager {
+      "${guest.name}" = {
+        imports = ["${self}/modules/home/workstation"];
+      };
+    });
 }


diff --git a/modules/nixos/workstation/defau
lt.nix b/modules/nixos/workstation/default.n
ix
index fe1f519..b31a3b8 100644
--- a/modules/nixos/workstation/default.nix
+++ b/modules/nixos/workstation/default.nix
@@ -4,8 +4,8 @@
   lib,
   ...
 }: let
-  inherit (lib) mkIf;
-  inherit (config.ooknet.host) admin;
+  inherit (lib) optionalAttrs;
+  inherit (config.ooknet.host) admin guest;
 in {
   imports = [
     ./options.nix
@@ -17,7 +17,15 @@ in {
     ./virtualization
   ];
 
-  home-manager.users.${admin.name} = mkIf a
dmin.homeManager {
-    imports = ["${self}/modules/home/workst
ation"];
-  };
+  home-manager.users =
+    (optionalAttrs admin.homeManager {
+      "${admin.name}" = {
+        imports = ["${self}/modules/home/wo
rkstation"];
+      };
+    })
+    // (optionalAttrs guest.homeManager {
+      "${guest.name}" = {
+        imports = ["${self}/modules/home/wo
rkstation"];
+      };
+    });
 }

 

diff --git a/modules/nixos/workstation/environment/default.nix b/modules/nixos/wor
kstation/environment/default.nix
index 527c6f3..7f28a8e 100644
--- a/modules/nixos/workstation/environment/default.nix
+++ b/modules/nixos/workstation/environment/default.nix
@@ -1,3 +1,6 @@
 {
-  imports = [./hyprland];
+  imports = [
+    ./hyprland
+    ./gnome
+  ];
 }


diff --git a/modules/nixos/workstation/envir
onment/default.nix b/modules/nixos/workstati
on/environment/default.nix
index 527c6f3..7f28a8e 100644
--- a/modules/nixos/workstation/environment/
default.nix
+++ b/modules/nixos/workstation/environment/
default.nix
@@ -1,3 +1,6 @@
 {
-  imports = [./hyprland];
+  imports = [
+    ./hyprland
+    ./gnome
+  ];
 }

 

diff --git a/modules/nixos/workstation/environment/gnome/default.nix b/modules/nix
os/workstation/environment/gnome/default.nix
index 390ab55..4eacc15 100644
--- a/modules/nixos/workstation/environment/gnome/default.nix
+++ b/modules/nixos/workstation/environment/gnome/default.nix
@@ -32,7 +32,7 @@ in {
         hitori
         iagno
         tali
-        atmoix
+        atomix
         ;
     };
   };


diff --git a/modules/nixos/workstation/envir
onment/gnome/default.nix b/modules/nixos/wor
kstation/environment/gnome/default.nix
index 390ab55..4eacc15 100644
--- a/modules/nixos/workstation/environment/
gnome/default.nix
+++ b/modules/nixos/workstation/environment/
gnome/default.nix
@@ -32,7 +32,7 @@ in {
         hitori
         iagno
         tali
-        atmoix
+        atomix
         ;
     };
   };

 

diff --git a/modules/nixos/workstation/options.nix b/modules/nixos/workstation/opt
ions.nix
index da3d19a..cfa2625 100644
--- a/modules/nixos/workstation/options.nix
+++ b/modules/nixos/workstation/options.nix
@@ -12,12 +12,12 @@ in {
       default = [];
     };
     environment = mkOption {
-      type = nullOr (enum ["hyprland"]);
+      type = nullOr (enum ["hyprland" "gnome"]);
       default = "hyprland";
     };
     default = {
       browser = mkOption {
-        type = nullOr (enum ["firefox"]);
+        type = nullOr (enum ["firefox" "chromium"]);
         default = "firefox";
       };
       terminal = mkOption {
@@ -27,6 +27,7 @@ in {
     };
     programs = {
       firefox.enable = mkEnableOption "";
+      chromium.enable = mkEnableOption "";
       foot.enable = mkEnableOption "";
       ghostty.enable = mkEnableOption "";
       ollama.enable = mkEnableOption "";


diff --git a/modules/nixos/workstation/optio
ns.nix b/modules/nixos/workstation/options.n
ix
index da3d19a..cfa2625 100644
--- a/modules/nixos/workstation/options.nix
+++ b/modules/nixos/workstation/options.nix
@@ -12,12 +12,12 @@ in {
       default = [];
     };
     environment = mkOption {
-      type = nullOr (enum ["hyprland"]);
+      type = nullOr (enum ["hyprland" "gnom
e"]);
       default = "hyprland";
     };
     default = {
       browser = mkOption {
-        type = nullOr (enum ["firefox"]);
+        type = nullOr (enum ["firefox" "chr
omium"]);
         default = "firefox";
       };
       terminal = mkOption {
@@ -27,6 +27,7 @@ in {
     };
     programs = {
       firefox.enable = mkEnableOption "";
+      chromium.enable = mkEnableOption "";
       foot.enable = mkEnableOption "";
       ghostty.enable = mkEnableOption "";
       ollama.enable = mkEnableOption "";

 

diff --git a/outputs/hosts/workstations.nix b/outputs/hosts/workstations.nix
index 0584476..829b99c 100644
--- a/outputs/hosts/workstations.nix
+++ b/outputs/hosts/workstations.nix
@@ -12,6 +12,12 @@ in {
       hostname = "ookst480s";
       type = "laptop";
     };
+    ooksx1 = mkWorkstation {
+      inherit withSystem;
+      system = "x86_64-linux";
+      hostname = "ooksx1";
+      type = "laptop";
+    };
     ooksdesk = mkWorkstation {
       inherit withSystem;
       system = "x86_64-linux";


diff --git a/outputs/hosts/workstations.nix 
b/outputs/hosts/workstations.nix
index 0584476..829b99c 100644
--- a/outputs/hosts/workstations.nix
+++ b/outputs/hosts/workstations.nix
@@ -12,6 +12,12 @@ in {
       hostname = "ookst480s";
       type = "laptop";
     };
+    ooksx1 = mkWorkstation {
+      inherit withSystem;
+      system = "x86_64-linux";
+      hostname = "ooksx1";
+      type = "laptop";
+    };
     ooksdesk = mkWorkstation {
       inherit withSystem;
       system = "x86_64-linux";

 

diff --git a/outputs/pkgs/live-buds-cli/default.nix b/outputs/pkgs/live-buds-cli/d
efault.nix
index 590f4a9..d769f06 100644
--- a/outputs/pkgs/live-buds-cli/default.nix
+++ b/outputs/pkgs/live-buds-cli/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "A4XQiJrk4ehb6+935L2JFOeAhUJ7bdukV5mL0Jxn0sQ=";
   };
 
-  cargoHash = "sha256-w/dt7Q9TACw5N/+QNAKMUEngf8sAhWyGslnw3B16crQ";
+  cargoHash = "sha256-D7kS8frUFHQOn0awCe6aLeE5nCJWchmoa0iqnOM36MM";
 
   nativeBuildInputs = [pkg-config];
   buildInputs = [libpulseaudio bluez dbus];


diff --git a/outputs/pkgs/live-buds-cli/defa
ult.nix b/outputs/pkgs/live-buds-cli/default
.nix
index 590f4a9..d769f06 100644
--- a/outputs/pkgs/live-buds-cli/default.nix
+++ b/outputs/pkgs/live-buds-cli/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPack
age rec {
     sha256 = "A4XQiJrk4ehb6+935L2JFOeAhUJ7b
dukV5mL0Jxn0sQ=";
   };
 
-  cargoHash = "sha256-w/dt7Q9TACw5N/+QNAKMU
Engf8sAhWyGslnw3B16crQ";
+  cargoHash = "sha256-D7kS8frUFHQOn0awCe6aL
eE5nCJWchmoa0iqnOM36MM";
 
   nativeBuildInputs = [pkg-config];
   buildInputs = [libpulseaudio bluez dbus];

 
[ BACK TO LOG ]
──────────────────────────────────────────────────────────────────────────────────────
OOKNET
────────────────────────────────────────────────
OOKNET