build: update inputs

fix(nvim): smartcolumn-nvim syntax
fix(synology-drive): always restart
2023-07-24 18:56:51 +02:00 · 2023-07-24 18:55:11 +02:00 · 2023-07-24 18:54:47 +02:00 · 2023-07-24 18:46:35 +02:00 · 2023-07-24 18:45:27 +02:00
11 changed files with 219 additions and 354 deletions
--- a/flake.lock
+++ b/flake.lock
@ -9,11 +9,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1684153753,
-        "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=",
+        "lastModified": 1689334118,
+        "narHash": "sha256-djk5AZv1yU84xlKFaVHqFWvH73U7kIRstXwUAnDJPsk=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "db5637d10f797bb251b94ef9040b237f4702cde3",
+        "rev": "0d8c5325fc81daf00532e3e26c6752f7bcde1143",
        "type": "github"
      },
      "original": {
@ -25,11 +25,11 @@
    "arkenfox-userjs": {
      "flake": false,
      "locked": {
-        "lastModified": 1683284168,
-        "narHash": "sha256-EWa9vkzprNuBFV+HpO6yBrClVtMTI5QmChErISW/SZY=",
+        "lastModified": 1689799111,
+        "narHash": "sha256-JGucBOBTSYBapMrI7GCMAqTFaT1O7Kqw0S3uBtFawIo=",
        "owner": "arkenfox",
        "repo": "user.js",
-        "rev": "04e6e77439bfa6e3f6b7b9c5e0afac7f74f0586a",
+        "rev": "6151d664acced94364e7e3a075e6ac3ca555ef48",
        "type": "github"
      },
      "original": {
@ -74,11 +74,11 @@
    "copilot-lua": {
      "flake": false,
      "locked": {
-        "lastModified": 1685261869,
-        "narHash": "sha256-jBTS8MeN7Ydf0ZY7JWbrxaGo/GeDoEClfULiJVfN8Wo=",
+        "lastModified": 1688190439,
+        "narHash": "sha256-lD9FdbKKZ6d/BjIfqp0Ust2hqSYNLpCFWxuaKUO9qLs=",
        "owner": "zbirenbaum",
        "repo": "copilot.lua",
-        "rev": "77e3a4907928f0813024e573b882dc879dfc0c6b",
+        "rev": "e48bd7020a98be217d85c006a298656294fd6210",
        "type": "github"
      },
      "original": {
@ -157,22 +157,6 @@
        "type": "github"
      }
    },
-    "flake-compat_4": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": [
@ -181,11 +165,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1685662779,
-        "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
+        "lastModified": 1688466019,
+        "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
+        "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
        "type": "github"
      },
      "original": {
@ -199,11 +183,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1685546676,
-        "narHash": "sha256-XDbjJyAg6odX5Vj0Q22iI/gQuFvEkv9kamsSbQ+npaI=",
+        "lastModified": 1688466019,
+        "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "6ef2707776c6379bc727faf3f83c0dd60b06e0c6",
+        "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
        "type": "github"
      },
      "original": {
@ -221,11 +205,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1680392223,
-        "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
+        "lastModified": 1688466019,
+        "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
+        "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
        "type": "github"
      },
      "original": {
@ -238,6 +222,24 @@
      "inputs": {
        "systems": "systems"
      },
+      "locked": {
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
      "locked": {
        "lastModified": 1685518550,
        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
@ -252,43 +254,16 @@
        "type": "github"
      }
    },
-    "flake-utils_2": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
    "flake-utils_3": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
+      "inputs": {
+        "systems": "systems_3"
      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_4": {
      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
        "type": "github"
      },
      "original": {
@ -298,30 +273,6 @@
      }
    },
    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "neovim-nightly-overlay",
-          "hercules-ci-effects",
-          "hercules-ci-agent",
-          "pre-commit-hooks-nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1660459072,
-        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "gitignore_2": {
      "inputs": {
        "nixpkgs": [
          "pre-commit-hooks",
@ -344,16 +295,16 @@
    },
    "haskell-flake": {
      "locked": {
-        "lastModified": 1678745009,
-        "narHash": "sha256-ujfwSrkxThmHJozibkCnJmlXLVyxm+Cbo2Q4wXPbCS4=",
+        "lastModified": 1684780604,
+        "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
        "owner": "srid",
        "repo": "haskell-flake",
-        "rev": "26852ade574c712bc3912ad28de52b0c4cf7d4cb",
+        "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
        "type": "github"
      },
      "original": {
        "owner": "srid",
-        "ref": "0.2.0",
+        "ref": "0.3.0",
        "repo": "haskell-flake",
        "type": "github"
      }
@ -362,16 +313,14 @@
      "inputs": {
        "flake-parts": "flake-parts_3",
        "haskell-flake": "haskell-flake",
-        "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs_4",
-        "pre-commit-hooks-nix": "pre-commit-hooks-nix"
+        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1681758488,
-        "narHash": "sha256-RBd/RNq3wL52FvoajMwrnfyZPfq67KMzmp6rtNAx/2o=",
+        "lastModified": 1688568579,
+        "narHash": "sha256-ON0M56wtY/TIIGPkXDlJboAmuYwc73Hi8X9iJGtxOhM=",
        "owner": "hercules-ci",
        "repo": "hercules-ci-agent",
-        "rev": "ef296dd6211e2ffeb942f12e6232a2d9abdd488d",
+        "rev": "367dd8cd649b57009a6502e878005a1e54ad78c5",
        "type": "github"
      },
      "original": {
@ -389,11 +338,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1685557007,
-        "narHash": "sha256-0prbgwFJeBuLGJgNdOXCXQ8/oSamzkcNZYHr04ZXI2I=",
+        "lastModified": 1689397210,
+        "narHash": "sha256-fVxZnqxMbsDkB4GzGAs/B41K0wt/e+B/fLxmTFF/S20=",
        "owner": "hercules-ci",
        "repo": "hercules-ci-effects",
-        "rev": "6d8e62977dc34fd2c187879856ebb6cf1faabba9",
+        "rev": "0a63bfa3f00a3775ea3a6722b247880f1ffe91ce",
        "type": "github"
      },
      "original": {
@ -430,11 +379,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1685721552,
-        "narHash": "sha256-ifvq/zlO7lck8q+YkC5uom/h8/MVdMcQEldOL3cDQW0=",
+        "lastModified": 1689875525,
+        "narHash": "sha256-fgUrFH3bMZ6R7qgBTfuTRGlkZXIkdyjndl6ZbExbjE8=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "29519461834c08395b35f840811faf8c23e3b61c",
+        "rev": "1443abd2696ec6bd6fb9701e6c26b277a27b4a3e",
        "type": "github"
      },
      "original": {
@ -448,11 +397,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1684479483,
-        "narHash": "sha256-NCkOkgR7PtkAQmYgeYd6vOzkulQjxlf+vWGUmrQu4uw=",
+        "lastModified": 1688849364,
+        "narHash": "sha256-gW4x5YiCWFlckFiaLZo+RWJa1IyQ2Cx4jTrJzNy1OzQ=",
        "owner": "hyprwm",
        "repo": "contrib",
-        "rev": "805bedf51a2f75a2279b6fc75b3066ff21f235ee",
+        "rev": "3126196e7ed609e7c427a39dc126ea067de62a65",
        "type": "github"
      },
      "original": {
@ -469,11 +418,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1685729674,
-        "narHash": "sha256-i5+/bAZVmCbeIKmnwyd2DG3mGrP4LOJWbsU7nJ1lzuA=",
+        "lastModified": 1689879667,
+        "narHash": "sha256-g6XQ1slkxXw1kddaUKBwvYktIPJczSbZVoe4EzjNjD8=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "871ab24c6e9d2fb6e48cbf990ddddf0c46a950af",
+        "rev": "f864b15427b363443e767eb5e78f5dc9603c49f3",
        "type": "github"
      },
      "original": {
@ -508,11 +457,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1685378141,
-        "narHash": "sha256-/ehJbAtSJS86NlqHVOeR2ViBKlImKH4guFVPacTmCr8=",
+        "lastModified": 1689547456,
+        "narHash": "sha256-jZQ377LqcazitvH2fVXKiL8kvmpGT3fuqev+yQqvuRw=",
        "owner": "hyprwm",
        "repo": "hyprpaper",
-        "rev": "cd86c196f3500f20539754d347c8378349ca0974",
+        "rev": "ac5f7b038d5ac589d32f5ae18f9745bfe5200618",
        "type": "github"
      },
      "original": {
@ -556,11 +505,11 @@
    "lspsaga-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1685612219,
-        "narHash": "sha256-Cr4BAAMX0SEPM51JejjnhOUXigMIGvyzqFYYAZ426bU=",
+        "lastModified": 1689849495,
+        "narHash": "sha256-tD3UxJUtYoxUMTFF4gfKChVfI5SxZQ2C12WRF73Ahc4=",
        "owner": "glepnir",
        "repo": "lspsaga.nvim",
-        "rev": "c475ace5b8882631b351ef7c3e8078ca9ebbb751",
+        "rev": "0c20101ac826961a7052c4ad9d5f7f791b4adab1",
        "type": "github"
      },
      "original": {
@ -571,11 +520,11 @@
    },
    "master": {
      "locked": {
-        "lastModified": 1685770779,
-        "narHash": "sha256-cJd4Bf0jUOG/l/k9I83IYsq9jDFPyLAfiIw1cjErcTU=",
+        "lastModified": 1689880801,
+        "narHash": "sha256-jWeQSVczGNRNs48DWiAwb6ojKXb+woqoXoVsA1KwdUM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "f04dbdd29e954e51e98d2a0896c13180f5247143",
+        "rev": "ebaae879a74f772ecc827d264e37960087a4b182",
        "type": "github"
      },
      "original": {
@ -586,7 +535,7 @@
    },
    "neovim-flake": {
      "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
        "nixpkgs": [
          "neovim-nightly-overlay",
          "nixpkgs"
@ -594,11 +543,11 @@
      },
      "locked": {
        "dir": "contrib",
-        "lastModified": 1685727707,
-        "narHash": "sha256-qxmSnNjRxXuFfPNaDMnTPjn8890CN2EQ1Il8XVJhkKE=",
+        "lastModified": 1689785735,
+        "narHash": "sha256-QdjWbe4oNjIazmOrbJ9u5GadaqTV44RiYbiZoLgNKC8=",
        "owner": "neovim",
        "repo": "neovim",
-        "rev": "a8ee4c7a81a8df3fe705e941e7d1c2c9e2f6194e",
+        "rev": "86ce3878d662c1dbfec61a5ad8e7c16c4283ed5c",
        "type": "github"
      },
      "original": {
@ -617,11 +566,11 @@
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1685750689,
-        "narHash": "sha256-ylsh7ELjDc4jHCBZgUVTD08aTD31SpXoqXnjlbGdyoQ=",
+        "lastModified": 1689811489,
+        "narHash": "sha256-rQ1gnq+ApoowEic21nIYIeQ0Qibb3IEEtwv0LgNIYDc=",
        "owner": "nix-community",
        "repo": "neovim-nightly-overlay",
-        "rev": "b9c2089d1936a81d466de8a2ccb9d75c22b5b7fd",
+        "rev": "65f2e8da89ba400e7bbad6fe2f51af0ed9f7e968",
        "type": "github"
      },
      "original": {
@ -641,11 +590,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1685532165,
-        "narHash": "sha256-xHH9WbE9uya2B+j5w82HzpZVeErBt03/jtmWVRox0EU=",
+        "lastModified": 1689759503,
+        "narHash": "sha256-wFrcae6V58hIlDW+7NDoUXzXBmsU7W/k3V1KIePcwRA=",
        "owner": "oxalica",
        "repo": "nil",
-        "rev": "dcd38b96c91a2d07552f824a6480e00dc7b4948a",
+        "rev": "59bcad0b13b5d77668c0c125fef71d7b41406d7a",
        "type": "github"
      },
      "original": {
@ -654,32 +603,9 @@
        "type": "github"
      }
    },
-    "nix-darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "neovim-nightly-overlay",
-          "hercules-ci-effects",
-          "hercules-ci-agent",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1680266963,
-        "narHash": "sha256-IW/lzbUCOcldLHWHjNSg1YoViDnZOmz0ZJL7EH9OkV8=",
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "rev": "99d4187d11be86b49baa3a1aec0530004072374f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
    "nix-super": {
      "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
        "lowdown-src": "lowdown-src",
        "nixpkgs": [
          "stable"
@ -687,11 +613,11 @@
        "nixpkgs-regression": "nixpkgs-regression"
      },
      "locked": {
-        "lastModified": 1687621557,
-        "narHash": "sha256-FWtdWRmtzmqjjAsvYXefdZ2uVv5p5UfB7eftqsctSck=",
+        "lastModified": 1689005785,
+        "narHash": "sha256-gxJmO6Y6L+iEgIhBlyOLlruQQqixERkWkByYSH4LaTg=",
        "owner": "privatevoid-net",
        "repo": "nix-super",
-        "rev": "c39cdf9ad2365509a602f8e2c6faa35aec1097a3",
+        "rev": "6ff67e40b495e79aa6b2dc9356f1e9ade3b77bca",
        "type": "github"
      },
      "original": {
@ -719,11 +645,11 @@
    "nixpkgs-lib": {
      "locked": {
        "dir": "lib",
-        "lastModified": 1682879489,
-        "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
+        "lastModified": 1688049487,
+        "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
+        "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
        "type": "github"
      },
      "original": {
@ -752,43 +678,27 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1678872516,
-        "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
+        "lastModified": 1685801374,
+        "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
+        "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-22.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1678872516,
-        "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-23.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1685655444,
-        "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=",
+        "lastModified": 1688500189,
+        "narHash": "sha256-djYYiY4lzJOlXOnTHytH6BUugrxHDZjuGxTSrU4gt4M=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd",
+        "rev": "78419edadf0fabbe5618643bd850b2f2198ed060",
        "type": "github"
      },
      "original": {
@ -816,11 +726,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1680213900,
-        "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
+        "lastModified": 1688322751,
+        "narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
+        "rev": "0fbe93c5a7cac99f90b60bdf5f149383daaa615f",
        "type": "github"
      },
      "original": {
@ -832,11 +742,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1685677062,
-        "narHash": "sha256-zoHF7+HNwNwne2XEomphbdc4Y8tdWT16EUxUTXpOKpQ=",
+        "lastModified": 1689752456,
+        "narHash": "sha256-VOChdECcEI8ixz8QY+YC4JaNEFwQd1V8bA0G4B28Ki0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "95be94370d09f97f6af6a1df1eb9649b5260724e",
+        "rev": "7f256d7da238cb627ef189d56ed590739f42f13b",
        "type": "github"
      },
      "original": {
@ -848,11 +758,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1685677062,
-        "narHash": "sha256-zoHF7+HNwNwne2XEomphbdc4Y8tdWT16EUxUTXpOKpQ=",
+        "lastModified": 1689752456,
+        "narHash": "sha256-VOChdECcEI8ixz8QY+YC4JaNEFwQd1V8bA0G4B28Ki0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "95be94370d09f97f6af6a1df1eb9649b5260724e",
+        "rev": "7f256d7da238cb627ef189d56ed590739f42f13b",
        "type": "github"
      },
      "original": {
@ -864,16 +774,16 @@
    },
    "nixpkgs_7": {
      "locked": {
-        "lastModified": 1681303793,
-        "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
+        "lastModified": 1689261696,
+        "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc",
+        "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
@ -896,45 +806,18 @@
    },
    "pre-commit-hooks": {
      "inputs": {
-        "flake-compat": "flake-compat_4",
-        "flake-utils": "flake-utils_4",
-        "gitignore": "gitignore_2",
-        "nixpkgs": "nixpkgs_7",
-        "nixpkgs-stable": "nixpkgs-stable_2"
-      },
-      "locked": {
-        "lastModified": 1685361114,
-        "narHash": "sha256-4RjrlSb+OO+e1nzTExKW58o3WRwVGpXwj97iCta8aj4=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "ca2fdbf3edda2a38140184da6381d49f8206eaf4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
-    "pre-commit-hooks-nix": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_2",
+        "flake-compat": "flake-compat_3",
+        "flake-utils": "flake-utils_3",
        "gitignore": "gitignore",
-        "nixpkgs": [
-          "neovim-nightly-overlay",
-          "hercules-ci-effects",
-          "hercules-ci-agent",
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_7",
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1680170909,
-        "narHash": "sha256-FtKU/edv1jFRr/KwUxWTYWXEyj9g8GBrHntC2o8oFI8=",
+        "lastModified": 1689668210,
+        "narHash": "sha256-XAATwDkaUxH958yXLs1lcEOmU6pSEIkatY3qjqk8X0E=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "29dbe1efaa91c3a415d8b45d62d48325a4748816",
+        "rev": "eb433bff05b285258be76513add6f6c57b441775",
        "type": "github"
      },
      "original": {
@ -999,11 +882,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1685413459,
-        "narHash": "sha256-+ELexqS2yN0wj1WnmWdF24OfjRBIgTN6Ltcpjvp2dEo=",
+        "lastModified": 1688783586,
+        "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "9b3284e2412f76bd68ff46f8cf1c7af44d7ffac0",
+        "rev": "7a29283cc242c2486fc67f60b431ef708046d176",
        "type": "github"
      },
      "original": {
@ -1030,11 +913,11 @@
    },
    "stable": {
      "locked": {
-        "lastModified": 1685620773,
-        "narHash": "sha256-iQ+LmporQNdLz8uMJdP62TaAWeLUwl43/MYUBtWqulM=",
+        "lastModified": 1689680872,
+        "narHash": "sha256-brNix2+ihJSzCiKwLafbyejrHJZUP0Fy6z5+xMOC27M=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "f0ba8235153dd2e25cf06cbf70d43efdd4443592",
+        "rev": "08700de174bc6235043cb4263b643b721d936bdb",
        "type": "github"
      },
      "original": {
@ -1059,6 +942,36 @@
        "type": "github"
      }
    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "telekasten-nvim": {
      "flake": false,
      "locked": {
@ -1079,17 +992,18 @@
      "flake": false,
      "locked": {
        "host": "gitlab.freedesktop.org",
-        "lastModified": 1685723274,
-        "narHash": "sha256-mjETVZbVheaSO0VRKQHWYAHcoKwYu0WZ0vhKVN7vyRo=",
+        "lastModified": 1689611045,
+        "narHash": "sha256-3RTOlQabkNetQ4O4UzSf57JPco9VGVHhSU1ls5uKBeE=",
        "owner": "wlroots",
        "repo": "wlroots",
-        "rev": "6668c822b3bf58ca5af5d370ef03b075be3e4d27",
+        "rev": "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e",
        "type": "gitlab"
      },
      "original": {
        "host": "gitlab.freedesktop.org",
        "owner": "wlroots",
        "repo": "wlroots",
+        "rev": "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e",
        "type": "gitlab"
      }
    },
--- a/hosts/nixos-desktop/default.nix
+++ b/hosts/nixos-desktop/default.nix
@ -27,6 +27,8 @@
    jetbrains.idea-community
  ];

+  hardware.keyboard.qmk.enable = true;
+
  # KERNEL
  boot.kernelPackages = pkgs.linuxPackages_latest;

--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@ -222,26 +222,35 @@ in
        withNodeJs = true;
        withPython3 = true;
        extraLuaConfig = lib.concatLines [ (builtins.readFile ./options.lua) lazy ];
-        extraPackages = with pkgs; [
-          alejandra
-          black
-          deadnix
-          isort
-          jq
-          nil
-          nixpkgs-fmt
-          nodePackages.bash-language-server
-          rustfmt
-          shellcheck
-          shfmt
-          statix
-          stylua
-          sumneko-lua-language-server
-          taplo
-          typst
-          typst-lsp
-          yamlfmt
-        ];
+        extraPython3Packages = ps:
+          let
+            plugins = map (getAttr "plugin") cfg.plugins;
+            depAttrName = "python3Dependencies";
+            filtered = filter (hasAttr depAttrName) plugins;
+            funcs = map (getAttr depAttrName) filtered;
+          in
+          foldl (list: f: list ++ (f ps)) [ ] funcs;
+        extraPackages = with pkgs;
+          [
+            alejandra
+            black
+            deadnix
+            isort
+            jq
+            nil
+            nixpkgs-fmt
+            nodePackages.bash-language-server
+            rustfmt
+            shellcheck
+            shfmt
+            statix
+            stylua
+            sumneko-lua-language-server
+            taplo
+            typst
+            typst-lsp
+            yamlfmt
+          ];
        plugins = [
          pkgs.vimPlugins.lazy-nvim
        ];
--- a/modules/programs/nvim/plugins/codeium-vim.lua
+++ b/modules/programs/nvim/plugins/codeium-vim.lua
@ -0,0 +1,2 @@
+-- dont show ghost text
+vim.g.codeium_render = false
--- a/modules/programs/nvim/plugins/coq-nvim.lua
+++ b/modules/programs/nvim/plugins/coq-nvim.lua
@ -0,0 +1,3 @@
+vim.g.coq_settings = {
+  auto_start = "shut-up",
+}
--- a/modules/programs/nvim/plugins/coq-thirdparty.lua
+++ b/modules/programs/nvim/plugins/coq-thirdparty.lua
@ -0,0 +1,4 @@
+require("coq_3p")({
+  { src = "orgmode", short_name = "ORG" },
+  { src = "codeium", short_name = "COD" },
+})
--- a/modules/programs/nvim/plugins/default.nix
+++ b/modules/programs/nvim/plugins/default.nix
@ -82,28 +82,6 @@ with builtins;
        { plugin = nvim-web-devicons; }
      ];
    }
-    {
-      plugin = nvim-cmp;
-      conf = readFile ./nvim-cmp.lua;
-      event = [ "InsertEnter" ];
-      dependencies = [
-        { plugin = cmp-async-path; }
-        { plugin = cmp-nvim-lsp; }
-        { plugin = cmp_luasnip; }
-        {
-          plugin = copilot-cmp;
-          dependencies = [
-            {
-              plugin = copilot-lua;
-              conf = readFile ./copilot-lua.lua;
-              dependencies = [{ plugin = which-key-nvim; }];
-            }
-          ];
-        }
-        { plugin = friendly-snippets; }
-        { plugin = luasnip; }
-      ];
-    }
    {
      plugin = todo-comments-nvim;
      event = [ "BufReadPost" "BufNewFile" ];
@ -281,5 +259,25 @@ with builtins;
      plugin = markdown-preview-nvim;
      lazy = false;
    }
+    {
+      plugin = coq_nvim;
+      lazy = false;
+      init = builtins.readFile ./coq-nvim.lua;
+      dependencies = [
+        {
+          plugin = coq-thirdparty;
+          conf = builtins.readFile ./coq-thirdparty.lua;
+          dependencies = [
+            {
+              plugin = codeium-vim;
+              init = builtins.readFile ./codeium-vim.lua;
+            }
+          ];
+        }
+        {
+          plugin = coq-artifacts;
+        }
+      ];
+    }
  ];
 }
--- a/modules/programs/nvim/plugins/nvim-cmp.lua
+++ b/modules/programs/nvim/plugins/nvim-cmp.lua
@ -1,63 +0,0 @@
-local cmp = require("cmp")
-local luasnip = require("luasnip")
-require("luasnip.loaders.from_vscode").lazy_load()
-require("copilot_cmp").setup()
-
-local default_sources = {
-  { name = "async_path", priority = 1 },
-  { name = "copilot", priority = 2 },
-  { name = "luasnip", priority = 2 },
-  { name = "nvim_lsp", priority = 3 },
-}
-
-cmp.setup({
-  formatting = {
-    format = require("lspkind").cmp_format({
-      mode = "symbol", -- show only symbol annotations
-      maxwidth = 50, -- prevent the popup from showing more than provided characters
-      ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead
-      symbol_map = {
-        Copilot = "",
-      },
-    }),
-  },
-  snippet = {
-    -- REQUIRED - you must specify a snippet engine
-    expand = function(args)
-      require("luasnip").lsp_expand(args.body)
-    end,
-  },
-  mapping = cmp.mapping.preset.insert({
-    ["<C-b>"] = cmp.mapping.scroll_docs(-4),
-    ["<C-f>"] = cmp.mapping.scroll_docs(4),
-    ["<C-Space>"] = cmp.mapping.complete(),
-    ["<C-e>"] = cmp.mapping.abort(),
-    ["<CR>"] = cmp.mapping.confirm({ select = true }),
-    ["<Tab>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_next_item()
-      elseif luasnip.expand_or_jumpable() then
-        luasnip.expand_or_jump()
-      else
-        fallback()
-      end
-    end, { "i", "s" }),
-    ["<S-Tab>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_prev_item()
-      elseif luasnip.jumpable(-1) then
-        luasnip.jump(-1)
-      else
-        fallback()
-      end
-    end, { "i", "s" }),
-  }),
-  sources = default_sources,
-})
-
-cmp.setup.filetype("org", {
-  sources = vim.tbl_deep_extend("force", default_sources, {
-    { name = "buffer", priority = 1 },
-    { name = "orgmode", priority = 3 },
-  }),
-})
--- a/modules/programs/nvim/plugins/nvim-lspconfig.lua
+++ b/modules/programs/nvim/plugins/nvim-lspconfig.lua
@ -5,9 +5,6 @@ vim.diagnostic.config({
  virtual_text = false,
 })

-- The nvim-cmp almost supports LSP's capabilities so You should advertise it to LSP servers..
-local capabilities = require("cmp_nvim_lsp").default_capabilities()
-
 vim.o.foldcolumn = "1" -- '0' is not bad
 vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
 vim.o.foldlevelstart = 99
@ -47,6 +44,7 @@ require("which-key").register({
    M = { require("ufo").closeAllFolds, "Close all folds" },
  },
 })
+local capabilities = vim.lsp.protocol.make_client_capabilities()
 -- Tell the server the capability of foldingRange,
 -- Neovim hasn't added foldingRange to default capabilities, users must add it manually
 capabilities.textDocument.foldingRange = {
@ -107,9 +105,6 @@ end
 local lspconfig_default_options = {
  on_attach = on_attach_def,
  capabilities = capabilities,
-  flags = {
-    debounce_text_changes = 100,
-  },
 }

 ---function to add default options to lspconfig
@ -117,8 +112,9 @@ local lspconfig_default_options = {
 ---@param options table
 ---@return nil
 local function lspconfig_setup(lsp, options)
-  local final_options = vim.tbl_deep_extend("force", lspconfig_default_options, options)
-  lspconfig[lsp].setup(final_options)
+  local coq_options = require("coq").lsp_ensure_capabilities({})
+  local merged_options = vim.tbl_deep_extend("force", coq_options, lspconfig_default_options, options)
+  lspconfig[lsp].setup(merged_options)
 end

 local servers = {
--- a/modules/programs/nvim/plugins/smartcolumn-nvim.lua
+++ b/modules/programs/nvim/plugins/smartcolumn-nvim.lua
@ -1,4 +1,4 @@
 require("smartcolumn").setup({
-  colorcolumn = 120,
+  colorcolumn = "120",
  disabled_filetypes = { "help", "text", "markdown", "dashboard" },
 })
--- a/modules/services/synology-drive.nix
+++ b/modules/services/synology-drive.nix
@ -21,7 +21,7 @@ in
      wantedBy = [ "graphical-session.target" ];
      serviceConfig = {
        ExitType = "cgroup";
-        Restart = "on-failure";
+        Restart = "always";
        RestartSec = "1s";
        ExecStartPre = "${pkgs.coreutils}/bin/rm -rf %h/.SynologyDrive/SynologyDrive.app %h/.SynologyDrive/cloud-connect.pid";
        ExecStart = "${cfg.package}/bin/synology-drive";
Author	SHA1	Message	Date
Moritz Böhme	b226231002	build: update inputs	2023-07-24 18:56:51 +02:00
Moritz Böhme	4fdafeebd4	fix(nvim): smartcolumn-nvim syntax	2023-07-24 18:55:11 +02:00
Moritz Böhme	3ec0b50207	fix(synology-drive): always restart	2023-07-24 18:54:47 +02:00
Moritz Böhme	f38c4d065a	feat(desktop): add qmk	2023-07-24 18:46:35 +02:00
Moritz Böhme	e2aff57d72	feat(nvim): add coq-nvim	2023-07-24 18:45:27 +02:00