From f2aa9901d477041bcc69e712f61396bea56c7e96 Mon Sep 17 00:00:00 2001
From: "Lennart J. Kurzweg (Nx2)" <git@nx2.site>
Date: Fri, 7 Jun 2024 14:06:48 +0200
Subject: [PATCH] merge

---
 .vscode/launch.json    | 22 ----------------------
 .vscode/settings.json  |  3 ---
 flake.lock             | 25 +++++++++++++++++++++++++
 flake.nix              |  4 ++++
 home-modules/helix.nix |  4 +++-
 home-modules/yazi.nix  |  2 +-
 6 files changed, 33 insertions(+), 27 deletions(-)
 delete mode 100755 .vscode/launch.json
 delete mode 100755 .vscode/settings.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100755
index 30a66d0..0000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        
-
-
-
-
-
-        {
-            "name": "Python Debugger: Current File with Arguments",
-            "type": "debugpy",
-            "request": "launch",
-            "program": "${file}",
-            "console": "integratedTerminal",
-            "args": "${command:pickArgs}"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100755
index 2931276..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "nixEnvSelector.nixFile": "${workspaceFolder}/configuration.nix"
-}
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 90c4c85..cfa5b98 100755
--- a/flake.lock
+++ b/flake.lock
@@ -47,6 +47,11 @@
         "owner": "rycee",
         "repo": "nur-expressions",
         "rev": "bdbbd8c2cb03b23b586fea14a8a680b218ab363c",
+        "lastModified": 1717128197,
+        "narHash": "sha256-jUObiEzZXl07D1JYsZr86TJOFFeJw3rJD3OUOCHicP0=",
+        "owner": "rycee",
+        "repo": "nur-expressions",
+        "rev": "179e0cecb2c8a663fcf9acfaff067cd2dd0da66b",
         "type": "gitlab"
       },
       "original": {
@@ -389,6 +394,11 @@
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc",
+        "lastModified": 1716655032,
+        "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f",
         "type": "github"
       },
       "original": {
@@ -405,6 +415,11 @@
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
+        "lastModified": 1716948383,
+        "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
         "type": "github"
       },
       "original": {
@@ -436,6 +451,11 @@
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105",
+        "lastModified": 1716991068,
+        "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "25cf937a30bf0801447f6bf544fc7486c6309234",
         "type": "github"
       },
       "original": {
@@ -525,6 +545,11 @@
         "owner": "Mic92",
         "repo": "sops-nix",
         "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0",
+        "lastModified": 1716692524,
+        "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=",
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "rev": "962797a8d7f15ed7033031731d0bb77244839960",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 2943e0a..f1f1e7e 100755
--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,10 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    sops-nix = {
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     hyprland = {
       url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
diff --git a/home-modules/helix.nix b/home-modules/helix.nix
index d8e41a0..654f4ed 100644
--- a/home-modules/helix.nix
+++ b/home-modules/helix.nix
@@ -52,7 +52,9 @@
           tab = "⇥";
           skip-levels = 1;
         };
-
+      };
+      keys.normal = {
+        C-g = [":new" ":insert-output lazygit" ":buffer-close!" ":redraw"];
       };
     };
     languages.language = [{
diff --git a/home-modules/yazi.nix b/home-modules/yazi.nix
index 5c3dd30..3608e01 100755
--- a/home-modules/yazi.nix
+++ b/home-modules/yazi.nix
@@ -14,7 +14,7 @@ lib.mkIf (user != "tv")
     enableFishIntegration = true;
     settings = {
       manager = {
-        layout = [1 3 4];
+        layout = [2 3 4];
         sort_by = "natural";
         sort_sensitive = true;
         sort_reverse = false;