From a9ca1fd34725bebc00b2cfd10924af5f4e3c0903 Mon Sep 17 00:00:00 2001
From: Liam Malone <maloneliam@proton.me>
Date: Sat, 16 Mar 2024 01:28:20 +0000
Subject: [PATCH] .

---
 hosts/default/configuration.nix         | 23 ++++++++++++-----------
 modules/old_configs/waybar/config.jsonc | 20 ++++++++++----------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index 27b8f3f..5b514bb 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -43,7 +43,6 @@
         fcitx5-mozc
         fcitx5-gtk
         fcitx5-chinese-addons
-        # fcitx5-japanese-addons
       ];
     };
   };
@@ -54,20 +53,22 @@
   # };
 
   # Enable the X11 windowing system.
-  services.xserver.enable = true;
-  services.xserver.displayManager = {
-    sddm.enable = true;
-    sessionPackages = [ pkgs.hyprland ];
-  };
-  services.xserver.windowManager.i3.enable = true;
-
-  # services.xserver.xkb.options = "eurosign:e,caps:escape";
   services.xserver = {
+    enable = true;
     xkb = {
       layout = "us";
       variant = "";
     };
+    displayManager = {
+      sddm.enable = true;
+      sessionPackages = [ pkgs.hyprland ];
+    };
+    windowManager.i3.enable = true;
+    libinput.enable = true;
   };
+
+  # services.xserver.xkb.options = "eurosign:e,caps:escape";
+
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
 
@@ -81,7 +82,6 @@
   hardware.pulseaudio.enable = true;
 
   # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   # users.users.alice = {
@@ -156,6 +156,8 @@
     algorithm = "zstd";
   };
 
+  xdg.mime.enable = true;
+
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
@@ -197,5 +199,4 @@
   #
   # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
   system.stateVersion = "23.11"; # Did you read the comment?
-
 }
diff --git a/modules/old_configs/waybar/config.jsonc b/modules/old_configs/waybar/config.jsonc
index ab9c6c2..414e11f 100644
--- a/modules/old_configs/waybar/config.jsonc
+++ b/modules/old_configs/waybar/config.jsonc
@@ -15,7 +15,7 @@
   "modules-left": [
     //"custom/notification",
     "custom/kernel",
-    "custom/updates",
+    // "custom/updates",
     "clock",
     "disk",
     "keyboard-state"
@@ -45,17 +45,17 @@
   */
   "custom/kernel": {
       "exec": "uname -r | sed 's/-a.*//p'",
-      "format": "<big> </big>\n{}",
+      "format": " <big> </big>\n{}",
       "interval": "once"
   },
 
-  "custom/updates": {
-    // maybe add check to not attempt run when offline
-    "exec": "( checkupdates; paru -Qua ) | wc -l",
-    "interval": 7200,
-    "format": "<big>󰏖</big>\n{}",
-    "on-click": "( checkupdates; paru -Qua ) | wc -l",
-  },
+  // "custom/updates": {
+  //   // maybe add check to not attempt run when offline
+  //   "exec": "( checkupdates; paru -Qua ) | wc -l",
+  //   "interval": 7200,
+  //   "format": "<big>󰏖</big>\n{}",
+  //   "on-click": "( checkupdates; paru -Qua ) | wc -l",
+  // },
 
   "clock": {
     "interval": 1,
@@ -67,7 +67,7 @@
   "disk": {
     "interval": 30,
     "path": "/home",
-    "format": "<big>  </big>\n {path}:\n  {percentage_used}%",
+    "format": "<big>  </big>\n {path}:\n   {percentage_used}%",
     "alt-format": "  {path}:{used}\/{total}",
     "tooltip-format": "  {path}:{used}\/{total}",
   },