From e634f2a628c72169c4ae2a0bb59c42c839a2f331 Mon Sep 17 00:00:00 2001
From: cy <hi@cything.io>
Date: Sat, 7 Dec 2024 03:29:15 -0500
Subject: [PATCH] remove restic azure

---
 nix/configuration.nix     | 47 ++++++++-------------------------------
 nix/flake.lock            | 12 +++++-----
 nvim/init.lua             |  4 ----
 nvim/lazy-lock.json       |  1 +
 nvim/lua/config/hop.lua   | 16 +++++++++++++
 nvim/lua/plugin_specs.lua |  8 +++++++
 6 files changed, 40 insertions(+), 48 deletions(-)
 create mode 100644 nvim/lua/config/hop.lua

diff --git a/nix/configuration.nix b/nix/configuration.nix
index 8982c23..af52cf3 100644
--- a/nix/configuration.nix
+++ b/nix/configuration.nix
@@ -11,7 +11,6 @@
   sops.age.keyFile = "/root/.config/sops/age/keys.txt";
   sops.secrets = {
     "borg/yt" = { };
-    "restic/azure-yt" = { };
     "azure" = { };
     "ntfy" = { };
   };
@@ -145,6 +144,8 @@
       aw-watcher-window-wayland
       aw-qt
       aw-watcher-afk
+      sshfs
+      nextcloud-client
 
       (callPackage ./anki-bin.nix {})
     ];
@@ -255,43 +256,6 @@
       '';
   };
   
-  services.restic.backups.ytazure = {
-    paths = [ "/root" "/home" "/var/lib" "/var/log" "/opt" "/etc" ];
-    exclude = [
-      ".git"
-      "**/.cache"
-      "**/node_modules"
-      "**/cache"
-      "**/Cache"
-      "/var/lib/docker"
-      "/home/**/Downloads"
-      "**/.steam"
-      "**/.rustup"
-      "**/.docker"
-      "**/borg"
-    ];
-    passwordFile = "/run/secrets/restic/azure-yt";
-    environmentFile = "/run/secrets/azure";
-    repository = "azure:yt-backup:/";
-    extraOptions = [
-      "azure.access-tier=Archive"
-    ];
-    package = pkgs.restic.overrideAttrs {
-      src = pkgs.fetchFromGitHub {
-        owner = "restic";
-        repo = "restic";
-        rev = "1133498ef80762608f959df41d303f7246fff04f";
-        hash = "sha256-RmCEZ5T99uNNDwrQ3CofXBf4UzNjelVzyZyvx5aZO0A=";
-      };
-      vendorHash = "sha256-TstuI6KgAFEQH90PCZMN6s4dUab2GyPKqOtqMfIV8wA=";
-    };
-    backupCleanupCommand = ''
-      ${pkgs.curl}/bin/curl -u $(cat /run/secrets/ntfy) -d "ytazure: backup completed with exit code: $exitStatus
-      $(journalctl -u restic-backups-ytazure.service|tail -n 5)" \
-      https://ntfy.cything.io/chunk
-    '';
-  };
-
   services.btrbk.instances.local = {
     onCalendar = "hourly";
     settings = {
@@ -380,4 +344,11 @@
     enable = true;
     wlr.enable = true;
   };
+
+  nix.optimise = {
+    automatic = true;
+    dates = [ "03:45" ];
+  };
+
+  nix.settings.auto-optimise-store = true;
 }
diff --git a/nix/flake.lock b/nix/flake.lock
index f58d0e8..257fc02 100644
--- a/nix/flake.lock
+++ b/nix/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733389730,
-        "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=",
+        "lastModified": 1733484277,
+        "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f",
+        "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733212471,
-        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
+        "lastModified": 1733392399,
+        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
+        "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
         "type": "github"
       },
       "original": {
diff --git a/nvim/init.lua b/nvim/init.lua
index abce735..d77f398 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -43,10 +43,6 @@ keymap.set("n", "<space>s", require("nvim-tree.api").tree.toggle, {
 -- shortcut to command mode
 keymap.set({ "n", "x" }, ";", ":", { silent = true })
 
-keymap.set("n", [[\d]], "<cmd>close<cr>", {
-  silent = true,
-})
-
 keymap.set("n", "<space>o", "printf('m`%so<ESC>``', v:count1)", {
   expr = true,
   desc = "insert line below without moving cursor",
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index e6b279a..32f0195 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -10,6 +10,7 @@
   "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
   "fzf-lua": { "branch": "main", "commit": "175ddbb9bbe28eef006516f38b126215de1fef57" },
   "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
+  "hop.nvim": { "branch": "master", "commit": "08ddca799089ab96a6d1763db0b8adc5320bf050" },
   "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" },
   "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
   "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
diff --git a/nvim/lua/config/hop.lua b/nvim/lua/config/hop.lua
new file mode 100644
index 0000000..37942f0
--- /dev/null
+++ b/nvim/lua/config/hop.lua
@@ -0,0 +1,16 @@
+local hop = require('hop')
+local keymap = vim.keymap
+
+hop.setup {
+  case_insensitive = true;
+  char2_fallback_key = "<CR>",
+  quit_key = "<Esc",
+}
+
+keymap.set({ 'n', 'v', 'o' }, 'f', "", {
+  silent = true;
+  noremap = true;
+  callback = function()
+    hop.hint_char2()
+  end,
+})
diff --git a/nvim/lua/plugin_specs.lua b/nvim/lua/plugin_specs.lua
index 4af075a..a11adf9 100644
--- a/nvim/lua/plugin_specs.lua
+++ b/nvim/lua/plugin_specs.lua
@@ -83,6 +83,14 @@ local plugin_specs = {
   { "nvim-lualine/lualine.nvim", dependencies = { "nvim-tree/nvim-web-devicons" } },
 
   { "github/copilot.vim", lazy = false },
+
+  {
+    'smoka7/hop.nvim',
+    version = "*",
+    config = function()
+      require("config.hop")
+    end,
+  }
 }
 
 require("lazy").setup({