diff --git a/flake.lock b/flake.lock
index e123968..32e25f3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -320,11 +320,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1663678795,
-        "narHash": "sha256-SkROcpe7lb46fpBnwMYooExP6WqttsRPeao1d9ykHho=",
+        "lastModified": 1664882193,
+        "narHash": "sha256-uiAYOxN/M4dpaB6ieY3xOvOH6XgHP9NVXDTzSRa3pMc=",
         "owner": "nix-community",
         "repo": "dream2nix",
-        "rev": "0f3b6c5dd1630d601ae6f456421b4dfed178f260",
+        "rev": "785b76894263fd76a0e69955e4cd990b7b735bdf",
         "type": "github"
       },
       "original": {
@@ -381,11 +381,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1664455278,
-        "narHash": "sha256-RxeLR9NQnWW2VsROMIrPhiqQ7qHXmDqyKlxNs23B45E=",
+        "lastModified": 1664638652,
+        "narHash": "sha256-3mPHAFecDyP1Rgjshjyn1u5EsdjZun9DofnVbtlfRJk=",
         "owner": "elkowar",
         "repo": "eww",
-        "rev": "91d55cb3051b007b480aa3cf1bc4ac63f09eff75",
+        "rev": "0cccd9d74f0bda19f8409549588db274eba0d393",
         "type": "github"
       },
       "original": {
@@ -586,11 +586,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1664475105,
-        "narHash": "sha256-+Q7jyAMgXcCba6Z+2oA1ahXWKkmMqn0dPgz9t3DyEiQ=",
+        "lastModified": 1666357885,
+        "narHash": "sha256-DemaXcgFATQmft2PsoY6SewraST/Y5V8CuGjDD8vs9g=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "8a7a6e4cff1db3ef65a2c20e0e90c60b44516e27",
+        "rev": "79ef39ab3a41c32fcdcb660df6ee60aeb1eb80e6",
         "type": "github"
       },
       "original": {
@@ -607,11 +607,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1664449551,
-        "narHash": "sha256-iTStJtZB1+MppkT+95Ckqy2NDaISb+QcUkOAa0DS0io=",
+        "lastModified": 1666253070,
+        "narHash": "sha256-MtaNgghmfp+ywh5mv9FcspFT4ACaYINSN+D98PCkrP0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "864ff685fe6443101a0a8f3950d21bcb4330e56a",
+        "rev": "c485669ca529e01c1505429fa9017c9a93f15559",
         "type": "github"
       },
       "original": {
@@ -629,11 +629,11 @@
         "wlroots": "wlroots"
       },
       "locked": {
-        "lastModified": 1664477193,
-        "narHash": "sha256-W8pe+3wrAUjtexyd6ve4qZGLOWzfqqXKyieY3Q3ntsY=",
+        "lastModified": 1666345512,
+        "narHash": "sha256-/45v91bYl9hbEJSgYu51ep9ZyoEHlZDE44gotGZfO4M=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "da40bf823f2f307e439f4bd85c405d9e612c2df5",
+        "rev": "b71d7c9007d77f78a403075b99adf8e9d43bf125",
         "type": "github"
       },
       "original": {
@@ -649,11 +649,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1664384946,
-        "narHash": "sha256-zqpXujNioqibBBkVT2BQSa/l3GQRGZRZbcY69vpRpVU=",
+        "lastModified": 1666104453,
+        "narHash": "sha256-gMH11FNZtnU7d+pIkwg9NmumJ6YvxyUP9Do43YKrd/E=",
         "owner": "hyprwm",
         "repo": "contrib",
-        "rev": "63ebc34d0c2398e33bc97d065e3790abc5e1f070",
+        "rev": "5b21c74a3200ffdd48ed7764c7041d43c3cd5588",
         "type": "github"
       },
       "original": {
@@ -737,11 +737,11 @@
         "rust-overlay": "rust-overlay_4"
       },
       "locked": {
-        "lastModified": 1664360253,
-        "narHash": "sha256-QXXzd6SYgpuFGcr6D8gtALC2V23kPIT4IkSM0eU6MJI=",
+        "lastModified": 1664831215,
+        "narHash": "sha256-Oo0y/333YyeW9zeYQyiUUay7q7GK/Uu/FdEa6+5c4Pk=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "d2a22b8460279a001bf070bcd6da660bda9c8bd7",
+        "rev": "756be130c8cda1d02c3681299ce372c97cc7d0bd",
         "type": "github"
       },
       "original": {
@@ -776,11 +776,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1664206072,
-        "narHash": "sha256-VPKsLlfSfsJ4GsvtrcFdXiR5VUcsl1jFyKSxB4qvcf8=",
+        "lastModified": 1665496492,
+        "narHash": "sha256-CFR9423s2TalOHYEw+6r7v8FmtABKB4NVNQMjwXXt8g=",
         "owner": "matthewcroughan",
         "repo": "nixinate",
-        "rev": "efa632418053bbbaf5b8cf8215c14b699830e3e1",
+        "rev": "bc620b8f801f4d0dcb2a1fb6d061fff0d585d4a5",
         "type": "github"
       },
       "original": {
@@ -791,11 +791,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1664452918,
-        "narHash": "sha256-SfnQ2t5b9RTSIqO3PQBDlwrWn4l3t0F65sZtCKTl8eA=",
+        "lastModified": 1665987993,
+        "narHash": "sha256-MvlaIYTRiqefG4dzI5p6vVCfl+9V8A1cPniUjcn6Ngc=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "12f905b731494bc59010f05a7467df8abdcf8d63",
+        "rev": "0e6593630071440eb89cd97a52921497482b22c6",
         "type": "github"
       },
       "original": {
@@ -850,11 +850,11 @@
     "nixpkgs-wayland": {
       "flake": false,
       "locked": {
-        "lastModified": 1664477139,
-        "narHash": "sha256-YYb3KDl7JWrQNjGQX9rBlpLl7bsAvDxooKHMiim28YA=",
+        "lastModified": 1665858291,
+        "narHash": "sha256-aqazSjyKXnHu0PF7K1Y4i6E4UK/w+BTC5NTu+FvPg/c=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "494999730de678ee83c3caadfee8e0b77719060d",
+        "rev": "1e4635a232db95976217590c77f5d76a91a87f61",
         "type": "github"
       },
       "original": {
@@ -881,11 +881,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1664370076,
-        "narHash": "sha256-NDnIo0nxJozLwEw0VPM+RApMA90uTfbvaNNtC5eB7Os=",
+        "lastModified": 1666282307,
+        "narHash": "sha256-O1T2HGLARLKDLfdOmjPBfn3eC4cSIaQD71wUN4I/6/s=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "854fdc68881791812eddd33b2fed94b954979a8e",
+        "rev": "b7d8c687782c8f9a1d425a7e486eb989654f6468",
         "type": "github"
       },
       "original": {
@@ -897,11 +897,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1664885842,
-        "narHash": "sha256-k8JVyQrgtxK9ds6qQBRRcWERy0MIJXJME2hxdwKg/a4=",
+        "lastModified": 1666358658,
+        "narHash": "sha256-xNszm7yHrsF7hLzvHYUIrvM69U1uNNK3vddGjFAgk0w=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "b9bcb3284b3eb365d8214e6fc62c458fb993e649",
+        "rev": "6c1a3c3e533118ef6466718dd389896c47cf588d",
         "type": "github"
       },
       "original": {
@@ -1063,11 +1063,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1663815552,
-        "narHash": "sha256-J4j/d69SGKx1qripBCINe7T3SUtMM1sdj5PoHRThV5Q=",
+        "lastModified": 1664734860,
+        "narHash": "sha256-Agin7U5+AhlVqPCZAhlAMlRnoV7rGIZXtDsPspF/DRg=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "f45f856ae5a9fe2c48d756fa17bb9c5b3b8070c5",
+        "rev": "5db6b63124ccedd61e896ec98def85fb4e6668f4",
         "type": "github"
       },
       "original": {
@@ -1124,11 +1124,11 @@
         "webcord": "webcord_2"
       },
       "locked": {
-        "lastModified": 1664817607,
-        "narHash": "sha256-1c9doRBUy61lrkA5MTRF4xIE9VcnBxfWUGzXMnMm0CM=",
+        "lastModified": 1666097086,
+        "narHash": "sha256-6WKh4NwItcz9IGY5rGkkeWCtGOmpU3nf85dX29suDjE=",
         "owner": "fufexan",
         "repo": "webcord-flake",
-        "rev": "6fdcb79b9aa692acf95c2c9e05b7cd7fa426a385",
+        "rev": "9098504f2a08ac848ea43de40496925c450e7111",
         "type": "github"
       },
       "original": {
@@ -1140,11 +1140,11 @@
     "webcord_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1663533822,
-        "narHash": "sha256-TvlaaWu40La+CRD2+zXXRmyAF6LEU63eH/BuEQgUiQ4=",
+        "lastModified": 1664742535,
+        "narHash": "sha256-QoXBlhCM97haNlkbU4O2oXITnzrkiM9hYAiNpduVjIQ=",
         "owner": "SpacingBat3",
         "repo": "WebCord",
-        "rev": "2df618b4669eaca06b2f635145d1293a612fa24c",
+        "rev": "cb6938bde4f57b252b167b23fc0c2d6120326fff",
         "type": "github"
       },
       "original": {
@@ -1157,11 +1157,11 @@
       "flake": false,
       "locked": {
         "host": "gitlab.freedesktop.org",
-        "lastModified": 1663507239,
-        "narHash": "sha256-LISZtkPVe8lQ2N8YwVe+KxCkXWLP9mdw6Q2kG93wE8A=",
+        "lastModified": 1665405587,
+        "narHash": "sha256-lVL48azhjGA/oEIcUSZQNwomNs0EzPxCcjgzyDST0PM=",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "2ad25b1460400e66ea26bd6489b04072be7d9dbb",
+        "rev": "221ee83d440fb7dcbfd141ef3a459a5a973331b6",
         "type": "gitlab"
       },
       "original": {
diff --git a/modules/de/gnome/default.nix b/modules/de/gnome/default.nix
index d51d31c..0302cac 100644
--- a/modules/de/gnome/default.nix
+++ b/modules/de/gnome/default.nix
@@ -1,18 +1,26 @@
-{lib, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   services.gnome = {
     gnome-keyring.enable = true;
     core-shell.enable = true;
     core-os-services.enable = true;
     at-spi2-core.enable = true;
-    chrome-gnome-shell.enable = false;
-    gnome-online-accounts.enable = false;
-    gnome-online-miners.enable = lib.mkForce false;
+    gnome-browser-connector.enable = true;
+    gnome-online-accounts.enable = true;
+    gnome-online-miners.enable = true;
+    tracker-miners.enable = true;
+    tracker.enable = true;
+    sushi.enable = true;
     gnome-remote-desktop.enable = false;
-    core-utilities.enable = false;
-    tracker-miners.enable = false;
-    tracker.enable = false;
-    gnome-settings-daemon.enable = lib.mkForce false;
-    sushi.enable = false;
+  };
+  services.tumbler.enable = true;
+  programs = {
+    geary.enable = lib.mkForce false;
+    gnome-terminal.enable = true;
+    evince.enable = true;
   };
   services.xserver = {
     enable = true;
@@ -37,4 +45,6 @@
     "autovt@tty1".enable = false;
   };
   services.power-profiles-daemon.enable = false;
+  environment.systemPackages = with pkgs; [gnome.gnome-tweaks ffmpegthumbnailer webp-pixbuf-loader];
+  environment.gnome.excludePackages = with pkgs; [gnome-console gnome-tour gnome.gnome-maps];
 }
diff --git a/users/modules/discord/default.nix b/users/modules/discord/default.nix
index 91c90ad..7ad8536 100644
--- a/users/modules/discord/default.nix
+++ b/users/modules/discord/default.nix
@@ -15,7 +15,7 @@ in {
   ];
   home.packages = let
     pkg = inputs.webcord.packages.${pkgs.system}.webcord.override {
-      flags = "--add-css-theme=${theme}";
+      flags = ["--add-css-theme=${theme}"];
     };
   in [pkg];
 }
diff --git a/users/modules/dunst/default.nix b/users/modules/dunst/default.nix
index a1fb9a1..f7d07a2 100644
--- a/users/modules/dunst/default.nix
+++ b/users/modules/dunst/default.nix
@@ -14,7 +14,7 @@ in {
         alignment = "center";
         corner_radius = 16;
         follow = "mouse";
-        font = config.settings.font.fullName;
+        font = config.settings.font.regular.fullName;
         format = "<b>%s</b>\\n%b";
         frame_width = 1;
         offset = "5x5";
diff --git a/users/modules/foot/default.nix b/users/modules/foot/default.nix
index 80195c1..1cc8ad7 100644
--- a/users/modules/foot/default.nix
+++ b/users/modules/foot/default.nix
@@ -5,7 +5,7 @@
     server.enable = false;
     settings = {
       main = {
-        font = "${config.settings.font.name}:size=${toString config.settings.font.size}";
+        font = "${config.settings.font.monospace.name}:size=${toString config.settings.font.monospace.size}";
         dpi-aware = "yes";
       };
       colors = {
diff --git a/users/modules/mako/default.nix b/users/modules/mako/default.nix
index 2835370..4b27c50 100644
--- a/users/modules/mako/default.nix
+++ b/users/modules/mako/default.nix
@@ -6,7 +6,7 @@
   programs.mako = {
     enable = true;
     anchor = "top-center";
-    font = config.settings.font.fullName;
+    font = config.settings.font.regular.fullName;
     borderRadius = 16;
     extraConfig = builtins.readFile (
       builtins.fetchurl {
diff --git a/users/modules/rofi-nm/default.nix b/users/modules/rofi-nm/default.nix
index 66387ec..7631ae8 100644
--- a/users/modules/rofi-nm/default.nix
+++ b/users/modules/rofi-nm/default.nix
@@ -34,7 +34,7 @@ in {
       }
 
       * {
-          font: "${config.settings.font.fullName}";
+          font: "${config.settings.font.regular.fullName}";
       }
 
       @theme "catppuccin"
diff --git a/users/modules/rofi/default.nix b/users/modules/rofi/default.nix
index 8738163..a0e0700 100644
--- a/users/modules/rofi/default.nix
+++ b/users/modules/rofi/default.nix
@@ -16,7 +16,7 @@
       configuration{
           modi: "drun";
           lines: 5;
-          font: "${config.settings.font.fullName}";
+          font: "${config.settings.font.regular.fullName}";
           show-icons: true;
           terminal: "st";
           drun-display-format: "{icon} {name}";
diff --git a/users/modules/settings/default.nix b/users/modules/settings/default.nix
index ec953b4..055d177 100644
--- a/users/modules/settings/default.nix
+++ b/users/modules/settings/default.nix
@@ -6,6 +6,21 @@
   l = lib // builtins;
   t = l.types;
   cfg = config.settings;
+  fontSettings = {
+    name = l.mkOption {
+      type = t.str;
+    };
+    package = l.mkOption {
+      type = t.package;
+    };
+    size = l.mkOption {
+      type = t.ints.unsigned;
+    };
+    fullName = l.mkOption {
+      type = t.str;
+      readOnly = true;
+    };
+  };
 in {
   options = {
     settings.iconTheme = {
@@ -22,28 +37,14 @@ in {
       };
     };
     settings.font = {
-      enable = l.mkOption {
-        type = t.bool;
-        default = false;
-      };
-      name = l.mkOption {
-        type = t.str;
-      };
-      package = l.mkOption {
-        type = t.package;
-      };
-      size = l.mkOption {
-        type = t.ints.unsigned;
-      };
-      fullName = l.mkOption {
-        type = t.str;
-        readOnly = true;
-      };
+      regular = fontSettings;
+      monospace = fontSettings;
     };
   };
 
-  config = l.mkIf cfg.font.enable {
-    home.packages = [cfg.font.package];
-    settings.font.fullName = "${cfg.font.name} ${toString cfg.font.size}";
+  config = {
+    home.packages = [cfg.font.regular.package cfg.font.monospace.package];
+    settings.font.regular.fullName = "${cfg.font.regular.name} ${toString cfg.font.regular.size}";
+    settings.font.monospace.fullName = "${cfg.font.monospace.name} ${toString cfg.font.monospace.size}";
   };
 }
diff --git a/users/modules/starship/default.nix b/users/modules/starship/default.nix
index ee5695b..60e5add 100644
--- a/users/modules/starship/default.nix
+++ b/users/modules/starship/default.nix
@@ -2,19 +2,12 @@
   programs.starship = {
     enable = true;
     settings = {
-      format = "$shell$shlvl@ $directory$character";
+      format = "$directory$character";
       add_newline = false;
       character = {
         success_symbol = "[>](bold green)";
         error_symbol = "[>](bold red)";
       };
-      shell.disabled = false;
-      shlvl = {
-        disabled = false;
-        symbol = "shlvl ";
-        format = "on [$symbol$shlvl]($style) ";
-      };
-      nix_shell.format = "via [$name]($style) ";
       directory = {
         truncation_length = 2;
         truncate_to_repo = false;
diff --git a/users/modules/swaylock/default.nix b/users/modules/swaylock/default.nix
index d5c0d28..d963e54 100644
--- a/users/modules/swaylock/default.nix
+++ b/users/modules/swaylock/default.nix
@@ -12,6 +12,6 @@
     effect-scale = "0.5";
     effect-greyscale = true;
     effect-blur = "20x3";
-    font = config.settings.font.name;
+    font = config.settings.font.regular.name;
   };
 }
diff --git a/users/modules/wayland/default.nix b/users/modules/wayland/default.nix
index 242b353..677d6b9 100644
--- a/users/modules/wayland/default.nix
+++ b/users/modules/wayland/default.nix
@@ -7,5 +7,9 @@
     NIXOS_OZONE_WL = "1";
     MOZ_ENABLE_WAYLAND = "1";
     XDG_SESSION_TYPE = "wayland";
+    GDK_SCALE = "2";
   };
+  programs.zsh.loginExtra = ''
+    xprop -root -f _XWAYLAND_GLOBAL_OUTPUT_SCALE 32c -set _XWAYLAND_GLOBAL_OUTPUT_SCALE 2
+  '';
 }
diff --git a/users/modules/wezterm/default.nix b/users/modules/wezterm/default.nix
index 90de4f2..2bbd1f8 100644
--- a/users/modules/wezterm/default.nix
+++ b/users/modules/wezterm/default.nix
@@ -17,8 +17,8 @@
       }
 
       return {
-        font = wezterm.font("${config.settings.font.name}"),
-        font_size = ${builtins.toJSON config.settings.font.size},
+        font = wezterm.font("${config.settings.font.regular.name}"),
+        font_size = ${builtins.toJSON config.settings.font.regular.size},
         default_cursor_style = "BlinkingBar",
         enable_wayland = true,
         enable_tab_bar = false,
diff --git a/users/patriot/default.nix b/users/patriot/default.nix
index affa1af..18240f4 100644
--- a/users/patriot/default.nix
+++ b/users/patriot/default.nix
@@ -10,6 +10,7 @@
 
   nixosConfig = globalAttrs.config;
 in {
+  imports = [../../modules/de/gnome];
   users.users.patriot = {
     isNormalUser = true;
     createHome = true;
@@ -50,7 +51,6 @@ in {
     fuse.userAllowOther = true;
     adb.enable = true;
     steam.enable = true;
-    kdeconnect.enable = true;
     # gnome stuffs
     seahorse.enable = true;
     dconf.enable = true;
@@ -98,13 +98,14 @@ in {
     imports = let
       modulesToEnable = l.flatten [
         # wm
-        ["hyprland"]
+        # ["hyprland"]
+        ["wayland"]
         # desktop stuff
         ["firefox" "discord"]
         # cli stuff
         ["zoxide" "zsh" "fzf" "starship" "direnv"]
         # dev stuff
-        ["helix" "git" "ssh" "obsidian" "godot"]
+        ["helix" "git" "ssh" "obsidian"]
       ];
     in
       l.flatten [
@@ -122,7 +123,6 @@ in {
       directories =
         l.flatten [
           "Downloads"
-          # "smos"
           ".wine"
           # ssh / gpg / keys
           ".ssh"
@@ -142,19 +142,24 @@ in {
         ]
         ++ mkPaths ".config" [
           "lutris"
-          "kdeconnect"
+          "dconf"
         ];
       files = l.flatten [
         ".config/wallpaper"
         ".config/wallpaper.mp4"
+        ".config/gnome-initial-setup-done"
         (lib.removePrefix "~/" config.programs.ssh.userKnownHostsFile)
       ];
       allowOther = true;
     };
 
     fonts.fontconfig.enable = l.mkForce true;
-    settings.font = {
-      enable = true;
+    settings.font.regular = {
+      name = "Comic Neue";
+      size = 13;
+      package = pkgs.comic-neue;
+    };
+    settings.font.monospace = {
       name = "Comic Mono";
       size = 13;
       package = pkgs.comic-mono;
@@ -177,7 +182,7 @@ in {
       enable = true;
 
       font = {
-        inherit (config.settings.font) name package;
+        inherit (config.settings.font.regular) name package;
       };
 
       gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
@@ -236,11 +241,6 @@ in {
         userName = name;
         userEmail = email;
       };
-      zsh.loginExtra = ''
-        if [[ "$(tty)" == "/dev/tty1" ]]; then
-          exec Hyprland
-        fi
-      '';
     };
     services = {
       gpg-agent = let