diff --git a/flake.lock b/flake.lock
index 7cf3198..d1fd0af 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,15 +5,15 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1732200724,
-        "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
-        "owner": "SenchoPens",
+        "lastModified": 1745452037,
+        "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
+        "owner": "awwpotato",
         "repo": "base16.nix",
-        "rev": "153d52373b0fb2d343592871009a286ec8837aec",
+        "rev": "985d704b4ff9f75627f279ef091b2899f8456690",
         "type": "github"
       },
       "original": {
-        "owner": "SenchoPens",
+        "owner": "awwpotato",
         "repo": "base16.nix",
         "type": "github"
       }
@@ -74,11 +74,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741786315,
-        "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
+        "lastModified": 1745502102,
+        "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
+        "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70",
         "type": "github"
       },
       "original": {
@@ -90,11 +90,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1741628778,
-        "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=",
+        "lastModified": 1744642301,
+        "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80",
+        "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
         "type": "github"
       },
       "original": {
@@ -190,11 +190,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741379162,
-        "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
         "type": "github"
       },
       "original": {
@@ -249,11 +249,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741955947,
-        "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=",
+        "lastModified": 1745494811,
+        "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4",
+        "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
         "type": "github"
       },
       "original": {
@@ -270,11 +270,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741635347,
-        "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=",
+        "lastModified": 1745439012,
+        "narHash": "sha256-TwbdiH28QK7Da2JQTqFHdb+UCJq6QbF2mtf+RxHVzEA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551",
+        "rev": "d31710fb2cd536b1966fee2af74e99a0816a61a8",
         "type": "github"
       },
       "original": {
@@ -285,11 +285,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742069588,
-        "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
+        "lastModified": 1745391562,
+        "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
+        "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
         "type": "github"
       },
       "original": {
@@ -301,11 +301,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1741513245,
-        "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
+        "lastModified": 1745234285,
+        "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
+        "rev": "c11863f1e964833214b767f4a369c6e6a7aba141",
         "type": "github"
       },
       "original": {
@@ -325,11 +325,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1741693509,
-        "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=",
+        "lastModified": 1745459908,
+        "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "5479646b2574837f1899da78bdf9a48b75a9fb27",
+        "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035",
         "type": "github"
       },
       "original": {
@@ -368,11 +368,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1742040559,
-        "narHash": "sha256-Hb3aw00C1/5ORiTCASwMd8vcLAl/GNJfyjXZyl/EKpc=",
+        "lastModified": 1745511266,
+        "narHash": "sha256-W68rSRTGhRF22nDzJgq2ffQwI/4k+4jMs84Mpj38aOI=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "bcc674f1994396137438bac9d905971453d33b12",
+        "rev": "3194470d07d2885da178a6baca10a91ea1068e1b",
         "type": "github"
       },
       "original": {
@@ -433,11 +433,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1741468895,
-        "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=",
+        "lastModified": 1744974599,
+        "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991",
+        "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
         "type": "github"
       },
       "original": {
@@ -449,11 +449,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1740877430,
-        "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=",
+        "lastModified": 1745111349,
+        "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4",
+        "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
         "type": "github"
       },
       "original": {
diff --git a/hosts/home/configuration.nix b/hosts/home/configuration.nix
index e9ff6c1..3ce156e 100644
--- a/hosts/home/configuration.nix
+++ b/hosts/home/configuration.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   inputs,
+  nixpkgs,
   ...
 }:
 
@@ -62,6 +63,7 @@
         "nix-command"
         "flakes"
       ];
+      trusted-users = [ "root" "yoru" ];
     };
     gc = {
       automatic = true;
@@ -69,6 +71,11 @@
       options = "--delete-older-than 10d";
     };
     nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
+    extraOptions = ''
+      extra-substituters = https://devenv.cachix.org
+      extra-trusted-public-keys = devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=
+    '';
+    
   };
 
   time.timeZone = "Europe/Paris";
@@ -93,8 +100,14 @@
     bluetooth.powerOnBoot = true;
   };
 
-  environment.sessionVariables = {
-    FLAKE = "/home/yoru/nixos";
+  environment = {
+    sessionVariables = {
+      FLAKE = "/home/yoru/nixos";
+      DIRENV_LOG_FORMAT = "";
+    };
+    systemPackages = with pkgs; [
+      logitech-udev-rules
+    ];
   };
 
   security = {
diff --git a/hosts/home/home.nix b/hosts/home/home.nix
index 12999c0..f46d7d5 100644
--- a/hosts/home/home.nix
+++ b/hosts/home/home.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  nixpkgs,
   outputs,
   ...
 }:
@@ -60,11 +61,6 @@
       gtk-application-prefer-dark-theme = 1;
     };
   };
-  # qt = {
-    # enable = true;
-    # style.name = "adwaita-dark";
-    # platformTheme.name = "gtk3";
-  # };
 
   services = {
     hypridle = {
@@ -90,6 +86,7 @@
     };
   };
 
+  nixpkgs.config.allowUnfree = true;
   programs = {
     gh.enable = true;
     btop = {
diff --git a/modules/nixos/cli-environment.nix b/modules/nixos/cli-environment.nix
index 22b8ca6..3c155e8 100644
--- a/modules/nixos/cli-environment.nix
+++ b/modules/nixos/cli-environment.nix
@@ -30,12 +30,17 @@ in
       bat
       tree
       imv
-      eza # ?
+      eza
+      fzf
       appimage-run
       nh
       openssl
       nixfmt-rfc-style
       nil
+      ripgrep
+      coreutils
+      fd
+      clang
     ];
     programs.fish.enable = true;
   };
diff --git a/modules/nixos/dev-environment.nix b/modules/nixos/dev-environment.nix
index e665520..2588ec2 100644
--- a/modules/nixos/dev-environment.nix
+++ b/modules/nixos/dev-environment.nix
@@ -25,8 +25,23 @@ in
       lazyjj # jjui
       commitizen
       pre-commit
+      devenv
       # cargo
       # rustup
+      python312
+      lua
+      lua52Packages.luarocks
+      ghostscript
+      tectonic
+      mermaid-cli
+      lazygit
     ];
+    programs = {
+      neovim = {
+        enable = true;
+        vimAlias = true;
+        viAlias = true;
+      };
+    };
   };
 }
diff --git a/modules/nixos/window-manager.nix b/modules/nixos/window-manager.nix
index 384736a..48a2b13 100644
--- a/modules/nixos/window-manager.nix
+++ b/modules/nixos/window-manager.nix
@@ -16,6 +16,21 @@ in
   };
 
   config = mkIf cfg.enable {
+    # services.displayManager.defaultSession = "none+i3";
+    services.xserver = {
+      enable = true;
+      windowManager.i3 = {
+        enable = true;
+        extraPackages = with pkgs; [
+          # dmenu
+          i3lock
+          i3status
+        ];
+      };
+    };
+    services.picom.enable = true;
+    programs.dconf.enable = true;
+
     programs.hyprland.enable = true;
     programs.hyprlock.enable = true;
     security.pam.services.hyprlock = { };
@@ -25,6 +40,7 @@ in
       waybar
       pavucontrol
       libnotify
+      xclip
       wl-clipboard
       hyprpaper
       libnotify