diff --git a/flake.lock b/flake.lock index 6ecc379..14e7bc4 100644 --- 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": { @@ -521,6 +470,22 @@ "type": "github" } }, + "leap-spooky-nvim": { + "flake": false, + "locked": { + "lastModified": 1687792124, + "narHash": "sha256-EPqbsG7KFHdnbW430+BSrPeOoVy99KtIC8OpFbV1ycw=", + "owner": "ggandor", + "repo": "leap-spooky.nvim", + "rev": "e003f2aa376190148f2e7731a60c89239335013c", + "type": "github" + }, + "original": { + "owner": "ggandor", + "repo": "leap-spooky.nvim", + "type": "github" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -540,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": { @@ -555,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": { @@ -570,7 +535,7 @@ }, "neovim-flake": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -578,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": { @@ -601,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": { @@ -625,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": { @@ -638,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" @@ -671,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": { @@ -703,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": { @@ -736,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": { @@ -800,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": { @@ -816,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": { @@ -832,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": { @@ -848,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" } @@ -880,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": { @@ -956,6 +855,7 @@ "hypr-contrib": "hypr-contrib", "hyprland": "hyprland", "hyprpaper": "hyprpaper", + "leap-spooky-nvim": "leap-spooky-nvim", "lspsaga-nvim": "lspsaga-nvim", "master": "master", "neovim-nightly-overlay": "neovim-nightly-overlay", @@ -966,7 +866,8 @@ "pre-commit-hooks": "pre-commit-hooks", "rofi-wayland": "rofi-wayland", "smartcolumn-nvim": "smartcolumn-nvim", - "stable": "stable" + "stable": "stable", + "telekasten-nvim": "telekasten-nvim" } }, "rust-overlay": { @@ -981,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": { @@ -1012,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": { @@ -1041,21 +942,68 @@ "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": { + "lastModified": 1689074017, + "narHash": "sha256-yBw0Ja9xBhHcEdzvKvg6LCDzmIgW9kg0XaXS7hcr958=", + "owner": "renerocksai", + "repo": "telekasten.nvim", + "rev": "4a5e57eee9c5154ed77423bb7fa6619fdb0784cd", + "type": "github" + }, + "original": { + "owner": "renerocksai", + "repo": "telekasten.nvim", + "type": "github" + } + }, "wlroots": { "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" } }, diff --git a/flake.nix b/flake.nix index 9eae8fc..42191c8 100644 --- a/flake.nix +++ b/flake.nix @@ -50,6 +50,12 @@ smartcolumn-nvim.flake = false; smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim"; + leap-spooky-nvim.flake = false; + leap-spooky-nvim.url = "github:ggandor/leap-spooky.nvim"; + + telekasten-nvim.flake = false; + telekasten-nvim.url = "github:renerocksai/telekasten.nvim"; + # Hyprland hypr-contrib.url = "github:hyprwm/contrib"; hyprland.url = "github:hyprwm/Hyprland"; diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index 43f39fa..30679e6 100644 --- 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; @@ -64,13 +66,7 @@ } ]; }; - networkmanager = { - enable = true; - dns = "none"; - }; - dhcpcd.extraConfig = '' - nohook resolv.conf - ''; + networkmanager.enable = true; }; hardware.nvidia.modesetting.enable = true; services.xserver.videoDrivers = [ "nvidia" ]; diff --git a/hosts/scadspc25/default.nix b/hosts/scadspc25/default.nix new file mode 100644 index 0000000..6e1633d --- /dev/null +++ b/hosts/scadspc25/default.nix @@ -0,0 +1,56 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running `nixos-help`). + +{ pkgs, ... }: + +{ + imports = + [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + + my = { + yubikey.luksSupport.enable = false; + profiles = { + desktop.enable = true; + webis.enable = true; + }; + services.synology-drive.enable = true; + programs.hyprland.keyboardLayouts = [ "us" "de" ]; + }; + + # Use the systemd-boot EFI boot loader. + boot.loader.grub.enable = true; + boot.loader.grub.device = "nodev"; + boot.loader.grub.efiSupport = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "scadspc25"; # Define your hostname. + networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # Set your time zone. + time.timeZone = "Europe/Berlin"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + environment.systemPackages = with pkgs; [ + vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + wget + ]; + + hardware.bluetooth.enable = true; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It's perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "23.05"; # Did you read the comment? + +} + diff --git a/hosts/scadspc25/hardware-configuration.nix b/hosts/scadspc25/hardware-configuration.nix new file mode 100644 index 0000000..d4d8fdb --- /dev/null +++ b/hosts/scadspc25/hardware-configuration.nix @@ -0,0 +1,72 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { + device = "/dev/disk/by-uuid/cfc2d232-f833-4ecf-8098-fe805afd390d"; + fsType = "btrfs"; + options = [ "subvol=root" "compress=zstd" "noatime" ]; + }; + + fileSystems."/home" = + { + device = "/dev/disk/by-uuid/cfc2d232-f833-4ecf-8098-fe805afd390d"; + fsType = "btrfs"; + options = [ "subvol=home" "compress=zstd" "noatime" ]; + }; + + fileSystems."/nix" = + { + device = "/dev/disk/by-uuid/cfc2d232-f833-4ecf-8098-fe805afd390d"; + fsType = "btrfs"; + options = [ "subvol=nix" "compress=zstd" "noatime" ]; + }; + + fileSystems."/var/log" = + { + device = "/dev/disk/by-uuid/cfc2d232-f833-4ecf-8098-fe805afd390d"; + fsType = "btrfs"; + options = [ "subvol=log" "compress=zstd" "noatime" ]; + }; + + fileSystems."/snapshots" = + { + device = "/dev/disk/by-uuid/cfc2d232-f833-4ecf-8098-fe805afd390d"; + fsType = "btrfs"; + options = [ "subvol=snapshots" "compress=zstd" "noatime" ]; + }; + + fileSystems."/boot" = + { + device = "/dev/disk/by-uuid/3B2B-63DB"; + fsType = "vfat"; + }; + + swapDevices = + [{ device = "/dev/disk/by-uuid/c08ff6b6-d6e2-4620-95fc-6c20b04c7363"; }]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.eno1.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/scadspc25/system.nix b/hosts/scadspc25/system.nix new file mode 100644 index 0000000..132026a --- /dev/null +++ b/hosts/scadspc25/system.nix @@ -0,0 +1 @@ +"x86_64-linux" diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix index 86a70be..9727af2 100644 --- a/modules/profiles/base.nix +++ b/modules/profiles/base.nix @@ -14,6 +14,18 @@ let ''; }; nom-system-command = command: "${nom-system}/bin/nom-system && ${command}"; + + f = pkgs.writeFishApplication { + name = "f"; + runtimeInputs = with pkgs; [ fzf bat ]; + text = '' + #!/usr/bin/env fish + fzf --query "$argv" --multi --bind "enter:become($EDITOR {+})" --preview "bat --color=always --style=header,grid --line-range :500 {+}" + ''; + completions = '' + complete -c f + ''; + }; in { users.users.moritz = { @@ -58,7 +70,6 @@ in fish.enable = true; git.enable = true; gpg.enable = true; - navi.enable = true; nix = { gc.enable = true; optimise.enable = true; @@ -116,6 +127,7 @@ in viu wget vim + f ]; fonts.fonts = with pkgs; [ @@ -152,6 +164,7 @@ in enable = true; defaultOptions = [ "--height 50%" + "--bind alt-j:preview-down,alt-k:preview-up" ]; }; zoxide.enable = true; diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index bae0d2f..5fcd3f1 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -36,7 +36,25 @@ in nix-edit.enable = mkDefault true; nvim.enable = mkDefault true; python.versions."311".enable = mkDefault true; - spotify.enable = mkDefault true; + spotify-player = { + enable = mkDefault true; + package = pkgs.spotify-player.overrideAttrs (old: { + buildFeatures = lib.lists.remove "notify" (old.buildFeatures or [ ]); + }); + config = { + client_id = "3172dbeaf64949728920c58b823bc24b"; + copy_command = { + command = "wl-copy"; + args = [ ]; + }; + enable_cover_image_cache = true; + default_device = "spotify-player-daemon"; + enable_streaming = false; + playback_window_position = "Bottom"; + cover_img_length = 20; + cover_img_width = 10; + }; + }; ssh.enable = mkDefault true; thunar.enable = mkDefault true; wallpaper.enable = mkDefault true; @@ -47,6 +65,19 @@ in gammastep.enable = true; kdeconnect.enable = mkDefault true; printing.enable = true; + spotify-player = { + enable = mkDefault true; + config = { + client_id = "3172dbeaf64949728920c58b823bc24b"; + device = { + name = "spotify-player-daemon"; + device_type = "computer"; + volume = 70; + bitrate = 320; + audio_cache = true; + }; + }; + }; wireguard.enable = true; }; }; @@ -75,6 +106,7 @@ in }; services = { illum.enable = true; + resolved.enable = true; gnome.gnome-keyring.enable = true; pipewire = { enable = true; diff --git a/modules/profiles/work.nix b/modules/profiles/work.nix index 75f2225..ffca834 100644 --- a/modules/profiles/work.nix +++ b/modules/profiles/work.nix @@ -13,7 +13,6 @@ in config = mkIf cfg.enable { my = { programs = { - code.enable = mkDefault true; ssh.enable = mkForce false; git.identity.email = mkDefault "moritz.boehme@l.de"; hyprland = { @@ -21,7 +20,7 @@ in }; miracast.enable = mkDefault true; python.versions = { - "38".enable = mkDefault true; + # "38".enable = mkDefault true; "310".enable = mkDefault true; "311".enable = mkDefault true; }; diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix index 2805a2e..d75333d 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -38,7 +38,6 @@ in wallpaper.enable = true; kitty.enable = true; rofi.enable = true; - }; wallpapers.enable = true; services.dunst.enable = true; diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix index 7e88008..f126481 100644 --- a/modules/programs/nvim/default.nix +++ b/modules/programs/nvim/default.nix @@ -48,9 +48,9 @@ let listToStringMultiLine id ([ "dir = ${quote plugin}" - "name = ${quote plugin.name}" - "lazy = ${boolToString lazy}" + "name = ${quote (getName plugin)}" ] + ++ (optional (lazy != null) "lazy = ${boolToString lazy}") ++ (optional (!enabled) "enabled = ${boolToString enabled}") ++ (optional (dependencies != [ ]) "dependencies = ${listToStringMultiLine id (map lazySpecFromPlugin dependencies)}") ++ (optional (init != null) "init = function(plugin)\n${toString init}\nend") @@ -59,7 +59,7 @@ let ++ (optional (event != [ ]) "event = ${listToStringOneLine quote event}") ++ (optional (cmd != [ ]) "cmd = ${listToStringOneLine quote cmd}") ++ (optional (ft != [ ]) "ft = ${listToStringOneLine quote ft}") - ++ (optional (priority != 50) "priority = ${toString priority}") + ++ (optional (priority != null) "priority = ${toString priority}") ); lazySpecs = listToStringMultiLine id (map lazySpecFromPlugin cfg.plugins); lazy = '' @@ -86,7 +86,7 @@ in type = nullOr str; default = null; description = '' - Lua code to be executed when the plugin is loaded. + Lua function to be executed when the plugin is loaded. ''; }; dependencies = mkOption { @@ -111,8 +111,8 @@ in ''; }; lazy = mkOption { - type = bool; - default = true; + type = nullOr bool; + default = null; description = '' Whether to load the plugin lazily. ''; @@ -145,8 +145,8 @@ in ''; }; priority = mkOption { - type = int; - default = 50; + type = nullOr int; + default = null; description = '' Priority to load the plugin. ''; @@ -222,27 +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 - nodePackages.cspell - 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 ]; diff --git a/modules/programs/nvim/plugins/catppuccin-nvim.lua b/modules/programs/nvim/plugins/catppuccin-nvim.lua index 921651c..3b8cd7c 100644 --- a/modules/programs/nvim/plugins/catppuccin-nvim.lua +++ b/modules/programs/nvim/plugins/catppuccin-nvim.lua @@ -10,6 +10,7 @@ require("catppuccin").setup({ enabled = true, }, treesitter = true, + telekasten = true, telescope = true, lsp_trouble = true, which_key = true, diff --git a/modules/programs/nvim/plugins/codeium-vim.lua b/modules/programs/nvim/plugins/codeium-vim.lua new file mode 100644 index 0000000..72cd968 --- /dev/null +++ b/modules/programs/nvim/plugins/codeium-vim.lua @@ -0,0 +1,2 @@ +-- dont show ghost text +vim.g.codeium_render = false diff --git a/modules/programs/nvim/plugins/coq-nvim.lua b/modules/programs/nvim/plugins/coq-nvim.lua new file mode 100644 index 0000000..9946c3b --- /dev/null +++ b/modules/programs/nvim/plugins/coq-nvim.lua @@ -0,0 +1,3 @@ +vim.g.coq_settings = { + auto_start = "shut-up", +} diff --git a/modules/programs/nvim/plugins/coq-thirdparty.lua b/modules/programs/nvim/plugins/coq-thirdparty.lua new file mode 100644 index 0000000..ec1e05c --- /dev/null +++ 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" }, +}) diff --git a/modules/programs/nvim/plugins/default.nix b/modules/programs/nvim/plugins/default.nix index 89dc6af..c6372f2 100644 --- a/modules/programs/nvim/plugins/default.nix +++ b/modules/programs/nvim/plugins/default.nix @@ -31,7 +31,6 @@ with builtins; { plugin = nvim-web-devicons; } ]; } - { plugin = nvim-ts-context-commentstring; } { plugin = mini-nvim; lazy = false; @@ -82,28 +81,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" ]; @@ -200,9 +177,9 @@ with builtins; conf = readFile ./smartcolumn-nvim.lua; } { - plugin = telescope-fzf-native-nvim; - conf = readFile ./telescope-fzf-native-nvim.lua; + plugin = telescope-nvim; cmd = [ "Telescope" ]; + conf = builtins.readFile ./telescope.lua; keys = [ { key = "ff"; cmd = "Telescope find_files"; desc = "Find files"; } { key = "fb"; cmd = "Telescope buffers"; desc = "Find buffers"; } @@ -220,13 +197,9 @@ with builtins; { key = "gs"; cmd = "Telescope git_status"; desc = "Status"; } ]; dependencies = [ - { - plugin = telescope-nvim; - dependencies = [ - { plugin = plenary-nvim; } - { plugin = which-key-nvim; } - ]; - } + { plugin = plenary-nvim; } + { plugin = which-key-nvim; } + { plugin = telescope-fzf-native-nvim; } ]; } { @@ -241,7 +214,59 @@ with builtins; { plugin = comment-nvim; event = [ "BufReadPost" "BufNewFile" ]; - conf = "require('Comment').setup()"; + conf = '' + require("Comment").setup() + ''; + } + { + plugin = telekasten-nvim; + dependencies = [ + { plugin = telescope-nvim; } + { plugin = which-key-nvim; } + ]; + cmd = [ "Telekasten" ]; + keys = [ + { key = "z"; cmd = "Telekasten"; desc = "zettelkasten"; } + ]; + conf = builtins.readFile ./zettelkasten-nvim.lua; + } + { + plugin = markdown-preview-nvim; + lazy = false; + } + { + plugin = coq_nvim; + event = [ "BufReadPost" "BufNewFile" ]; + 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; + } + ]; + } + { + plugin = nvim-surround; + event = [ "BufReadPost" "BufNewFile" ]; + conf = '' + require("nvim-surround").setup({}) + ''; + } + { + plugin = nvim-treesitter-context; + event = [ "BufReadPost" "BufNewFile" ]; + conf = '' + require("treesitter-context").setup({}) + ''; } ]; } diff --git a/modules/programs/nvim/plugins/formatter-nvim.lua b/modules/programs/nvim/plugins/formatter-nvim.lua index adbdeeb..a7eee92 100644 --- a/modules/programs/nvim/plugins/formatter-nvim.lua +++ b/modules/programs/nvim/plugins/formatter-nvim.lua @@ -6,6 +6,9 @@ require("formatter").setup({ log_level = vim.log.levels.WARN, -- All formatter configurations are opt-in filetype = { + go = { + require("formatter.filetypes.go").gofmt, + }, json = { require("formatter.filetypes.json").jq, }, diff --git a/modules/programs/nvim/plugins/mini-nvim.lua b/modules/programs/nvim/plugins/mini-nvim.lua index 6ce1ecc..e89e7a3 100644 --- a/modules/programs/nvim/plugins/mini-nvim.lua +++ b/modules/programs/nvim/plugins/mini-nvim.lua @@ -1,18 +1,8 @@ require("mini.align").setup() -require("mini.surround").setup() require("mini.move").setup() require("mini.pairs").setup() require("mini.starter").setup() -require("mini.tabline").setup() -local tabline_current = vim.api.nvim_get_hl(0, { name = "MiniTablineCurrent" }) -vim.api.nvim_set_hl(0, "MiniTablineCurrent", { - fg = tabline_current.fg, - bg = tabline_current.bg, - bold = true, - italic = true, -}) - require("mini.statusline").setup({ content = { active = function() diff --git a/modules/programs/nvim/plugins/null-ls-nvim.lua b/modules/programs/nvim/plugins/null-ls-nvim.lua index 7d65248..c689fad 100644 --- a/modules/programs/nvim/plugins/null-ls-nvim.lua +++ b/modules/programs/nvim/plugins/null-ls-nvim.lua @@ -3,14 +3,12 @@ local null_ls = require("null-ls") null_ls.setup({ sources = { -- Code actions - null_ls.builtins.code_actions.cspell, null_ls.builtins.code_actions.gitsigns, null_ls.builtins.code_actions.shellcheck, null_ls.builtins.code_actions.statix, -- Completion null_ls.builtins.completion.spell, -- Diagnostics - null_ls.builtins.diagnostics.cspell, null_ls.builtins.diagnostics.deadnix, null_ls.builtins.diagnostics.shellcheck, null_ls.builtins.diagnostics.statix, @@ -18,7 +16,6 @@ null_ls.setup({ }) -- disable (c)spell initially -null_ls.disable("cspell") null_ls.disable("spell") -- make sources toggle able @@ -31,11 +28,5 @@ require("which-key").register({ end, "spell", }, - S = { - function() - null_ls.toggle("cspell") - end, - "cspell", - }, }, }, { prefix = "t" }) diff --git a/modules/programs/nvim/plugins/nvim-cmp.lua b/modules/programs/nvim/plugins/nvim-cmp.lua deleted file mode 100644 index 0533cb7..0000000 --- a/modules/programs/nvim/plugins/nvim-cmp.lua +++ /dev/null @@ -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({ - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.abort(), - [""] = cmp.mapping.confirm({ select = true }), - [""] = 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" }), - [""] = 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 }, - }), -}) diff --git a/modules/programs/nvim/plugins/nvim-lspconfig.lua b/modules/programs/nvim/plugins/nvim-lspconfig.lua index d844ca5..35cce24 100644 --- 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 = { @@ -126,13 +122,23 @@ local servers = { "nil_ls", "pylsp", "ruff_lsp", - "rust_analyzer", "typst_lsp", + "gopls", } for _, lsp in ipairs(servers) do lspconfig_setup(lsp, {}) end +lspconfig_setup("rust_analyzer", { + settings = { + ["rust-analyzer"] = { + checkOnSave = { + command = "clippy", + }, + }, + }, +}) + lspconfig_setup("lua_ls", { settings = { Lua = { diff --git a/modules/programs/nvim/plugins/smartcolumn-nvim.lua b/modules/programs/nvim/plugins/smartcolumn-nvim.lua index 1858689..c095401 100644 --- 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" }, }) diff --git a/modules/programs/nvim/plugins/telescope-fzf-native-nvim.lua b/modules/programs/nvim/plugins/telescope.lua similarity index 100% rename from modules/programs/nvim/plugins/telescope-fzf-native-nvim.lua rename to modules/programs/nvim/plugins/telescope.lua diff --git a/modules/programs/nvim/plugins/zettelkasten-nvim.lua b/modules/programs/nvim/plugins/zettelkasten-nvim.lua new file mode 100644 index 0000000..6a35570 --- /dev/null +++ b/modules/programs/nvim/plugins/zettelkasten-nvim.lua @@ -0,0 +1,27 @@ +local telekasten = require("telekasten") +telekasten.setup({ + home = vim.fn.expand("~/Nextcloud/Notes/zettelkasten"), + auto_set_filetype = false, + image_subdir = "assets", +}) + +vim.api.nvim_create_autocmd({ "BufReadPost", "BufNewFile" }, { + pattern = "*/zettelkasten/*", + callback = function(_) + require("which-key").register({ + g = { + f = { telekasten.follow_link, "Follow link" }, + r = { telekasten.show_backlinks, "Show backlinks" }, + }, + [""] = { + f = { + f = { telekasten.find_notes, "Find note" }, + n = { telekasten.new_note, "New note" }, + }, + s = { + g = { telekasten.search_note, "Grep notes" }, + }, + }, + }, { buffer = vim.fn.bufnr("%") }) + end, +}) diff --git a/modules/programs/spotify_player.nix b/modules/programs/spotify_player.nix new file mode 100644 index 0000000..435b9c8 --- /dev/null +++ b/modules/programs/spotify_player.nix @@ -0,0 +1,33 @@ +{ config +, lib +, pkgs +, ... +}: + +with lib; +let + cfg = config.my.programs.spotify-player; + toml = pkgs.formats.toml { }; +in +{ + options.my.programs.spotify-player = { + enable = mkEnableOption "spotify-player"; + package = mkOption { + type = types.package; + default = pkgs.spotify-player; + }; + config = mkOption { + inherit (toml) type; + default = { }; + }; + }; + + config = mkIf cfg.enable { + home-manager.users.moritz = { + xdg.configFile."spotify-player/app.toml" = { + source = toml.generate "app.toml" cfg.config; + }; + home.packages = [ cfg.package ]; + }; + }; +} diff --git a/modules/programs/tmux.nix b/modules/programs/tmux/default.nix similarity index 73% rename from modules/programs/tmux.nix rename to modules/programs/tmux/default.nix index 912f7ad..6469f96 100644 --- a/modules/programs/tmux.nix +++ b/modules/programs/tmux/default.nix @@ -4,40 +4,33 @@ with lib; let cfg = config.my.programs.tmux; - tmux-sessionizer = pkgs.writeShellApplication { - name = "ts"; - runtimeInputs = with pkgs; [ tmux findutils coreutils procps fd ]; + tmux-switch = pkgs.writeShellApplication { + name = "tmux-switch"; + runtimeInputs = with pkgs; [ tmux ]; text = '' #!/usr/bin/env bash - - options=$(fd -HIg '.git' ~/ --min-depth 1 --max-depth 5 --type d --prune --exec dirname {} | fzf --filter "''$*") - - if [[ -z $options ]]; then - exit 1 - elif [[ $(wc -l <<< "$options") -eq 1 ]]; then - selected="$options" - else - selected=$(echo "$options" | fzf --query="$*") - fi - - if [[ -z $selected ]]; then - exit 0 - fi - - selected_name=$(basename "$selected" | tr . _) - - if ! tmux has-session -t="$selected_name" 2> /dev/null; then - tmux new-session -ds "$selected_name" -c "$selected" - fi - if [[ -z ''${TMUX+x} ]]; then - tmux attach -t "$selected_name" + tmux attach -t "$1" else - tmux switch-client -t "$selected_name" + tmux switch-client -t "$1" fi ''; }; + tmux-sessionizer = pkgs.writeFishApplication { + name = "ts"; + runtimeInputs = with pkgs; [ tmux findutils coreutils procps fd fzf1 tmux-switch ]; + text = readFile ./tmux-sessionizer/script.fish; + completions = readFile ./tmux-sessionizer/completions.fish; + }; + + tmux-attach = pkgs.writeFishApplication { + name = "ta"; + runtimeInputs = with pkgs; [ tmux fzf1 tmux-switch ]; + text = readFile ./tmux-attach/script.fish; + completions = readFile ./tmux-attach/completions.fish; + }; + in { options.my.programs.tmux = { @@ -64,7 +57,10 @@ in config = mkIf cfg.enable { my.shell.abbreviations.t = "tmux"; - home-manager.users.moritz.home.packages = [ tmux-sessionizer ]; + home-manager.users.moritz.home.packages = [ + tmux-sessionizer + tmux-attach + ]; home-manager.users.moritz.programs = { tmux = { enable = true; @@ -72,7 +68,6 @@ in customPaneNavigationAndResize = true; keyMode = "vi"; mouse = true; - newSession = true; prefix = "C-Space"; sensibleOnTop = false; plugins = with pkgs.tmuxPlugins; [ diff --git a/modules/programs/tmux/tmux-attach/completions.fish b/modules/programs/tmux/tmux-attach/completions.fish new file mode 100644 index 0000000..6e31f9f --- /dev/null +++ b/modules/programs/tmux/tmux-attach/completions.fish @@ -0,0 +1 @@ +complete -c ta -f -a '(tmux list-sessions -F "#{session_name}" 2>/dev/null)' diff --git a/modules/programs/tmux/tmux-attach/script.fish b/modules/programs/tmux/tmux-attach/script.fish new file mode 100644 index 0000000..442dec2 --- /dev/null +++ b/modules/programs/tmux/tmux-attach/script.fish @@ -0,0 +1,5 @@ +set selected (tmux list-sessions -F '#{session_name}' 2>/dev/null | fzf1 $argv) +if not test -n "$selected" + exit 1 +end +tmux-switch "$selected" diff --git a/modules/programs/tmux/tmux-sessionizer/completions.fish b/modules/programs/tmux/tmux-sessionizer/completions.fish new file mode 100644 index 0000000..f48642c --- /dev/null +++ b/modules/programs/tmux/tmux-sessionizer/completions.fish @@ -0,0 +1 @@ +complete -c ts -f -a '(fd -HIg '.git' ~/ --min-depth 1 --max-depth 5 --type d --prune --exec realpath "{}/.." | xargs -I{} basename {} | string replace "." "")' diff --git a/modules/programs/tmux/tmux-sessionizer/script.fish b/modules/programs/tmux/tmux-sessionizer/script.fish new file mode 100644 index 0000000..d0ca484 --- /dev/null +++ b/modules/programs/tmux/tmux-sessionizer/script.fish @@ -0,0 +1,13 @@ +set selected (fd -HIg '.git' ~/ --min-depth 1 --max-depth 5 --type d --prune --exec dirname {} | fzf1 $argv) + +set selected_name (basename $selected 2>/dev/null | string replace "." "_") + +if not test -n "$selected_name" + exit 1 +end + +if ! tmux has-session -t $selected_name 2> /dev/null + tmux new-session -ds $selected_name -c $selected +end + +tmux-switch $selected_name diff --git a/modules/services/spotify_player.nix b/modules/services/spotify_player.nix new file mode 100644 index 0000000..b494c3a --- /dev/null +++ b/modules/services/spotify_player.nix @@ -0,0 +1,58 @@ +{ lib, config, pkgs, ... }: + +with lib; +let + toml = pkgs.formats.toml { }; + cfg = config.my.services.spotify-player; + + tomlConfig = + if cfg.configFile != null + then cfg.configFile + else toml.generate "app.toml" cfg.config; + + configFolder = pkgs.runCommand "spotify-player-config" { } '' + mkdir $out + ln -s "${tomlConfig}" $out/app.toml + ''; +in +{ + options.my.services.spotify-player = { + enable = mkEnableOption "spotify_player"; + config = mkOption { + inherit (toml) type; + default = { }; + }; + configFile = mkOption { + type = with types; nullOr path; + default = null; + }; + package = mkOption { + type = types.package; + default = pkgs.spotify-player; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.config == { } || cfg.configFile == null; + message = "At least one of the options 'config' or 'configFile' must be set."; + } + { + assertion = cfg.config != { } || cfg.configFile != null; + message = "Only one of the options 'config' or 'configFile' may be set."; + } + ]; + systemd.user.services.spotify-player = { + after = [ "graphical-session.target" "network.target" ]; + partOf = [ "graphical-session.target" ]; + wantedBy = [ "graphical-session.target" ]; + serviceConfig = { + Type = "forking"; + Restart = "always"; + RestartSec = "1s"; + ExecStart = "${getExe cfg.package} --daemon --config-folder ${configFolder}"; + }; + }; + }; +} diff --git a/modules/services/synology-drive.nix b/modules/services/synology-drive.nix index 9ff8384..63776d1 100644 --- 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"; diff --git a/overlays/builders.nix b/overlays/builders.nix new file mode 100644 index 0000000..498ebcc --- /dev/null +++ b/overlays/builders.nix @@ -0,0 +1,49 @@ +_: + +final: _: +with final.lib; +{ + writeFishApplication = + { name + , text + , completions ? null + , runtimeInputs ? [ ] + , checkPhase ? null + }: + let + fishFile = destination: content: final.writeTextFile { + inherit name destination; + executable = true; + allowSubstitutes = true; + preferLocalBuild = false; + text = '' + #!${getExe final.fish} + '' + optionalString (runtimeInputs != [ ]) '' + + export PATH="${makeBinPath runtimeInputs}:$PATH" + '' + '' + + ${content} + ''; + + checkPhase = + if checkPhase == null then '' + runHook preCheck + ${getExe final.fish} -n "$target" + runHook postCheck + '' + else checkPhase; + }; + + + script = fishFile "/bin/${name}" text; + + completions_file = fishFile "/share/fish/vendor_completions.d/${name}.fish" completions; + in + final.symlinkJoin { + inherit name; + paths = [ + script + ] ++ optional (completions != null) completions_file; + }; +} diff --git a/overlays/packages.nix b/overlays/packages.nix index bb884a9..e56b410 100644 --- a/overlays/packages.nix +++ b/overlays/packages.nix @@ -1,6 +1,6 @@ { inputs, lib, ... }: -_: prev: +final: prev: { agenix = inputs.agenix.packages.${prev.system}.default; hyprpaper = inputs.hyprpaper.packages.${prev.system}.default; @@ -10,4 +10,19 @@ _: prev: src = inputs.rofi-wayland; version = lib.my.mkVersionInput inputs.rofi-wayland; }); + + fzf1 = final.writeShellApplication { + name = "fzf1"; + runtimeInputs = with final; [ coreutils fzf fd ]; + text = '' + #!/usr/bin/env bash + selected=$(fzf --query="$*" -1 < /dev/stdin) + + if [[ -z $selected ]]; then + exit 0 + fi + + echo "$selected" + ''; + }; } diff --git a/overlays/vimPlugins.nix b/overlays/vimPlugins.nix index 4c1e2aa..0b8727b 100644 --- a/overlays/vimPlugins.nix +++ b/overlays/vimPlugins.nix @@ -31,5 +31,17 @@ with lib.my; version = mkVersionInput inputs.cmp-async-path; src = inputs.cmp-async-path; }); + + leap-spooky-nvim = prev.vimUtils.buildVimPluginFrom2Nix { + pname = "leap-spooky-nvim"; + version = mkVersionInput inputs.leap-spooky-nvim; + src = inputs.leap-spooky-nvim; + }; + + telekasten-nvim = prev.vimUtils.buildVimPluginFrom2Nix { + pname = "telekasten-nvim"; + version = mkVersionInput inputs.telekasten-nvim; + src = inputs.telekasten-nvim; + }; }; } diff --git a/secrets/github.age b/secrets/github.age index b091b3b..fdda25e 100644 --- a/secrets/github.age +++ b/secrets/github.age @@ -1,16 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 CjuqfA vQgqFrMrdEi4vwNj9qSLO9YVBTpY5OSMoRzH+Wk19lw -GkYkh9FisOcAREJe+CW3gftgWunKH1V7N/hm4l2n2BM --> ssh-ed25519 QRYDmg pRNoHHxbQ7p6bzanDmakpHGc06EVqB8TSn+X7+4fbm8 -O2rpt/OVbGKKzEnGVlMnOhyJaqsMQdeB5ZxjfKf9BNc --> ssh-ed25519 wG6LYg 2aXp/3oo9BbOg7vBHnSPwDY9ycuJHA68Uf6Q9afYmA8 -vd+yYpAqiDYMVIGvJmGD6T6Inwo64dYMRwq4n8kqV7E --> ssh-ed25519 ZYd7Zg c/egc/Me5k/RirfanQY/Qq3Fhdm7q67lUL7SzpBp9Tk -81ubfNCPJOtbo82iKmB/Tq3jgUntKnAQQy+JuiZkeTo --> ssh-ed25519 as9VYQ 6g/5nmOnTK9BWF0bLpk58OGb5iLMaJpNvg955iY5qhs -jWt7sv4r5n5x5zJRvmWuP9moVzqmro8jHrnAIUjH+vU --> wn7ow-grease /PE|\ M5 3a3-e/J+ hv7j2 -fPDfe6t5LKX5MmidzQkudoyFfF+GuUHIhtfz7DTyTAEczkqOCSUGvpGmgR5wckMK -rPUibrMFHW0 ---- ivXm5PXqcdPjqMKGTRTasnf0zgaLc1QovA6gmxPEGQQ -0T`ݓNkg]ج XvȞ ̝9Jd|b,&Sބ- WDߚS \ No newline at end of file +-> ssh-ed25519 CjuqfA G27Yt1FyurlWFuq0397PV2+bivdRG0X//CfFqrSR2Qc +n31SgYLmCGlAsSIpOr/UwQupt92qh5ONU5n4xOGfeJU +-> ssh-ed25519 QRYDmg T36WQmcOabBJRDC18gIwEg+wHOs2k2a+ti4VKE9H+RQ +A8hj7izomU3eGEb7ML3EVZYaqvhQ5ZSHcb/EM2QnBa0 +-> ssh-ed25519 wG6LYg weF/pK+Xxh5Kxt/JTXAd/YXkTibD6yGnewOloDWfszE +VpUC74mIThmgieN5cfljgFl3Os7SQ/HG9iA/nhUdORY +-> ssh-ed25519 ZYd7Zg TRuhGwA6YOxJjodDMhyQm6JiInbIwnSO86Vptoj+lGc +sknbCE94iTQwnwjWPpsbRUKAEqTSY82rXS/17bRXt0E +-> ssh-ed25519 as9VYQ oqaIVShntZXxqkkZP7Mg+Je3k0OvNWVH+6sbsu1Zlgc +gSd1Ecv5gNGxRZjsFYkcIDlJ+uv9ubZn8pgo56GrOHg +-> ssh-ed25519 dWIbQQ hNi/nS5QeE+MPUYvb94XwoN+GOuinzgc2QU/v2+VhkQ +L3p7rRv64DvD+VX7kad7B15kuDCQMxVB+ZE91mJYv74 +-> @l~.-grease m4vSyUw1 +xxt67nUfB58sf7oOIxzYCoiiqX/E4yJQmdJt3tVZ6FHyqNfU7SxrInaFDppl9tiW +WIhtVGjS +--- 6Hp/UXOV+kUSkC+cYQFu4vJ70qctprk/T/pr5tH0gV0 +$U5E\ tn|GBۍ.n} wz& +Zx@ÚI|i^sCOu @ \ No newline at end of file diff --git a/secrets/nordvpn.age b/secrets/nordvpn.age index ebce709..4f0074e 100644 Binary files a/secrets/nordvpn.age and b/secrets/nordvpn.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 723b0a8..09e13f4 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -6,8 +6,11 @@ let nixos-laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDhtwHDGAZshiQWKkCcPWV9tC83b+bKBgjDcjP/N2CKO"; nixos-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKl8gMhwSf1NsP5gp14xbbyjqQLZzcHLb/XKRMoHdXgI"; nixos-work = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGQdruRBgcS3JbX+8DP4GE+28M/ZnxqxhoaMM5EVUkrD"; + scadspc25 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID3i/+siSLZmbW/8uM1LCpmR4ErCtS9zdS4aDDSfCESC"; + hosts-personal = [ nixos-laptop nixos-desktop ]; - hosts = hosts-personal ++ [ nixos-work ]; + hosts-work = [ nixos-work scadspc25 ]; + hosts = hosts-personal ++ hosts-work; all = users ++ hosts; in @@ -19,6 +22,6 @@ in "uni-vpn.age".publicKeys = all; "wireguard-preshared-key.age".publicKeys = all; "wireguard-private-key.age".publicKeys = all; - "webis.age".publicKeys = hosts-personal ++ [ moritz ]; - "webis-ssh.age".publicKeys = hosts-personal ++ [ moritz ]; + "webis.age".publicKeys = hosts-personal ++ [ scadspc25 moritz ]; + "webis-ssh.age".publicKeys = hosts-personal ++ [ scadspc25 moritz ]; } diff --git a/secrets/spotifyd.age b/secrets/spotifyd.age index 80c2746..f564d39 100644 --- a/secrets/spotifyd.age +++ b/secrets/spotifyd.age @@ -1,16 +1,17 @@ age-encryption.org/v1 --> ssh-ed25519 CjuqfA eP249XpK70os6x/XG6zr0VWmQ4dDUvbijmYeArRAogs -C/nwUI7ObSuJRt4TfqUM8Z0IxD/mXg392CawE3r52Yw --> ssh-ed25519 QRYDmg gv9JRmJBt0lQV2mx7TiZlyWNOIDXW2flISCN2Tw9kh8 -h5wmTiWn8oX5Sr/yJp/FZ4eGxutCgIkPpDU8E4Dul0A --> ssh-ed25519 wG6LYg 5Pw8gHIEP5rA4aStCC217iNnky9J/t1KsmfK25o6Ylw -TRJ4+3AsT9n0IEMZXyvcFRqSS1J48fFaVWHK9C3DgWw --> ssh-ed25519 ZYd7Zg ns34LIL0NNzrSUFTJGsELNVyfxcknuDfgK9ZE0DGNXM -NUgBXe/HNOz8NKbS0xMzd3Z2cP9zsjLKcc4fDu66nw0 --> ssh-ed25519 as9VYQ kd/k9sA8gUNNKmhi5LcZqSrRg3qUKhHXhYKE7nkQgmY -JVPlAWimRS2QZu0PIvQMwzC21B35miaWpEEsUUEq37Q --> T_b>Tl-grease Xe5~ 2q } -wGqdSY44FDId8JTxJS0/1mMbT/yPvB2L ---- 3g9QhHQwSdmcyWII9LEiUq38yyKfvW/OJFgRZHpQfhk -6}jJoeNL1=OJgr\~*ZmsWA -x \ No newline at end of file +-> ssh-ed25519 CjuqfA /YCi+4iCBCJc2+n5DfEi6yFqYiC6WKyKqMQTC3dxYTM +TXnSGexVJPzsxV3GBoxujBPy4sYFK7tTzpgZd+tL7PY +-> ssh-ed25519 QRYDmg 7ol/1aYbVuD1peL4kMHFifxtfj1LJPQ7ByMgmoIiLG0 +LJyz1aoBxOnxcy/x9yXCcMDG1CM8XSGTIvklShHsLr8 +-> ssh-ed25519 wG6LYg LvuMCPIaXP8gDriTDVIXak2dLUTDgyA+ADnsFDEtpX4 +PSsM5NsSVhsV1xtZPs3VZbJopfkDQg7Gxjkrnf+I5VI +-> ssh-ed25519 ZYd7Zg jt4zPtq1gv/SQ8Zqy2kFQZTUHo57d3BcBOusafU5TwE +FCifF8kUwHqlvokMMhJ/A2zCutshBg9K22gZPeYyK5s +-> ssh-ed25519 as9VYQ 2w+TXKZGnMQ5nRqVPfDiXAjGPLjMQcDzuZ42tXD81zE +GHVNnPD1QrRfjlxymtkIvW/fSH8280ye4ojag/RrL6Y +-> ssh-ed25519 dWIbQQ vFV8rbuDIUhVuWlp1zLKbSZkxWwBpjLGAHZ7TZmlpxA +2qq8R8eGQHMAtTAKJxv7ouXwbw9h9LnoipQ+dtq0bOk +-> eLqn-grease +s21qb67X34dXu+DeHZV4IA9mvegTyQSulJuWZXUyGmlxQT4N7pDAjAgrlrsT8zI +--- ogDMsipm47a5cDUlzX1zPmeakFaqXecpvYfPILf5PGA +;(+\"`qnC:6V싄t0\2o<*?J\TϢV_ \ No newline at end of file diff --git a/secrets/ssh-home.age b/secrets/ssh-home.age index e7b777b..b937b62 100644 Binary files a/secrets/ssh-home.age and b/secrets/ssh-home.age differ diff --git a/secrets/uni-vpn.age b/secrets/uni-vpn.age index 2c7daaa..d17cedf 100644 --- a/secrets/uni-vpn.age +++ b/secrets/uni-vpn.age @@ -1,16 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 CjuqfA wsRuh5f7FBwEuH60mY/n5B2rfMXmN9loDRI5sgLAmQY -QRNPLd433Ax/F/NMCGdUUl1dXKvpaqErPYlDRPASkLA --> ssh-ed25519 QRYDmg 1TN+ZhZMn3a5Ny/rrWZedHIwf69NCNj82RGfDt4VI1s -I+VsfBTJZ7gIIGROjU5hkvRZ/+OkxxPda9qYn28O5dg --> ssh-ed25519 wG6LYg WhRpXAXmZPYLSmNcqvuLQIkwbOnyP/Fqmt5ZhvNqQx8 -lKyFPSmEgY/BuLKxTOQMrOVf7ScL50WwvghgDQT6gsY --> ssh-ed25519 ZYd7Zg E4VAC6uIuBdXZ0jciRW/835qIaDWixDig6oGi8KqFlw -15J0vEUwCFiViXP7UlKmAmKfm+d6UgjcA3gHvDzSQwg --> ssh-ed25519 as9VYQ +sGqCqiBOgMcF90Rt6xKRHm0fqZMXflg6OBRwAhVU2k -rgzztigEJ1WCdI9AuXcjP2VZrPQxiecYRPfg4RdOyFM --> xA'C-grease s-9 ?tXT 38r l[ -lAYTp6Ot ---- RvWgnW1+4pux4UMOamln/5/xVLsyIgxAZwYOYZJGQo4 -H -I!4HQ uR7~Չ!3\B6 yGN7|v>n+2z'>D \ No newline at end of file +-> ssh-ed25519 CjuqfA G9o6Fr/QDmLnyWzDJ6H7hDbHOiDB+O+YktAPdvU7W3w +lJyk/YTCa5ZjO8dAlkkdhKTHZMSigRbjbKJfqw/fUEE +-> ssh-ed25519 QRYDmg EhRXKZpW6YrK5gnmjknsLw0n/p/6wpKYaxWl8okQmTk +CfhAxfuAslOeBUJ2KwPkOh3Z0iNzpLzWS6RDXf2FoeU +-> ssh-ed25519 wG6LYg QYrpUmxiXhq1j6J8Z2LitWd1B2HLcKN5+AoeKKxq0A8 +cqvR67PV3wfNa9fmJb/WBXfC7A0sdmVaM/rsnVMtbIY +-> ssh-ed25519 ZYd7Zg vL7E7XfhSbk+tMTrtesX6CmzvGWkticcPX/sciDH0ls +i/vSM2S32FE9ehBTNZMMgA44JF35VrsDc4Zj/0XawV8 +-> ssh-ed25519 as9VYQ ySyFU1aWka32ZrVR9psB7STvoBTszdCnL2J1Cp1CBnk +fmKHzYW7fvUnhfUUtK5agqcjK959GiV0RVCMOSx1BaE +-> ssh-ed25519 dWIbQQ 2L8XRok6Pn2pWjEiONRA5AJbRj7JKJY+nmvMaqD9zFA +t96XWaBuCxX/yawMq1DTK96B9rj8MnHL8JDf077lpvU +-> FS#1-grease p/ s |i4Z RP +945g87K4K3dU72Jn79DaImolDd5q+oVX5z4sKiqi2rZe2HbUgoNHlhRF8yyDIQpH +t2tFBx4OJN8NqVXkKw5NXTdmqKVIzCg +--- 9px5+jkQswAox2FjRnHynMCI0o0pnUqdmEcmGqdbqaE +ќK6F +@*֙?j~ !ϺՓxB>+b ssh-ed25519 CjuqfA EQLHOBOVfp+j3x+coXt1isDkG+LvsSYkU8PT1cg97FQ -NJWJKvmN4hUHsC34n1ap4HlipC0rGWlqrbgR4vm91YY --> ssh-ed25519 QRYDmg LOvHPzC4zfX2rlQBxYwHoHhjftCyWnBRLXZ/aB1ekQM -lVtsflczWZwhBx4FZeJK6jtcUCvwQKIA5Gmbth2to9U --> ssh-ed25519 wG6LYg nqcLDqaVL7D0seK7kW52vmG/lm0Nd28lBroYrRMVynI -oYA8E4DDR26gpRCdJMWtzoGvUTErI6GMSdF99kTNKtc --> ssh-ed25519 ZYd7Zg vz3LZxq0+KTx6E4J0X6duivLP0TFtA8WaOQaiSmMcF4 -5g+3H/6J9FjsWifcfmEq8dz0hk4mpZhhJaEndPE3Mpw --> ssh-ed25519 as9VYQ VIQ18yC/qEiP66hfCwWAbAbNCBypB47gbWkFg/TJmWE -MXK5RnuwAlKt676CPO0N/3BeM9gsgMPZNEG1DXq8uXA --> 8kx-grease s%obC ~GOw1 C - ---- V8z981BPe2yVOaMCj2np9Vvvy/6zP8xHCFKRFwsceXs -+Xob_) ssh-ed25519 CjuqfA OoHLAZHlhjUykTdrTL3vR4xOR+M9xUz6PRr8sxM/ikc +MA0ZOeqZoraMOKFLs9XnEzLNGpAt3jJWytC5MXDO0qM +-> ssh-ed25519 QRYDmg uciExW93VcA/9Y1pchLXoWwDr3R47VbMvvxQUmeonxM +lckRRFSnA/MGRYaoBe3PTTTk1O+ZhfBrjhppvU16j5A +-> ssh-ed25519 wG6LYg 8J8epMCx+l9M6KBtVfjgD5+jdCC8//CtBnk1t64+5EM +lLhpx7tk43/gOQTg4L9XRg+EDmupK0bW3hS1PclpZjY +-> ssh-ed25519 ZYd7Zg wTghQ4lU1zbttB1pzWQJZVZAEmWvbZzJ1dh5vOqq90g +AwtibVxQP2AOkq6O0AW8M4BxCXE6DkDkdatoYr8E8rg +-> ssh-ed25519 as9VYQ E4qn+C3VtEKcnOfh2/VTuzQtyR1y3vjyTlEbVQbj604 +vtFR+dBGPXbvfK2HT5J2Tfn++yUUAs5oIOKEoRqITxk +-> ssh-ed25519 dWIbQQ O0PMTuY3HGpLFOiE5QzsX4TkQv6DReuHipvFBxdE2xM +SsJrr8NB3d+ohcftj5CkmtK6GZvoVt8GQeav6le/uwY +-> kkxK-grease Y+ 1G ^ ++17Pd0/0prkcbg/vxL8ews/NtQJrYEXafnHXU7L5NxqtYiokkh9d +--- HerEQyxchdLe0MJl/ZwU/NLtCNewjaNFqNA+KjvDtYg +9jv^7X#BAUC2wDg^Úf^R(2M)I[ |8лFNbBnMcZDr \ No newline at end of file