diff --git a/flake.lock b/flake.lock
index d8f046f..62b8880 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1677621055,
-        "narHash": "sha256-n3D/pZX0cYEpWKcLJSFImo5Dpk3D1RrxKVDmI6lnaIg=",
+        "lastModified": 1677756477,
+        "narHash": "sha256-EZzkIti0a7Xlmuzx0ECXmiBIxz3mXrIS4ppb8eqshWE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ef7d316578367ed7732a21eede6c79546a36124f",
+        "rev": "547a3bc8d464cb2a22e4cf0dbbb746f8c654151a",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1677665175,
-        "narHash": "sha256-LjZZ0lt1amhkjyCRp9egnQrGzu/fmlNpQupW3D4Gg+g=",
+        "lastModified": 1677758681,
+        "narHash": "sha256-xLvvtCRp/7XuZ/VwD0eWzbAhbJFoevMMdwSZKIdN3ag=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "ea717731a41be907e9bfaa2c41a3f145452c7767",
+        "rev": "dea71875e40d5ff4ad649b3c04b02419b06da5df",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1677407201,
-        "narHash": "sha256-3blwdI9o1BAprkvlByHvtEm5HAIRn/XPjtcfiunpY7s=",
+        "lastModified": 1677587185,
+        "narHash": "sha256-zYT66MAYwctAQqI5VBw3LbBXiSKdB8vuMAqCGG8onbE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7f5639fa3b68054ca0b062866dc62b22c3f11505",
+        "rev": "68196a61c26748d3e53a6803de3d2f8c69f27831",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d051905..3c3fc2a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -188,7 +188,7 @@
           ./common/x11.nix
 
           # Host Specific
-          ./hosts/local/weda/default.nix          
+          ./hosts/local/weda/default.nix      
           ./hosts/local/weda/hardware-configuration.nix
           ./hosts/local/weda/packages.nix
 
diff --git a/hosts/local/frija/packages.nix b/hosts/local/frija/packages.nix
index 1be5b45..7fc6b25 100644
--- a/hosts/local/frija/packages.nix
+++ b/hosts/local/frija/packages.nix
@@ -5,6 +5,19 @@
 { config, pkgs, ... }:
 
 {
+  fonts.fontDir.enable = true;
+  
+  fonts.fonts = with pkgs; [
+    #########
+    # Fonts #
+    #########
+    anonymousPro     # TrueType Font Set for Source Code
+    font-awesome     # Scalable vector icons
+    #nerdfonts       # Developer oriented fonts
+    roboto           # Android Family of Fonts
+    tamsyn           # Monospace Bitmap Font for Programmers    
+  ];
+  
   environment.systemPackages = with pkgs;
   [
     #################
@@ -20,15 +33,6 @@
     ###########
     phinger-cursors
 
-    #########
-    # Fonts #
-    #########
-    anonymousPro     # TrueType Font Set for Source Code
-    font-awesome     # Scalable vector icons
-    #nerdfonts       # Developer oriented fonts
-    roboto           # Android Family of Fonts
-    tamsyn           # Monospace Bitmap Font for Programmers
-
     #########
     # Games #
     #########
diff --git a/hosts/local/tyr/packages.nix b/hosts/local/tyr/packages.nix
index b29ca37..99e9355 100644
--- a/hosts/local/tyr/packages.nix
+++ b/hosts/local/tyr/packages.nix
@@ -5,6 +5,19 @@
 { config, pkgs, ... }:
 
 {
+  fonts.fontDir.enable = true;
+  
+  fonts.fonts = with pkgs; [
+    #########
+    # Fonts #
+    #########
+    anonymousPro     # TrueType Font Set for Source Code
+    font-awesome     # Scalable vector icons
+    #nerdfonts       # Developer oriented fonts
+    roboto           # Android Family of Fonts
+    tamsyn           # Monospace Bitmap Font for Programmers    
+  ];
+  
   environment.systemPackages = with pkgs;
   [
     #################
@@ -20,15 +33,6 @@
     ###########
     phinger-cursors
 
-    #########
-    # Fonts #
-    #########
-    anonymousPro     # TrueType Font Set for Source Code
-    font-awesome     # Scalable vector icons
-    #nerdfonts       # Developer oriented fonts
-    roboto           # Android Family of Fonts
-    tamsyn           # Monospace Bitmap Font for Programmers
-
     #########
     # Games #
     #########
diff --git a/hosts/local/weda/packages.nix b/hosts/local/weda/packages.nix
index 4d6b249..502d3b4 100644
--- a/hosts/local/weda/packages.nix
+++ b/hosts/local/weda/packages.nix
@@ -5,6 +5,19 @@
 { config, pkgs, ... }:
 
 {
+  fonts.fontDir.enable = true;
+  
+  fonts.fonts = with pkgs; [
+    #########
+    # Fonts #
+    #########
+    anonymousPro     # TrueType Font Set for Source Code
+    font-awesome     # Scalable vector icons
+    #nerdfonts       # Developer oriented fonts
+    roboto           # Android Family of Fonts
+    tamsyn           # Monospace Bitmap Font for Programmers    
+  ];
+  
   environment.systemPackages = with pkgs;
   [
     #################
@@ -20,14 +33,7 @@
     ###########
     phinger-cursors
 
-    #########
-    # Fonts #
-    #########
-    anonymousPro     # TrueType Font Set for Source Code
-    font-awesome     # Scalable vector icons
-    #nerdfonts       # Developer oriented fonts
-    roboto           # Android Family of Fonts
-    tamsyn           # Monospace Bitmap Font for Programmers
+
 
     #########
     # Games #
diff --git a/hosts/remote/tuisto/packages.nix b/hosts/remote/tuisto/packages.nix
index 8c39769..3236289 100644
--- a/hosts/remote/tuisto/packages.nix
+++ b/hosts/remote/tuisto/packages.nix
@@ -3,6 +3,19 @@
 { config, pkgs, ... }:
 
 {
+  fonts.fontDir.enable = true;
+  
+  fonts.fonts = with pkgs; [
+    #########
+    # Fonts #
+    #########
+    anonymousPro     # TrueType Font Set for Source Code
+    font-awesome     # Scalable vector icons
+    #nerdfonts       # Developer oriented fonts
+    roboto           # Android Family of Fonts
+    tamsyn           # Monospace Bitmap Font for Programmers    
+  ];
+  
   environment.systemPackages = with pkgs;
   [
     # Communication
@@ -14,12 +27,6 @@
     # Cursors
     phinger-cursors
 
-    # Fonts
-    anonymousPro     # TrueType Font Set for Source Code
-    font-awesome     # Scalable vector icons
-    #nerdfonts       # Developer oriented fonts
-    roboto           # Android Family of Fonts
-    tamsyn           # Monospace Bitmap Font for Programmers
     # Gaming
     #airshipper
     #assaultcube