fix private ssh config

flake.lock

@@ -61,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1672110422,
+        "lastModified": 1672567750,
-        "narHash": "sha256-IYR6XGwmgORfSIZYYywZmtRBoWROBjI5rZjgYmQGPJ4=",
+        "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,
+        "lastModified": 1672349765,
-        "narHash": "sha256-jbLgfSnmLchARBNFRvCic63CFQ9LAyvlXnBpc2kwjQc=",
+        "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,
+        "lastModified": 1672510982,
-        "narHash": "sha256-UCA9ObYOGpZh5cZi9HO0p35RJVD1i2DT/Djgyx1dOPM=",
+        "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,
+        "lastModified": 1672266418,
-        "narHash": "sha256-ls8i+lXweg0udqbd9XuF/ag+rqDSy/i05B6RrMW2BAI=",
+        "narHash": "sha256-Xxooxjoymgl65dIMtcBB4/bZx0OcqPZ52G/fw4rozYE=",
         "owner": "hyprwm",
         "repo": "hyprpaper",
-        "rev": "60013ee65566ec7601c367829da2560d7b8638fa",
+        "rev": "aefd63876d0353e4b25e473708903e6c30054931",
         "type": "github"
       },
       "original": {
@@ -303,11 +321,11 @@
     },
     "master": {
       "locked": {
-        "lastModified": 1672128529,
+        "lastModified": 1672582743,
-        "narHash": "sha256-VBMP7GZ4lUgEyFJUPu+emFn58kqDXthJRi5zwdBu+cw=",
+        "narHash": "sha256-BcHOaoxnUL+DzjGZV+vm8rIDGOFL6DvbPxeCLvzDrN0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "813159a4264a1cacd2a0ebed863ac3b041f1ebb9",
+        "rev": "3d9c0b6bdb5d6ee7126b6362167550c74590d612",
         "type": "github"
       },
       "original": {
@@ -318,11 +336,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1671722432,
+        "lastModified": 1658161305,
-        "narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=",
+        "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,
+        "lastModified": 1672428209,
-        "narHash": "sha256-GN7/10DNNvs1FPj9tlZA2qgNdFuYKKuS3qlHTqAxasQ=",
+        "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,
+        "lastModified": 1672353432,
-        "narHash": "sha256-C15oAtyupmLB3coZY7qzEHXjhtUx/+77olVdqVMruAg=",
+        "narHash": "sha256-oZfgp/44/o2tWiylV30cR+DLyWTJ+5dhsdWZVpzs3e4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dac57a4eccf1442e8bf4030df6fcbb55883cb682",
+        "rev": "913a47cd064cc06440ea84e5e0452039a85781f0",
         "type": "github"
       },
       "original": {

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 {

modules/profiles/base.nix

@@ -39,9 +39,9 @@ with lib;
         rm = "rm -i";
         mv = "mv -i";
 
-        nix-switch = "sudo nixos-rebuild switch --flake ~/.dotfiles";
+        nixos-switch = "sudo nixos-rebuild switch --flake ~/.dotfiles";
-        nix-boot = "sudo nixos-rebuild boot --flake ~/.dotfiles";
+        nixos-boot = "sudo nixos-rebuild boot --flake ~/.dotfiles";
-        nix-lock = "pushd ~/.dotfiles && nix flake update && popd";
+        nixos-update = "pushd ~/.dotfiles && nix flake update && popd";
 
         latexwatch = ''find -type f -name "*.tex" | entr -c latexmk -pdf -silent'';
       };

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, R, exec, rofi -x11 -show combi
-  bind = $mainMod, C, exec, rofi -show calc -modi calc -no-show-match -no-sort | xclip -selection clipboard
+  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

modules/programs/hyprland/default.nix

@@ -109,8 +109,8 @@ in
       pamixer
       playerctl
       brightnessctl
-      slurp
+      grimblast
-      grim
+      wl-clipboard
     ];
 
     security.pam.services.swaylock = { };