Changing file structure to prepare for ISO

generic/user/home.nix

@@ -0,0 +1,31 @@
+{ ... }:
+
+{
+  # Git config
+  programs.git = {
+    enable = true;
+    userName = "Lyes Saadi";
+    userEmail = "dev@lyes.eu";
+    signing = {
+      key = "17418538BAA17767";
+      signByDefault = true;
+    };
+    extraConfig = {
+      code.editor = "nvim";
+      merge.tool = "nvim";
+      color.ui = true;
+      init.defaultBranch = "main";
+      includeIf = {
+        "gitdir:~/Documents/fedpkg/" = {
+          path = "~/Documents/fedpkg/.gitconfig_include";
+        };
+      };
+    };
+  };
+
+  # Protonup config
+  home.sessionVariables = {
+    STEAM_EXTRA_COMPAT_TOOLS_PATHS =
+      "\${HOME}/.steam/root/compatibilitytools.d";
+  };
+}

generic/user/packages.nix

@@ -0,0 +1,87 @@
+{ pkgs, lib, ... }:
+
+let
+  tex = (pkgs.texlive.combine { inherit (pkgs.texlive)
+      scheme-medium
+      lettre
+      wallpaper
+      lastpage
+      hyphenat
+      moresize
+      fontawesome5
+      montserrat
+      titlesec
+      ly1;
+    });
+in {
+  users.users.lyes.packages = with pkgs; [
+    # Software
+    firefox
+    thunderbird
+    discord
+    vesktop
+    mpv
+    vlc
+    syncplay
+    gnome.gnome-tweaks
+    gnome-extension-manager
+    protonmail-bridge-gui
+
+    # Games
+    # citra-canary
+    minecraft
+    vvvvvv
+
+    # Utilities
+    home-manager
+    nix-index
+    direnv
+    starship
+    dropbox
+    yt-dlp
+    wl-clipboard
+
+    # Customization
+    adw-gtk3
+    paper-icon-theme
+    gnomeExtensions.gsconnect
+
+    # Programming
+    git
+    git-lfs
+    vscode
+    ocaml
+    ledit
+    nodejs
+    nil
+
+    # Containers
+    toolbox
+    distrobox
+
+    # Note taking
+    setzer
+    tex
+    pandoc
+ 
+    # Multimedia
+    pipewire.dev
+    pulseaudio
+    libopus
+  ];
+
+  # Flatpaks
+  services.flatpak.remotes = lib.mkOptionDefault [{
+    name = "gnome-nightly";
+    location = "https://nightly.gnome.org/gnome-nightly.flatpakrepo";
+  }];
+
+  services.flatpak.packages = [
+    "com.github.muriloventuroso.pdftricks"
+    "app.drey.Damask"
+    "dev.tchx84.Gameeky"
+    "dev.tchx84.Gameeky.ThematicPack.FreedomValley"
+    "dev.tchx84.Gameeky.ThematicPack.Blasterman"
+    "dev.tchx84.Gameeky.ThematicPack.Wackman"
+  ];
+}

generic/user/user.nix

@@ -0,0 +1,32 @@
+{ pkgs, home-manager, ... }:
+
+{
+  imports =
+    [
+      ./packages.nix
+      home-manager.nixosModules.default
+    ];
+
+  users.users.lyes = {
+    description = "Lyes Saadi";
+    home = "/home/lyes";
+    isNormalUser = true;
+    initialHashedPassword = ""; # Set for vms and initial installations
+    extraGroups = [ "wheel" "networkmanager" ];
+    shell = pkgs.fish;
+  };
+
+  home-manager.useUserPackages = true;
+  home-manager.useGlobalPkgs = true;
+  home-manager.users.lyes = { pkgs, ... }: {
+    imports =
+      [
+        ./home.nix
+      ];
+    
+    home.username = "lyes";
+    home.homeDirectory = "/home/lyes";
+
+    home.stateVersion = "22.11";
+  };
+}