From db89325b560002c2eee0f420c673cba273e75a4f Mon Sep 17 00:00:00 2001 From: Lucy Hochkamp Date: Mon, 25 Dec 2023 18:50:39 +0100 Subject: [PATCH] update --- flake.lock | 126 +++++++++++++-------------- hm-imports/vscode/default.nix | 22 ++++- hosts/picard/default.nix | 5 ++ nixos-modules/services/bitwarden.nix | 2 +- 4 files changed, 88 insertions(+), 67 deletions(-) diff --git a/flake.lock b/flake.lock index da06097d..66b5f178 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1696775529, - "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", + "lastModified": 1703107199, + "narHash": "sha256-Xx9Kkoqye520mkEWTZx/sKQRJsIeWOuwoh568uwHpNg=", "owner": "ryantm", "repo": "agenix", - "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", + "rev": "17090d105af1b9f941109c1e12d6e3a596657f97", "type": "github" }, "original": { @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1699867978, - "narHash": "sha256-+arl45HUOcBdKiRGrKXZYXDyBQ6MQGkYPZa/28f6Yzo=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "e67f2bf515343da378c3f82f098df8ca01bccc5f", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1699781810, - "narHash": "sha256-LD+PIUbm1yQmQmGIbSsc/PB1dtJtGqXFgxRc1C7LlfQ=", + "lastModified": 1703162528, + "narHash": "sha256-pQ41wN6JlStkZOhRTIHEpuwVywLdh+xzZQW1+FzdjVs=", "owner": "nix-community", "repo": "disko", - "rev": "2d7d77878c5d70f66f3d676ff66708d8d4f9d7df", + "rev": "a050895e4eb06e0738680021a701ea05dc8dbfc9", "type": "github" }, "original": { @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "type": "github" }, "original": { @@ -217,11 +217,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -257,11 +257,11 @@ ] }, "locked": { - "lastModified": 1699381651, - "narHash": "sha256-mZlQ54xJs3j5+SJrLhzePPMXzS+Czbx7gNyOnOAQrHA=", + "lastModified": 1701009247, + "narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "0bd99f5ab7ec7a74c11238bd02bb29e709c14328", + "rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09", "type": "github" }, "original": { @@ -298,11 +298,11 @@ ] }, "locked": { - "lastModified": 1702195709, - "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=", + "lastModified": 1703113038, + "narHash": "sha256-oxkyzjpD+mNT7arzU/zHrkNHLuY9tKwmnD2MNaZiSDw=", "owner": "nix-community", "repo": "home-manager", - "rev": "6761b8188b860f374b457eddfdb05c82eef9752f", + "rev": "0c2353d5d930c3d93724df6858aef064a31b3c00", "type": "github" }, "original": { @@ -314,11 +314,11 @@ }, "impermanence": { "locked": { - "lastModified": 1697303681, - "narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=", + "lastModified": 1702984171, + "narHash": "sha256-reIUBrUXibohXmvXRsgpvtlCE0QQSvWSA+qQCKohgR0=", "owner": "nix-community", "repo": "impermanence", - "rev": "0f317c2e9e56550ce12323eb39302d251618f5b5", + "rev": "123e94200f63952639492796b8878e588a4a2851", "type": "github" }, "original": { @@ -396,11 +396,11 @@ ] }, "locked": { - "lastModified": 1700069490, - "narHash": "sha256-lzFqp58RQofM2zXKMPGHt3AH7uPmJy49CCJnn/dsTdI=", + "lastModified": 1703203422, + "narHash": "sha256-bIikC6bL0E7ucPAa8gEMcb0OOsvgccNUgw0qgxlPc8s=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "b4eb6912388de7e8952383c0764e5ef8fa66f48a", + "rev": "385011d45745682c382a5fd92300e8a50123c19d", "type": "github" }, "original": { @@ -416,11 +416,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1700097605, - "narHash": "sha256-nVqtih7bV5zso/y8tCSYwqmkEdMDU6R5NBb8D7w5mEY=", + "lastModified": 1703208018, + "narHash": "sha256-Onaxa2D7fSunlDQQ1//QVPA0F5IXYl7jF154p3lvxNo=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "4192069cbb3f98b114e6f0bc0e7e4720c6c98c09", + "rev": "049ae6414ecfdac9bae325e658c878603b10e199", "type": "github" }, "original": { @@ -437,11 +437,11 @@ ] }, "locked": { - "lastModified": 1699966122, - "narHash": "sha256-zEN3ET7jfXpIKYeYh/z4xekOBOoaFS+n0q3oL3sVh+0=", + "lastModified": 1702723399, + "narHash": "sha256-Rp1JG10AjtBVU4+UTDGUuZVLoaaq3TMELKaSidkFeH4=", "owner": "nix-community", "repo": "nixd", - "rev": "b3bb9ea7cd3c2f07c89779a474d6468b2c11e303", + "rev": "2611b45cf786e7ba1679cd4adfe256ca85b371f5", "type": "github" }, "original": { @@ -452,11 +452,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1699997707, - "narHash": "sha256-ugb+1TGoOqqiy3axyEZpfF6T4DQUGjfWZ3Htry1EfvI=", + "lastModified": 1702453208, + "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "5689f3ebf899f644a1aabe8774d4f37eb2f6c2f9", + "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6", "type": "github" }, "original": { @@ -468,11 +468,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699781429, - "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -484,11 +484,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1702161203, - "narHash": "sha256-nq40oP9Pk/bC9/3ShxUah2FWsyHcObtS2NU5rV8shXY=", + "lastModified": 1703075545, + "narHash": "sha256-7iPyRYSB5aK15izd1Rccpn9tB8Gmwuh3xDtbdOxsKzU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "901fc6ea49ca9e9bbf636c48e2611588802e7b16", + "rev": "f1f519256f007a3910a50b88bff7bcfe6d1202da", "type": "github" }, "original": { @@ -518,11 +518,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1700138465, - "narHash": "sha256-VrudVHHmqJyolo4bXYEZcm1mitcwGKLWyhcsgMGl5VY=", + "lastModified": 1703259726, + "narHash": "sha256-b8pmPOTj1X2+ivVE0HHOh8GZmjtxTHS8N0zMykC1Dkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6d1c5c20eb207f0937444aa9c45ef670ab8e92d9", + "rev": "ea8bb2df93b9b8db2619328e690da962eaf99862", "type": "github" }, "original": { @@ -550,11 +550,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1701952659, - "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=", + "lastModified": 1703068421, + "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4", + "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f", "type": "github" }, "original": { @@ -599,11 +599,11 @@ "notify-nvim": { "flake": false, "locked": { - "lastModified": 1695930572, - "narHash": "sha256-1tWvzE4x1lgldg6vAHCQy9XDMcxJ6G9bZPSG1pEn+qg=", + "lastModified": 1703259573, + "narHash": "sha256-a4N/gQQ20jf57e0+WhEN3MkbR3RM01HJ0M9CUWjmW/c=", "owner": "rcarriga", "repo": "nvim-notify", - "rev": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3", + "rev": "27a6649ba6b22828ccc67c913f95a5407a2d8bec", "type": "github" }, "original": { @@ -647,11 +647,11 @@ "pandoc-latex-template": { "flake": false, "locked": { - "lastModified": 1693988615, - "narHash": "sha256-9iA1MgDA6NQRulkc8zVuoEjKmKgXZJV5A1v8OZ+bZpc=", + "lastModified": 1700921779, + "narHash": "sha256-RPN5llRjhiIy/z9BPYz7Hpuc/OHAfGvHtvH1llBwLRs=", "owner": "Wandmalfarbe", "repo": "pandoc-latex-template", - "rev": "8c48a175e2f5274858f6ea9fd3e56d8a60dd5c66", + "rev": "cd58c398c7fbcca53ae891759e3bced71b37d84c", "type": "github" }, "original": { @@ -797,11 +797,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -885,11 +885,11 @@ "zsh-completions": { "flake": false, "locked": { - "lastModified": 1700095262, - "narHash": "sha256-+X7RzRcId5+GDhWhx432OyiyJQHJMsdkwybTVOctUT8=", + "lastModified": 1701436115, + "narHash": "sha256-sZCHI4ZFfRjcG1XF/3ABf9+zv7f2Di8Xrh4Dr+qt4Us=", "owner": "zsh-users", "repo": "zsh-completions", - "rev": "634736c009a8c982b798b2edee93a0dfc6ef1a54", + "rev": "f7c3173886f4f56bf97d622677c6d46ab005831f", "type": "github" }, "original": { @@ -901,11 +901,11 @@ "zsh-syntax-highlighting": { "flake": false, "locked": { - "lastModified": 1698603908, - "narHash": "sha256-bD0oKXSw9lucJR+6/O16m7prwA1cP36C0Tvh5mklapw=", + "lastModified": 1702937259, + "narHash": "sha256-c7jLX8u5QfW4ukxYd5mBmMY5e7unDEjsvbIUxg3jnaA=", "owner": "zsh-users", "repo": "zsh-syntax-highlighting", - "rev": "bb27265aeeb0a22fb77f1275118a5edba260ec47", + "rev": "dcc99a86497491dfe41fb8b0d5f506033546a8c0", "type": "github" }, "original": { diff --git a/hm-imports/vscode/default.nix b/hm-imports/vscode/default.nix index de8c4035..42338a40 100644 --- a/hm-imports/vscode/default.nix +++ b/hm-imports/vscode/default.nix @@ -2,6 +2,7 @@ let cfg = config.ragon.vscode; marketplace = inputs.nix-vscode-extensions.extensions.${pkgs.system}.vscode-marketplace; + marketplace-release = inputs.nix-vscode-extensions.extensions.${pkgs.system}.vscode-marketplace-release; in { @@ -10,11 +11,12 @@ in home.packages = with pkgs; [ nixd nixpkgs-fmt - (unstable.quarto.overrideAttrs (curr: { meta.platforms = [ pkgs.system ]; })) + # (unstable.quarto.overrideAttrs (curr: { meta.platforms = [ pkgs.system ]; })) ]; programs.vscode = { enable = true; package = pkgs.unstable.vscode; + mutableExtensionsDir = false; extensions = with pkgs.vscode-extensions; [ vscodevim.vim # vim mode (hopefully good) jdinhlife.gruvbox # theme @@ -28,14 +30,24 @@ in marketplace.james-yu.latex-workshop # latex, also provides pdf preview yzhang.markdown-all-in-one # markdown marketplace.davidanson.vscode-markdownlint - marketplace.quarto.quarto + # marketplace.quarto.quarto # marketplace.pokey.cursorless # too much xe exposure #marketplace.valentjn.vscode-ltex # languagetool valentjn.vscode-ltex #marketplace.gpoore.codebraid-preview + marketplace.ms-vscode.hexeditor # a hex editor + ms-vscode-remote.remote-containers # container envs for stuff + marketplace.ms-vscode-remote.remote-ssh + ## others + marketplace.vscjava.vscode-java-pack # java schmava + marketplace.vscjava.vscode-java-debug + marketplace.vscjava.vscode-java-test + marketplace.vscjava.vscode-java-dependency + marketplace.vscjava.vscode-maven + marketplace.redhat.java marketplace.ms-vscode.cpptools-extension-pack # cpp marketplace.ms-vscode.cmake-tools marketplace.ms-vscode.cpptools @@ -45,17 +57,21 @@ in marketplace.ms-python.python # python marketplace.donjayamanne.python-environment-manager # python #ms-dotnettools.csharp # c# und so + #marketplace.ms-dotnettools.csdevkit (marketplace.ms-dotnettools.csdevkit.overrideAttrs (super: a: { sourceRoot = "."; })) rust-lang.rust-analyzer # rust marketplace.sswg.swift-lang # swift marketplace.vadimcn.vscode-lldb # swift - marketplace.ms-toolsai.jupyter # jupiter notebooks + # marketplace.ms-toolsai.jupyter # jupiter notebooks, broken on 2023-12-19 + marketplace.ms-toolsai.jupyter-renderers + ms-toolsai.jupyter marketplace.jakebecker.elixir-ls # elixir marketplace.dart-code.flutter # dart/flutter marketplace.dart-code.dart-code # dart/flutter marketplace.alexisvt.flutter-snippets # flutter snippets marketplace.tauri-apps.tauri-vscode # tauri marketplace.dbaeumer.vscode-eslint # js + marketplace.firefox-devtools.vscode-firefox-debug # js debugging marketplace.arcanis.vscode-zipfs # yarn ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 4c7d954b..dd1eed88 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -80,6 +80,11 @@ locations."/".return = "307 https://xyno.space$request_uri"; } // (lib.my.findOutTlsConfig "xyno.systems" config); + services.nginx.virtualHosts."graph.czi.dating" = { + locations."/".return = "307 https://graph-czi-dating-s8tan-01d008685713bd0312de3223b3b980279b0ca590.fspages.org$request_uri"; + forceSSL = true; + enableACME = true; + }; services.nginx.virtualHosts."czi.dating" = { locations."/".return = "307 https://foss-ag.de$request_uri"; forceSSL = true; diff --git a/nixos-modules/services/bitwarden.nix b/nixos-modules/services/bitwarden.nix index 5575fd16..515cd59b 100644 --- a/nixos-modules/services/bitwarden.nix +++ b/nixos-modules/services/bitwarden.nix @@ -40,7 +40,7 @@ in ensureUsers = [ { name = "vaultwarden"; - ensurePermissions."DATABASE vaultwarden" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } ]; };