hyprland porting

This commit is contained in:
2024-04-19 18:04:49 +02:00
parent 158fe716da
commit f6eb31a26b
5 changed files with 53 additions and 32 deletions

View File

@@ -3,13 +3,13 @@
]; ];
dconf.settings."org/gnome/desktop/interface".color-scheme = # dconf.settings."org/gnome/desktop/interface".color-scheme =
if config.colorscheme.variant == "dark" # if config.colorscheme.variant == "dark"
then "prefer-dark" # then "prefer-dark"
else if config.colorscheme.variant == "light" # else if config.colorscheme.variant == "light"
then "prefer-light" # then "prefer-light"
else "default"; # else "default";
xdg.portal.enable = true; # xdg.portal.enable = true;
} }

View File

@@ -7,14 +7,14 @@
gtk3 gtk3
imv imv
mimeo mimeo
primary-xwayland # primary-xwayland
pulseaudio pulseaudio
slurp slurp
waypipe waypipe
wf-recorder wf-recorder
wl-clipboard wl-clipboard
wl-mirror wl-mirror
wl-mirror-pick # wl-mirror-pick
xdg-utils xdg-utils
ydotool ydotool
]; ];
@@ -25,5 +25,5 @@
LIBSEAT_BACKEND = "logind"; LIBSEAT_BACKEND = "logind";
}; };
xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-wlr]; # xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-wlr];
} }

View File

@@ -4,37 +4,40 @@
pkgs, pkgs,
... ...
}: let }: let
hyprland = pkgs.inputs.hyprland.hyprland.override {wrapRuntimeDeps = false;}; # hyprland = pkgs.inputs.hyprland.hyprland.override {wrapRuntimeDeps = false;};
xdhp = pkgs.inputs.hyprland.xdg-desktop-portal-hyprland.override {inherit hyprland;}; # xdhp = pkgs.inputs.hyprland.xdg-desktop-portal-hyprland.override {inherit hyprland;};
in { in {
imports = [ imports = [
../common ../common
../common/wayland-wm ../common/wayland-wm
]; ];
xdg.portal = { # xdg.portal = {
extraPortals = [xdhp]; # extraPortals = [xdhp];
configPackages = [hyprland]; # configPackages = [hyprland];
}; # };
home.packages = with pkgs; [ home.packages = with pkgs; [
inputs.hyprwm-contrib.grimblast # inputs.hyprwm-contrib.grimblast
hyprslurp # hyprslurp
hyprpicker hyprpicker
hyprpaper
waybar
xdg-desktop-portal-hyprland
]; ];
wayland.windowManger.hyprland = { # wayland.windowManger.hyprland = {
enable = true; # enable = true;
package = hyprland; # # package = hyprland;
systemd = { # systemd = {
enable = true; # enable = true;
# Same as default but stop graphical-session too # # Same as default but stop graphical-session too
extraCommands = lib.mkBefore [ # extraCommands = lib.mkBefore [
"systemctl --user stop graphical-session.target" # "systemctl --user stop graphical-session.target"
"systemctl --user start hyprland-session.target" # "systemctl --user start hyprland-session.target"
]; # ];
}; # };
#
#TODO: Add hyprland config # #TODO: Add hyprland config
}; # };
} }

View File

@@ -19,6 +19,7 @@
# You can also split up your configuration and import pieces of it here: # You can also split up your configuration and import pieces of it here:
# ./nvim.nix # ./nvim.nix
./features/cli ./features/cli
./features/desktop/hyprland
./features/kitty.nix ./features/kitty.nix
./features/neovim.nix ./features/neovim.nix
]; ];

View File

@@ -12,6 +12,23 @@
# }); # });
}; };
# For every flake input, aliases 'pkgs.inputs.${flake}' to
# 'inputs.${flake}.packages.${pkgs.system}' or
# 'inputs.${flake}.legacyPackages.${pkgs.system}'
flake-inputs = final: _: {
inputs =
builtins.mapAttrs (
_: flake: let
legacyPackages = (flake.legacyPackages or {}).${final.system} or {};
packages = (flake.packages or {}).${final.system} or {};
in
if legacyPackages != {}
then legacyPackages
else packages
)
inputs;
};
# When applied, the unstable nixpkgs set (declared in the flake inputs) will # When applied, the unstable nixpkgs set (declared in the flake inputs) will
# be accessible through 'pkgs.unstable' # be accessible through 'pkgs.unstable'
unstable-packages = final: _prev: { unstable-packages = final: _prev: {