diff --git a/flake.nix b/flake.nix
index 12b4986..2ac3153 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,12 +15,6 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hyprland = {
-      type = "git";
-      url = "https://github.com/hyprwm/Hyprland.git";
-      ref = "refs/tags/v0.45.2";
-      submodules = true;
-    };
     nix-colors.url = "github:misterio77/nix-colors";
     nixvim.url = "github:nix-community/nixvim";
     catppuccin.url = "github:catppuccin/nix";
diff --git a/home/common/programs/desktop/default.nix b/home/common/programs/desktop/default.nix
index 0b7ca9f..b27fba0 100644
--- a/home/common/programs/desktop/default.nix
+++ b/home/common/programs/desktop/default.nix
@@ -18,6 +18,13 @@
     pavucontrol
     zathura
     lxappearance
+    xournalpp
+    jq
+
+    # networking
+    networkmanagerapplet
+    mtr
+    dnsutils
 
     # networking
     networkmanagerapplet
diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix
index 97435f2..74b0821 100644
--- a/home/common/programs/hyprland/default.nix
+++ b/home/common/programs/hyprland/default.nix
@@ -14,6 +14,7 @@ in
     pamixer
     hyprshot
     hyprpanel
+    playerctl
   ];
 
   home.sessionVariables = {
@@ -23,31 +24,14 @@ in
   wayland.windowManager.hyprland = {
     enable = true;
     settings = {
-      decoration = {
-        blur = {
-          enabled = "yes";
-          size = 30;
-          passes = 1;
-          new_optimizations = "on";
-        };
-
-        # shadow = {
-        #   range = 2;
-        #   render_power = 4;
-        # };
-      };
-
       input = {
-        kb_layout = "us";
         kb_options = "ctrl:nocaps";
-        follow_mouse = 1;
         repeat_delay = 150;
-        repeat_rate = 25;
 
         touchpad = {
           natural_scroll = "yes";
         };
-        numlock_by_default = "true";
+        numlock_by_default = 2;
       };
 
       cursor = {
@@ -83,14 +67,6 @@ in
 
       };
 
-      dwindle = {
-        preserve_split = "yes";
-      };
-
-      master = {
-        orientation = "center";
-      };
-
       env = [
         "GDK_SCALE, 1.5"
         "XCURSOR_SIZE, 32"
@@ -121,6 +97,7 @@ in
       ];
 
       "$mod" = "SUPER";
+
       bind = [
         "$mod, t, exec, kitty"
         "$mod, e, exec, thunar"
@@ -169,16 +146,20 @@ in
         "$mod, mouse_down, workspace, e+1"
         "$mod, mouse_up, workspace, e-1"
 
-        # media
-        ", XF86AudioRaiseVolume, exec, volumectl -u up"
-        ", XF86AudioLowerVolume, exec, volumectl -u down"
-        ", XF86AudioMute, exec, volumectl toggle-mute"
+      ];
+
+      bindel = [
+        ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
+        ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+        ", XF86MonBrightnessUp, exec, brightnessctl set 5%+"
+        ", XF86MonBrightnessDown, exec, brightnessctl set 5%-"
+      ];
+      bindl = [
+        ", XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle"
         ", XF86AudioMicMute, exec, volumectl -m toggle-mute"
         ", XF86AudioNext, exec, playerctl next"
         ", XF86AudioPrev, exec, playerctl previous"
         ", XF86AudioPlay, exec, playerctl play-pause"
-        ", XF86MonBrightnessUp, exec, brightnessctl set 5%+"
-        ", XF86MonBrightnessDown, exec, brightnessctl set 5%-"
       ];
 
       bindm = [
diff --git a/home/common/programs/kitty.nix b/home/common/programs/kitty.nix
index 138b363..066e182 100644
--- a/home/common/programs/kitty.nix
+++ b/home/common/programs/kitty.nix
@@ -10,8 +10,8 @@
       enabled_layouts = "tall, grid, fat, splits";
 
       # font
-      font_family = "FiraCode Nerd Font Regular";
-      bold_font = "FiraCode Nerd Font Bold";
+      font_family = "FiraCode Nerd Font Mono";
+      bold_font = "FiraCode Nerd Font Mono Bold";
       italic_font = "VictorMono Nerd Font Mono Oblique";
       bold_italic_font = "VictorMono Nerd Font Mono Bold Oblique";
       disable_ligatures = "cursor";
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index 24383fb..aa1e5cd 100644
--- a/hosts/arrakis/default.nix
+++ b/hosts/arrakis/default.nix
@@ -4,10 +4,6 @@
   config,
   ...
 }:
-let
-  tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet";
-  hyprland-session = "${pkgs.hyprland}/share/wayland-sessions";
-in
 {
   imports = [
     ./hardware-configuration.nix
diff --git a/hosts/common/features/fonts.nix b/hosts/common/features/fonts.nix
index 3c069e2..50c0084 100644
--- a/hosts/common/features/fonts.nix
+++ b/hosts/common/features/fonts.nix
@@ -10,15 +10,9 @@
     packages = with pkgs; [
       ubuntu_font_family
       libertine
-      fira-code
-      fira-code-symbols
+      nerd-fonts.fira-code
+      nerd-fonts.victor-mono
       roboto
-      (nerdfonts.override {
-        fonts = [
-          "FiraCode"
-          "VictorMono"
-        ];
-      })
     ];
 
     fontconfig = {
diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 3d2ddff..9b178d9 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -4,10 +4,6 @@
   config,
   ...
 }:
-let
-  tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet";
-  hyprland-session = "${pkgs.hyprland}/share/wayland-sessions";
-in
 {
   imports = [
     ./hardware-configuration.nix
@@ -50,7 +46,7 @@ in
       let
         authorizedKeys = pkgs.fetchurl {
           url = "https://github.com/naps62.keys";
-          sha256 = "sha256-v0WtkeIENYjPnHjRUkhfKkEMTa/0DGF6qA6+jBsx+B0=";
+          sha256 = "sha256-xVrGO4Cultc3tPcnLFKLa98btLh7EAl3tLM1MTvwmn8=";
         };
       in
       pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys);
diff --git a/hosts/trantor/default.nix b/hosts/trantor/default.nix
index 5bd5e16..b474200 100644
--- a/hosts/trantor/default.nix
+++ b/hosts/trantor/default.nix
@@ -4,10 +4,6 @@
   config,
   ...
 }:
-let
-  tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet";
-  hyprland-session = "${pkgs.hyprland}/share/wayland-sessions";
-in
 {
   imports = [
     ./hardware-configuration.nix