diff --git a/flake.nix b/flake.nix
index 9bf5122..16c30d8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,19 +28,7 @@
       inputs.nixpkgs.follows = "nixpkgs-stable";
     };
 
-    # TODO: theming
-
-    ## Hyprland ##
-
-    watershot = {
-      url = "github:Liassica/watershot/165dd431c95054ac1bfea2f9a85e1be924af21c9";
-      inputs.nixpkgs.follows = "nixpkgs-stable";
-    };
-
-    better-control = {
-      url = "github:rishabh5321/better-control-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    ## Theming ##
 
     rose-pine-hyprcursor = {
       url = "github:ndom91/rose-pine-hyprcursor";
diff --git a/home/toph/common/core/default.nix b/home/toph/common/core/default.nix
index 527da2c..a4a14c9 100644
--- a/home/toph/common/core/default.nix
+++ b/home/toph/common/core/default.nix
@@ -1,5 +1,3 @@
-#FIXME: Move attrs that will only work on linux to nixos.nix
-#FIXME: if pulling in homemanager for isMinimal maybe set up conditional for some packages
 {
   config,
   lib,
@@ -18,17 +16,7 @@ in
       "modules/global"
       "modules/home"
     ])
-    ./asdf.nix
-    ./bash.nix # TODO: setup a nicer bash config... or zsh
-    ./bat.nix
-    ./direnv.nix
-    ./fastfetch
-    ./fish
-    ./git.nix
-    ./ranger.nix
-    ./screen.nix
-    ./ssh.nix
-    ./zoxide.nix
+    (lib.custom.scanPaths ./.)
   ];
 
   services.ssh-agent.enable = true;
@@ -43,9 +31,8 @@ in
     sessionVariables = {
       EDITOR = "micro";
       FLAKE = "${homeDir}/git/Nix/dot.nix";
-      MANPAGER = "batman"; # see ./cli/bat.nix
+      MANPAGER = "batman";
       SHELL = shell;
-      TERM = "foot";
       VISUAL = "micro";
     };
     preferXdgDirectories = true; # whether to make programs use XDG directories whenever supported
@@ -67,15 +54,14 @@ in
     };
   };
 
+  # Core pkgs with no configs
   home.packages = builtins.attrValues {
     inherit (pkgs)
-      # Packages that don't have custom configs go here
       btop # resource monitor
       coreutils # basic gnu utils
       dust # disk usage
       eza # ls replacement
       jq # json parser
-      p7zip # compression & encryption
       pre-commit # git hooks
       trashy # trash cli
       unrar # rar extraction
diff --git a/home/toph/common/optional/development/default.nix b/home/toph/common/optional/development/default.nix
index 8d5dd6e..de82c00 100644
--- a/home/toph/common/optional/development/default.nix
+++ b/home/toph/common/optional/development/default.nix
@@ -15,9 +15,7 @@
         delta # diffing
         gh # github cli
 
-        logisim-evolution
         mcaselector
-        prettierd
 
         # nix
         nixpkgs-review
diff --git a/hosts/global/common/audio.nix b/hosts/global/common/audio.nix
index 8232b14..14cedd3 100644
--- a/hosts/global/common/audio.nix
+++ b/hosts/global/common/audio.nix
@@ -18,16 +18,5 @@
     wireplumber.enable = true;
     jack.enable = true;
     lowLatency.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    # media-session.enable = true;
-  };
-
-  environment.systemPackages = builtins.attrValues {
-    inherit (pkgs)
-      playerctl # cli utility and lib for controlling media players
-      # pamixer # cli pulseaudio sound mixer
-      ;
   };
 }
diff --git a/hosts/global/common/bluetooth.nix b/hosts/global/common/bluetooth.nix
index e8ac142..abdd1aa 100644
--- a/hosts/global/common/bluetooth.nix
+++ b/hosts/global/common/bluetooth.nix
@@ -25,17 +25,9 @@
     };
   };
 
-  services.blueman.enable = true;
-  # these 2 options below were not mentioned in wiki
-
   boot = {
     extraModprobeConfig = ''
       options bluetooth enable_ecred=1
     '';
   };
-
-  environment.systemPackages = with pkgs; [
-    bluez-tools
-    bluetuith # can transfer files via OBEX
-  ];
 }
diff --git a/hosts/nixos/rune/default.nix b/hosts/nixos/rune/default.nix
index f46e174..6758f72 100644
--- a/hosts/nixos/rune/default.nix
+++ b/hosts/nixos/rune/default.nix
@@ -37,8 +37,7 @@ in
       "hosts/global/common/bluetooth.nix"
       "hosts/global/common/ddcutil.nix" # ddcutil for monitor controls
       "hosts/global/common/gaming.nix" # steam, gamescope, gamemode, and related hardware
-      # "hosts/global/common/gnome.nix" # desktop
-      "hosts/global/common/hyprland" # desktop
+      "hosts/global/common/gnome.nix"
       "hosts/global/common/libvirt.nix" # vm tools
       "hosts/global/common/nvtop.nix" # GPU monitor (not available in home-manager)
       "hosts/global/common/plymouth.nix" # fancy boot screen