From afbfe9f576ecde189ece40b7f23086cb979f23e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 1 Jan 2023 15:27:31 +0100 Subject: [PATCH 1/4] hyprland improvements --- flake.nix | 7 +++++-- modules/programs/hyprland/config.nix | 11 ++--------- modules/programs/hyprland/default.nix | 4 ++-- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 1c93a22..e95fcb4 100644 --- a/flake.nix +++ b/flake.nix @@ -51,9 +51,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland.url = "github:hyprwm/Hyprland"; + # Hyprland + hyprland.url = "github:hyprwm/Hyprland"; hyprpaper.url = "github:hyprwm/hyprpaper"; + hypr-contrib.url = "github:hyprwm/contrib"; }; outputs = @@ -72,13 +74,14 @@ overlay = import ./overlays { inherit inputs; }; channels.nixpkgs.overlaysBuilder = channels: [ - self.overlay inputs.agenix.overlay inputs.emacs-overlay.overlay inputs.howdy.overlays.default + inputs.hypr-contrib.overlays.default inputs.hyprland.overlays.default inputs.hyprpaper.overlays.default inputs.utils.overlay + self.overlay ]; # overlays = utils.lib.exportOverlays { diff --git a/modules/programs/hyprland/config.nix b/modules/programs/hyprland/config.nix index 0fcaa86..038f962 100644 --- a/modules/programs/hyprland/config.nix +++ b/modules/programs/hyprland/config.nix @@ -18,15 +18,8 @@ in # See https://wiki.hyprland.org/Configuring/Monitors/ monitor=,preferred,auto,1 - # See https://wiki.hyprland.org/Configuring/Keywords/ for more - # Execute your favorite apps at launch - # exec-once = waybar & hyprpaper & firefox - - # Source a file (multi-file configs) - # source = ~/.config/hypr/myColors.conf - # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ input { kb_layout = de,us @@ -140,8 +133,8 @@ in bind = $mainMod, M, exec, hyprctl keyword general:layout master bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, Q, killactive, - bind = $mainMod, R, exec, rofi -show combi -normal-window - bind = $mainMod, C, exec, rofi -show calc -modi calc -no-show-match -no-sort | xclip -selection clipboard + bind = $mainMod, R, exec, rofi -x11 -show combi + bind = $mainMod, C, exec, rofi -x11 -show calc -modi calc -no-show-match -no-sort | wl-copy bind = $mainMod, B, exec, rofi-bluetooth bind = $mainMod, RETURN, exec, kitty bind = $mainMod, T, togglesplit, # dwindle diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix index b46c677..4f7b32a 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -109,8 +109,8 @@ in pamixer playerctl brightnessctl - slurp - grim + grimblast + wl-clipboard ]; security.pam.services.swaylock = { }; From ba33446b5d61730a35677ec2625ea169129d5274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 1 Jan 2023 15:27:55 +0100 Subject: [PATCH 2/4] update inputs --- flake.lock | 95 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 65 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 2633ff2..8c67553 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1672110422, - "narHash": "sha256-IYR6XGwmgORfSIZYYywZmtRBoWROBjI5rZjgYmQGPJ4=", + "lastModified": 1672567750, + "narHash": "sha256-Hz1b1TUJbzuLj0eR+LTSUqoGR2gkQdrm3uxru+0rVuY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "06d88ea2a783a7c563ce57e62d794313ae1e4855", + "rev": "524c884484c312b76cb4bc9fbf37eec66e2f8406", "type": "github" }, "original": { @@ -195,11 +195,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1671966569, - "narHash": "sha256-jbLgfSnmLchARBNFRvCic63CFQ9LAyvlXnBpc2kwjQc=", + "lastModified": 1672349765, + "narHash": "sha256-Ul3lSGglgHXhgU3YNqsNeTlRH1pqxbR64h+2hM+HtnM=", "owner": "nix-community", "repo": "home-manager", - "rev": "c55fa26ce05fee8e063db22918d05a73d430b2ea", + "rev": "dd99675ee81fef051809bc87d67eb07f5ba022e8", "type": "github" }, "original": { @@ -230,19 +230,37 @@ "type": "sourcehut" } }, + "hypr-contrib": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1672071700, + "narHash": "sha256-Z0pbBVtijv4xbL42rPzMoYFSOqALFRYDMN9iOumSEso=", + "owner": "hyprwm", + "repo": "contrib", + "rev": "37c8121f98d76f57caa00dd7106877876e0d7483", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "contrib", + "type": "github" + } + }, "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1672057622, - "narHash": "sha256-UCA9ObYOGpZh5cZi9HO0p35RJVD1i2DT/Djgyx1dOPM=", + "lastModified": 1672510982, + "narHash": "sha256-fxpb2GM2Zi4DU119b7c1g8RN/jF7WXD5UcjXN7lxPJ8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "545e63d1dd14c76e9faad7839ad255dc9ead4cd8", + "rev": "7525818097f92a99b2b8d02ea43bd0f8ccabd51c", "type": "github" }, "original": { @@ -285,14 +303,14 @@ }, "hyprpaper": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1671404096, - "narHash": "sha256-ls8i+lXweg0udqbd9XuF/ag+rqDSy/i05B6RrMW2BAI=", + "lastModified": 1672266418, + "narHash": "sha256-Xxooxjoymgl65dIMtcBB4/bZx0OcqPZ52G/fw4rozYE=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "60013ee65566ec7601c367829da2560d7b8638fa", + "rev": "aefd63876d0353e4b25e473708903e6c30054931", "type": "github" }, "original": { @@ -303,11 +321,11 @@ }, "master": { "locked": { - "lastModified": 1672128529, - "narHash": "sha256-VBMP7GZ4lUgEyFJUPu+emFn58kqDXthJRi5zwdBu+cw=", + "lastModified": 1672582743, + "narHash": "sha256-BcHOaoxnUL+DzjGZV+vm8rIDGOFL6DvbPxeCLvzDrN0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "813159a4264a1cacd2a0ebed863ac3b041f1ebb9", + "rev": "3d9c0b6bdb5d6ee7126b6362167550c74590d612", "type": "github" }, "original": { @@ -318,11 +336,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1671722432, - "narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=", + "lastModified": 1658161305, + "narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "652e92b8064949a11bc193b90b74cb727f2a1405", + "rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9", "type": "github" }, "original": { @@ -349,6 +367,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1671722432, + "narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "652e92b8064949a11bc193b90b74cb727f2a1405", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1658826464, "narHash": "sha256-94ZTF0uIX/iZdiD4RJ5f933ak/OM4XLl7hF+gCa4Iuk=", @@ -364,13 +398,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1672057183, - "narHash": "sha256-GN7/10DNNvs1FPj9tlZA2qgNdFuYKKuS3qlHTqAxasQ=", + "lastModified": 1672428209, + "narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b139e44d78c36c69bcbb825b20dbfa51e7738347", + "rev": "293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847", "type": "github" }, "original": { @@ -380,7 +414,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1671271357, "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", @@ -426,7 +460,7 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils_3", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -452,10 +486,11 @@ "forgit-git": "forgit-git", "home-manager": "home-manager", "howdy": "howdy", + "hypr-contrib": "hypr-contrib", "hyprland": "hyprland", "hyprpaper": "hyprpaper", "master": "master", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks_2", "stable": "stable", "utils": "utils_2" @@ -463,11 +498,11 @@ }, "stable": { "locked": { - "lastModified": 1671883564, - "narHash": "sha256-C15oAtyupmLB3coZY7qzEHXjhtUx/+77olVdqVMruAg=", + "lastModified": 1672353432, + "narHash": "sha256-oZfgp/44/o2tWiylV30cR+DLyWTJ+5dhsdWZVpzs3e4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dac57a4eccf1442e8bf4030df6fcbb55883cb682", + "rev": "913a47cd064cc06440ea84e5e0452039a85781f0", "type": "github" }, "original": { From 0b0fda1dd4a98589163e62b049fc0cee5410b3e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 1 Jan 2023 15:28:13 +0100 Subject: [PATCH 3/4] rename aliases --- modules/profiles/base.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix index 08e96e6..e8b9533 100644 --- a/modules/profiles/base.nix +++ b/modules/profiles/base.nix @@ -39,9 +39,9 @@ with lib; rm = "rm -i"; mv = "mv -i"; - nix-switch = "sudo nixos-rebuild switch --flake ~/.dotfiles"; - nix-boot = "sudo nixos-rebuild boot --flake ~/.dotfiles"; - nix-lock = "pushd ~/.dotfiles && nix flake update && popd"; + nixos-switch = "sudo nixos-rebuild switch --flake ~/.dotfiles"; + nixos-boot = "sudo nixos-rebuild boot --flake ~/.dotfiles"; + nixos-update = "pushd ~/.dotfiles && nix flake update && popd"; latexwatch = ''find -type f -name "*.tex" | entr -c latexmk -pdf -silent''; }; From e8229815424d84b6c532d5bb25f2c70c2534d786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 1 Jan 2023 15:28:38 +0100 Subject: [PATCH 4/4] fix private ssh config --- secrets/ssh-home.age | Bin 1005 -> 884 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets/ssh-home.age b/secrets/ssh-home.age index 70909cfddeab92c1fee3d025be14ed22d82331be..0922fb521452a41b52668a71a6e7e1f1bf850a1f 100644 GIT binary patch delta 796 zcmWmB-HY1<003~#$tH32!9CpM9i!%SSK0=DTT< zrV0fGWl!6v6UE`j#_oK*G4W|K9O52yIzgBoW5-@Z*(QQt6L*Nef8lp`&+ofWK0EC+ zu_A1E5e^c(j&Y^FO@vYx(Vb;i)6F;^=xzfEnmxmi0n6dr%vw$x&^p8Ak@}D!28kYY za&B%d4|83<%2c2j?jmsu$h?>if_|o_=TH>J)2+6=WE<&HrAnz(Sfk~(7gs4LtoF)+ z1`Z4X>l+^DCsAb}ITNkSatJ_Wm4lpBIrtnnfzDpG!_ ziO6W9iK;kNjp!jo{y#t;IyPEM=!`M!DM2rdsCD*$E&{};s4>o%g?JY8rnKBJP`nFd zGMRLr910UG@}y-Iruwm^;jm&0qEu;hXt=<)Muka|L!4@}M*~;nqmMnay6rxG{Mg2W z@B?t;@}=+%bnEc*VTxQoLHT#D{j`g}`S6`T7f*5zy^eDS>6;6CPaIl-5A*Nry2d4Y z3*WwZ<a&kin-_1GJNEfUr&f3KKJnG< z=Y$_lPyd~}c&>ZrmHK_){dec>_kO-5>|9Q^QU{E;f9&mB{EImI&%tp0>E`0vIV@m!-eMl_M|w KapuDLh5rCx-Y8Z8 delta 918 zcmWmB>uVbY003~iNhhf~n3ImWYN$e~XG|{F+$9z3dbwP#x!fhWJnm6iN$xI}*X44} z<#GwSbO;XI*s7iAI&p%t7MW9ge2`IDLEWqloU1sxmHC9Vb5^I!PKs0if!~+kpY7MS zOg_@$i#0d_#{!9dOKtiPvyn9YI!DP^tR5c<$wmSjmw1XT!9>x9v7FlUvqmf)GCcJx zF{EkZ813(m5fXuy5I`aWQxg4sFO;i za1k6bMI`NyqSW)hce1f^!|mlQ-Y3Y>5>YClGMZyZHcD7%&6oAo7_Q(;@jQkH6dTg7 zbHxlp3MpL#`H0E-!vUuerf3*v6u&f{61?s>>H+~dIrU^)Cu>O%WWW(Dhe<##Sf?Zv zQ!Fnw48s%@lm!il;#Lz0MN0{MW6HQ$a~D ziZ>#D4iQX%Csl&?R1zhTG6H486W2^OuEzc!2>0~@PdG8ip^VGvs%#7Ua>+Oa=LALu zBSM^V=AcZAlL$`76SNpa#7c6AG~LPEaIxfu@)1qsFiNPi5>08K9*>o6VtFV{l!4iw(>o(Ivv@&ys=H} z={q#=W%-M)HuPnt_4X^Xznsf1+e$JR zqhpuH=2p0UcfT5vrcT}evGc&+OAFPm_1BNxYCmr6dd?bHzZcvzFnxOS&QoXp_-2in zS$gTgjb1bO>xGZb{8%)0bgT|eY#BXq{=UOEFL&>q$UJuV^Y|q@c%pT6c@Z77tuN=l zotwP^{Pnm+{C0=@{u{>EuMMnT@7{FMd|)zl?Zc66yH~syI@XTtfAhWU?yvOuJ)hk+ z-y=0I{#4$-etPum$gzzVdY3xi>bdiW@2*}ta?j?)g|24{FOKe89bFupo}0Mw$;{f$ pbn)lOo`>7tiA-(9yRUTIc;@=9r|&wreg4+L5#!?dNB4N2`WL&7V>18%