From bca7e349d6b282f7f3913eb41db949f314ad1dc7 Mon Sep 17 00:00:00 2001 From: albert Date: Sun, 27 Aug 2023 20:27:40 +0900 Subject: [PATCH] Testing --- flake.lock | 219 +++++++++++++++++- .../desktops/hyprland/hyprland-conf.nix | 16 +- 2 files changed, 226 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 453831c7..4bd78684 100644 --- a/flake.lock +++ b/flake.lock @@ -220,6 +220,21 @@ "type": "github" } }, + "flake-compat_3": { + "locked": { + "lastModified": 1688025799, + "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -241,6 +256,28 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs-wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690933134, + "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -277,6 +314,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "format-all": { "flake": false, "locked": { @@ -361,6 +416,45 @@ "type": "github" } }, + "lib-aggregate": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1692878963, + "narHash": "sha256-/pv2E36Su112vPMk5dgUED0j2v7n/Mh0p99sXdJ9cH4=", + "owner": "nix-community", + "repo": "lib-aggregate", + "rev": "e74fab6aff10cd2f4241c4bf646e53f5b3203349", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "lib-aggregate", + "type": "github" + } + }, + "nix-eval-jobs": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_3", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1692841356, + "narHash": "sha256-ppV8EdbH6s4+E9YeHhF1+MrEO/R36PeFE/6zjHS4Pn8=", + "owner": "nix-community", + "repo": "nix-eval-jobs", + "rev": "3681d5930d1479898758b752f2d77be0c8e0f90f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-eval-jobs", + "type": "github" + } + }, "nix-straight": { "flake": false, "locked": { @@ -392,6 +486,21 @@ "type": "indirect" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1692492218, + "narHash": "sha256-sBj4dllTXEuBzVUaXGvWrQt3iwr64wlnVP26ZcaND0E=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2a3f8763738dca95b14705619c5e489912b7f36a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1685801374, @@ -424,6 +533,28 @@ "type": "github" } }, + "nixpkgs-wayland": { + "inputs": { + "flake-compat": "flake-compat_3", + "lib-aggregate": "lib-aggregate", + "nix-eval-jobs": "nix-eval-jobs", + "nixpkgs": "nixpkgs_4", + "nixpkgs_sirula": "nixpkgs_sirula" + }, + "locked": { + "lastModified": 1693084361, + "narHash": "sha256-m8ykR435hKvQlIxxLRnCypgYoZUoyJXcsf5ygnCUydI=", + "owner": "nix-community", + "repo": "nixpkgs-wayland", + "rev": "def9db89b01754460a38680378e3af7afe12213a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs-wayland", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1692638711, @@ -440,6 +571,38 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1692838642, + "narHash": "sha256-Y47k7ckDN2nlH+A2hdfgNulXqKkTX8WdWCfd6l0ys0Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6408fedbfacd0d323edc2512f6033dbce818672a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1693003285, + "narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1691853136, "narHash": "sha256-wTzDsRV4HN8A2Sl0SVQY0q8ILs90CD43Ha//7gNZE+E=", @@ -455,6 +618,22 @@ "type": "github" } }, + "nixpkgs_sirula": { + "locked": { + "lastModified": 1682879489, + "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", + "type": "github" + } + }, "nose": { "flake": false, "locked": { @@ -619,6 +798,7 @@ "home-manager": "home-manager", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs_2", + "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", "sops-nix": "sops-nix" } @@ -657,7 +837,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -704,6 +884,43 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs-wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1692792358, + "narHash": "sha256-yqKPLUvl9lFTy43+GvVRwT39k1qu7Yd0HNktZjRbUP4=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "b070c28bf9d7d3ef93084aa47c01b4b6c16cdce4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "ts-fold": { "flake": false, "locked": { diff --git a/home-manager/hosts/nixos-laptop/desktops/hyprland/hyprland-conf.nix b/home-manager/hosts/nixos-laptop/desktops/hyprland/hyprland-conf.nix index 7470b660..e244efeb 100644 --- a/home-manager/hosts/nixos-laptop/desktops/hyprland/hyprland-conf.nix +++ b/home-manager/hosts/nixos-laptop/desktops/hyprland/hyprland-conf.nix @@ -226,14 +226,14 @@ bind = $mainMod, R, exec, notify-send "Entered resize mode.\nPress ESC to quit." bind = $mainMod, R, submap, resize submap = resize - binde = , H , resizeactive,-50 0 - binde = , L , resizeactive, 50 0 - binde = , K , resizeactive, 0 -50 - binde = , J , resizeactive, 0 50 - binde = , left , resizeactive,-50 0 - binde = , right , resizeactive, 50 0 - binde = , up , resizeactive, 0 -50 - binde = , down , resizeactive, 0 50 + binde = , H, resizeactive,-50 0 + binde = , L, resizeactive,50 0 + binde = , K, resizeactive,0 -50 + binde = , J, resizeactive,0 50 + binde = , left, resizeactive,-50 0 + binde = , righ, resizeactive,50 0 + binde = , up, resizeactive,0 -50 + binde = , down, resizeactive,0 50 bind = , escape, submap, reset submap = reset