matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
matt1432 2024-05-01 10:21:28 -04:00
parent 315a06dbf2
commit bc4be97591
12 changed files with 129 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
devices/nos/modules/arion/forgejo/images/forgejo.nix
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";
}

2
devices/nos/modules/arion/forgejo/images/postgres.nix
View file

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

2
devices/nos/modules/arion/freshrss/images/postgres.nix
View file

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

4
devices/nos/modules/arion/freshrss/images/rss-bridge.nix
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";
}

4
devices/nos/modules/arion/media/calibre/images/calibre-web.nix
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";
}

163
flake.lock generated
View file

@ -1,25 +1,5 @@
{
"nodes": {
"Hyprspace": {
"inputs": {
"hyprland": [
"hyprland"
]
},
"locked": {
"lastModified": 1713989021,
"narHash": "sha256-oIpcibtKHP8e7yhYilK9+TaiOTApS4TqXQbdKqJpyWQ=",
"owner": "KZDKM",
"repo": "Hyprspace",
"rev": "a44d834af279f233a269d065d2e14fe4101d6f41",
"type": "github"
},
"original": {
"owner": "KZDKM",
"repo": "Hyprspace",
"type": "github"
}
},
"ags": {
"inputs": {
"nixpkgs": [
@ -50,11 +30,11 @@
]
},
"locked": {
"lastModified": 1713728172,
"narHash": "sha256-rac5WwUyZGxVqcNh2PIOxXJFGPXBSFPfkox1AdqwVgk=",
"lastModified": 1714329018,
"narHash": "sha256-q0vsfqjYB0Phx4HoykT2HwRZDuxFwaRI9SQeEDbqZkU=",
"owner": "hercules-ci",
"repo": "arion",
"rev": "add0e67d2b83814667490985ea4ef1226d3b4511",
"rev": "efa008e12f590eea1a3e7f2088877dc9bdcc54b7",
"type": "github"
},
"original": {
@ -106,11 +86,11 @@
]
},
"locked": {
"lastModified": 1714028800,
"narHash": "sha256-fiQASqXfJAIkyNen7YB1FzDKg9eQg9MU1PiTp4QVv74=",
"lastModified": 1714201567,
"narHash": "sha256-dQrobwxJ0V/5Aqqwh73xVsNkfg9el18RQZAACNhh25I=",
"owner": "matt1432",
"repo": "nixos-caddy-cloudflare",
"rev": "5fac03dc0bba7d446883f00f506d2121bc04e647",
"rev": "e3b7b522376f5bcb547f13cd0f1434919ad40210",
"type": "github"
},
"original": {
@ -431,11 +411,11 @@
"gpu-screen-recorder-src": {
"flake": false,
"locked": {
"lastModified": 1714047774,
"narHash": "sha256-st4tcl13jyqOnwBR2uP4el28VIF4SqiLPQ1xd9xUX9A=",
"lastModified": 1714173938,
"narHash": "sha256-1PULc1djvATCoXn6jZRJqbE8RtEYEUHFhNMj738Hsd4=",
"ref": "refs/heads/master",
"rev": "4b28221a77cd1407208793cc84cfe4014607f3db",
"revCount": 573,
"rev": "3143358c3bfc882fb94c1ea906630fc0aa7fd061",
"revCount": 575,
"type": "git",
"url": "https://repo.dec05eba.com/gpu-screen-recorder"
},
@ -504,11 +484,11 @@
]
},
"locked": {
"lastModified": 1713937475,
"narHash": "sha256-UxXU9tsSXF7c5csEWZf1WYYa1Jy+B3YBsHqw9U2KOtE=",
"lastModified": 1714207659,
"narHash": "sha256-WvMkLtarhFksY4PIe4wj+6Uk2yDoUnJJRshuHWCe2tI=",
"owner": "juanfont",
"repo": "headscale",
"rev": "fef8261339899fe526777a7aa42df57ca02021c5",
"rev": "cb0b495ea9b4a6728db84b6da7df4401d31190ae",
"type": "github"
},
"original": {
@ -546,11 +526,11 @@
]
},
"locked": {
"lastModified": 1714042918,
"narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=",
"lastModified": 1714343445,
"narHash": "sha256-OzD1P0o46uD3Ix4ZI/g9z3YAeg+4g+W3qctB6bNOReo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db",
"rev": "9fe79591c1005ce6f93084ae7f7dab0a2891440d",
"type": "github"
},
"original": {
@ -559,6 +539,31 @@
"type": "github"
}
},
"hypr-official-plugins": {
"inputs": {
"hyprland": [
"hyprland"
],
"systems": [
"hypr-official-plugins",
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1714219583,
"narHash": "sha256-s6yf/bsAum3sAXSxB5gDCHQoLMn5Skl9EWL8nvsXzog=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
"rev": "97e9d252ffec654cdc69a2cea8b63a172795706b",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-plugins",
"type": "github"
}
},
"hyprcursor": {
"inputs": {
"hyprlang": [
@ -624,11 +629,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1714060631,
"narHash": "sha256-Ur7gYu2R1AvJMZCxqRr5ai3SKmgzY5QAEX+9OpKqfUY=",
"lastModified": 1714351104,
"narHash": "sha256-e8/5G9H0aD/SsAtYDSNKhiEw8QS89sp5cCGol5GzbaQ=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "0652a20bd31de9cd3de6abbbc5f645b0faa77f6d",
"rev": "33e0bb14786dc22a0c82eaaf097b469d3fdeceea",
"type": "github"
},
"original": {
@ -721,11 +726,11 @@
]
},
"locked": {
"lastModified": 1713989318,
"narHash": "sha256-WSsEQQxZQ+bsAWRhi1iXvP8sxgRyNtY3X1V3CfFdP5Q=",
"lastModified": 1714171579,
"narHash": "sha256-eaWDIvt8ufUKKz3Lc2a3PyemLJG1m9RYlF+HP3hWbaw=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "1cfe2d26a82ce794fd33ec06fa022e68501c5a45",
"rev": "126dad854f22fe30e6b82cd21808e76903d90ac5",
"type": "github"
},
"original": {
@ -776,11 +781,11 @@
"nixpkgs-lib": "nixpkgs-lib_4"
},
"locked": {
"lastModified": 1713701427,
"narHash": "sha256-v6z8hz/UDaC/rbnkH+hxGFUxlNyseVntRetVpSxLU6c=",
"lastModified": 1714306226,
"narHash": "sha256-CA7bfnDt9TcFc7I8eKHf72DodYUEETDPgmBFXBRP9/E=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "3b32a98eb3053f8c8ca55497d1881443ef2996e6",
"rev": "49d9b510614b9bd137e067eb31445a8feca83313",
"type": "github"
},
"original": {
@ -826,11 +831,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1713635132,
"narHash": "sha256-lLftlafVmv9RPzCO7gTsswiD+Q0MoAP0FVXVoK3iGmE=",
"lastModified": 1714165257,
"narHash": "sha256-/pZwLN3ATpmvTvGVV70mYU0ifRCmALLqvrt8cRbty1A=",
"owner": "viperML",
"repo": "nh",
"rev": "6c772f572fd17ed9181625e221e2365e9bffc3f6",
"rev": "9589dea0e74a819c296c591123f6af37c3f0bce3",
"type": "github"
},
"original": {
@ -934,11 +939,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1713921309,
"narHash": "sha256-9/5xt3019W55Vu8MX9LlaFTFoNd4dwLqwvUEDWjn+KU=",
"lastModified": 1714303849,
"narHash": "sha256-o/IgiwA0ZS/nMh5YB0bt+ae3Lt+tlbQouY/xL7tB5h0=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "a21a6f3321682226e47f7ead4d2eba59a3f63654",
"rev": "dbb96ae98e723128cf5a612480ba6187113f5e49",
"type": "github"
},
"original": {
@ -997,11 +1002,11 @@
]
},
"locked": {
"lastModified": 1713869268,
"narHash": "sha256-o3CMQeu/S8/4zU0pMtYg51rd1FWdJsI2Xohzng1Ysdg=",
"lastModified": 1714273701,
"narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "dcb6ac44922858ce3a5b46f77a36d6030181460c",
"rev": "941c4973c824509e0356be455d89613611f76c8a",
"type": "github"
},
"original": {
@ -1062,11 +1067,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1714002774,
"narHash": "sha256-gj/MyKHqQdxfZKnmbsGVz2fkRbAVFKaEyWZZmgZsiaQ=",
"lastModified": 1714328530,
"narHash": "sha256-wjkMkU2nc4d0MByzl26VGclcpO6RxMJdTKSdnCRmjmk=",
"owner": "nix-community",
"repo": "nixd",
"rev": "39ff96c1f1e7ea2584b55b96469b0a55e445c97c",
"rev": "598a2c33d5421f3a8ef2f393e38ea8711d217505",
"type": "github"
},
"original": {
@ -1179,11 +1184,11 @@
},
"nixpkgs-lib_4": {
"locked": {
"lastModified": 1713660444,
"narHash": "sha256-2bVnrEGyWJhRNKspzfTJmVD/fsH9HQURD4cWpz79Ulw=",
"lastModified": 1714265296,
"narHash": "sha256-jVnKiCOoFulPT1zDdA4jfG/lnEnngdth5CT6rVDXEJ4=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "6882347415e352cfc9c277cc01f73e0f5cb7b93c",
"rev": "ade4fb7bbf04cd52bc1705734d5dc67755d77ec9",
"type": "github"
},
"original": {
@ -1232,11 +1237,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1714047868,
"narHash": "sha256-uGbzMTV3Vs5pWqzeLPWXx8oe4EkidB73jzeaXmdcV2c=",
"lastModified": 1714335386,
"narHash": "sha256-PLjmgp9msARENTVYPlsHZwuSwjUao/Lpka0ZvHCJ64g=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "41903b991bc2dc248f39439e376339e5e2fd436c",
"rev": "61c88f2ca79f01fb41c2787fed0affa22eb51214",
"type": "github"
},
"original": {
@ -1247,11 +1252,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1713596654,
"narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=",
"lastModified": 1714213793,
"narHash": "sha256-Yg5D5LhyAZvd3DZrQQfJAVK8K3TkUYKooFtH1ulM0mw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be",
"rev": "d6f6eb2a984f2ba9a366c31e4d36d65465683450",
"type": "github"
},
"original": {
@ -1295,11 +1300,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1713895582,
"narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=",
"lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "572af610f6151fd41c212f897c71f7056e3fb518",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github"
},
"original": {
@ -1327,11 +1332,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1713895582,
"narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=",
"lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "572af610f6151fd41c212f897c71f7056e3fb518",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github"
},
"original": {
@ -1449,11 +1454,11 @@
},
"nur": {
"locked": {
"lastModified": 1714056679,
"narHash": "sha256-RKilQQQiuVVeRTRjJkZSmhsG60MG0ln9d9eSn07Zbt0=",
"lastModified": 1714349228,
"narHash": "sha256-ghWwfIueHfBeAgeYlQAsYQq08UUEwST+KX4KqXsW1ho=",
"owner": "nix-community",
"repo": "NUR",
"rev": "9410133c3f453de8074e16f06926a5302bc19b29",
"rev": "4044fcb14edb075ec92d2e112afef07a439ca7a4",
"type": "github"
},
"original": {
@ -1682,7 +1687,6 @@
},
"root": {
"inputs": {
"Hyprspace": "Hyprspace",
"ags": "ags",
"arion": "arion",
"astal": "astal",
@ -1698,6 +1702,7 @@
"gtk-theme-src": "gtk-theme-src",
"headscale": "headscale",
"home-manager": "home-manager",
"hypr-official-plugins": "hypr-official-plugins",
"hypridle": "hypridle",
"hyprland": "hyprland",
"jellyfin-flake": "jellyfin-flake",
@ -1981,11 +1986,11 @@
]
},
"locked": {
"lastModified": 1714058656,
"narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
"lastModified": 1711963903,
"narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
"rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac",
"type": "github"
},
"original": {

6
flake.nix
View file

@ -268,10 +268,10 @@
inputs.nixpkgs.follows = "nixpkgs";
};
Hyprspace = {
hypr-official-plugins = {
type = "github";
owner = "KZDKM";
repo = "Hyprspace";
owner = "hyprwm";
repo = "hyprland-plugins";
inputs.hyprland.follows = "hyprland";
};

10
modules/greetd/default.nix
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;

15
modules/hyprland/Hyprspace.nix
View file

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

5
modules/hyprland/default.nix
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
];

28
modules/hyprland/hyprexpo.nix Normal file
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
];
};
};
}

2
modules/hyprland/packages.nix
View file

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