Added the rest of importants modules to port

hosts/common/modules.nix

@@ -7,10 +7,10 @@ in
       modules.common.nix # Fait
       modules.common.direnv # Fait
     # modules.nixos.swap
-      modules.nixos.locale # For localisation options # A faire, prioritaire
+      modules.nixos.locale # For localisation options # Fait
-      modules.common.ssh # A faire, prioritaire
+      modules.common.ssh # Fait
       modules.nixos.bootloader # Fait
-      modules.common.environment # A faire
+      modules.common.environment # Fait
       modules.nixos.desktop.lightDM # Fait
     ];
 }

hosts/framework/modules.nix

@@ -8,7 +8,7 @@ in
     inputs.sops-nix.nixosModules.sops # Inutile pour le moment
     modules.hm.colors # A faire, peu prioritaire
     modules.nixos.secureboot # Fait
-    modules.common.module # A faire
+    modules.common.module # Fait
     modules.nixos.secrets # Voir sops
     modules.nixos.desktop.bluetooth # Fait
     modules.nixos.desktop.utils # Fait

modules_dentritic/features/core/env.nix

@@ -1,19 +1,25 @@
 { self, inputs, ... }:
 {
-  flake.homeModules.env = { pkgs, lib, ... }: {
+  flake = {
-    home = {
+    homeModules.env = { pkgs, lib, ... }: {
-      shellAliases = {
+      home = {
-        drs = "time sudo darwin-rebuild switch --flake ~/Developer/nix/NixOSDots#macOS";
+        shellAliases = {
-        nrs = "time sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#nixos";
+          drs = "time sudo darwin-rebuild switch --flake ~/Developer/nix/NixOSDots#macOS";
-        frs = "time sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#FW16";
+          nrs = "time sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#nixos";
-        lrs = "time sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#light";
+          frs = "time sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#FW16";
-        lars = "time sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#laptop";
+          lrs = "time sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#light";
-        cdd = "cd ~/Developer/nix/NixOSDots";
+          lars = "time sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#laptop";
-        ncg = "time nix-collect-garbage -d";
+          cdd = "cd ~/Developer/nix/NixOSDots";
-        nso = "time nix store optimise";
+          ncg = "time nix-collect-garbage -d";
-        nfc = "time nix flake check ~/Developer/nix/NixOSDots";
+          nso = "time nix store optimise";
-        nfu = "time nix flake update --flake ~/Developer/nix/NixOSDots";
+          nfc = "time nix flake check ~/Developer/nix/NixOSDots";
+          nfu = "time nix flake update --flake ~/Developer/nix/NixOSDots";
+          };
+        };
       };
     };
+
+    #nixosModules = { pkgs, lib, ... }: {
+    #};
   };
 }

modules_dentritic/features/core/locales.nix

@@ -0,0 +1,37 @@
+{ self, inputs, ... }: {
+  flake.nixosConfigurations.locales = { pkgs, lib, ... }: {
+    # Toute la configuration lié à la langue, etc...
+    time.timeZone = "Europe/Paris";
+
+    i18n = {
+      defaultLocale = "fr_FR.UTF-8";
+
+      extraLocaleSettings = {
+        LC_ADDRESS = "fr_FR.UTF-8";
+        LC_IDENTIFICATION = "fr_FR.UTF-8";
+        LC_MEASURMENT = "fr_FR.UTF-8";
+        LC_MONETARY = "fr_FR.UTF-8";
+        LC_NAME = "fr_FR.UTF-8";
+        LC_NUMERIC = "fr_FR.UTF-8";
+        LC_PAPER = "fr_FR.UTF-8";
+        LC_TELEPHONE = "fr_FR.UTF-8";
+        LC_TIME = "fr_FR.UTF-8";
+      };
+    };
+
+    # Keymap in X11
+    services = {
+      xserver = {
+        xkb = {
+          layout = "fr";
+          #variant = "fr";
+        };
+      };
+    };
+
+    # Keymap in the console
+    console = {
+      keyMap = "fr";
+    };
+  };
+}

modules_dentritic/features/core/shell.nix

@@ -24,6 +24,20 @@
             saveNoDups = true;
             share = true;
           };
+
+          oh-my-zsh = {
+            enable = true;
+            package = pkgs.oh-my-zsh;
+            plugins = [
+              "git"
+              "golang"
+              "docker"
+              "eza"
+              "fzf"
+              "gh"
+              "kitty"
+            ];
+          };
         };
         starship = {
           enable = true;
@@ -31,6 +45,17 @@
         };
       };
     };
+
+    nixosModules.shell = { pkgs, lib, ... }: {
+      environment = {
+        pathsToLink = [ "/share/zsh" ];
+        systemPackages = with pkgs; [
+          eza
+          fzf
+          cmatrix
+        ];
+      };
+    };
   };
 
   perSystem = { pkgs, lib, ... }: {

modules_dentritic/features/desktop/core/utils.nix

@@ -10,6 +10,18 @@
       unrar
       p7zip-rar
       obs-studio
+      # System utils
+      ripgrep
+      sshfs
+      wget
+      tree
+      ffmpeg-full
+      netcat
+      tmux
+      gnupg
+      gh
+
+   	  inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default
     ];
   };
 }

modules_dentritic/features/desktop/gaming/steam.nix

@@ -0,0 +1,38 @@
+{ self, inputs, ... }: {
+  flake.nixosModules.steam = { pkgs, lib, ... }: {
+    programs = {
+      steam = {
+        enable = true;
+        gamescopeSession = {
+          enable = true;
+        };
+      };
+      gamemode = {
+        enable = true;
+      };
+    };
+
+    # Proton GE
+    environment = {
+      sessionVariables = {
+        STEAM_EXTRA_COMPAT_TOOLS_PATHS =
+          "/home/alex/.steam/root/compatibilitytools.d";
+      };
+    };
+
+    # Programmes requis
+    environment = {
+      systemPackages = with pkgs; [
+        mangohud
+        protonup-ng
+        protonup-qt
+        protontricks
+        protonplus
+        #lutris
+        #heroic
+        #bottles
+        prismlauncher
+      ];
+    };
+  }
+}

modules_dentritic/hosts/common/common.nix

@@ -24,6 +24,10 @@
       self.nixosModules.utils
       self.nixosModules.sysFetch
       self.nixosModules.git
+      self.nixosModules.locales
+      self.nixosModules.shell
+      self.nixosModules.greeter
+      self.nixosModules.steam
     ];
   };
 }

modules_dentritic/hosts/framework16/configuration.nix

@@ -37,13 +37,6 @@
       };
     };
 
-    # Flatpak
-    #services = {
-    #  flatpak = {
-    #    enable = true;
-    #  };
-    #};
-
     # Todo -> Display server for all nixos machines (lightdm or smth else)
 
     # User
@@ -69,12 +62,6 @@
       hyprland = {
         enable = true;
       };
-      zsh = {
-        enable = true;
-        autosuggestions = {
-          enable = true;
-        };
-      };
     };
 
     environment = {
@@ -90,7 +77,6 @@
         NIXOS_OZONE_WL = "1";
         LIBVA_DRIVER_NAME = "radeonsi";
       };
-      pathsToLink = [ "/share/zsh" ];
     };
 
     system = {