Switching to flakes and adding home-manager

user/home.nix

@@ -0,0 +1,25 @@
+{ ... }:
+
+{
+  # 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";
+        };
+      };
+    };
+  };
+}

user/packages.nix

@@ -1,7 +1,18 @@
 { pkgs, ... }:
 
 let
-  unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
+  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
@@ -13,10 +24,10 @@ in {
     syncplay
     gnome.gnome-tweaks
     gnome-extension-manager
-    unstable.protonmail-bridge-gui
+    protonmail-bridge-gui
 
     # Games
-    citra-canary
+    # citra-canary
     steam
     minecraft
     vvvvvv
@@ -37,16 +48,19 @@ in {
 
     # Programming
     git
+    vscode
     ocaml
     ledit
     nodejs
+    nil
 
     # Containers
     toolbox
     distrobox
 
     # Note taking
-    texlive.combined.scheme-medium
+    setzer
+    tex
     pandoc
  
     # Multimedia
@@ -54,4 +68,4 @@ in {
     pulseaudio
     libopus
   ];
-}
+}

user/user.nix

@@ -1,9 +1,10 @@
-{ pkgs, ... }:
+{ pkgs, home-manager, ... }:
 
 {
   imports =
     [
       ./packages.nix
+      home-manager.nixosModules.default
     ];
 
   users.users.lyes = {
@@ -16,7 +17,16 @@
   };
 
   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";
   };
-}
+}