diff --git a/flake.nix b/flake.nix index 6d80b5ca2..667dbca82 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,7 @@ oneUI, ... }: let - supportedSystems = ["x86_64-linux" "aarch64-darwin"]; + supportedSystems = ["x86_64-linux"]; eachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: let pkgs = import nixpkgs { @@ -48,6 +48,14 @@ }; legacyPackages = eachSupportedSystem (pkgs: { + quickshellWithQT = quickshell.packages.${pkgs.system}.default.overrideAttrs (oldAttrs: { + propagatedBuildInputs = + oldAttrs.propagatedBuildInputs or [] + ++ [ + pkgs.kdePackages.qt5compat + pkgs.kdePackages.qtpositioning + ]; + }); iiShellConfig = pkgs.stdenv.mkDerivation { pname = "ii-shell-config"; version = "1.0"; @@ -55,8 +63,8 @@ installPhase = '' runHook preInstall - install -d -m 755 $out/.config - cp -r .config/quickshell $out/.config/ + install -d -m 755 $out/share/ii + cp -r .config/quickshell/ii/* $out/share/ii runHook postInstall ''; @@ -91,154 +99,143 @@ devShells = eachSupportedSystem (pkgs: { default = pkgs.mkShell { - packages = with pkgs; - [ - self.legacyPackages.${pkgs.system}.iiShellConfig - ] - # --- 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 - 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 - 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 --- - ++ [ - 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 --- - ++ [ - inputs.quickshell.packages.${pkgs.system}.default - fuzzel - # glib2 - translate-shell - wlogout - ]; + 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 + # ]; }; }); }; diff --git a/nix/modules/desktop/desktop.nix b/nix/modules/desktop/desktop.nix index 878be2d16..deea0b2cd 100644 --- a/nix/modules/desktop/desktop.nix +++ b/nix/modules/desktop/desktop.nix @@ -64,7 +64,13 @@ in { }; environment.systemPackages = with pkgs; - # --- Illogical Impulse Audio Dependencies --- + [ + inputs.self.packages.${pkgs.system}.default + inputs.matugen.packages.${pkgs.system}.default + inputs.hyprland.packages.${pkgs.system}.default + ] + ++ + # --- Illogical Impulse Audio Dependencies --- [ cava pavucontrol @@ -150,12 +156,11 @@ in { ] # --- Illogical Impulse OneUI Dependencies --- ++ [ - self.legacyPackages.${pkgs.system}.iiOneUI4Icons ] # --- Illogical Impulse XDG Portal Dependencies --- ++ [ xdg-desktop-portal - xdg-desktop-portal-kde + kdePackages.xdg-desktop-portal-kde xdg-desktop-portal-gtk xdg-desktop-portal-hyprland ] @@ -182,7 +187,7 @@ in { ] # --- Illogical Impulse GTK/Qt Dependencies --- ++ [ - kdialog + kdePackages.kdialog # qt6-5compat # qt6-avif-image-plugin # qt6-base @@ -203,7 +208,6 @@ in { ] # --- Illogical Impulse Widget Dependencies --- ++ [ - quickshell.packages.${pkgs.system}.default fuzzel # glib2 translate-shell diff --git a/result b/result index a9a8c8e53..cf34293d4 120000 --- a/result +++ b/result @@ -1 +1 @@ -/nix/store/56gx0b9amh21m0wjfb72mzgprsdyyr9a-illogical-impulse-packages \ No newline at end of file +/nix/store/8471m2w95hhz2b0906bmkrcly18cm0dz-illogical-impulse-packages \ No newline at end of file