more stuff

modules/common/default.nix

@@ -179,13 +179,6 @@
         curl
       ];
 
-      # Use the system-level nixpkgs instead of Home Manager's
-      home-manager.useGlobalPkgs = true;
-
-      # Install packages to /etc/profiles instead of ~/.nix-profile, useful when
-      # using multiple profiles for one user
-      home-manager.useUserPackages = true;
-
       # Allow specified unfree packages (identified elsewhere)
       # Retrieves package object based on string name
       nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.unfreePackages;

modules/nixos/default.nix

@@ -1,12 +0,0 @@
-{ ... }:
-{
-
-  imports = [
-    ./applications
-    ./gaming
-    ./graphical
-    ./hardware
-    ./services
-    ./system
-  ];
-}

modules/nixos/graphical/default.nix

@@ -1,64 +0,0 @@
-{ lib, ... }:
-{
-
-  imports = [
-    ./dunst.nix
-    ./fonts.nix
-    ./gtk.nix
-    ./i3.nix
-    ./picom.nix
-    ./polybar.nix
-    ./rofi.nix
-    ./xorg.nix
-  ];
-
-  options = {
-
-    launcherCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for launching";
-    };
-    systemdSearch = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for interacting with systemd";
-    };
-    altTabCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for choosing windows";
-    };
-    audioSwitchCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for switching audio sink";
-    };
-    brightnessCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for adjusting brightness";
-    };
-    calculatorCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for quick calculations";
-    };
-    toggleBarCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to hide and show the status bar.";
-    };
-    powerCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for power options menu";
-    };
-    terminal = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      description = "Path to executable for terminal emulator program.";
-      default = null;
-    };
-    terminalLaunchCommand = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      description = "Command for using the terminal to launch a new window with a program.";
-      default = null;
-    };
-    wallpaper = lib.mkOption {
-      type = lib.types.path;
-      description = "Wallpaper background image file";
-    };
-  };
-}

modules/nixos/graphical/fonts.nix

@@ -1,34 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-let
-  fontName = "Victor Mono";
-in
-{
-
-  config = lib.mkIf (config.gui.enable && pkgs.stdenv.isLinux) {
-
-    fonts.packages = with pkgs; [
-      victor-mono # Used for Vim and Terminal
-      nerd-fonts.hack # For Polybar, Rofi
-    ];
-    fonts.fontconfig.defaultFonts.monospace = [ fontName ];
-
-    home-manager.users.${config.user} = {
-      xsession.windowManager.i3.config.fonts = {
-        names = [ "pango:${fontName}" ];
-        # style = "Regular";
-        # size = 11.0;
-      };
-      services.polybar.config."bar/main".font-0 = "Hack Nerd Font:size=10;2";
-      programs.rofi.font = "Hack Nerd Font 14";
-      programs.alacritty.settings.font.normal.family = fontName;
-      programs.kitty.font.name = fontName;
-      services.dunst.settings.global.font = "Hack Nerd Font 14";
-    };
-  };
-}

modules/nixos/graphical/rofi.nix

@@ -1,36 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-let
-
-  rofi = config.home-manager.users.${config.user}.programs.rofi.finalPackage;
-in
-{
-
-  imports = [
-    ./rofi/power.nix
-    ./rofi/brightness.nix
-  ];
-
-  config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
-
-    launcherCommand = ''${rofi}/bin/rofi -modes drun -show drun -theme-str '@import "launcher.rasi"' '';
-    systemdSearch = "${pkgs.rofi-systemd}/bin/rofi-systemd";
-    altTabCommand = "${rofi}/bin/rofi -show window -modi window";
-    calculatorCommand = "${rofi}/bin/rofi -modes calc -show calc";
-    audioSwitchCommand = "${
-      (pkgs.writeShellApplication {
-        name = "switch-audio";
-        runtimeInputs = [
-          pkgs.ponymix
-          rofi
-        ];
-        text = builtins.readFile ./rofi/pulse-sink.sh;
-      })
-    }/bin/switch-audio";
-  };
-}