diff --git a/flake.lock b/flake.lock
index 471748a..e42a541 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1680266963,
+        "narHash": "sha256-IW/lzbUCOcldLHWHjNSg1YoViDnZOmz0ZJL7EH9OkV8=",
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "rev": "99d4187d11be86b49baa3a1aec0530004072374f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -37,6 +57,7 @@
     },
     "root": {
       "inputs": {
+        "darwin": "darwin",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs"
       }
diff --git a/flake.nix b/flake.nix
index 5699c84..43ca0a7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,42 +5,47 @@
     # Home manager
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+
+    darwin.url = "github:LnL7/nix-darwin";
+    darwin.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, home-manager }:
+  outputs = { self, nixpkgs, home-manager, darwin }:
     let
       username = "maddie";
-      pkgs = import nixpkgs { inherit system; config.allowUnfree = true; overlays = import ./overlays.nix; };
+      pkgs = import nixpkgs { system = "aarch64-darwin"; config.allowUnfree = true; config.allowUnsupportedSystem = false; config.allowBroken = false; overlays = import ./overlays.nix; };
       utils = import ./utils pkgs;
       specialArgs = { inherit username; inherit pkgs; };
     in
     {
-      nixosConfigurations.luna = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        inherit pkgs;
+      nixosConfigurations."luna" = nixpkgs.lib.nixosSystem {
         inherit specialArgs;
+        inherit pkgs;
+        system = "x86_64-linux";
         modules = [
           home-manager.nixosModules.home-manager
           {
-            home-manager.users.${username}.imports = utils.nixFilesIn ./maddie;
+            home-manager.users.${username}.imports = utils.nixFilesIn ./maddie/common ++ utils.nixFilesIn ./maddie/nixos;
             home-manager.extraSpecialArgs = specialArgs;
           }
         ] ++ utils.nixFilesIn ./systems/desktop;
       };
 
-      darwinConfigurations."MMacBookPro" = inputs.darwin.lib.darwinSystem {
-        inherit pkgs;
+      darwinConfigurations."MMacBookPro" = darwin.lib.darwinSystem {
         inherit specialArgs;
-        system = "aarch64-darwin",
+        inherit pkgs;
+        system = "aarch64-darwin";
         modules = [
           home-manager.darwinModules.home-manager
           {
-            home-manager.users.${username}.imports = utils.nixFilesIn ./maddie;
+            home-manager.useUserPackages = true;
+            home-manager.users.${username}.imports = utils.nixFilesIn ./maddie/common ++ utils.nixFilesIn ./maddie/macos;
             home-manager.extraSpecialArgs = specialArgs;
           }
         ] ++ utils.nixFilesIn ./systems/macbookpro;
       };
 
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
+      formatter.aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.nixpkgs-fmt;
     };
 }
diff --git a/maddie/browserpass.nix b/maddie/browserpass.nix
deleted file mode 100644
index 091d0af..0000000
--- a/maddie/browserpass.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  programs.browserpass = {
-    enable = true;
-    browsers = [
-      "chromium"
-      "firefox"
-    ];
-  };
-}
diff --git a/maddie/browser.nix b/maddie/common/browser.nix
similarity index 67%
rename from maddie/browser.nix
rename to maddie/common/browser.nix
index f68dff5..d0db707 100644
--- a/maddie/browser.nix
+++ b/maddie/common/browser.nix
@@ -2,8 +2,7 @@
 
 {
   home.packages = with pkgs; [
-    tor-browser-bundle-bin
-    librewolf
+    # librewolf
     amfora
     lynx
   ];
diff --git a/maddie/btop.nix b/maddie/common/btop.nix
similarity index 100%
rename from maddie/btop.nix
rename to maddie/common/btop.nix
diff --git a/maddie/calculator.nix b/maddie/common/calculator.nix
similarity index 71%
rename from maddie/calculator.nix
rename to maddie/common/calculator.nix
index fb1cf64..d371b89 100644
--- a/maddie/calculator.nix
+++ b/maddie/common/calculator.nix
@@ -2,6 +2,6 @@
 
 {
   home.packages = with pkgs; [
-    nodePackages.insect
+    # nodePackages.insect
   ];
 }
diff --git a/maddie/code.nix b/maddie/common/code.nix
similarity index 100%
rename from maddie/code.nix
rename to maddie/common/code.nix
diff --git a/maddie/editor.nix b/maddie/common/editor.nix
similarity index 100%
rename from maddie/editor.nix
rename to maddie/common/editor.nix
diff --git a/maddie/common/exa.nix b/maddie/common/exa.nix
new file mode 100644
index 0000000..d1661e5
--- /dev/null
+++ b/maddie/common/exa.nix
@@ -0,0 +1,15 @@
+{ config, ... }:
+
+{
+  programs.exa = {
+    enable = true;
+    enableAliases = true;
+    extraOptions = [
+      "--group-directories-first"
+      "--time-style=long-iso"
+      "--git"
+      "-h"
+    ];
+    icons = true;
+  };
+}
diff --git a/maddie/fetch.nix b/maddie/common/fetch.nix
similarity index 100%
rename from maddie/fetch.nix
rename to maddie/common/fetch.nix
diff --git a/maddie/git.nix b/maddie/common/git.nix
similarity index 84%
rename from maddie/git.nix
rename to maddie/common/git.nix
index 5aaeb0b..039e8ea 100644
--- a/maddie/git.nix
+++ b/maddie/common/git.nix
@@ -37,5 +37,14 @@
       init.defaultBranch = "development";
       pull.rebase = "merges";
     };
+
+    ignores = [
+      "**/.DS_Store"
+      "**/._.DS_Store"
+      ".DS_Store"
+      "._.DS_Store"
+      "**/*.swp"
+      "*.swp"
+    ];
   };
 }
diff --git a/maddie/git/git-sync.sh b/maddie/common/git/git-sync.sh
similarity index 100%
rename from maddie/git/git-sync.sh
rename to maddie/common/git/git-sync.sh
diff --git a/maddie/htop.nix b/maddie/common/htop.nix
similarity index 100%
rename from maddie/htop.nix
rename to maddie/common/htop.nix
diff --git a/maddie/jetbrains.nix b/maddie/common/jetbrains.nix
similarity index 100%
rename from maddie/jetbrains.nix
rename to maddie/common/jetbrains.nix
diff --git a/maddie/kakoune.nix b/maddie/common/kakoune.nix
similarity index 100%
rename from maddie/kakoune.nix
rename to maddie/common/kakoune.nix
diff --git a/maddie/lf.nix b/maddie/common/lf.nix
similarity index 100%
rename from maddie/lf.nix
rename to maddie/common/lf.nix
diff --git a/maddie/lf/icons b/maddie/common/lf/icons
similarity index 100%
rename from maddie/lf/icons
rename to maddie/common/lf/icons
diff --git a/maddie/lf/scope b/maddie/common/lf/scope
similarity index 100%
rename from maddie/lf/scope
rename to maddie/common/lf/scope
diff --git a/maddie/media.nix b/maddie/common/media.nix
similarity index 100%
rename from maddie/media.nix
rename to maddie/common/media.nix
diff --git a/maddie/messaging.nix b/maddie/common/messaging.nix
similarity index 64%
rename from maddie/messaging.nix
rename to maddie/common/messaging.nix
index 1f8bd2a..832d5f6 100644
--- a/maddie/messaging.nix
+++ b/maddie/common/messaging.nix
@@ -3,8 +3,8 @@
 {
   home.packages = with pkgs; [
     element-desktop # Matrix client
-    signal-desktop # Signal client
+    # signal-desktop # Signal client
     discord-canary # Discord client
-    ripcord # Better discord client
+    #ripcord # Better discord client
   ];
 }
diff --git a/maddie/mommy.nix b/maddie/common/mommy.nix
similarity index 100%
rename from maddie/mommy.nix
rename to maddie/common/mommy.nix
diff --git a/maddie/mommy/shell-mommy.sh b/maddie/common/mommy/shell-mommy.sh
similarity index 100%
rename from maddie/mommy/shell-mommy.sh
rename to maddie/common/mommy/shell-mommy.sh
diff --git a/maddie/mpv.nix b/maddie/common/mpv.nix
similarity index 100%
rename from maddie/mpv.nix
rename to maddie/common/mpv.nix
diff --git a/maddie/neovim.nix b/maddie/common/neovim.nix
similarity index 100%
rename from maddie/neovim.nix
rename to maddie/common/neovim.nix
diff --git a/maddie/neovim/.gitignore b/maddie/common/neovim/.gitignore
similarity index 100%
rename from maddie/neovim/.gitignore
rename to maddie/common/neovim/.gitignore
diff --git a/maddie/neovim/LICENSE b/maddie/common/neovim/LICENSE
similarity index 100%
rename from maddie/neovim/LICENSE
rename to maddie/common/neovim/LICENSE
diff --git a/maddie/neovim/README.md b/maddie/common/neovim/README.md
similarity index 100%
rename from maddie/neovim/README.md
rename to maddie/common/neovim/README.md
diff --git a/maddie/neovim/init.lua b/maddie/common/neovim/init.lua
similarity index 98%
rename from maddie/neovim/init.lua
rename to maddie/common/neovim/init.lua
index de906a8..68daca1 100644
--- a/maddie/neovim/init.lua
+++ b/maddie/common/neovim/init.lua
@@ -52,9 +52,7 @@ return require('packer').startup(function(use)
   use {
     'xiyaowong/nvim-transparent',
     config = function()
-      require('transparent').setup({
-        enable = false;
-      })
+      vim.g.transparent_enabled = false
     end
   }
 
diff --git a/maddie/neovim/lua/basics.lua b/maddie/common/neovim/lua/basics.lua
similarity index 100%
rename from maddie/neovim/lua/basics.lua
rename to maddie/common/neovim/lua/basics.lua
diff --git a/maddie/neovim/lua/colours.lua b/maddie/common/neovim/lua/colours.lua
similarity index 100%
rename from maddie/neovim/lua/colours.lua
rename to maddie/common/neovim/lua/colours.lua
diff --git a/maddie/neovim/lua/keymaps.lua b/maddie/common/neovim/lua/keymaps.lua
similarity index 100%
rename from maddie/neovim/lua/keymaps.lua
rename to maddie/common/neovim/lua/keymaps.lua
diff --git a/maddie/neovim/lua/plugins/cmp.lua b/maddie/common/neovim/lua/plugins/cmp.lua
similarity index 100%
rename from maddie/neovim/lua/plugins/cmp.lua
rename to maddie/common/neovim/lua/plugins/cmp.lua
diff --git a/maddie/neovim/spell/en.utf-8.add b/maddie/common/neovim/spell/en.utf-8.add
similarity index 100%
rename from maddie/neovim/spell/en.utf-8.add
rename to maddie/common/neovim/spell/en.utf-8.add
diff --git a/maddie/neovim/spell/en.utf-8.add.spl b/maddie/common/neovim/spell/en.utf-8.add.spl
similarity index 100%
rename from maddie/neovim/spell/en.utf-8.add.spl
rename to maddie/common/neovim/spell/en.utf-8.add.spl
diff --git a/maddie/passwords.nix b/maddie/common/passwords.nix
similarity index 69%
rename from maddie/passwords.nix
rename to maddie/common/passwords.nix
index 9575900..c43e87d 100644
--- a/maddie/passwords.nix
+++ b/maddie/common/passwords.nix
@@ -11,9 +11,4 @@
   home.sessionVariables = {
     PASSWORD_STORE_DIR = "${config.xdg.dataHome}/password-store";
   };
-
-  services.pass-secret-service = {
-    enable = true;
-    storePath = "${config.xdg.dataHome}/password-store";
-  };
 }
diff --git a/maddie/processes.nix b/maddie/common/processes.nix
similarity index 80%
rename from maddie/processes.nix
rename to maddie/common/processes.nix
index 27c0201..8ef33c9 100644
--- a/maddie/processes.nix
+++ b/maddie/common/processes.nix
@@ -4,6 +4,5 @@
   home.packages = with pkgs; [
     xorg.xkill # Kill X11 programs with mouse
     killall # Kill programs
-    gotop # Process manager in go
   ];
 }
diff --git a/maddie/rust.nix b/maddie/common/rust.nix
similarity index 100%
rename from maddie/rust.nix
rename to maddie/common/rust.nix
diff --git a/maddie/shell.nix b/maddie/common/shell.nix
similarity index 94%
rename from maddie/shell.nix
rename to maddie/common/shell.nix
index 1b283cb..5543933 100644
--- a/maddie/shell.nix
+++ b/maddie/common/shell.nix
@@ -5,8 +5,6 @@
     # Aliases
     shellAliases = {
       # Core Programs
-      ls = "ls -lhN --color=auto --group-directories-first";
-      ll = "ls -av";
       cp = "cp -iv";
       mv = "mv -iv";
       rm = "rm -vI";
diff --git a/maddie/smart-home.nix b/maddie/common/smart-home.nix
similarity index 100%
rename from maddie/smart-home.nix
rename to maddie/common/smart-home.nix
diff --git a/maddie/ssh.nix b/maddie/common/ssh.nix
similarity index 86%
rename from maddie/ssh.nix
rename to maddie/common/ssh.nix
index b004949..d484c3c 100644
--- a/maddie/ssh.nix
+++ b/maddie/common/ssh.nix
@@ -1,11 +1,6 @@
 { config, pkgs, username, ... }:
 
 {
-  # Drawterm
-  home.packages = with pkgs; [
-    drawterm
-  ];
-
   # SSH
   programs.ssh = {
     enable = true;
diff --git a/maddie/ssh/id_ed25519_sk.pub b/maddie/common/ssh/id_ed25519_sk.pub
similarity index 100%
rename from maddie/ssh/id_ed25519_sk.pub
rename to maddie/common/ssh/id_ed25519_sk.pub
diff --git a/maddie/tmux.nix b/maddie/common/tmux.nix
similarity index 100%
rename from maddie/tmux.nix
rename to maddie/common/tmux.nix
diff --git a/maddie/zsh.nix b/maddie/common/zsh.nix
similarity index 100%
rename from maddie/zsh.nix
rename to maddie/common/zsh.nix
diff --git a/maddie/firefox.nix b/maddie/firefox.nix
deleted file mode 100644
index 3a4bb28..0000000
--- a/maddie/firefox.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ config, ... }:
-
-{
-  programs.firefox = {
-    enable = true;
-    profiles = {
-      "maddie" = {
-        name = "Maddie";
-        bookmarks = [
-          {
-            name = "Home";
-            bookmarks = [
-              {
-                name = "BT Home Hub";
-                url = "http://192.168.1.254/";
-              }
-              {
-                name = "Home Assistant";
-                url = "http://192.168.1.105:8123/lovelace/0";
-              }
-              {
-                name = "Security Cameras";
-                url = "http://192.168.1.108/";
-              }
-              {
-                name = "Fast";
-                url = "https://fast.com/";
-              }
-            ];
-          }
-          {
-            name = "Nix";
-            bookmarks = [
-              {
-                name = "NixOS Packages";
-                url = "https://search.nixos.org/packages";
-              }
-              {
-                name = "NixOS Options";
-                url = "https://search.nixos.org/options";
-              }
-            ];
-          }
-        ];
-      };
-    };
-  };
-}
diff --git a/maddie/macos/home.nix b/maddie/macos/home.nix
new file mode 100644
index 0000000..1b361b4
--- /dev/null
+++ b/maddie/macos/home.nix
@@ -0,0 +1,19 @@
+{ config, username, pkgs, lib, ... }:
+
+{
+  programs.home-manager.enable = true;
+  home = {
+    inherit username;
+    homeDirectory = lib.mkForce "/Users/${username}";
+    stateVersion = "23.05";
+  };
+
+  # Install MacOS applications to the user environment if the targetPlatform is Darwin
+  home.file."Applications/home-manager-linked".source = let
+  apps = pkgs.buildEnv {
+    name = "home-manager-applications";
+    paths = config.home.packages;
+    pathsToLink = "/Applications";
+  };
+  in lib.mkIf pkgs.stdenv.targetPlatform.isDarwin "${apps}/Applications";
+}
diff --git a/maddie/macos/testing.nix b/maddie/macos/testing.nix
new file mode 100644
index 0000000..cf79e90
--- /dev/null
+++ b/maddie/macos/testing.nix
@@ -0,0 +1,5 @@
+{ config, ... }:
+
+{
+  programs.kitty.enable = true;
+}
diff --git a/maddie/macos/wezterm.nix b/maddie/macos/wezterm.nix
new file mode 100644
index 0000000..20a043c
--- /dev/null
+++ b/maddie/macos/wezterm.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+  programs.wezterm = {
+    enable = true;
+    extraConfig = ''
+      return {
+        color_scheme = 'OneDark (base16)',
+        hide_tab_bar_if_only_one_tab = true
+      }
+    '';
+  };
+}
diff --git a/maddie/audio.nix b/maddie/nixos/audio.nix
similarity index 100%
rename from maddie/audio.nix
rename to maddie/nixos/audio.nix
diff --git a/maddie/audio/ytdlp-music.sh b/maddie/nixos/audio/ytdlp-music.sh
similarity index 100%
rename from maddie/audio/ytdlp-music.sh
rename to maddie/nixos/audio/ytdlp-music.sh
diff --git a/maddie/bosskey.nix b/maddie/nixos/bosskey.nix
similarity index 100%
rename from maddie/bosskey.nix
rename to maddie/nixos/bosskey.nix
diff --git a/maddie/bosskey/bosskey.sh b/maddie/nixos/bosskey/bosskey.sh
similarity index 100%
rename from maddie/bosskey/bosskey.sh
rename to maddie/nixos/bosskey/bosskey.sh
diff --git a/maddie/chromium.nix b/maddie/nixos/chromium.nix
similarity index 100%
rename from maddie/chromium.nix
rename to maddie/nixos/chromium.nix
diff --git a/maddie/dmenu.nix b/maddie/nixos/dmenu.nix
similarity index 100%
rename from maddie/dmenu.nix
rename to maddie/nixos/dmenu.nix
diff --git a/maddie/dmenu/dmenu-bluetooth b/maddie/nixos/dmenu/dmenu-bluetooth
similarity index 100%
rename from maddie/dmenu/dmenu-bluetooth
rename to maddie/nixos/dmenu/dmenu-bluetooth
diff --git a/maddie/dmenu/dmenu-kdeconnect b/maddie/nixos/dmenu/dmenu-kdeconnect
similarity index 100%
rename from maddie/dmenu/dmenu-kdeconnect
rename to maddie/nixos/dmenu/dmenu-kdeconnect
diff --git a/maddie/dmenu/dmenu-mount b/maddie/nixos/dmenu/dmenu-mount
similarity index 100%
rename from maddie/dmenu/dmenu-mount
rename to maddie/nixos/dmenu/dmenu-mount
diff --git a/maddie/dmenu/dmenu-mpc b/maddie/nixos/dmenu/dmenu-mpc
similarity index 100%
rename from maddie/dmenu/dmenu-mpc
rename to maddie/nixos/dmenu/dmenu-mpc
diff --git a/maddie/dmenu/dmenu-pass b/maddie/nixos/dmenu/dmenu-pass
similarity index 100%
rename from maddie/dmenu/dmenu-pass
rename to maddie/nixos/dmenu/dmenu-pass
diff --git a/maddie/dmenu/dmenu-power b/maddie/nixos/dmenu/dmenu-power
similarity index 100%
rename from maddie/dmenu/dmenu-power
rename to maddie/nixos/dmenu/dmenu-power
diff --git a/maddie/dmenu/dmenu-unicode b/maddie/nixos/dmenu/dmenu-unicode
similarity index 100%
rename from maddie/dmenu/dmenu-unicode
rename to maddie/nixos/dmenu/dmenu-unicode
diff --git a/maddie/dunst.nix b/maddie/nixos/dunst.nix
similarity index 100%
rename from maddie/dunst.nix
rename to maddie/nixos/dunst.nix
diff --git a/maddie/dwm.nix b/maddie/nixos/dwm.nix
similarity index 100%
rename from maddie/dwm.nix
rename to maddie/nixos/dwm.nix
diff --git a/maddie/files.nix b/maddie/nixos/files.nix
similarity index 100%
rename from maddie/files.nix
rename to maddie/nixos/files.nix
diff --git a/maddie/games.nix b/maddie/nixos/games.nix
similarity index 100%
rename from maddie/games.nix
rename to maddie/nixos/games.nix
diff --git a/maddie/gtk.nix b/maddie/nixos/gtk.nix
similarity index 100%
rename from maddie/gtk.nix
rename to maddie/nixos/gtk.nix
diff --git a/maddie/home.nix b/maddie/nixos/home.nix
similarity index 100%
rename from maddie/home.nix
rename to maddie/nixos/home.nix
diff --git a/maddie/kdeconnect.nix b/maddie/nixos/kdeconnect.nix
similarity index 100%
rename from maddie/kdeconnect.nix
rename to maddie/nixos/kdeconnect.nix
diff --git a/maddie/minecraft.nix b/maddie/nixos/minecraft.nix
similarity index 100%
rename from maddie/minecraft.nix
rename to maddie/nixos/minecraft.nix
diff --git a/maddie/mpd.nix b/maddie/nixos/mpd.nix
similarity index 100%
rename from maddie/mpd.nix
rename to maddie/nixos/mpd.nix
diff --git a/maddie/nsxiv.nix b/maddie/nixos/nsxiv.nix
similarity index 100%
rename from maddie/nsxiv.nix
rename to maddie/nixos/nsxiv.nix
diff --git a/maddie/nsxiv/exec/key-handler b/maddie/nixos/nsxiv/exec/key-handler
similarity index 100%
rename from maddie/nsxiv/exec/key-handler
rename to maddie/nixos/nsxiv/exec/key-handler
diff --git a/maddie/office.nix b/maddie/nixos/office.nix
similarity index 100%
rename from maddie/office.nix
rename to maddie/nixos/office.nix
diff --git a/maddie/openrgb.nix b/maddie/nixos/openrgb.nix
similarity index 100%
rename from maddie/openrgb.nix
rename to maddie/nixos/openrgb.nix
diff --git a/maddie/pcmanfm.nix b/maddie/nixos/pcmanfm.nix
similarity index 100%
rename from maddie/pcmanfm.nix
rename to maddie/nixos/pcmanfm.nix
diff --git a/maddie/pcmanfm/default/pcmanfm.conf b/maddie/nixos/pcmanfm/default/pcmanfm.conf
similarity index 100%
rename from maddie/pcmanfm/default/pcmanfm.conf
rename to maddie/nixos/pcmanfm/default/pcmanfm.conf
diff --git a/maddie/picom.nix b/maddie/nixos/picom.nix
similarity index 100%
rename from maddie/picom.nix
rename to maddie/nixos/picom.nix
diff --git a/maddie/qt.nix b/maddie/nixos/qt.nix
similarity index 100%
rename from maddie/qt.nix
rename to maddie/nixos/qt.nix
diff --git a/maddie/screenshot.nix b/maddie/nixos/screenshot.nix
similarity index 100%
rename from maddie/screenshot.nix
rename to maddie/nixos/screenshot.nix
diff --git a/maddie/screenshot/sss.sh b/maddie/nixos/screenshot/sss.sh
similarity index 100%
rename from maddie/screenshot/sss.sh
rename to maddie/nixos/screenshot/sss.sh
diff --git a/maddie/slstatus.nix b/maddie/nixos/slstatus.nix
similarity index 100%
rename from maddie/slstatus.nix
rename to maddie/nixos/slstatus.nix
diff --git a/maddie/statusbar/sb-clock b/maddie/nixos/statusbar/sb-clock
similarity index 100%
rename from maddie/statusbar/sb-clock
rename to maddie/nixos/statusbar/sb-clock
diff --git a/maddie/statusbar/sb-cpu b/maddie/nixos/statusbar/sb-cpu
similarity index 100%
rename from maddie/statusbar/sb-cpu
rename to maddie/nixos/statusbar/sb-cpu
diff --git a/maddie/statusbar/sb-disk b/maddie/nixos/statusbar/sb-disk
similarity index 100%
rename from maddie/statusbar/sb-disk
rename to maddie/nixos/statusbar/sb-disk
diff --git a/maddie/statusbar/sb-forecast b/maddie/nixos/statusbar/sb-forecast
similarity index 100%
rename from maddie/statusbar/sb-forecast
rename to maddie/nixos/statusbar/sb-forecast
diff --git a/maddie/statusbar/sb-iplocate b/maddie/nixos/statusbar/sb-iplocate
similarity index 100%
rename from maddie/statusbar/sb-iplocate
rename to maddie/nixos/statusbar/sb-iplocate
diff --git a/maddie/statusbar/sb-kernel b/maddie/nixos/statusbar/sb-kernel
similarity index 100%
rename from maddie/statusbar/sb-kernel
rename to maddie/nixos/statusbar/sb-kernel
diff --git a/maddie/statusbar/sb-memory b/maddie/nixos/statusbar/sb-memory
similarity index 100%
rename from maddie/statusbar/sb-memory
rename to maddie/nixos/statusbar/sb-memory
diff --git a/maddie/statusbar/sb-temp b/maddie/nixos/statusbar/sb-temp
similarity index 100%
rename from maddie/statusbar/sb-temp
rename to maddie/nixos/statusbar/sb-temp
diff --git a/maddie/statusbar/sb-uptime b/maddie/nixos/statusbar/sb-uptime
similarity index 100%
rename from maddie/statusbar/sb-uptime
rename to maddie/nixos/statusbar/sb-uptime
diff --git a/maddie/statusbar/sb-volume b/maddie/nixos/statusbar/sb-volume
similarity index 100%
rename from maddie/statusbar/sb-volume
rename to maddie/nixos/statusbar/sb-volume
diff --git a/maddie/steam.nix b/maddie/nixos/steam.nix
similarity index 100%
rename from maddie/steam.nix
rename to maddie/nixos/steam.nix
diff --git a/maddie/steam/steam-killer.sh b/maddie/nixos/steam/steam-killer.sh
similarity index 100%
rename from maddie/steam/steam-killer.sh
rename to maddie/nixos/steam/steam-killer.sh
diff --git a/maddie/tabbed.nix b/maddie/nixos/tabbed.nix
similarity index 100%
rename from maddie/tabbed.nix
rename to maddie/nixos/tabbed.nix
diff --git a/maddie/tabbed/tabbed-st b/maddie/nixos/tabbed/tabbed-st
similarity index 100%
rename from maddie/tabbed/tabbed-st
rename to maddie/nixos/tabbed/tabbed-st
diff --git a/maddie/terminal.nix b/maddie/nixos/terminal.nix
similarity index 100%
rename from maddie/terminal.nix
rename to maddie/nixos/terminal.nix
diff --git a/maddie/virtualisation.nix b/maddie/nixos/virtualisation.nix
similarity index 100%
rename from maddie/virtualisation.nix
rename to maddie/nixos/virtualisation.nix
diff --git a/maddie/xdg.nix b/maddie/nixos/xdg.nix
similarity index 100%
rename from maddie/xdg.nix
rename to maddie/nixos/xdg.nix
diff --git a/maddie/xorg.nix b/maddie/nixos/xorg.nix
similarity index 100%
rename from maddie/xorg.nix
rename to maddie/nixos/xorg.nix
diff --git a/maddie/zathura.nix b/maddie/nixos/zathura.nix
similarity index 100%
rename from maddie/zathura.nix
rename to maddie/nixos/zathura.nix
diff --git a/maddie/obs-studio.nix b/maddie/obs-studio.nix
deleted file mode 100644
index 07f8a87..0000000
--- a/maddie/obs-studio.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, ... }:
-
-{
-  programs.obs-studio.enable = true;
-}
diff --git a/overlays.nix b/overlays.nix
index a4e4b6f..e61ca03 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -56,7 +56,7 @@
       clockSupport = false;
     };
     nerdfonts = prev.nerdfonts.override {
-      fonts = [ "Iosevka" "Terminus" ];
+      fonts = [ "Iosevka" "Terminus" "JetBrainsMono" ];
     };
   })
 ]
diff --git a/systems/desktop/packages.nix b/systems/desktop/packages.nix
index 433fa1d..9919547 100644
--- a/systems/desktop/packages.nix
+++ b/systems/desktop/packages.nix
@@ -16,9 +16,6 @@
     # Processes
     killall
     appimage-run
-    ani-cli
-    yt-dlp
-    mediainfo
 
     # Filesystems
     dosfstools
diff --git a/systems/macbookpro/finder.nix b/systems/macbookpro/finder.nix
new file mode 100644
index 0000000..7c4d987
--- /dev/null
+++ b/systems/macbookpro/finder.nix
@@ -0,0 +1,13 @@
+{ config, ... }:
+
+{
+  system.defaults = {
+    finder = {
+      AppleShowAllExtensions = true;
+      QuitMenuItem = true;
+      ShowPathbar = true;
+      ShowStatusBar = true;
+    };
+    NSGlobalDomain.AppleShowAllExtensions = true;
+  };
+}
diff --git a/systems/macbookpro/fonts.nix b/systems/macbookpro/fonts.nix
new file mode 100644
index 0000000..3ad636f
--- /dev/null
+++ b/systems/macbookpro/fonts.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+  fonts.fonts = with pkgs; [
+    font-awesome
+    nerdfonts
+  ];
+
+  fonts.fontDir.enable = true;
+}
diff --git a/systems/macbookpro/gpg.nix b/systems/macbookpro/gpg.nix
new file mode 100644
index 0000000..238bdc5
--- /dev/null
+++ b/systems/macbookpro/gpg.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+
+{
+  programs.gnupg.agent = {
+    enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    gnupg
+  ];
+}
diff --git a/systems/macbookpro/keyboard.nix b/systems/macbookpro/keyboard.nix
new file mode 100644
index 0000000..08a8789
--- /dev/null
+++ b/systems/macbookpro/keyboard.nix
@@ -0,0 +1,13 @@
+{ config, ... }:
+
+{
+  system.keyboard = {
+    enableKeyMapping = true;
+    remapCapsLockToEscape = true;
+  };
+
+  system.defaults.NSGlobalDomain = {
+    InitialKeyRepeat = 14;
+    KeyRepeat = 1;
+  };
+}
diff --git a/systems/macbookpro/nix.nix b/systems/macbookpro/nix.nix
new file mode 100644
index 0000000..88d721e
--- /dev/null
+++ b/systems/macbookpro/nix.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, ... }:
+
+{
+  # Enable flakes and nix-command
+  nix = {
+    package = pkgs.nixVersions.stable;
+    settings = {
+      experimental-features = [ "nix-command" "flakes" ];
+      auto-optimise-store = true;
+    };
+    gc = {
+      automatic = true;
+      options = "--delete-older-than 7d";
+    };
+  };
+  services.nix-daemon.enable = true;
+}
diff --git a/systems/macbookpro/packages.nix b/systems/macbookpro/packages.nix
new file mode 100644
index 0000000..6881309
--- /dev/null
+++ b/systems/macbookpro/packages.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    # Processes
+    killall
+
+    # Filesystems
+    dosfstools
+
+    # Archives
+    zip
+    unzip
+    unrar
+    p7zip
+
+    # Cli tools
+    wget
+    fzf
+    bat
+
+    # Git
+    git
+  ];
+}
diff --git a/systems/macbookpro/zsh.nix b/systems/macbookpro/zsh.nix
new file mode 100644
index 0000000..2a5ba4c
--- /dev/null
+++ b/systems/macbookpro/zsh.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+  programs.zsh = {
+    enable = true;
+    enableSyntaxHighlighting = true;
+    enableCompletion = true;
+  };
+  environment.loginShell = pkgs.zsh;
+}