diff --git a/dotfiles/tmux/tmux.conf b/dotfiles/tmux/tmux.conf
index 4e53bee..123d1e5 100644
--- a/dotfiles/tmux/tmux.conf
+++ b/dotfiles/tmux/tmux.conf
@@ -15,8 +15,8 @@ set -g pane-border-style 'fg=brightblack,bg=default'
 set -g mouse on
 #bind-key -r B run-shell "~/.config/tmux/scripts/sessionizer.sh ~/omerxx/omerxx.com"
 
-set -g @fzf-url-fzf-options '-p 60%,30% --prompt="   " --border-label=" Open URL "'
-set -g @fzf-url-history-limit '2000'
+#set -g @fzf-url-fzf-options '-p 60%,30% --prompt="   " --border-label=" Open URL "'
+#set -g @fzf-url-history-limit '2000'
 
 # Vim style pane selection
 bind h select-pane -L
@@ -31,18 +31,18 @@ set-window-option -g pane-base-index 1
 set-option -g renumber-windows on
 
 # Use Alt-arrow keys without prefix key to switch panes
-bind -n M-Left select-pane -L
-bind -n M-Right select-pane -R
-bind -n M-Up select-pane -U
-bind -n M-Down select-pane -D
+#bind -n M-Left select-pane -L
+#bind -n M-Right select-pane -R
+#bind -n M-Up select-pane -U
+#bind -n M-Down select-pane -D
 
 # Shift arrow to switch windows
-bind -n S-Left  previous-window
-bind -n S-Right next-window
+#bind -n S-Left  previous-window
+#bind -n S-Right next-window
 
 # Shift Alt vim keys to switch windows
-bind -n M-H previous-window
-bind -n M-L next-window
+#bind -n M-H previous-window
+#bind -n M-L next-window
 
 # set vi-mode
 set-window-option -g mode-keys vi
@@ -51,45 +51,45 @@ bind-key -T copy-mode-vi v send-keys -X begin-selection
 bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
 bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
 
-bind '"' split-window -v -c "#{pane_current_path}"
-bind % split-window -h -c "#{pane_current_path}"
+#bind '"' split-window -v -c "#{pane_current_path}"
+#bind % split-window -h -c "#{pane_current_path}"
 
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @plugin 'tmux-plugins/tmux-continuum'
-set -g @plugin 'fcsonline/tmux-thumbs'
-set -g @plugin 'sainnhe/tmux-fzf'
-set -g @plugin 'wfxr/tmux-fzf-url'
-set -g @plugin 'omerxx/catppuccin-tmux' # My fork that holds the meetings script bc I'm lazy af
-set -g @plugin 'omerxx/tmux-sessionx'
+#set -g @plugin 'fcsonline/tmux-thumbs'
+#set -g @plugin 'sainnhe/tmux-fzf'
+#set -g @plugin 'wfxr/tmux-fzf-url'
+#set -g @plugin 'omerxx/catppuccin-tmux' # My fork that holds the meetings script bc I'm lazy af
+#set -g @plugin 'omerxx/tmux-sessionx'
 
-set -g @sessionx-bind 'o'
-set -g @sessionx-x-path '~/dotfiles'
-set -g @sessionx-window-height '85%'
-set -g @sessionx-window-width '75%'
-set -g @sessionx-zoxide-mode 'on'
-set -g @continuum-restore 'on'
-set -g @resurrect-strategy-nvim 'session'
-set -g @catppuccin_window_left_separator ""
-set -g @catppuccin_window_right_separator " "
-set -g @catppuccin_window_middle_separator " █"
-set -g @catppuccin_window_number_position "right"
-set -g @catppuccin_window_default_fill "number"
-set -g @catppuccin_window_default_text "#W"
-set -g @catppuccin_window_current_fill "number"
-set -g @catppuccin_window_current_text "#W#{?window_zoomed_flag,(),}"
-set -g @catppuccin_status_modules_right "directory date_time"
-set -g @catppuccin_status_modules_left "session"
-set -g @catppuccin_status_left_separator  " "
-set -g @catppuccin_status_right_separator " "
-set -g @catppuccin_status_right_separator_inverse "no"
-set -g @catppuccin_status_fill "icon"
-set -g @catppuccin_status_connect_separator "no"
-set -g @catppuccin_directory_text "#{b:pane_current_path}"
+#set -g @sessionx-bind 'o'
+#set -g @sessionx-x-path '~/dotfiles'
+#set -g @sessionx-window-height '85%'
+#set -g @sessionx-window-width '75%'
+#set -g @sessionx-zoxide-mode 'on'
+#set -g @continuum-restore 'on'
+#set -g @resurrect-strategy-nvim 'session'
+#set -g @catppuccin_window_left_separator ""
+#set -g @catppuccin_window_right_separator " "
+#set -g @catppuccin_window_middle_separator " █"
+#set -g @catppuccin_window_number_position "right"
+#set -g @catppuccin_window_default_fill "number"
+#set -g @catppuccin_window_default_text "#W"
+#set -g @catppuccin_window_current_fill "number"
+#set -g @catppuccin_window_current_text "#W#{?window_zoomed_flag,(),}"
+#set -g @catppuccin_status_modules_right "directory date_time"
+#set -g @catppuccin_status_modules_left "session"
+#set -g @catppuccin_status_left_separator  " "
+#set -g @catppuccin_status_right_separator " "
+#set -g @catppuccin_status_right_separator_inverse "no"
+#set -g @catppuccin_status_fill "icon"
+#set -g @catppuccin_status_connect_separator "no"
+#set -g @catppuccin_directory_text "#{b:pane_current_path}"
 #set -g @catppuccin_meetings_text "#($HOME/.config/tmux/scripts/cal.sh)"
-set -g @catppuccin_meetings_text ""
-set -g @catppuccin_date_time_text "%H:%M"
+#set -g @catppuccin_meetings_text ""
+#set -g @catppuccin_date_time_text "%H:%M"
 
 run '~/.config/tmux/plugins/tpm/tpm'
diff --git a/machines/dragon/configuration.nix b/machines/dragon/configuration.nix
index 4e5bd6a..31f40fa 100644
--- a/machines/dragon/configuration.nix
+++ b/machines/dragon/configuration.nix
@@ -12,10 +12,9 @@
 
   networking.hostName = "dragon"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.extraHosts =
-    ''
-      163.172.173.184 aleks-test-install-bookworm.test
-    '';
+  networking.extraHosts = ''
+    163.172.173.184 aleks-test-install-bookworm.test
+  '';
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
@@ -42,13 +41,10 @@
     LC_TIME = "fr_FR.UTF-8";
   };
 
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
   };
 
-
   nixpkgs.config.allowUnfree = true;
   nixpkgs.config.nvidia.acceptLicense = true;
   hardware.nvidia = {
@@ -58,7 +54,7 @@
 
     # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
     # Enable this if you have graphical corruption issues or application crashes after waking
-    # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead 
+    # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
     # of just the bare essentials.
     powerManagement.enable = true;
 
@@ -68,9 +64,9 @@
 
     # Use the NVidia open source kernel module (not to be confused with the
     # independent third-party "nouveau" open source driver).
-    # Support is limited to the Turing and later architectures. Full list of 
-    # supported GPUs is at: 
-    # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus 
+    # Support is limited to the Turing and later architectures. Full list of
+    # supported GPUs is at:
+    # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
     # Only available from driver 515.43.04+
     # Currently alpha-quality/buggy, so false is currently the recommended setting.
     open = false;
@@ -82,56 +78,57 @@
     # Optionally, you may need to select the appropriate driver version for your specific GPU.
     package = config.boot.kernelPackages.nvidiaPackages.latest;
   };
-  #hardware.opengl = {
-  #  enable = true;
-  #};
-  #hardware.nvidia = {
-  #  modesetting.enable = true;
-  #  powerManagement.enable = false;
-  #  powerManagement.finegrained = true;
-  #  open = true;
-  #  nvidiaSettings = true;
-  #  package = config.boot.kernelPackages.nvidiaPackages.beta;
-  #};
-
   services.xserver = {
     enable = true;
-    videoDrivers = [ "intel" "nvidia" ];
+    videoDrivers = [
+      "intel"
+      "nvidia"
+    ];
     xkb.layout = "us";
     xkb.variant = "";
   };
 
-  fileSystems."/mnt/nas/music" =
-    {
-      device = "192.168.1.2:/volume1/music";
-      options = [ "nfsvers=4.2" "x-systemd.automount" "noauto" "rw" "relatime" "user" "acl" "defaults" ];
-      fsType = "nfs";
-    };
+  fileSystems."/mnt/nas/music" = {
+    device = "192.168.1.2:/volume1/music";
+    options = [
+      "nfsvers=4.2"
+      "x-systemd.automount"
+      "noauto"
+      "rw"
+      "relatime"
+      "user"
+      "acl"
+      "defaults"
+    ];
+    fsType = "nfs";
+  };
 
   services.rpcbind.enable = true; # needed for NFS
-  systemd.mounts = [{
-    type = "nfs";
-    mountConfig = {
-      Options = "defaults,acl,user,noauto,relatime,rw";
-    };
-    what = "192.168.1.2:/volume1/music";
-    where = "/mnt/nas/music";
-  }];
-
-  systemd.automounts = [{
-    wantedBy = [ "multi-user.target" ];
-    automountConfig = {
-      TimeoutIdleSec = "600";
-    };
-    where = "/mnt/nas/music";
-  }];
+  systemd.mounts = [
+    {
+      type = "nfs";
+      mountConfig = {
+        Options = "defaults,acl,user,noauto,relatime,rw";
+      };
+      what = "192.168.1.2:/volume1/music";
+      where = "/mnt/nas/music";
+    }
+  ];
 
+  systemd.automounts = [
+    {
+      wantedBy = [ "multi-user.target" ];
+      automountConfig = {
+        TimeoutIdleSec = "600";
+      };
+      where = "/mnt/nas/music";
+    }
+  ];
 
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
   # Enable sound with pipewire.
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
diff --git a/modules/console.nix b/modules/console.nix
index 4698a94..b5df943 100644
--- a/modules/console.nix
+++ b/modules/console.nix
@@ -1,12 +1,5 @@
 # cli programs should be available on servers and desktop
 { config, pkgs, ... }:
-let
-  unstable =
-    import
-      (builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/7afa2c97ebb0585d00c64c112344483e89e00545")
-      # reuse the current configuration
-      { config = config.nixpkgs.config; };
-in
 {
   programs.zsh.enable = true;
   programs.fzf = {
@@ -14,13 +7,13 @@ in
     keybindings = true;
   };
 
-  # programs.neovim = {
-  #   enable = true;
-  #   defaultEditor = true;
-  #   package = unstable.neovim;
-  #   viAlias = true;
-  #   vimAlias = true;
-  # };
+  #  programs.neovim = {
+  #  enable = true;
+  #  defaultEditor = true;
+  #  package = pkgs.neovim;
+  #  viAlias = true;
+  #  vimAlias = true;
+  #};
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
@@ -58,7 +51,7 @@ in
     mpv
     neofetch
     nixd
-    unstable.neovim
+    neovim
     ollama
     pandoc
     pass
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 0499cd8..63bc621 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -1,7 +1,6 @@
 # Window Manager and desktop programs
 { lib, pkgs, ... }:
 {
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
 
@@ -138,7 +137,7 @@
     signal-desktop
     thunderbird
     tigervnc
-    transmission-qt
+    transmission_4-qt
     unetbootin
     vlc