diff --git a/flake.nix b/flake.nix index 9fea1b0cd..f9dfcf769 100644 --- a/flake.nix +++ b/flake.nix @@ -102,144 +102,7 @@ devShells = eachSupportedSystem (pkgs: { default = pkgs.mkShell { - packages = with pkgs; - [ - self.packages.${pkgs.system}.default - matugen.packages.${pkgs.system}.default - hyprland.packages.${pkgs.system}.default - ] - # --- Illogical Impulse Audio Dependencies --- - ++ [ - cava - pavucontrol - wireplumber - libdbusmenu-gtk3 - playerctl - ] - # --- Illogical Impulse Backlight Dependencies --- - ++ [ - geoclue2 # FIXME - brightnessctl - ddcutil - ] - # --- Illogical Impulse Basic Dependencies --- - ++ [ - axel - bc - coreutils - cliphist - cmake - curl - rsync - wget - ripgrep - jq - meson - xdg-user-dirs - ] - # --- Illogical Impulse Bibata Dependencies --- - ++ [ - bibata-cursors - ] - # --- Illogical Impulse Fonts and Theming Dependencies --- - ++ [ - # adw-gtk-theme-git - # breeze - # breeze-plus - # darkly-bin - adw-gtk3 #FIXME - darkly - eza - foot - fish - fontconfig - # kde-material-you-colors - kitty - matugen.packages.${pkgs.system}.default - # otf-space-grotesk - starship - # ttf-gabarito-git - nerd-fonts.jetbrains-mono - # ttf-material-symbols-variable-git - # ttf-readex-pro - # ttf-rubik-vf - # ttf-twemoji - ] - # --- Illogical Impulse Hyprland Dependencies --- - ++ [ - hyprland.packages.${pkgs.system}.default - hypridle - hyprcursor - hyprlang - hyprlock - hyprpicker - hyprsunset - hyprutils - hyprwayland-scanner - wl-clipboard - ] - # --- Illogical Impulse KDE Dependencies --- - ++ [ - kdePackages.bluedevil - gnome-keyring - networkmanager - kdePackages.plasma-nm - kdePackages.polkit-kde-agent-1 - kdePackages.dolphin - kdePackages.systemsettings - ] - # TODO - # Microtex - ++ [ - ] - # --- Illogical Impulse OneUI Dependencies --- - ++ [ - ] - # --- Illogical Impulse XDG Portal Dependencies --- - ++ [ - xdg-desktop-portal - kdePackages.xdg-desktop-portal-kde - xdg-desktop-portal-gtk - xdg-desktop-portal-hyprland - ] - # --- Illogical Impulse Python Dependencies --- - ++ [ - clang - uv - gtk4 - libadwaita - libsoup_3 - libportal-gtk4 - gobject-introspection - sassc - python3Packages.opencv-python - ] - # --- Illogical Impulse Screencapture Dependencies --- - ++ [ - hyprshot - slurp - swappy - tesseract - # tesseract-data-eng - wf-recorder - ] - # --- Illogical Impulse GTK/Qt Dependencies --- - ++ [ - kdePackages.kdialog - # libsForQt5.qt5.qtgraphicaleffects - - upower - wtype - ydotool - ] - # --- Illogical Impulse Widget Dependencies --- - ++ [ - quickshell.packages.${pkgs.system}.default - fuzzel - # glib2 - translate-shell - wlogout - ]; + packages = import ./modules/packages.nix {inherit pkgs;}; }; }); }; diff --git a/modules/desktop/desktop.nix b/modules/desktop/desktop.nix index 2a49ccbfa..b9014672c 100644 --- a/modules/desktop/desktop.nix +++ b/modules/desktop/desktop.nix @@ -48,158 +48,159 @@ in { ".config/xdg-desktop-portal".source = builtins.path {path = ../../.config/xdg-desktop-portal;}; ".config/starship.toml".source = builtins.path {path = ../../.config/starship.toml;}; }; - - home.packages = with pkgs; - [ - inputs.illogical-impulse.legacyPackages.${pkgs.system}.iiShellConfig - inputs.illogical-impulse.legacyPackages.${pkgs.system}.iiOneUI4Icons - inputs.illogical-impulse.legacyPackages.${pkgs.system}.quickshellWithQT - inputs.matugen.packages.${pkgs.system}.default - ] - ++ - # --- Illogical Impulse Audio Dependencies --- - [ - cava - pavucontrol - wireplumber - libdbusmenu-gtk3 - playerctl - ] - # --- Illogical Impulse Backlight Dependencies --- - ++ [ - geoclue2 # FIXME - brightnessctl - ddcutil - ] - # --- Illogical Impulse Basic Dependencies --- - ++ [ - axel - bc - coreutils - cliphist - cmake - curl - rsync - wget - ripgrep - jq - meson - xdg-user-dirs - ] - # --- Illogical Impulse Bibata Dependencies --- - ++ [ - bibata-cursors - ] - # --- Illogical Impulse Fonts and Theming Dependencies --- - ++ [ - # adw-gtk-theme-git - # breeze - # breeze-plus - # darkly-bin - adw-gtk3 #FIXME - darkly - eza - foot - fish - fontconfig - # kde-material-you-colors - kitty - # matugen.packages.${pkgs.system}.default - # otf-space-grotesk - starship - # ttf-gabarito-git - nerd-fonts.jetbrains-mono - material-symbols - # ttf-material-symbols-variable-git - # ttf-readex-pro - # ttf-rubik-vf - # ttf-twemoji - ] - # --- Illogical Impulse Hyprland Dependencies --- - ++ [ - # hyprland.packages.${pkgs.system}.default - hypridle - hyprcursor - hyprlang - hyprlock - hyprpicker - hyprsunset - hyprutils - hyprwayland-scanner - wl-clipboard - ] - # --- Illogical Impulse KDE Dependencies --- - ++ [ - kdePackages.bluedevil - gnome-keyring - networkmanager - kdePackages.plasma-nm - kdePackages.polkit-kde-agent-1 - kdePackages.dolphin - kdePackages.systemsettings - ] - # TODO - # Microtex - ++ [ - ] - # --- Illogical Impulse OneUI Dependencies --- - ++ [ - ] - # --- Illogical Impulse XDG Portal Dependencies --- - ++ [ - xdg-desktop-portal - kdePackages.xdg-desktop-portal-kde - xdg-desktop-portal-gtk - xdg-desktop-portal-hyprland - ] - # --- Illogical Impulse Python Dependencies --- - ++ [ - clang - uv - gtk4 - libadwaita - libsoup_3 - libportal-gtk4 - gobject-introspection - sassc - python3Packages.opencv-python - ] - # --- Illogical Impulse Screencapture Dependencies --- - ++ [ - hyprshot - slurp - swappy - tesseract - # tesseract-data-eng - wf-recorder - ] - # --- Illogical Impulse GTK/Qt Dependencies --- - ++ [ - kdePackages.kdialog - # qt6-5compat - # qt6-avif-image-plugin - # qt6-base - # qt6-declarative - # qt6-imageformats - # qt6-multimedia - # qt6-positioning - # qt6-quicktimeline - # qt6-sensors - # qt6-svg - # qt6-tools - # qt6-translations - # qt6-virtualkeyboard - # qt6-wayland - upower - wtype - ydotool - ] - # --- Illogical Impulse Widget Dependencies --- - ++ [ - fuzzel - # glib2 - translate-shell - wlogout - ]; + home.packages = import ../packages.nix; + # + # home.packages = with pkgs; + # [ + # inputs.illogical-impulse.legacyPackages.${pkgs.system}.iiShellConfig + # inputs.illogical-impulse.legacyPackages.${pkgs.system}.iiOneUI4Icons + # inputs.illogical-impulse.legacyPackages.${pkgs.system}.quickshellWithQT + # inputs.matugen.packages.${pkgs.system}.default + # ] + # ++ + # # --- Illogical Impulse Audio Dependencies --- + # [ + # cava + # pavucontrol + # wireplumber + # libdbusmenu-gtk3 + # playerctl + # ] + # # --- Illogical Impulse Backlight Dependencies --- + # ++ [ + # geoclue2 # FIXME + # brightnessctl + # ddcutil + # ] + # # --- Illogical Impulse Basic Dependencies --- + # ++ [ + # axel + # bc + # coreutils + # cliphist + # cmake + # curl + # rsync + # wget + # ripgrep + # jq + # meson + # xdg-user-dirs + # ] + # # --- Illogical Impulse Bibata Dependencies --- + # ++ [ + # bibata-cursors + # ] + # # --- Illogical Impulse Fonts and Theming Dependencies --- + # ++ [ + # # adw-gtk-theme-git + # # breeze + # # breeze-plus + # # darkly-bin + # adw-gtk3 #FIXME + # darkly + # eza + # foot + # fish + # fontconfig + # # kde-material-you-colors + # kitty + # # matugen.packages.${pkgs.system}.default + # # otf-space-grotesk + # starship + # # ttf-gabarito-git + # nerd-fonts.jetbrains-mono + # material-symbols + # # ttf-material-symbols-variable-git + # # ttf-readex-pro + # # ttf-rubik-vf + # # ttf-twemoji + # ] + # # --- Illogical Impulse Hyprland Dependencies --- + # ++ [ + # # hyprland.packages.${pkgs.system}.default + # hypridle + # hyprcursor + # hyprlang + # hyprlock + # hyprpicker + # hyprsunset + # hyprutils + # hyprwayland-scanner + # wl-clipboard + # ] + # # --- Illogical Impulse KDE Dependencies --- + # ++ [ + # kdePackages.bluedevil + # gnome-keyring + # networkmanager + # kdePackages.plasma-nm + # kdePackages.polkit-kde-agent-1 + # kdePackages.dolphin + # kdePackages.systemsettings + # ] + # # TODO + # # Microtex + # ++ [ + # ] + # # --- Illogical Impulse OneUI Dependencies --- + # ++ [ + # ] + # # --- Illogical Impulse XDG Portal Dependencies --- + # ++ [ + # xdg-desktop-portal + # kdePackages.xdg-desktop-portal-kde + # xdg-desktop-portal-gtk + # xdg-desktop-portal-hyprland + # ] + # # --- Illogical Impulse Python Dependencies --- + # ++ [ + # clang + # uv + # gtk4 + # libadwaita + # libsoup_3 + # libportal-gtk4 + # gobject-introspection + # sassc + # python3Packages.opencv-python + # ] + # # --- Illogical Impulse Screencapture Dependencies --- + # ++ [ + # hyprshot + # slurp + # swappy + # tesseract + # # tesseract-data-eng + # wf-recorder + # ] + # # --- Illogical Impulse GTK/Qt Dependencies --- + # ++ [ + # kdePackages.kdialog + # # qt6-5compat + # # qt6-avif-image-plugin + # # qt6-base + # # qt6-declarative + # # qt6-imageformats + # # qt6-multimedia + # # qt6-positioning + # # qt6-quicktimeline + # # qt6-sensors + # # qt6-svg + # # qt6-tools + # # qt6-translations + # # qt6-virtualkeyboard + # # qt6-wayland + # upower + # wtype + # ydotool + # ] + # # --- Illogical Impulse Widget Dependencies --- + # ++ [ + # fuzzel + # # glib2 + # translate-shell + # wlogout + # ]; }; } diff --git a/modules/packages.nix b/modules/packages.nix new file mode 100644 index 000000000..4016a00e1 --- /dev/null +++ b/modules/packages.nix @@ -0,0 +1,110 @@ +{ + inputs, + pkgs, + ... +}: +with pkgs; [ + # --- Illogical Impulse Audio Dependencies --- + cava + pavucontrol + wireplumber + libdbusmenu-gtk3 + playerctl + # --- Illogical Impulse Backlight Dependencies --- + geoclue2 # FIXME + brightnessctl + ddcutil + # --- Illogical Impulse Basic Dependencies --- + axel + bc + coreutils + cliphist + cmake + curl + rsync + wget + ripgrep + jq + meson + xdg-user-dirs + # --- Illogical Impulse Bibata Dependencies --- + bibata-cursors + # --- Illogical Impulse Fonts and Theming Dependencies --- + # adw-gtk-theme-git + # breeze + # breeze-plus + # darkly-bin + adw-gtk3 #FIXME + darkly + eza + foot + fish + fontconfig + python313Packages.kde-material-you-colors #FIXME + kitty + inputs.matugen.packages.${pkgs.system}.default + # otf-space-grotesk + starship + # ttf-gabarito-git + nerd-fonts.jetbrains-mono + # ttf-material-symbols-variable-git + # ttf-readex-pro + # ttf-rubik-vf + # ttf-twemoji + # --- Illogical Impulse Hyprland Dependencies --- + inputs.hyprland.packages.${pkgs.system}.default + hypridle + hyprcursor + hyprlang + hyprlock + hyprpicker + hyprsunset + hyprutils + hyprwayland-scanner + wl-clipboard + # --- Illogical Impulse KDE Dependencies --- + kdePackages.bluedevil + gnome-keyring + networkmanager + kdePackages.plasma-nm + kdePackages.polkit-kde-agent-1 + kdePackages.dolphin + kdePackages.systemsettings + # TODO + # Microtex + # --- Illogical Impulse OneUI Dependencies --- + # --- Illogical Impulse XDG Portal Dependencies --- + xdg-desktop-portal + kdePackages.xdg-desktop-portal-kde + xdg-desktop-portal-gtk + xdg-desktop-portal-hyprland + # --- Illogical Impulse Python Dependencies --- + clang + uv + gtk4 + libadwaita + libsoup_3 + libportal-gtk4 + gobject-introspection + sassc + python3Packages.opencv-python + # --- Illogical Impulse Screencapture Dependencies --- + hyprshot + slurp + swappy + tesseract + # tesseract-data-eng + wf-recorder + # --- Illogical Impulse GTK/Qt Dependencies --- + kdePackages.kdialog + upower + wtype + ydotool + # --- Illogical Impulse Widget Dependencies --- + inputs.illogical-impulse.legacyPackages.${pkgs.system}.quickshellWithQT + # quickshell.packages.${pkgs.system}.default + fuzzel + # glib2 + translate-shell + wlogout +]