adding editorconfig for consistency

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{yaml,yml,json5}]
+indent_style = space
+indent_size = 2

nixos/home/jahanson/workstation.nix

@@ -29,22 +29,22 @@ with config;
         _1password-gui
         discord
         flameshot
-        vlc
-        termius
-        obsidian
         jetbrains.datagrip
-        talosctl
+        obsidian
-        pika-backup
         parsec-bin
+        pika-backup
+        talosctl
+        termius
         unstable.nheko
         unstable.telegram-desktop
+        vlc
 
         # cli
         brightnessctl
 
         # dev utils
-        pre-commit # Pre-commit tasks for git
         minio-client # S3 management
+        pre-commit # Pre-commit tasks for git
         shellcheck # shell script linting
         unstable.act
       ];

nixos/home/modules/shell/atuind/default.nix

@@ -1,6 +1,5 @@
 { config, pkgs, lib, ... }:
 with lib; let
-  inherit (config.myHome) username homeDirectory;
   cfg = config.myHome.shell.atuind;
 in
 {

nixos/hosts/telchar/default.nix

@@ -42,7 +42,6 @@
   virtualisation.docker.enable = true;
 
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
   # System settings and services.
   mySystem = {
     purpose = "Development";

nixos/modules/nixos/editor/default.nix

@@ -21,6 +21,8 @@ let
     "tamasfe.even-better-toml"
     "tyriar.sort-lines"
     "yzhang.markdown-all-in-one"
+    "mrmlnc.vscode-json5"
+    "editorconfig.editorconfig"
   ];
   # Nixpkgs Extensions. These are updated whenver they get around to it.
   vscodeNixpkgsExtensions = [

nixos/modules/nixos/services/onepassword-connect/default.nix

@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }:
+{ lib, config, ... }:
 with lib;
 let
   cfg = config.mySystem.services.onepassword-connect;
@@ -6,6 +6,16 @@ in
 {
   options.mySystem.services.onepassword-connect = {
     enable = mkEnableOption "onepassword-connect";
+    apiVersion = lib.mkOption {
+      type = lib.types.str;
+      # renovate: depName=docker.io/1password/connect-api datasource=docker
+      default = "1.7.2";
+    };
+    syncVersion = lib.mkOption {
+      type = lib.types.str;
+      # renovate: depName=docker.io/1password/connect-sync datasource=docker
+      default = "1.7.2";
+    };
     credentialsFile = lib.mkOption {
       type = lib.types.path;
     };
@@ -25,7 +35,7 @@ in
     # Enable onepassword-connect containers.
     virtualisation.oci-containers.containers = {
       onepassword-connect-api = {
-        image = "docker.io/1password/connect-api:1.7.2";
+        image = "docker.io/1password/connect-api:${cfg.apiVersion}";
         autoStart = true;
         ports = [ "8080:8080" ];
         volumes = [
@@ -35,7 +45,7 @@ in
       };
 
       onepassword-connect-sync = {
-        image = "docker.io/1password/connect-sync:1.7.2";
+        image = "docker.io/1password/connect-sync:${cfg.syncVersion}";
         autoStart = true;
         ports = [ "8081:8080" ];
         volumes = [

renovate.json

@@ -1,13 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base"
-  ],
-  "nix": {
-    "enabled": true
-  },
-  "lockFileMaintenance": {
-    "enabled": true,
-    "extends": ["schedule:daily"]
-  }
-}

renovate.json5

@@ -0,0 +1,31 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ],
+  "nix": {
+    "enabled": true
+  },
+  "lockFileMaintenance": {
+    "enabled": true,
+    "extends": [
+      "schedule:daily"
+    ]
+  },
+  "customManagers": [
+    {
+      "customType": "regex",
+      "description": "Process various dependencies in nix files",
+      "fileMatch": [
+        "\\.nix$"
+      ],
+      "matchStrings": [
+        // Newline
+        "(?m:^[ \\t]*?# ?renovate: depName=(?<depName>\\S+)( datasource=(?<datasource>\\S+))?( versioning=(?<versioning>\\S+))?( extractVersion=(?<extractVersion>\\S+))?\\n[ \\t ]*?\\S+ = \"?(?<currentValue>[^\" ]+?)\";?$)"
+      ],
+      "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}",
+      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}",
+      "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{else}}^(?<version>.*)${{/if}}",
+    },
+  ],
+}