daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-22 10:10:45 -06:00
Code Issues Projects Releases Packages Wiki Activity

use hyprland nixosModule

Browse source
This commit is contained in:
Daylin Morgan 2024-06-18 10:45:51 -05:00
parent a4d27c83c1
commit 5004ce8353
Signed by: daylin
GPG key ID: 950D13E9719334AD
4 changed files with 30 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
flake.lock
View file

@ -305,11 +305,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1718633685, "lastModified": 1718723174,
"narHash": "sha256-dAuZ6mIIVQraN1PnCe12Qwdcs/Nvfe/zfSy45ED5aso=", "narHash": "sha256-cPIOblG2H8Z934FPeuU0I6kI1Ke8ZbF330Nq/hTJ2uU=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "a9c7a0830fd9a8b9fc4065f1cd654efd1326691a", "rev": "236150b3c5227bbfbe46d2610c739a386afdca1f",
"revCount": 4856, "revCount": 4859,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -630,11 +630,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1718470009, "lastModified": 1718710563,
"narHash": "sha256-VBeDG3we0bkbFWMyZy+wjUkmeDN58pGFzw1dQCTeDV8=", "narHash": "sha256-O4rrM0Bkh3IRe8D600iniQ52QTmlnuTSp2KyXV7C2jE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "e0a970cbb8c3af05c80ef48a336ad91efd9b2bf6", "rev": "2fb93bea657ad99a7005ef601c67cb2820560a41",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -682,11 +682,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1718630464, "lastModified": 1718716858,
"narHash": "sha256-GXuN6MmzNomxT9VOEFu4iwP1kRTJ7F3/HdOzeDGPE1c=", "narHash": "sha256-+MitVExoNGnT4rlO0bMKDUKVFXsUjTvq0x2QPTvKQkg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "4a3b27cc9526208686896d0ef01c7bb67a47b91f", "rev": "6b09276c557dd29bb043abb472007dc4a1f4f470",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -745,11 +745,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1717696253, "lastModified": 1718437845,
"narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", "rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -761,11 +761,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1718428119, "lastModified": 1718543737,
"narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", "narHash": "sha256-e8S/ODM1vkKHIexSVn9nIvne7vRO5M+35VAq/6JOYto=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", "rev": "683aa7c4e385509ca651d49eeb35e58c7a1baad6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -793,11 +793,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1718318537, "lastModified": 1718530797,
"narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "rev": "b60ebf54c15553b393d144357375ea956f89e9a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1169,11 +1169,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718624172, "lastModified": 1718673535,
"narHash": "sha256-ZWrhjpNX6WSdjnSV8/JTaSLLqY4VqRp9ql16DldcGYk=", "narHash": "sha256-KCHMePFrijSscQt6A4rtRJxciOaQXgHyGpqi9dzdy8E=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "26b1364329ffb4c910da43c53f6be27b140723de", "rev": "60a6e8d97759da986a488528d86548f611c89edb",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
lib/checks.nix
View file

@ -17,9 +17,11 @@ in
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.pixi pkgs.pixi
pkgs.swww pkgs.swww
pkgs.xdg-desktop-portal-hyprland
pkgs.nixVersions.stable pkgs.nixVersions.stable
inputs.hyprland.packages.${pkgs.system}.default
inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
inputs.tsm.packages.${pkgs.system}.default inputs.tsm.packages.${pkgs.system}.default
inputs.hyprman.packages.${pkgs.system}.default inputs.hyprman.packages.${pkgs.system}.default

1
lib/default.nix
View file

@ -33,6 +33,7 @@ let
../modules/oizys.nix ../modules/oizys.nix
../overlays ../overlays
inputs.lix-module.nixosModules.default inputs.lix-module.nixosModules.default
inputs.hyprland.nixosModules.default
] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostName}")); ] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostName}"));
specialArgs = { specialArgs = {
inherit inherit

15
modules/desktop/window-managers/hyprland.nix
View file

@ -6,18 +6,11 @@
enabled, enabled,
... ...
}: }:
# let
# lock = pkgs.writeShellApplication {
# name = "lock";
# runtimeInputs = with pkgs; [swaylock];
# text = ''
# swaylock -c 1e1e2e
# '';
# };
mkOizysModule config "hyprland" { mkOizysModule config "hyprland" {
programs.hyprland = enabled // { programs.hyprland = enabled; #// {
package = inputs.hyprland.packages.${pkgs.system}.default; # package = inputs.hyprland.packages.${pkgs.system}.default;
}; # };
security.pam.services.swaylock = { }; security.pam.services.swaylock = { };
# Optional, hint electron apps to use wayland: # Optional, hint electron apps to use wayland:
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1";