diff --git a/home/modules/zsh.nix b/home/modules/zsh.nix
index ffd2a31..6b62cba 100644
--- a/home/modules/zsh.nix
+++ b/home/modules/zsh.nix
@@ -10,7 +10,7 @@
     };
     enableAutosuggestions = true;
     enableCompletion = true;
-    enableSyntaxHighlighting = true;
+    syntaxHighlighting.enable = true;
     prezto = {
       enable = true;
       prompt.theme = "pure";
diff --git a/home/natto/config/emacs/config.org b/home/natto/config/emacs/config.org
index 97ec245..fdebefd 100644
--- a/home/natto/config/emacs/config.org
+++ b/home/natto/config/emacs/config.org
@@ -1,5 +1,5 @@
-# #+TITLE: My Emacs Configuration
-# #+AUTHOR: Amneesh Singh
+#+TITLE: My Emacs Configuration
+#+AUTHOR: Amneesh Singh
 #+PROPERTY: header-args:emacs-lisp :tangle yes
 
 * Settings
@@ -23,6 +23,9 @@
 (setq ring-bell-function 'ignore
       gc-cons-threshold most-positive-fixnum
       initial-major-mode 'fundamental-mode)
+(unless (display-graphic-p)
+        (require 'evil-terminal-cursor-changer)
+        (evil-terminal-cursor-changer-activate))
 #+end_src
 
 ** Setting some variables
@@ -132,6 +135,8 @@ Add selectrum-prescient
 To undo and redo easily like vi
 #+begin_src emacs-lisp
 (use-package undo-tree
+  :init
+  (setq undo-tree-history-directory-alist '(("." . "~/.emacs.d/undo")))
   :config
   (global-undo-tree-mode 1))
 #+end_src
@@ -199,8 +204,7 @@ For autocomplete
   :after lsp-mode
   :config
   (add-to-list 'company-backends 'company-dabbrev)
-  (setq company-backends (cons 'company-files (remove 'company-files company-backends)))
-  (add-to-list 'company-backends 'company-emoji)
+  (setq company-backends (append '(company-files) (remove 'company-files company-backends)))
   (company-mode 1))
 #+end_src
 
@@ -210,11 +214,6 @@ For autocomplete
   :hook (company-mode . company-quickhelp-mode))
 #+end_src
 
-*** Extra company packages
-#+begin_src emacs-lisp
-(use-package company-emoji)
-#+end_src
-
 ** Treesitter
 #+begin_src emacs-lisp
 (use-package tree-sitter-langs :defer t)
diff --git a/home/natto/config/hypr/hyprland.conf b/home/natto/config/hypr/hyprland.conf
index c07381a..927f78e 100644
--- a/home/natto/config/hypr/hyprland.conf
+++ b/home/natto/config/hypr/hyprland.conf
@@ -35,13 +35,15 @@ general {
 
 decoration {
     rounding = 1
-    blur = yes
-    blur_size = 5
-    blur_passes = 1
-    blur_new_optimizations = on
-    blur_xray = yes
-    drop_shadow = yes
     inactive_opacity = 0.8
+    drop_shadow = true
+
+    blur {
+        enabled = true
+        size = 5
+        new_optimizations = true
+        xray = true
+    }
 }
 
 animations {
diff --git a/home/natto/git.nix b/home/natto/git.nix
index 6b38e63..5fa52cf 100644
--- a/home/natto/git.nix
+++ b/home/natto/git.nix
@@ -10,7 +10,7 @@
   };
 
   age.secrets.gitconfig = {
-    file = ./secrets/.gitconfig.age;
+    file = ./secrets/gitconfig.age;
     path = "${config.home.homeDirectory}/.gitconfig";
   };
 }
diff --git a/home/natto/gtk.nix b/home/natto/gtk.nix
index b5a90f7..333b56a 100644
--- a/home/natto/gtk.nix
+++ b/home/natto/gtk.nix
@@ -3,7 +3,7 @@
   gtk = {
     enable = true;
     theme = {
-      name = "Catppuccin-Mocha-Standard-Teal-dark";
+      name = "Catppuccin-Mocha-Standard-Teal-Dark";
       package = pkgs.catppuccin-gtk.override {
         accents = [ "teal" ];
         variant = "mocha";
diff --git a/home/natto/pkgs.nix b/home/natto/pkgs.nix
index 2d2ef58..7a5b846 100644
--- a/home/natto/pkgs.nix
+++ b/home/natto/pkgs.nix
@@ -50,13 +50,14 @@
     gnome.zenity
 
     # Wine and games and stuff
+    lutris
     wineWowPackages.stable
     steam
     lutris
     winetricks
     flake.packages.${pkgs.system}.tlauncher
     mangohud
-    inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
+    #   inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
 
     # Programming and dev stuff
     (texlive.combine {
@@ -86,7 +87,6 @@
     ghc
     nodejs
     rust-bin.nightly.latest.default
-    clang-tools
     openjdk
 
     # Misc
diff --git a/home/natto/secrets/.gitconfig.age b/home/natto/secrets/.gitconfig.age
deleted file mode 100644
index 63e00d0..0000000
Binary files a/home/natto/secrets/.gitconfig.age and /dev/null differ
diff --git a/home/natto/secrets/gitconfig.age b/home/natto/secrets/gitconfig.age
new file mode 100644
index 0000000..a4a565a
Binary files /dev/null and b/home/natto/secrets/gitconfig.age differ
diff --git a/home/natto/secrets/.zshenv_secret b/home/natto/secrets/zshenv_secret
similarity index 100%
rename from home/natto/secrets/.zshenv_secret
rename to home/natto/secrets/zshenv_secret
diff --git a/home/natto/wayland.nix b/home/natto/wayland.nix
index 2dc5042..6e47aea 100644
--- a/home/natto/wayland.nix
+++ b/home/natto/wayland.nix
@@ -9,9 +9,7 @@
         enable = true;
         xwayland = {
           enable = true;
-          hidpi = true;
         };
-        nvidiaPatches = true;
         extraConfig = (builtins.readFile ./config/hypr/hyprland.conf)
           + (with config.home.pointerCursor; ''
           exec-once=hyprctl setcursor ${name} ${toString size}
diff --git a/home/natto/zsh.nix b/home/natto/zsh.nix
index 7ef720d..132c98e 100644
--- a/home/natto/zsh.nix
+++ b/home/natto/zsh.nix
@@ -9,7 +9,7 @@ in
   '';
 
   age.secrets.zshenv_secret = {
-    file = ./secrets/.zshenv_secret;
+    file = ./secrets/zshenv_secret;
     path = secretPath;
     mode = "660";
   };