From 8f19c6d7b499cdbd1a7d9ced9344229eb93ded86 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 19 Mar 2024 10:10:07 +0100 Subject: [PATCH] update --- common/hypridle.nix | 4 +-- common/hyprland.nix | 10 ++++--- common/hyprlock.nix | 8 ++++++ flake.lock | 65 ++++++++++++++++++++++++++++++++++++++++++--- flake.nix | 8 ++++-- 5 files changed, 85 insertions(+), 10 deletions(-) create mode 100644 common/hyprlock.nix diff --git a/common/hypridle.nix b/common/hypridle.nix index a0538b8..648f782 100644 --- a/common/hypridle.nix +++ b/common/hypridle.nix @@ -1,7 +1,7 @@ -{ ... }: +{ config, pkgs, inputs, ... }: { - options.services.hypridle = { + services.hypridle = { enable = true; # TODO: find commands to turn on/off monitors }; diff --git a/common/hyprland.nix b/common/hyprland.nix index 594e8cd..90d6c35 100644 --- a/common/hyprland.nix +++ b/common/hyprland.nix @@ -6,7 +6,8 @@ ./kitty.nix ./waybar.nix ./wofi.nix - ./hypridle.nix + # ./hypridle.nix # TODO: find out why these bitches not work + # ./hyprlock.nix ]; home.packages = with pkgs; [ hyprland @@ -22,8 +23,8 @@ enable = true; settings = { monitor = [ - "DP-3,2560x1440@360,2560x0,1,bitdepth,10,vrr,1" - "DP-2,2560x1440@144,0x0,1,bitdepth,10,vrr,1" + "DP-3,2560x1440@360,2560x0,1,vrr,1" + "DP-2,2560x1440@144,0x0,1,vrr,1" ]; windowrulev2 = [ "opacity 1.0 0.6,class:^(kitty)$" @@ -47,6 +48,9 @@ "col.active_border"="0xff950fad"; "col.inactive_border"="0xff26052e"; }; + misc = { + key_press_enables_dpms = true; + }; decoration = { rounding = "6"; active_opacity = "1"; diff --git a/common/hyprlock.nix b/common/hyprlock.nix new file mode 100644 index 0000000..076f805 --- /dev/null +++ b/common/hyprlock.nix @@ -0,0 +1,8 @@ +{ config, pkgs, inputs, ... }: + +{ + programs.hyprlock = { + enable = true; + # TODO: find commands to turn on/off monitors + }; +} diff --git a/flake.lock b/flake.lock index 32f0950..0352673 100644 --- a/flake.lock +++ b/flake.lock @@ -131,7 +131,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1701680307, @@ -149,7 +149,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1701680307, @@ -271,6 +271,49 @@ "type": "github" } }, + "hyprlang_2": { + "inputs": { + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708212860, + "narHash": "sha256-nW3Zrhh9RJcMTvOcXAaKADnJM/g6tDf3121lJtTHnYo=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "11d5ccda071c153dfdc18ef65338956a51cef96a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlock": { + "inputs": { + "hyprlang": "hyprlang_2", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1710690277, + "narHash": "sha256-bhep83LkF7tGERJquZ8J54XTFj0GLLXXMJP0EY/5/7o=", + "owner": "hyprwm", + "repo": "hyprlock", + "rev": "2ae79757d5e5c48de2f4284992a6bfa265853a2d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlock", + "type": "github" + } + }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -402,6 +445,7 @@ "disko": "disko", "home-manager": "home-manager", "hypridle": "hypridle", + "hyprlock": "hyprlock", "nix-colors": "nix-colors", "nixpkgs": "nixpkgs", "nixvim": "nixvim" @@ -423,6 +467,21 @@ } }, "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -437,7 +496,7 @@ "type": "github" } }, - "systems_3": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index 2956059..e10e03d 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + hyprlock = { + url = "github:hyprwm/hyprlock"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; @@ -37,7 +42,7 @@ }; - outputs = { self, nixpkgs, nix-colors, automapaper, disko, hypridle, ... }@inputs: + outputs = { self, nixpkgs, nix-colors, automapaper, disko, home-manager, ... }@inputs: { nixosConfigurations = { default = nixpkgs.lib.nixosSystem { @@ -45,7 +50,6 @@ inherit inputs; inherit nix-colors; inherit automapaper; - inherit hypridle; }; modules = [ ./hosts/default/configuration.nix