diff --git a/darwin.nix b/darwin.nix
index f04faf0..d3cdb60 100644
--- a/darwin.nix
+++ b/darwin.nix
@@ -3,7 +3,6 @@
   environment = {
     variables = {
       EDITOR = "nvim";
-      VISUAL = "neovide";
     };
     systemPackages = with pkgs; [
       eza
diff --git a/modules/alacritty.nix b/modules/alacritty.nix
deleted file mode 100644
index b056f3f..0000000
--- a/modules/alacritty.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  home-manager.users.dogth = {
-    programs.alacritty = {
-      enable = true;
-      settings = {
-        font = {
-          normal.family = "JetBrainsMono Nerd Font";
-          size = 13;
-        };
-        window = {
-          padding.x = 2;
-          padding.y = 2;
-          decorations = "Buttonless";
-          startup_mode = "Fullscreen";
-          option_as_alt = "Both";
-        };
-        colors = {
-          primary = {
-            background = "#1f1f1f";
-            foreground = "#e6e6e6";
-
-            dim_foreground = "#1f1f1f";
-            bright_foreground = "#868686";
-          };
-          cursor = {
-            text = "#1f1f1f";
-            cursor = "#e6e6e6";
-          };
-          normal = {
-            black = "#1f1f1f";
-            red = "#ee908d";
-            green = "#6ebd3f";
-            yellow = "#e89921";
-            blue = "#71adf6";
-            magenta = "#d88bfc";
-            cyan = "#00c09b";
-            white = "#e6e6e6";
-          };
-          bright = {
-            black = "#333333";
-            red = "#ff9ca9";
-            green = "#70d286";
-            yellow = "#ff9b5e";
-            blue = "#b3c5ff";
-            magenta = "#ee96e8";
-            cyan = "#2ed3ce";
-            white = "#fafafa";
-          };
-          dim = {
-            black = "#1f1f1f";
-            red = "#cf7d7a";
-            green = "#5fa435";
-            yellow = "#ca841b";
-            blue = "#6196d6";
-            magenta = "#bc78db";
-            cyan = "#00a786";
-            white = "#868686";
-          };
-        };
-
-      };
-    };
-  };
-}
diff --git a/modules/default.nix b/modules/default.nix
index 615e57a..586c9b6 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,7 +1,5 @@
 [
-  ./alacritty.nix
   ./git.nix
   ./tmux.nix
   ./zsh.nix
-  ./neovide.nix
 ]
diff --git a/modules/git.nix b/modules/git.nix
index 1a7e4a4..3e05123 100644
--- a/modules/git.nix
+++ b/modules/git.nix
@@ -1,40 +1,52 @@
 {
   home-manager.users.dogth = {
 
-    programs.git = {
+    programs = {
       difftastic = {
         enable = true;
       };
-      enable = true;
-      userName = "dogth";
-      userEmail = "dogth@kitteth.com";
-      aliases = {
-        co = "checkout";
-        ci = "commit";
-        cia = "commit --amend";
-        s = "status";
-        st = "status";
-        b = "branch";
-        pu = "push";
-      };
-      signing = {
-        key = "/Users/dogth/.ssh/git.pub";
-      };
-      iniContent = {
-        branch.sort = "-committerdate";
-        rerere.enabled = true;
-      };
-      ignores = [
-        "*~"
-        "*.swp"
-      ];
-      lfs.enable = true;
-      extraConfig = {
-        init.defaultBranch = "master";
-        core.editor = "nvim";
-        credential.helper = "store --file ~/.git-credentials";
-        pull.rebase = "false";
-        gpg.format = "ssh";
+
+      git = {
+        enable = true;
+        settings = {
+          core.editor = "nvim";
+          user = {
+            name = "dogth";
+            email = "dogth@kitteth.com";
+          };
+          aliases = {
+            co = "checkout";
+            ci = "commit";
+            cia = "commit --amend";
+            s = "status";
+            st = "status";
+            b = "branch";
+            pu = "push";
+          };
+          extraConfig = {
+            init.defaultBranch = "master";
+            core.editor = "nvim";
+            credential.helper = "store --file ~/.git-credentials";
+            pull.rebase = "false";
+            gpg.format = "ssh";
+          };
+
+        };
+
+        signing = {
+          key = "/Users/dogth/.ssh/git.pub";
+        };
+
+        iniContent = {
+          branch.sort = "-committerdate";
+          rerere.enabled = true;
+        };
+
+        ignores = [
+          "*~"
+          "*.swp"
+        ];
+        lfs.enable = true;
       };
     };
   };
diff --git a/modules/neovide.nix b/modules/neovide.nix
deleted file mode 100644
index ae55268..0000000
--- a/modules/neovide.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  home-manager.users.dogth = {
-    programs.neovide = {
-      enable = true;
-      settings = {
-        maximized = true;
-        title-hidden = true;
-        font = {
-          normal = [ ];
-          size = 12;
-        };
-      };
-    };
-  };
-}
diff --git a/user.nix b/user.nix
index f6d3088..3acf3a7 100644
--- a/user.nix
+++ b/user.nix
@@ -22,17 +22,13 @@
       "spotify"
     ];
     masApps = {
-      "Keynote" = 409183694;
       "Windows Apps" = 1295203466;
       "Wireguard" = 1451685025;
-      "Numbers" = 409203825;
-      "Pages" = 409201541;
     };
   };
 
   home-manager.users.dogth = {
     home.packages = [
-      # Additional home manager packages
       puppydog.packages.aarch64-darwin.default
     ];
     home.stateVersion = "22.05";