lol home

hosts/phone/default.nix

@@ -44,7 +44,7 @@
     home.stateVersion = "24.05";
 
     imports = [
-      ./home
+      ../../modules/apps/home
     ];
   };
 

hosts/phone/home/default.nix

@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./zsh
-    ./git
-    ./helix
-  ];
-}

hosts/phone/home/git/default.nix

@@ -1,7 +0,0 @@
-{
-  programs.git = {
-    enable = true;
-    userEmail = "mail@joygnu.org";
-    userName = "joy";
-  };
-}

hosts/phone/home/helix/default.nix

@@ -1,14 +0,0 @@
-{
-  programs.helix = {
-    enable = true;
-    defaultEditor = true;
-    settings = {
-      theme = "gruvbox";
-      keys.normal = {
-        space.space = "file_picker";
-        Z.Z = ":wq";
-        Z.Q = ":q!";
-      };
-    };
-  };
-}

hosts/phone/home/zsh/default.nix

@@ -1,20 +0,0 @@
-{
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    syntaxHighlighting.enable = true;
-    historySubstringSearch.enable = true;
-    dotDir = ".config/zsh";
-    initExtra = "PROMPT='%F{green}%~%f '";
-
-    shellAliases = {
-      v = "hx";
-      ser = "ssh root@joygnu.org";
-      rb = "nix-on-droid switch --flake ~/nix";
-      ep = "hx ~/.config/nix-on-droid/nix-on-droid.nix";
-    };
-
-    history.size = 1000000;
-    history.path = ".config/zsh/history";
-  };
-}

hosts/phone/home/zsh/push.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# Function to push to all remotes
-push_to_all_remotes() {
-    # Get a list of all remotes
-    remotes=$(git remote)
-
-    # Check if there are no remotes
-    if [ -z "$remotes" ]; then
-        echo "No remotes found."
-        exit 1
-    fi
-
-    # Loop through each remote and push
-    for remote in $remotes; do
-        echo "Pushing to remote '$remote'..."
-        git push "$remote" --all
-        git push "$remote" --tags
-        echo "Push to remote '$remote' completed."
-    done
-}
-
-# Execute the function
-push_to_all_remotes
-

modules/apps/default.nix

@@ -1,6 +1,12 @@
-{
+{inputs, ...}: {
+  home-manager = {
+    extraSpecialArgs = {inherit inputs;};
+    users = {
+      "joy" = import ./home;
+    };
+  };
+
   imports = [
-    ./home
     ./norm
   ];
 }

modules/apps/home/alacritty/default.nix

@@ -1,5 +1,5 @@
 {lib, ...}: {
-  home-manager.users.joy.programs.alacritty = {
+  programs.alacritty = {
     enable = true;
     settings = {
       window = {

modules/apps/home/code/default.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  home-manager.users.joy.programs.vscode = {
+  programs.vscode = {
     enable = true;
     package = pkgs.vscodium;
     extensions = with pkgs.vscode-extensions; [

modules/apps/home/firefox/default.nix

@@ -1,13 +1,10 @@
-{inputs,...}: 
-let 
+{inputs, ...}: let
   userChrome = builtins.readFile (./. + "/userChrome");
-in
-{
-  home-manager.users.joy = {
+in {
     programs.firefox = {
       enable = true;
       profiles.joy = {
-      userChrome = userChrome;
+        userChrome = userChrome;
         extensions = with inputs.firefox-addons.packages."x86_64-linux"; [
           ublock-origin
           darkreader
@@ -158,5 +155,4 @@ in
         };
       };
     };
-  };
 }

modules/apps/home/git/default.nix

@@ -1,5 +1,5 @@
 {
-  home-manager.users.joy.programs.git = {
+  programs.git = {
     enable = true;
     userEmail = "mail@joygnu.org";
     userName = "joygnu";

modules/apps/home/helix/default.nix

@@ -3,7 +3,7 @@
   lib,
   ...
 }: {
-  home-manager.users.joy.programs.helix = {
+  programs.helix = {
     enable = true;
     defaultEditor = true;
     settings = {
@@ -21,7 +21,7 @@
     };
   };
 
-  home-manager.users.joy.home.packages = with pkgs; [
+  home.packages = with pkgs; [
     texlab
     nil
     clang-tools

modules/apps/home/mpv/default.nix

@@ -1,5 +1,5 @@
 {
-  home-manager.users.joy.programs.mpv = {
+  programs.mpv = {
     enable = true;
     bindings = {
       x = "add speed 0.1";

modules/apps/home/newsboat/default.nix

@@ -1,5 +1,5 @@
 {
-  home-manager.users.joy.programs.newsboat = {
+  programs.newsboat = {
     enable = true;
     browser = "firefox";
     urls = [

modules/apps/home/rofi/default.nix

@@ -3,7 +3,7 @@
   lib,
   ...
 }: {
-  home-manager.users.joy.programs.rofi = {
+  programs.rofi = {
     enable = true;
     package = pkgs.rofi-wayland;
     theme = lib.mkForce "~/nix/modules/apps/gui/rofi/gruvbox-material.rasi";

modules/apps/home/zsh/default.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  home-manager.users.joy.programs.zsh = {
+  programs.zsh = {
     enable = true;
     syntaxHighlighting.enable = true;
     enableCompletion = true;
@@ -27,6 +27,4 @@
     history.size = 1000000;
     history.path = ".config/zsh/history";
   };
-  programs.zsh.enable = true;
-  users.defaultUserShell = pkgs.zsh;
 }

modules/system/misc/default.nix

@@ -1,5 +1,8 @@
+{pkgs,...}:
 {
   nix.settings.experimental-features = ["nix-command" "flakes"];
   time.timeZone = "Europe/Zurich";
   system.stateVersion = "23.11";
+  programs.zsh.enable = true;
+  users.defaultUserShell = pkgs.zsh;
 }