adapt config for use with standalone home-manager

modules/hosts/kitagawa/home/fastfetch.nix

@@ -1,6 +1,6 @@
 { inputs, self, ... }: {
-  flake.homeModules.kitagawa = { pkgs, lib, osConfig, ... }: {
-    config = lib.mkIf (osConfig.features.applications.cli.fastfetch.enable) ({
+  flake.homeModules.kitagawa = { pkgs, lib, config, ... }: {
+    config = lib.mkIf (config.features.applications.cli.fastfetch.enable) ({
       programs.fastfetch = {
         settings = {
           logo = {

modules/hosts/kitagawa/kitagawa.nix

@@ -32,39 +32,18 @@
       };
 
       applications = {
-        cli = {
-          fastfetch.enable = true;
-        };
-
         gui = {
           spotify = {
             enable = true;
             spicetify.enable = true;
           };
-          kitty.enable = true;
           vscode.enable = true;
-          floorp.enable = true;
-          equibop.enable = true;
-          remmina.enable = true;
         };
 
         extraPackages = with pkgs; [
           github-desktop
           moonlight-qt
         ];
-
-        extraUserPackages = with pkgs; [
-          obsidian
-          thunderbird
-          jetbrains.clion
-          jetbrains.idea
-          proton-vpn
-          ente-auth
-          signal-desktop
-          xarchiver
-          kdePackages.filelight
-          loupe
-        ];
       };
     };
 
@@ -109,6 +88,39 @@
       graphics
     ];
 
+    info = {
+      hostName = "kitagawa";
+      stateVersion = "26.05";
+    };
+
+    features = {
+      applications = {
+        cli = {
+          fastfetch.enable = true;
+        };
+
+        gui = {
+          equibop.enable = true;
+          floorp.enable = true;
+          kitty.enable = true;
+          remmina.enable = true;
+        };
+
+        extraPackages = with pkgs; [
+          obsidian
+          thunderbird
+          jetbrains.clion
+          jetbrains.idea
+          proton-vpn
+          ente-auth
+          signal-desktop
+          xarchiver
+          kdePackages.filelight
+          loupe
+        ];
+      };
+    };
+
     /*
     imports = [
       #"${global-configs}/gnome.nix"
@@ -129,7 +141,6 @@
     };
 
     xdg = {
-      enable = true;
       mimeApps.defaultApplications = {
         "x-scheme-handler/x-github-client" = [ "github-desktop.desktop" ];
         "x-scheme-handler/x-github-desktop-dev-auth" = [ "github-desktop.desktop" ];

modules/hosts/takamaki/home/zsh.nix

@@ -0,0 +1,7 @@
+{ inputs, self, ... }: {
+  flake.homeModules.takamaki = { config, pkgs, ... }: {
+    programs.zsh.shellAliases = {
+      apply-config = "zsh -c 'cd /home/grey/flake; git add .; home-manager switch --flake .#takamaki -b bak'";
+    };
+  };
+}

modules/hosts/takamaki/takamaki.nix

@@ -0,0 +1,72 @@
+{ inputs, self, ... }: {
+  flake.homeConfigurations.takamaki = inputs.home-manager.lib.homeManagerConfiguration {
+    pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
+    modules = with self.homeModules; [
+      global
+      graphics
+      takamaki
+    ];
+  };
+
+  flake.homeModules.takamaki = { pkgs, config, lib, ... }: {
+    info = {
+      rootPath = "/home/grey/flake";
+      hostName = "takamaki";
+      stateVersion = "26.11";
+    };
+
+    features = {
+      shells.zsh = {
+        enable = true;
+        antidote.enable = true;
+      };
+
+      applications = {
+        cli = {
+          fastfetch.enable = true;
+        };
+
+        extraPackages = with pkgs; [
+          (writeShellScriptBin "switch-os" ''
+            sudo efibootmgr --bootnext 0000
+            sudo reboot
+          '')
+          (writeShellScriptBin "universal-reboot" ''
+            sudo reboot
+          '')
+          (writeShellScriptBin "universal-shutdown" ''
+            sudo systemctl poweroff
+          '')
+          (writeShellScriptBin "increase-brightness" ''
+            LOOP_COUNTER=0
+            DEVICE=$1
+            PRETTY_NAME=$(sudo ddccontrol dev:$DEVICE 2>&1 >/dev/null | grep -oP "/usr/share/ddccontrol-db/monitor/\K.+\.xml" | sed 's/.xml//')
+            while
+              RESULT=$(sudo ddccontrol -r 0x10 -W +5 dev:$DEVICE 2> /dev/null)
+              WRITTEN=$(echo $RESULT | grep -oP "Writing.+\(\K\d{1,3}\)" | sed 's/)//')
+              CONTROL=$(echo $RESULT | grep -oP "Control.+\+/\K\d{1,3}/100" | sed 's/\/100//')
+              LOOP_COUNTER=$(($LOOP_COUNTER + 1))
+              [[ "$WRITTEN" != "$CONTROL" ]] && [ $LOOP_COUNTER -lt 10 ]
+            do true; done
+
+            noctalia msg notification-show "Set brightness to $WRITTEN for display $PRETTY_NAME"
+          '')
+          (writeShellScriptBin "decrease-brightness" ''
+            LOOP_COUNTER=0
+            DEVICE=$1
+            PRETTY_NAME=$(sudo ddccontrol dev:$DEVICE 2>&1 >/dev/null | grep -oP "/usr/share/ddccontrol-db/monitor/\K.+\.xml" | sed 's/.xml//')
+            while
+              RESULT=$(sudo ddccontrol -r 0x10 -W -5 dev:$DEVICE 2> /dev/null)
+              WRITTEN=$(echo $RESULT | grep -oP "Writing.+\(\K\d{1,3}\)" | sed 's/)//')
+              CONTROL=$(echo $RESULT | grep -oP "Control.+\+/\K\d{1,3}/100" | sed 's/\/100//')
+              LOOP_COUNTER=$(($LOOP_COUNTER + 1))
+              [[ "$WRITTEN" != "$CONTROL" ]] && [ $LOOP_COUNTER -lt 10 ]
+            do true; done
+
+            noctalia msg notification-show "Set brightness to $WRITTEN for display $PRETTY_NAME"
+          '')
+        ];
+      };
+    };
+  };
+}