diff options
| -rw-r--r-- | machines/x/configuration.nix | 9 | ||||
| -rw-r--r-- | machines/x/home.nix | 10 | ||||
| -rw-r--r-- | modules/core/audio.nix (renamed from modules/audio.nix) | 0 | ||||
| -rw-r--r-- | modules/core/bluetooth.nix (renamed from modules/bluetooth.nix) | 0 | ||||
| -rw-r--r-- | modules/core/fonts.nix (renamed from modules/fonts.nix) | 0 | ||||
| -rw-r--r-- | modules/polkit.nix (renamed from modules/wm.nix) | 11 | ||||
| -rw-r--r-- | modules/wm_utils.nix | 13 |
7 files changed, 21 insertions, 22 deletions
diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix index 21ca26a..7aae93d 100644 --- a/machines/x/configuration.nix +++ b/machines/x/configuration.nix @@ -6,12 +6,12 @@ inputs.home-manager.nixosModules.default ] ++ (map (path: ../../modules/${path}) [ "global.nix" + "core/audio.nix" + "core/bluetooth.nix" + "core/fonts.nix" + "polkit.nix" "compromyse.nix" "login.nix" - "wm.nix" - "fonts.nix" - "bluetooth.nix" - "audio.nix" "virtualization.nix" "nvidia.nix" ]); @@ -34,7 +34,6 @@ networking.hostName = "x"; home-manager.users.compromyse = import ./home.nix; - programs.steam.enable = true; networking.extraHosts = '' diff --git a/machines/x/home.nix b/machines/x/home.nix index 51cd064..9d0a4ab 100644 --- a/machines/x/home.nix +++ b/machines/x/home.nix @@ -37,8 +37,6 @@ in { wbg - kcalc - ccls nodePackages.pyright git-lfs @@ -46,14 +44,14 @@ in { imports = (map (path: ../../config/${path}) [ "themes.nix" - "fuzzel" - "dunst" - "dwl.nix" + "bash.nix" "dotfiles.nix" "git" "nvim" "alacritty" - "bash.nix" + "dwl.nix" + "fuzzel" + "dunst" ]); home.stateVersion = "23.11"; diff --git a/modules/audio.nix b/modules/core/audio.nix index f358c2c..f358c2c 100644 --- a/modules/audio.nix +++ b/modules/core/audio.nix diff --git a/modules/bluetooth.nix b/modules/core/bluetooth.nix index fbd9b48..fbd9b48 100644 --- a/modules/bluetooth.nix +++ b/modules/core/bluetooth.nix diff --git a/modules/fonts.nix b/modules/core/fonts.nix index 8a56aa7..8a56aa7 100644 --- a/modules/fonts.nix +++ b/modules/core/fonts.nix diff --git a/modules/wm.nix b/modules/polkit.nix index 327ac41..ebfd03a 100644 --- a/modules/wm.nix +++ b/modules/polkit.nix @@ -3,17 +3,6 @@ { environment.sessionVariables.NIXOS_OZONE_WL = "1"; - environment.systemPackages = with pkgs; [ - networkmanagerapplet - - polkit_gnome - - libnotify - libappindicator - - inotify-tools - ]; - systemd = { user.services.polkit-gnome-authentication-agent-1 = { description = "polkit-gnome-authentication-agent-1"; diff --git a/modules/wm_utils.nix b/modules/wm_utils.nix new file mode 100644 index 0000000..7ddaca6 --- /dev/null +++ b/modules/wm_utils.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + networkmanagerapplet + + polkit_gnome + + libnotify + libappindicator + + inotify-tools + ]; +} |