diff --git a/flake.lock b/flake.lock
index 9b33615..0ce65be 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1727303518,
-        "narHash": "sha256-lO5JMynTxNZxg/+E4/Y9reeLGIz/M8cEue+Re4cP6qo=",
+        "lastModified": 1728326430,
+        "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=",
         "owner": "Aylur",
         "repo": "ags",
-        "rev": "cd543afec4d9ed708990e5ba52184716809bf248",
+        "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d",
         "type": "github"
       },
       "original": {
@@ -96,11 +96,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1728187412,
-        "narHash": "sha256-KIJdXDYnaU6rHhzmLaVRjccwxIIaMBZXBRPGqUVyPiU=",
+        "lastModified": 1728360193,
+        "narHash": "sha256-UpN2xQiIzHLD3WZcr51BKtJTDLbjzB5H8cdg4Zn/LX4=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "40e077fcddef8fadcb796a20f2e69ee752af4545",
+        "rev": "4728d8775b311938b985c1b8ba07e077990d2a4b",
         "type": "gitlab"
       },
       "original": {
@@ -202,11 +202,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728041527,
-        "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
+        "lastModified": 1728337164,
+        "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
+        "rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
         "type": "github"
       },
       "original": {
@@ -311,11 +311,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728018373,
-        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
+        "lastModified": 1728241625,
+        "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
+        "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
         "type": "github"
       },
       "original": {
@@ -478,11 +478,11 @@
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1728242323,
-        "narHash": "sha256-GYGx9aK+PCseQO72u6eJc8LJxWhAm2p2+3WXJ42seE8=",
+        "lastModified": 1728312564,
+        "narHash": "sha256-z01cTK5VeLFOUekhAXrJHLDzE74uAxxMwE2p6+Wp9Sg=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "39e5435c1da9ce50fe36deaf58bd2b94dd4d8249",
+        "rev": "63426a59e714c4389c5a8e559dee05a0087a3043",
         "type": "github"
       },
       "original": {
diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 709cc96..b90870b 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -4,7 +4,7 @@
   openrgb.enable = true;
   steam.enable = true;
   suyu.enable = true;
-  norisk.enbale = true;
+  norisk.enable = true;
 
   imports = [
     ./hardware.nix
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index 2187ba8..d7ed69a 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -3,7 +3,8 @@
 
   hypridle.enable = true;
   led.enable = true;
-  # gnome.enable = true;
+  code.enable = true;
+  gnome.enable = true;
 
   imports = [
     ./hardware.nix
diff --git a/modules/apps/home/bat/default.nix b/modules/apps/home/bat/default.nix
new file mode 100644
index 0000000..8e00d24
--- /dev/null
+++ b/modules/apps/home/bat/default.nix
@@ -0,0 +1,8 @@
+{lib, ...}: {
+  programs.bat = {
+    enable = true;
+    config = {
+      theme = lib.mkForce "base16-stylix";
+    };
+  };
+}
diff --git a/modules/apps/home/code/default.nix b/modules/apps/home/code/default.nix
index 98f13b3..f8e16f3 100644
--- a/modules/apps/home/code/default.nix
+++ b/modules/apps/home/code/default.nix
@@ -1,10 +1,20 @@
-{pkgs, ...}: {
-  programs.vscode = {
-    enable = true;
-    package = pkgs.vscodium;
-    extensions = with pkgs.vscode-extensions; [
-      ms-dotnettools.csharp
-      jdinhlife.gruvbox
-    ];
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  options = {
+    code.enable = lib.mkEnableOption "";
+  };
+  config = lib.mkIf config.code.enable {
+    programs.vscode = {
+      enable = true;
+      package = pkgs.vscodium;
+      extensions = with pkgs.vscode-extensions; [
+        ms-dotnettools.csharp
+        jdinhlife.gruvbox
+      ];
+    };
   };
 }
diff --git a/modules/apps/home/default.nix b/modules/apps/home/default.nix
index d778d0c..ea1bf90 100644
--- a/modules/apps/home/default.nix
+++ b/modules/apps/home/default.nix
@@ -10,5 +10,6 @@
     ./rofi
     ./zsh
     ./zoxide
+    ./bat
   ];
 }
diff --git a/modules/apps/home/zsh/scripts/rebuild.sh b/modules/apps/home/zsh/scripts/rebuild.sh
index 104d264..496dfba 100755
--- a/modules/apps/home/zsh/scripts/rebuild.sh
+++ b/modules/apps/home/zsh/scripts/rebuild.sh
@@ -6,6 +6,8 @@ cd ~/nix
 
 git add .
 
+alejandra .
+
 hostname=$(hostname)
 
 if echo "$hostname" | grep -q 'desktop'; then
diff --git a/modules/apps/norm/misc/default.nix b/modules/apps/norm/misc/default.nix
index 6abaa68..053791b 100644
--- a/modules/apps/norm/misc/default.nix
+++ b/modules/apps/norm/misc/default.nix
@@ -1,46 +1,10 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
-    keepassxc
-    vesktop
-    signal-desktop
-    bottles
-    boxbuddy
-    waydroid
-    transmission_4-gtk
-    kdePackages.kdenlive
-    vscodium
-    networkmanagerapplet
-    ferdium
-    drawio
-    imv
+    # cli
     cmus
-    obs-studio
-    gnome-calculator
-    gnome-disk-utility
-    gnome-clocks
-    gnome-calendar
     htop
-    sent
-    texliveFull
-    alejandra
-    bat
-    screen
-    tree
-    zip
-    unzip
-    scrcpy
-    appimage-run
-    yt-dlp
-    distrobox
-    lm_sensors
-    brightnessctl
     ncdu
     git
-    lazygit
-    ffmpeg
-    libnotify
-    font-awesome
-    imagemagick
     zoxide
     fastfetch
     cmatrix
@@ -50,8 +14,37 @@
     sl
     cbonsai
     pipes
+    libnotify
+    brightnessctl
+    lazygit
+    ffmpeg
+    lm_sensors
+    sent
+    texliveFull
+    alejandra
+    screen
+    tree
+    zip
+    unzip
+    yt-dlp
+    #gui
+    imv
+    keepassxc
+    vesktop
+    signal-desktop
+    bottles
+    boxbuddy
+    transmission_4-gtk
+    kdePackages.kdenlive
+    networkmanagerapplet
+    ferdium
+    drawio
+    obs-studio
+    distrobox
     pulseaudioFull
-    cmus
-    adwaita-icon-theme
+    gnome-calculator
+    gnome-disk-utility
+    gnome-clocks
+    gnome-calendar
   ];
 }