add restruct2

home/adam/home.nix

@@ -0,0 +1,39 @@
+# This is your home-manager configuration file
+# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
+{
+  inputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+{
+  # You can import other home-manager modules here
+  imports = [ ../modules/adam.nix ];
+
+  nixpkgs = {
+    # You can add overlays here
+    overlays = [ ];
+    # Configure your nixpkgs instance
+    config = {
+      # Disable if you don't want unfree packages
+      allowUnfree = true;
+      # Workaround for https://github.com/nix-community/home-manager/issues/2942
+      allowUnfreePredicate = _: true;
+    };
+  };
+
+  # TODO: Set your username
+  home = {
+    username = "adam";
+    homeDirectory = "/home/adam";
+  };
+
+  programs.home-manager.enable = true;
+
+  # Nicely reload system units when changing configs
+  systemd.user.startServices = "sd-switch";
+
+  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
+  home.stateVersion = "24.05";
+}

home/cnst/home.nix

@@ -9,10 +9,7 @@
 }:
 {
   # You can import other home-manager modules here
-  imports = [
-    ../pkgs/cnst.nix
-    ../modules
-  ];
+  imports = [ ../modules/cnst.nix ];
 
   nixpkgs = {
     # You can add overlays here

home/modules/adam.nix

@@ -0,0 +1,39 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ./zellij
+    ./firefox
+    ./git
+    ./hypr
+    ./neovim
+    ./shell/adam.nix
+    ./appearance
+  ];
+  home.packages = with pkgs; [
+    # Desktop
+    alacritty
+    wl-clipboard
+    keepassxc
+    ranger
+    webcord
+    xfce.thunar
+    xfce.thunar-volman
+    xfce.thunar-archive-plugin
+    gnome.file-roller
+    wireguard-tools
+    wpa_supplicant
+    ntfs3g
+    kdePackages.polkit-kde-agent-1
+    networkmanagerapplet
+    htop
+    btop
+    pamixer
+    qbittorrent
+    fastfetch
+    waybar
+    nwg-look
+    thefuck
+    calcurse
+    gnome.adwaita-icon-theme
+  ];
+}

home/modules/cnst.nix

@@ -1,5 +1,14 @@
 { pkgs, ... }:
 {
+  imports = [
+    ./zellij
+    ./firefox
+    ./git
+    ./hypr
+    ./neovim
+    ./shell/cnst.nix
+    ./appearance
+  ];
   home.packages = with pkgs; [
     # Desktop
     alacritty

home/modules/default.nix

@@ -1,11 +0,0 @@
-{
-  imports = [
-    ./zellij
-    ./firefox
-    ./git
-    ./hypr
-    ./neovim
-    ./shell
-    ./appearance
-  ];
-}

home/modules/shell/adam.nix

@@ -0,0 +1,35 @@
+{ config, ... }:
+{
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+
+    shellAliases = {
+      nixconfig = "cd /home/adam/.nix-config/";
+      ll = "ls -l";
+      nixupdate = "sudo nixos-rebuild switch --flake .#adampad";
+      flakeupdate = "nix flake update";
+    };
+    history = {
+      size = 1000;
+      path = "${config.xdg.dataHome}/zsh/history";
+    };
+    oh-my-zsh = {
+      enable = true;
+      plugins = [
+        "git"
+        "thefuck"
+      ];
+      theme = "robbyrussell";
+    };
+    initExtra = ''
+      ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=241'
+      eval $(thefuck --alias)
+      eval $(thefuck --alias FUCK)
+
+      eval "$(zellij setup --generate-auto-start zsh)"
+    '';
+  };
+}

home/modules/shell/cnst.nix

@@ -9,7 +9,7 @@
     shellAliases = {
       nixconfig = "cd /home/cnst/.nix-config/";
       ll = "ls -l";
-      nixupdate = "sudo nixos-rebuild switch --flake .#cnix";
+      nixupdate = "sudo nixos-rebuild switch -v --show-trace --flake .#cnix";
       flakeupdate = "nix flake update";
     };
     history = {