From c45c402512cc10b8cc922c74e2da1653520467b1 Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 2 May 2023 10:05:49 +0200 Subject: [PATCH] updates --- flake.lock | 20 ++++++++++---------- nixos/common/hm-modules/vscode.nix | 1 + nixos/common/modules/vault.nix | 1 + nixos/hosts/thalassa/aoife/home/default.nix | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 85548df..2654663 100644 --- a/flake.lock +++ b/flake.lock @@ -865,11 +865,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1682978422, - "narHash": "sha256-HRlZBmPHPVoF3D68mPfrTRdPmzPUSGRZokSdTSbm5tU=", + "lastModified": 1683011302, + "narHash": "sha256-obh4V+P6hla1ek7vr16qmenF/6iI7bVrT0uMjI3SFsM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "052341df029a36590dcb3d208d8b2073bf9f9ba5", + "rev": "9b3e4ea4fd5e0202b2f81b23bdd28081c6607e81", "type": "github" }, "original": { @@ -980,11 +980,11 @@ }, "nur": { "locked": { - "lastModified": 1682970362, - "narHash": "sha256-SrivGIhZr8rl136UpPlMY6oYAMDvI1RMcrto1YqilwI=", + "lastModified": 1683007714, + "narHash": "sha256-UnW0R/JiTya9DjBjmtDfhW3SlEfVhkBDz5g2FTIK8CQ=", "owner": "nix-community", "repo": "NUR", - "rev": "694865435f5f375eb5d86e33096d9e527f297bc3", + "rev": "fb2febdfc649f68e7059537605761ffcc7d95cc0", "type": "github" }, "original": { @@ -1280,11 +1280,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1682941117, - "narHash": "sha256-O05pGzPrgx5ztX1YEa5EmumZ0/29fzEI2hhB9qCnB8E=", + "lastModified": 1683011386, + "narHash": "sha256-uFYsk+7753LRf9h2m7QPeIDp3Y3VcMtDSEbFLnWo0+Q=", "ref": "refs/heads/main", - "rev": "a3dca9e818eea43d32e2a3cc7498bf883f49ab01", - "revCount": 4, + "rev": "cafb08b4cd6c1f2a3ddf4acfeccf63dac7a12e4f", + "revCount": 7, "type": "git", "url": "https://git.0x76.dev/v/vault-unseal.git" }, diff --git a/nixos/common/hm-modules/vscode.nix b/nixos/common/hm-modules/vscode.nix index 5a2b95a..acc4d99 100644 --- a/nixos/common/hm-modules/vscode.nix +++ b/nixos/common/hm-modules/vscode.nix @@ -20,6 +20,7 @@ in { "nix.enableLanguageServer" = true; # Enable LSP. "nix.serverPath" = "${pkgs.nil}/bin/nil"; "[nix]" = { "editor.defaultFormatter" = "brettm12345.nixfmt-vscode"; }; + "[python]" = { "editor.formatOnType" = true; }; "rust-analyzer.checkOnSave.command" = "clippy"; "debug.allowBreakpointsEverywhere" = true; # Don't index unecessary things diff --git a/nixos/common/modules/vault.nix b/nixos/common/modules/vault.nix index f9b0390..1df023b 100644 --- a/nixos/common/modules/vault.nix +++ b/nixos/common/modules/vault.nix @@ -4,6 +4,7 @@ let cfg = config.services.v.vault; hostIP = config.deployment.targetHost; + # Find all vault hosts that do not have the same IP as the current host vault_hosts = filter ({ tags ? [ ], ip ? "", ... }: (elem "vault" tags) && (ip != hostIP)) flat_hosts; diff --git a/nixos/hosts/thalassa/aoife/home/default.nix b/nixos/hosts/thalassa/aoife/home/default.nix index 009553e..cce6c37 100644 --- a/nixos/hosts/thalassa/aoife/home/default.nix +++ b/nixos/hosts/thalassa/aoife/home/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +_: { programs.home-manager.enable = true; home.username = "victor";