Splitting desktop to user and gnome and adding agenix

users/lyes/common/default.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 = { ... }: {
+    imports =
+      [
+        ./home.nix
+      ];
+    
+    home.username = "lyes";
+    home.homeDirectory = "/home/lyes";
+
+    home.stateVersion = "22.11";
+  };
+}

users/lyes/common/packages.nix

@@ -1,9 +1,9 @@
-{ pkgs, nixpkgs-unstable, lib, config, ... }:
+{ pkgs, ... }:
 
 {
   # Packages
   users.users.lyes.packages = with pkgs; [
-    # Commandline
+    # Commandline Utilities
     starship
     wl-clipboard
     sl

users/lyes/default.nix

@@ -1,32 +1,8 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 
 {
   imports =
     [
-      ./packages.nix
-      home-manager.nixosModules.default
+      ./common
     ];
-
-  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 = { ... }: {
-    imports =
-      [
-        ./home.nix
-      ];
-    
-    home.username = "lyes";
-    home.homeDirectory = "/home/lyes";
-
-    home.stateVersion = "22.11";
-  };
 }

users/lyes/desktop/default.nix

@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  imports =
+    [
+      ./packages.nix
+    ];
+}

users/lyes/desktop/packages.nix

@@ -0,0 +1,124 @@
+{ pkgs, zen-browser, ... }:
+
+let
+  tex = (pkgs.texlive.combine { inherit (pkgs.texlive)
+      scheme-medium
+      lettre
+      wallpaper
+      lastpage
+      hyphenat
+      moresize
+      fontawesome5
+      montserrat
+      titlesec
+      ly1
+      footmisc
+      titling
+      frpseudocode
+      ebproof
+      comment;
+    });
+in {
+  users.users.lyes.packages = with pkgs; [
+    # Web
+    zen-browser.packages."${system}".default
+    dropbox
+    filezilla
+    organicmaps
+
+    # Messaging
+    discord
+    vesktop
+    whatsapp-for-linux
+    # element-desktop
+    fractal
+    zoom-us
+
+    # Image
+    gimp
+    inkscape
+
+    # Video
+    mpv
+    syncplay
+    obs-studio
+    yt-dlp
+    handbrake
+    (kodi.withPackages(kodiPkgs: with kodiPkgs; [
+      youtube
+      sponsorblock
+      pvr-iptvsimple
+    ]))
+
+    # Audio
+    helvum
+    local.quadcastrgb
+
+    # Games
+    heroic
+    # cemu
+    prismlauncher
+    # vvvvvv
+    ryujinx
+    dolphin-emu
+    parsec-bin
+    unstable.suyu
+    # suyu
+    # factorio
+
+    # Reading
+    # calibre
+
+    # Note taking
+    tex
+    pandoc
+    unstable.typst
+    # typst
+    tinymist
+    zotero
+
+    # Programming
+    git
+    git-lfs
+    vscode
+    # zed-editor
+    gcc
+    rustup
+    python3
+    ocaml
+    ocamlPackages.ocaml-lsp
+    ocamlPackages.ocamlformat
+    opam
+    ledit
+    nodejs
+    nil
+    nixd
+    nixfmt-rfc-style
+    protege # LogIA Course
+    haskellPackages.Agda
+    agdaPackages.standard-library
+    elan
+
+    # Containers & VMs
+    toolbox
+    distrobox
+
+    # Virtualization
+    qemu
+    virt-manager
+
+    # Utilities
+    ghostty
+
+    # Proton
+    protonmail-bridge-gui
+    protonmail-desktop
+    protonvpn-gui
+    proton-pass
+
+    # Multimedia
+    pipewire.dev
+    # pulseaudio
+    libopus
+  ];
+}