diff --git a/hosts/home/configuration.nix b/hosts/home/configuration.nix
index e081c46..853cb6e 100644
--- a/hosts/home/configuration.nix
+++ b/hosts/home/configuration.nix
@@ -22,6 +22,13 @@
     #   useTmpfs = false;
     #   tmpfsSize = "30%";
     # };
+    initrd.kernelModules = [ "amdgpu" ];
+    kernelPackages = pkgs.linuxPackages_latest;
+    kernelModules = [
+      "coretemp"
+      "cpuid"
+    ];
+    plymouth.enable = true;
   };
 
   fileSystems."/mnt/apps" = {
@@ -102,7 +109,10 @@
 
   hardware = {
     sane.enable = true;
-    graphics.enable = true;
+    graphics = {
+      enable = true;
+      enable32Bit = true;
+    };
     bluetooth.enable = true;
     bluetooth.powerOnBoot = true;
   };
@@ -113,25 +123,25 @@
       DIRENV_LOG_FORMAT = "";
     };
     systemPackages = with pkgs; [
+      pavucontrol
       vial
+      xwayland-satellite
+      clinfo
+      gcc
     ];
   };
 
+  programs = {
+    niri.enable = true;
+  };
+
   security = {
     rtkit.enable = true;
-    sudo.extraRules = [
-      {
-        users = [ "yoru" ];
-        commands = [
-          {
-            command = "ALL";
-            options = [ "NOPASSWD" ];
-          }
-        ];
-      }
-    ];
+    sudo.wheelNeedsPassword = false;
   };
-
+  systemd.tmpfiles.rules = [
+    "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
+  ];
   services = {
     udev.packages = with pkgs; [
       vial
@@ -149,6 +159,7 @@
       layout = "us";
       variant = "altgr-intl";
     };
+    xserver.videoDrivers = [ "amdgpu" ];
     blueman.enable = true;
     printing.enable = true;
     avahi = {
@@ -162,78 +173,17 @@
       alsa.support32Bit = true;
       pulse.enable = true;
     };
-    firefly-iii-data-importer = {
-      enable = true;
-      enableNginx = true;
-      settings = {
-        FIREFLY_III_URL_FILE = "/home/yoru/.firefly-url.txt";
-        VANITY_URL_FILE = "/home/yoru/.firefly-vanity-url.txt";
-        FIREFLY_III_CLIENT_ID = 2;
-      };
-    };
-    # my modules
-    cli-environment.enable = true;
-    desktop-apps.enable = true;
-    dev-environment.enable = true;
-    gaming.enable = true;
-    fonts.enable = true;
-    window-manager.enable = true;
   };
 
-  users.users.yoru = {
-    shell = pkgs.fish;
-    isNormalUser = true;
-    description = "Yoru";
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-      "scanner"
-      "lp"
-      "docker"
-      "cdrom"
-    ];
-  };
-  home-manager = {
-    extraSpecialArgs = { inherit inputs; };
-    users = {
-      "yoru" = import ./home.nix;
-    };
-  };
-
-  stylix = {
-    enable = true;
-    image = ../../wall.jpg;
-    polarity = "dark";
-    opacity.terminal = 0.9;
-    cursor.package = pkgs.bibata-cursors;
-    cursor.name = "Bibata-Modern-Ice";
-    cursor.size = 24;
-    fonts = {
-      monospace = {
-        package = pkgs.nerd-fonts.jetbrains-mono;
-        name = "JetBrainsMono Nerd Font Mono";
-      };
-      sansSerif = {
-        package = pkgs.montserrat;
-        name = "Montserrat";
-      };
-      serif = {
-        package = pkgs.montserrat;
-        name = "Montserrat";
-      };
-      sizes = {
-        applications = 12;
-        terminal = 12;
-        desktop = 11;
-        popups = 12;
+  myNixOS = {
+    home-users = {
+      "yoru" = {
+        userConfig = ./home.nix;
       };
     };
-  };
-  virtualisation.podman = {
-    enable = true;
-    autoPrune.enable = true;
-    dockerCompat = true;
-    dockerSocket.enable = true;
+    archetype.general.enable = true;
+    feature.fonts.enable = true;
+    feature.virtualisation.enable = true;
   };
 
   system.stateVersion = "24.05";
diff --git a/hosts/home/home.nix b/hosts/home/home.nix
index f46d7d5..116fc98 100644
--- a/hosts/home/home.nix
+++ b/hosts/home/home.nix
@@ -1,47 +1,64 @@
 {
-  config,
+  inputs,
   pkgs,
-  lib,
-  nixpkgs,
-  outputs,
   ...
 }:
-
 {
-  home.username = "yoru";
-  home.homeDirectory = "/home/yoru";
-
   imports = [
-    ../../modules/home-manager/dotfiles.nix
-    ../../modules/home-manager/helix.nix
-    ../../modules/home-manager/waybar.nix
-    ../../modules/home-manager/shell.nix
-    ../../modules/home-manager/kitty.nix
+    inputs.noctalia.homeModules.default
   ];
 
-  myHome.dotfiles.enable = true;
-  myHome.helix.enable = true;
-  myHome.waybar.enable = true;
-  myHome.kitty.enable = true;
-  myHome.shell.enable = true;
+  myHome = {
+    services.nix.enable = true;
+    bundle.work-apps.enable = false;
+    bundle.myhypr.enable = false;
+    bundle.desktop-apps.enable = true;
+    bundle.shell.enable = true;
+    programs.creativity = {
+      drawing.enable = true;
+      printing.enable = true;
+      gamedev.enable = true;
+      sound.enable = true;
+    };
+  };
 
-  home.file.".config/swappy/config".text = ''
-    [Default]
-    save_dir=/home/yoru/Pictures/Screenshots
-    save_filename_format=swappy-%Y%m%d-%H%M%S.png
-    show_panel=false
-    line_size=5
-    text_size=20
-    text_font=Ubuntu
-    paint_mode=brush
-    early_exit=true
-    fill_shape=false
-  '';
+  home = {
+    username = "yoru";
+    homeDirectory = "/home/yoru";
+    shell.enableFishIntegration = true;
+  };
 
-  home.packages = [
-    (import ../../scripts/screenshot.nix { inherit pkgs; })
-    (import ../../scripts/rainbow-border.nix { inherit pkgs; })
-  ];
+  # imports = [
+  #   ../../modules/home-manager/dotfiles.nix
+  #   ../../modules/home-manager/helix.nix
+  #   ../../modules/home-manager/waybar.nix
+  #   ../../modules/home-manager/shell.nix
+  #   ../../modules/home-manager/kitty.nix
+  # ];
+  #
+  # myHome.dotfiles.enable = true;
+  # myHome.helix.enable = true;
+  # myHome.waybar.enable = true;
+  # myHome.kitty.enable = true;
+  # myHome.shell.enable = true;
+
+  # home.file.".config/swappy/config".text = ''
+  #   [Default]
+  #   save_dir=/home/yoru/Pictures/Screenshots
+  #   save_filename_format=swappy-%Y%m%d-%H%M%S.png
+  #   show_panel=false
+  #   line_size=5
+  #   text_size=20
+  #   text_font=Ubuntu
+  #   paint_mode=brush
+  #   early_exit=true
+  #   fill_shape=false
+  # '';
+  #
+  # home.packages = [
+  #   (import ../../scripts/screenshot.nix { inherit pkgs; })
+  #   (import ../../scripts/rainbow-border.nix { inherit pkgs; })
+  # ];
 
   # stylix.targets = {
   #   waybar.enable = false;
@@ -49,44 +66,44 @@
   #   hyprland.enable = false;
   # };
 
-  gtk = {
-    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme;
-    };
-    gtk3.extraConfig = {
-      gtk-application-prefer-dark-theme = 1;
-    };
-    gtk4.extraConfig = {
-      gtk-application-prefer-dark-theme = 1;
-    };
-  };
+  # gtk = {
+  #   iconTheme = {
+  #     name = "Papirus-Dark";
+  #     package = pkgs.papirus-icon-theme;
+  #   };
+  #   gtk3.extraConfig = {
+  #     gtk-application-prefer-dark-theme = 1;
+  #   };
+  #   gtk4.extraConfig = {
+  #     gtk-application-prefer-dark-theme = 1;
+  #   };
+  # };
+  #
+  # services = {
+  #   hypridle = {
+  #     enable = true;
+  #     settings = {
+  #       general = {
+  #         after_sleep_cmd = "hyprctl dispatch dpms on";
+  #         ignore_dbus_inhibit = false;
+  #         lock_cmd = "hyprlock";
+  #       };
+  #       listener = [
+  #         {
+  #           timeout = 900;
+  #           on-timeout = "hyprlock";
+  #         }
+  #         {
+  #           timeout = 1200;
+  #           on-timeout = "hyprctl dispatch dpms off";
+  #           on-resume = "hyprctl dispatch dpms on";
+  #         }
+  #       ];
+  #     };
+  #   };
+  # };
 
-  services = {
-    hypridle = {
-      enable = true;
-      settings = {
-        general = {
-          after_sleep_cmd = "hyprctl dispatch dpms on";
-          ignore_dbus_inhibit = false;
-          lock_cmd = "hyprlock";
-        };
-        listener = [
-          {
-            timeout = 900;
-            on-timeout = "hyprlock";
-          }
-          {
-            timeout = 1200;
-            on-timeout = "hyprctl dispatch dpms off";
-            on-resume = "hyprctl dispatch dpms on";
-          }
-        ];
-      };
-    };
-  };
-
-  nixpkgs.config.allowUnfree = true;
+  # nixpkgs.config.allowUnfree = true;
   programs = {
     gh.enable = true;
     btop = {
@@ -95,18 +112,40 @@
         vim_keys = true;
       };
     };
-    home-manager.enable = true;
-    hyprlock = {
-      enable = true;
-      settings = {
-        general = {
-          disable_loading_bar = true;
-          grace = 10;
-          hide_cursor = true;
-          no_fade_in = false;
-        };
+    firefox.enable = true;
+    git = {
+      settings.user = {
+        name = "Xavier Morel";
+        email = "morelx42@gmail.com";
       };
     };
+    home-manager.enable = true;
+    rofi.enable = true;
+    noctalia-shell.enable = true;
+    quickshell.enable = true;
+    alacritty.enable = true;
+    # hyprlock = {
+    #   enable = true;
+    #   settings = {
+    #     general = {
+    #       disable_loading_bar = true;
+    #       grace = 10;
+    #       hide_cursor = true;
+    #       no_fade_in = false;
+    #     };
+    #   };
+    # };
+  };
+  xdg.portal = {
+    enable = true;
+    extraPortals = [
+      pkgs.xdg-desktop-portal-gtk
+      pkgs.xdg-desktop-portal
+    ];
+    configPackages = [
+      pkgs.xdg-desktop-portal-gtk
+      pkgs.xdg-desktop-portal
+    ];
   };
   home.stateVersion = "23.11";
 }
diff --git a/modules/nixos/home-manager.nix b/modules/nixos/home-manager.nix
index 19fcd05..d7580f2 100644
--- a/modules/nixos/home-manager.nix
+++ b/modules/nixos/home-manager.nix
@@ -61,6 +61,8 @@ in
           "lp"
           "wireshark"
           "dialout" # serial port access
+          "scanner"
+          "cdrom"
         ];
       }
       // user.userNixosSettings