From 348bb76b2067a62af3477b78ca32d8108ac2d9ba Mon Sep 17 00:00:00 2001 From: Trevor Vallender Date: Fri, 28 Apr 2023 19:09:55 +0100 Subject: [PATCH] Added grimblast for screenshots --- flake.lock | 41 +++++++++++++++++++++++++++++--- flake.nix | 3 ++- system/configuration.nix | 1 + users/tsv/home.nix | 1 + users/tsv/hyprland/hyprland.conf | 19 +++------------ 5 files changed, 45 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index e2e09ea..98151e9 100644 --- a/flake.lock +++ b/flake.lock @@ -150,10 +150,28 @@ "type": "github" } }, + "hyprcontrib": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1682622679, + "narHash": "sha256-n/WK09WqCA7Tuq3KtqW9zX7+hF977vLmvyW2zz9JrIU=", + "owner": "hyprwm", + "repo": "contrib", + "rev": "82cd44dc3c7ed79963aa29cc743655089191cd1d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "contrib", + "type": "github" + } + }, "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "wlroots": "wlroots", "xdph": "xdph" }, @@ -281,6 +299,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1658161305, + "narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1680669251, "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=", @@ -296,7 +330,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1681217261, "narHash": "sha256-RbxCHWN3Vhyv/WEsXcJlDwF7bpvZ9NxDjfSouQxXEKo=", @@ -346,8 +380,9 @@ "devenv": "devenv", "flake-utils": "flake-utils_3", "home-manager": "home-manager", + "hyprcontrib": "hyprcontrib", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" } }, "systems": { diff --git a/flake.nix b/flake.nix index f6d7a9f..050c5c8 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ }; devenv.url = "github:cachix/devenv/latest"; hyprland.url = "github:hyprwm/Hyprland"; + hyprcontrib.url = "github:hyprwm/contrib"; flake-utils.url = "github:numtide/flake-utils"; codeium = { url = "github:jcdickinson/codeium.nvim"; @@ -16,7 +17,7 @@ }; }; - outputs = inputs@{ nixpkgs, home-manager, devenv, hyprland, codeium, ... }: { + outputs = inputs@{ nixpkgs, home-manager, devenv, hyprland, hyprcontrib, codeium, ... }: { nixosConfigurations = { ritchie = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; diff --git a/system/configuration.nix b/system/configuration.nix index b68446b..1ece672 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -108,6 +108,7 @@ in }); }) inputs.codeium.overlays.x86_64-linux.default + inputs.hyprcontrib.overlays.default ]; diff --git a/users/tsv/home.nix b/users/tsv/home.nix index c1d8ed5..d5b989c 100644 --- a/users/tsv/home.nix +++ b/users/tsv/home.nix @@ -39,6 +39,7 @@ gnumake gnupg gimp + grimblast heroku htop hyprpaper diff --git a/users/tsv/hyprland/hyprland.conf b/users/tsv/hyprland/hyprland.conf index f8c870e..604b76e 100644 --- a/users/tsv/hyprland/hyprland.conf +++ b/users/tsv/hyprland/hyprland.conf @@ -51,8 +51,6 @@ general { } decoration { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - rounding = 5 blur = yes blur_size = 3 @@ -68,8 +66,6 @@ decoration { animations { enabled = yes - # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 animation = windows, 1, 7, myBezier @@ -81,34 +77,22 @@ animations { } dwindle { - # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below preserve_split = yes # you probably want this } master { - # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more new_is_master = true } gestures { - # See https://wiki.hyprland.org/Configuring/Variables/ for more workspace_swipe = off } -# Example per-device config -# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more device:epic-mouse-v1 { sensitivity = -0.5 } -# Example windowrule v1 -# windowrule = float, ^(kitty)$ -# Example windowrule v2 -# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more - - # See https://wiki.hyprland.org/Configuring/Keywords/ for more $mainMod = SUPER @@ -158,3 +142,6 @@ bind = $mainMod, mouse_up, workspace, e-1 # Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow + +bind = ,Print,exec,grimblast save active +bind = $mainMod,Print,exec,grimblast save area