From b9a7145c5c3215a21d88d4e24949254684f2233c Mon Sep 17 00:00:00 2001 From: kenji Date: Mon, 11 Aug 2025 17:22:12 -0500 Subject: [PATCH] flake update --- flake.lock | 21 +++ flake.nix | 275 ++++++++++++++++++------------------ modules/desktop/desktop.nix | 1 + 3 files changed, 160 insertions(+), 137 deletions(-) diff --git a/flake.lock b/flake.lock index d72a0b086..fd6869225 100644 --- a/flake.lock +++ b/flake.lock @@ -71,6 +71,26 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754924470, + "narHash": "sha256-asI/or9AcUMydwzodCgpHGytnMSNUlciw3uaycpXm4E=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "67393957c27b4e4c6c48a60108a201413ced7800", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -430,6 +450,7 @@ }, "root": { "inputs": { + "home-manager": "home-manager", "hyprland": "hyprland", "matugen": "matugen", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 896929f0c..9fea1b0cd 100644 --- a/flake.nix +++ b/flake.nix @@ -102,143 +102,144 @@ 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 = 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/modules/desktop/desktop.nix b/modules/desktop/desktop.nix index d7d894862..2a49ccbfa 100644 --- a/modules/desktop/desktop.nix +++ b/modules/desktop/desktop.nix @@ -109,6 +109,7 @@ in { starship # ttf-gabarito-git nerd-fonts.jetbrains-mono + material-symbols # ttf-material-symbols-variable-git # ttf-readex-pro # ttf-rubik-vf