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 # Fait
+      modules.nixos.locale # For localisation options # A faire, prioritaire
-      modules.common.ssh # Fait
+      modules.common.ssh # A faire, prioritaire
       modules.nixos.bootloader # Fait
-      modules.common.environment # Fait
+      modules.common.environment # A faire
       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 # Fait
+    modules.common.module # A faire
     modules.nixos.secrets # Voir sops
     modules.nixos.desktop.bluetooth # Fait
     modules.nixos.desktop.utils # Fait

modules_dentritic/features/core/env.nix

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

modules_dentritic/features/core/locales.nix

@@ -1,37 +0,0 @@
-{ 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

@@ -1,77 +1,13 @@
 { self, inputs, ... }: {
   flake = {
     homeModules.shell = { pkgs, lib, ... }: {
-      programs = {
+      programs.zsh = {
-        zsh = {
+        enable = true;
-          enable = true;
+        package = pkgs.zsh;
-          package = pkgs.zsh;
+        enableCompletion = true;
-          enableCompletion = true;
+        autocd = true;
-          autocd = true;
+        initContent = lib.getExe self.packages.${pkgs.stdenv.hostPlatform.system}.myFastfetch;
-          initContent = lib.getExe self.packages.${pkgs.stdenv.hostPlatform.system}.myFastfetch;
-
-          autosuggestion = {
-            enable = true;
-            strategy = [ "history" ];
-            highlight = "fg=8";
-          };
-
-          history = {
-            append = true;
-            extended = true;
-            ignoreSpace = false;
-            save = 100000;
-            size = 100000;
-            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;
-          package = self.packages.${pkgs.stdenv.hostPlatform.system}.myStarship;
-        };
       };
     };
-
-    nixosModules.shell = { pkgs, lib, ... }: {
-      environment = {
-        pathsToLink = [ "/share/zsh" ];
-        systemPackages = with pkgs; [
-          eza
-          fzf
-          cmatrix
-        ];
-      };
-    };
-  };
-
-  perSystem = { pkgs, lib, ... }: {
-    packages.myStarship = inputs.wrapper-modules.wrappers.starship.wrap {
-      inherit pkgs;
-
-      settings = {
-        battery = {
-          full_symbol     = "󰁹 ";
-          charging_symbol = "󰂄 ";
-        };
-      };
-      preset = [
-        "nerd-font-symbols"
-        "bracketed-segments"
-      ];
-    };
   };
 }

modules_dentritic/features/desktop/core/utils.nix

@@ -10,18 +10,6 @@
       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

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