feat(hypr): go back to hyprexpo and update flake.lock

This commit is contained in:
matt1432 2024-05-01 10:21:28 -04:00
parent 315a06dbf2
commit bc4be97591
12 changed files with 42 additions and 34 deletions

View file

@ -1,8 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "codeberg.org/forgejo/forgejo";
imageDigest = "sha256:c3c662609a02cf6d384fa3698c59eceaf78b8799dbfee4ea4e438eb19f613095";
sha256 = "0zx9ikm66bqdlkfgcj2v7si17qsc1m69xjjxf1ghdnia4wnwbch9";
imageDigest = "sha256:0b50b596246cc4c439b6113411973f4c0639cb8556c7cf98e8017efdb5c3ab90";
sha256 = "1jbnmdr7jdbwpmbl5gsp7p3yql1bd83fnmp3k1h6xymw7nigzflk";
finalImageName = "codeberg.org/forgejo/forgejo";
finalImageTag = "7";
}

View file

@ -1,7 +1,7 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "postgres";
imageDigest = "sha256:c7b1085b1a26835716593174ee2169e76e8ee1d37cc8aab0b78a3e4da794d8cb";
imageDigest = "sha256:d6850c40261fdc9a4fb33b9521d9d641c4a5dcb82145f7bcc32c9258f81e75a2";
sha256 = "0zjcx747n54jnnliqd80v8ca43rl09dp3bh6xir5kxq2hw5p22i4";
finalImageName = "postgres";
finalImageTag = "14";

View file

@ -1,7 +1,7 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "postgres";
imageDigest = "sha256:c7b1085b1a26835716593174ee2169e76e8ee1d37cc8aab0b78a3e4da794d8cb";
imageDigest = "sha256:d6850c40261fdc9a4fb33b9521d9d641c4a5dcb82145f7bcc32c9258f81e75a2";
sha256 = "0zjcx747n54jnnliqd80v8ca43rl09dp3bh6xir5kxq2hw5p22i4";
finalImageName = "postgres";
finalImageTag = "14";

View file

@ -1,8 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "rssbridge/rss-bridge";
imageDigest = "sha256:9e501c795c0e47dffbd81c7a0169b2601582abcadc5d8d415188ab60196b4819";
sha256 = "0gc8d1hd44k7ib4d8rg8w6qlz5zhjzp8wfn1cfcwbgm883pca808";
imageDigest = "sha256:4d173965f264fe8921366eb7b2f3ab0072d039ed85146a193b3e2029161dd7c1";
sha256 = "0d3cfhfasd4y46z6jj8ij728lih6mxwkhlplxr0vqnbd8ch3jg3h";
finalImageName = "rssbridge/rss-bridge";
finalImageTag = "latest";
}

View file

@ -1,8 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "ghcr.io/linuxserver/calibre-web";
imageDigest = "sha256:153babfa106ea042777784f64b06d228e9d4e28e3b96db1a88e7800729b1cfe8";
sha256 = "0723kr8k7vvdxnb462lbdgq5b6nxnf9pm8m03wydrzazi23071y7";
imageDigest = "sha256:33ddda92b3f02bbd38a452b44f7343da25ada4c374fbac50c656bc04b995d93f";
sha256 = "1qylqqbngqxsl87jr7ks9pnkjnchy7jinkdc3y5ch7vxrml1919r";
finalImageName = "ghcr.io/linuxserver/calibre-web";
finalImageTag = "latest";
}

Binary file not shown.

BIN
flake.nix

Binary file not shown.

View file

@ -8,20 +8,12 @@
inherit (import ./hyprland.nix {inherit config lib pkgs;}) hyprConf;
# Nix stuff
isTouchscreen = config.hardware.sensor.iio.enable;
hyprland = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage;
in {
imports = [./astal.nix];
services = {
displayManager = {
sessionPackages = [hyprland];
};
xserver = {
libinput.enable = true;
wacom.enable = isTouchscreen;
};
displayManager.sessionPackages = [hyprland];
greetd = {
enable = true;

View file

@ -1,15 +0,0 @@
{
Hyprspace,
pkgs,
...
}: {
wayland.windowManager.hyprland = {
plugins = [Hyprspace.packages.${pkgs.system}.Hyprspace];
settings = {
bind = [
"ALT, tab, overview:toggle"
];
};
};
}

View file

@ -9,6 +9,7 @@
inherit (config.vars) mainUser;
cfg = config.programs.hyprland;
isTouchscreen = config.hardware.sensor.iio.enable;
in {
# SYSTEM CONFIG
imports = [
@ -29,6 +30,8 @@ in {
services = {
dbus.enable = true;
gvfs.enable = true;
libinput.enable = true;
xserver.wacom.enable = isTouchscreen;
};
programs.hyprland = with hyprland.packages.${pkgs.system}; {
@ -56,7 +59,7 @@ in {
# HOME-MANAGER CONFIG
home-manager.users.${mainUser} = {
imports = [
./Hyprspace.nix
./hyprexpo.nix
./inputs.nix
./style.nix
];

View file

@ -0,0 +1,28 @@
{
hypr-official-plugins,
pkgs,
...
}: {
wayland.windowManager.hyprland = {
plugins = [hypr-official-plugins.packages.${pkgs.system}.hyprexpo];
settings = {
plugin = {
hyprexpo = {
columns = 3;
gap_size = 5;
bg_col = "rgb(111111)";
workspace_method = "center current"; # [center/first] [workspace] e.g. first 1 or center m+1
enable_gesture = true; # laptop touchpad, 4 fingers
gesture_distance = 300; # how far is the "max"
gesture_positive = true; # positive = swipe down. Negative = swipe up.
};
};
bind = [
"ALT, tab, hyprexpo:expo, toggle" # can be: toggle, off/disable or on/enable
];
};
};
}

View file

@ -62,7 +62,7 @@ in {
photoqt
nextcloud-client
jellyfin-media-player
prismlauncher-qt5
prismlauncher
# tools
wl-color-picker