switch dotnet version for vscodium

disable servicepoint-tanks
nix flake update, use nixosModule from tanks repo
2025-10-23 21:36:15 +02:00 · 2025-10-23 21:17:58 +02:00 · 2025-10-23 20:15:48 +02:00 · 2025-10-23 20:15:13 +02:00 · 2025-10-12 15:16:44 +02:00 · 2025-10-12 13:43:38 +02:00
7 changed files with 248 additions and 75 deletions
--- a/flake.lock
+++ b/flake.lock
@ -1,5 +1,49 @@
 {
  "nodes": {
+    "binding": {
+      "inputs": {
+        "binding": "binding_2",
+        "nixpkgs": [
+          "servicepoint-tanks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1759096792,
+        "narHash": "sha256-CW4D1yJecw7Id6AxIEJOW3OpcX3Y4Ehng76/YlR1I9w=",
+        "ref": "refs/heads/main",
+        "rev": "8df2996504866f3193fbe51860ab173d25724e5e",
+        "revCount": 307,
+        "type": "git",
+        "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-binding-csharp.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-binding-csharp.git"
+      }
+    },
+    "binding_2": {
+      "inputs": {
+        "nixpkgs": [
+          "servicepoint-tanks",
+          "binding",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1759093963,
+        "narHash": "sha256-nis9Xps/P1f/v9FC3LoMLGGCOMMbdrOniDSklqLsH8o=",
+        "ref": "refs/heads/main",
+        "rev": "44ef4bb6d707c46af1bed6244f17a16f26f246c1",
+        "revCount": 304,
+        "type": "git",
+        "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-binding-uniffi.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-binding-uniffi.git"
+      }
+    },
    "fenix": {
      "inputs": {
        "nixpkgs": [
@ -46,24 +90,6 @@
        "type": "github"
      }
    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -143,11 +169,11 @@
        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
      },
      "locked": {
-        "lastModified": 1760106247,
-        "narHash": "sha256-6eoVSzv2sNlZx3wgIGvwYrbL8X/FpCb/5cw/N/f/v6c=",
+        "lastModified": 1761187190,
+        "narHash": "sha256-5ln16iOeWpEX5MO7M3jzFEBNFE42gpFsCvSvPjtF6tQ=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "8ba0df9f335050044eddae848a7be8d9269ecc76",
+        "rev": "77a07f5d3b775fba67550c38122ebb8d3ee3ba1c",
        "type": "github"
      },
      "original": {
@ -176,11 +202,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1759395653,
-        "narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=",
+        "lastModified": 1760940149,
+        "narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec",
+        "rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5",
        "type": "github"
      },
      "original": {
@ -221,17 +247,16 @@
    },
    "nix-vscode-extensions": {
      "inputs": {
-        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1760071578,
-        "narHash": "sha256-MZUsqax6PoXPDzhpLyduHoPY4CYYrzL97uKbsx/iGPE=",
+        "lastModified": 1761240986,
+        "narHash": "sha256-EjePxTz1P2cdFCPG+M33CGUpBVkD2W+zllZF0Cv1uDY=",
        "owner": "nix-community",
        "repo": "nix-vscode-extensions",
-        "rev": "65365fe8c09b6c1b6bba1885a126723815376b1b",
+        "rev": "868d9f20e2d57e78cc53598f760c547a516f6ba7",
        "type": "github"
      },
      "original": {
@ -242,11 +267,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1759994382,
-        "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=",
+        "lastModified": 1761016216,
+        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7",
+        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
        "type": "github"
      },
      "original": {
@ -258,11 +283,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1759977445,
-        "narHash": "sha256-LYr4IDfuihCkFAkSYz5//gT2r1ewcWBYgd5AxPzPLIo=",
+        "lastModified": 1760965567,
+        "narHash": "sha256-0JDOal5P7xzzAibvD0yTE3ptyvoVOAL0rcELmDdtSKg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "2dad7af78a183b6c486702c18af8a9544f298377",
+        "rev": "cb82756ecc37fa623f8cf3e88854f9bf7f64af93",
        "type": "github"
      },
      "original": {
@ -281,6 +306,7 @@
        "nixpkgs-unstable": "nixpkgs-unstable",
        "servicepoint-cli": "servicepoint-cli",
        "servicepoint-simulator": "servicepoint-simulator",
+        "servicepoint-tanks": "servicepoint-tanks",
        "zerforschen-plus": "zerforschen-plus"
      }
    },
@ -362,19 +388,26 @@
        "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git"
      }
    },
-    "systems": {
+    "servicepoint-tanks": {
+      "inputs": {
+        "binding": "binding",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
+        "lastModified": 1760288584,
+        "narHash": "sha256-2eY1f4LV9s5Hc/tb1iuJYPewE4Seyeguf7VdzC9bbbo=",
+        "ref": "service-improvements",
+        "rev": "1bb73d664dac78c5d69a02ae67169d76cca7aab4",
+        "revCount": 218,
+        "type": "git",
+        "url": "https://git.berlin.ccc.de/vinzenz/servicepoint-tanks.git"
      },
      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
+        "ref": "service-improvements",
+        "type": "git",
+        "url": "https://git.berlin.ccc.de/vinzenz/servicepoint-tanks.git"
      }
    },
    "xwayland-satellite-stable": {
@ -397,11 +430,11 @@
    "xwayland-satellite-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1759707084,
-        "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=",
+        "lastModified": 1761173223,
+        "narHash": "sha256-FumZh+fPRaKXkl9Y1uTh5KV7Io/AyOZso+UkqLhLArs=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "a9188e70bd748118b4d56a529871b9de5adb9988",
+        "rev": "bf745144acda1343934e9a094cf9458a54d57889",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -14,6 +14,11 @@
      inputs.nixpkgs-stable.follows = "nixpkgs";
    };

+    nix-vscode-extensions = {
+      url = "github:nix-community/nix-vscode-extensions";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
    zerforschen-plus = {
      url = "git+https://git.berlin.ccc.de/vinzenz/zerforschen.plus";
      inputs.nixpkgs.follows = "nixpkgs";
@ -29,8 +34,8 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    nix-vscode-extensions = {
-      url = "github:nix-community/nix-vscode-extensions";
+    servicepoint-tanks = {
+      url = "git+https://git.berlin.ccc.de/vinzenz/servicepoint-tanks.git?ref=service-improvements";
      inputs.nixpkgs.follows = "nixpkgs";
    };
  };
@ -43,10 +48,10 @@
      niri,
      zerforschen-plus,
      nixpkgs-unstable,
+      nix-vscode-extensions,
      servicepoint-cli,
      servicepoint-simulator,
-      nix-vscode-extensions,
-      ...
+      servicepoint-tanks,
    }:
    let
      devices = {
@ -251,6 +256,7 @@
            home-manager.nixosModules.home-manager
            servicepoint-simulator.nixosModules.default
            servicepoint-cli.nixosModules.default
+            servicepoint-tanks.nixosModules.default
          ])
          ++ additional-modules;
        }
--- a/homeConfigurations/vinzenz/starship.nix
+++ b/homeConfigurations/vinzenz/starship.nix
@ -10,19 +10,21 @@
      format =
        "[](fg:color_r)[$username $os $hostname ($container )](bg:color_r fg:text_r)[ ](fg:color_r bg:color_g)"
        + "[$directory ](bg:color_g fg:text_g)[ ](fg:color_g bg:color_b)"
-        + "([($git_state$git_branch$git_commit$git_status)"
-        + "$all](bg:color_b fg:text_b))[ ](fg:color_b)"
-        + "$cmd_duration"
-        + "$line_break$character$status > ";
+        + "([(\\[$git_state$git_branch$git_commit$git_status\\] )"
+        + "$all](bg:color_b fg:text_b))[](fg:color_b bg:color_y)"
+        + "([ $cmd_duration$status](bg:color_y fg:text_y))[](fg:color_y)"
+        + "$line_break$character ";

      palette = "color_me_surprised";
      palettes.color_me_surprised = {
-        "color_r" = "red";
-        "color_g" = "green";
-        "color_b" = "blue";
+        "color_r" = "#a30262";
+        "color_g" = "#d162a4";
+        "color_b" = "#5BCEFA";
+        "color_y" = "white";
        "text_r" = "white";
        "text_g" = "black";
-        "text_b" = "white";
+        "text_b" = "black";
+        "text_y" = "black";
      };

      username = {
@ -30,6 +32,9 @@
        style_user = "bg:color_r fg:text_r";
        style_root = "bold bg:color_r fg:text_r";
        show_always = true;
+        aliases = {
+          "vinzenz" = "müde";
+        };
      };
      os = {
        disabled = false;
@ -65,19 +70,21 @@
      };

      git_state = {
-        style = "fg:white bg:color_b";
+        style = "fg:text_b bg:color_b";
      };
      git_branch = {
-        style = "fg:white bg:color_b";
+        style = "fg:text_b bg:color_b";
        format = "[$symbol $branch(:$remote_branch) ]($style)";
+        symbol = "";
      };
      git_commit = {
        format = "[$hash$tag ]($style)";
-        style = "fg:white bg:color_b";
+        style = "fg:text_b bg:color_b";
+        tag_symbol = "";
      };
      git_status = {
        format = "[$all_status$ahead_behind]($style)";
-        style = "fg:white bg:color_b";
+        style = "fg:text_b bg:color_b";
        ahead = "⇡$count";
        behind = "⇣$count";
        diverged = "⇕⇡$ahead_count⇣$behind_count";
@ -91,26 +98,27 @@
      rust = {
        symbol = "󱘗";
        format = "$symbol$version ";
-        version_format = "$\{raw\}";
+        version_format = "$major.$minor";
      };
      nix_shell = {
        symbol = "";
        format = "$symbol( \($name\))";
      };

-      character = {
-        success_symbol = "[](bold fg:green)";
-        error_symbol = "[✗](bold fg:color_r)";
-      };
      status = {
        disabled = false;
        format = "[$symbol$status_common_meaning$status_signal_name$status_maybe_int]($style)";
        map_symbol = true;
        pipestatus = true;
-        symbol = "🔴";
+        style = "bg:color_y fg:text_y";
      };
      cmd_duration = {
-        format = "[󱦟 $duration]($style)";
+        format = "󱦟 $duration ";
+      };
+
+      character = {
+        success_symbol = "[](bold)";
+        error_symbol = "[✗](bold fg:color_r)";
      };

      # icons
@ -130,8 +138,6 @@
      fennel.symbol = "";
      fossil_branch.symbol = "";
      gcloud.symbol = " ";
-      git_branch.symbol = "";
-      git_commit.tag_symbol = " ";
      golang.symbol = "";
      guix_shell.symbol = "";
      haskell.symbol = "";
@ -205,6 +211,120 @@
      zig.symbol = "";
      gradle.symbol = "";

+      palettes = {
+        catppuccin_mocha = {
+          rosewater = "#f5e0dc";
+          flamingo = "#f2cdcd";
+          pink = "#f5c2e7";
+          mauve = "#cba6f7";
+          red = "#f38ba8";
+          maroon = "#eba0ac";
+          peach = "#fab387";
+          yellow = "#f9e2af";
+          green = "#a6e3a1";
+          teal = "#94e2d5";
+          sky = "#89dceb";
+          sapphire = "#74c7ec";
+          blue = "#89b4fa";
+          lavender = "#b4befe";
+          text = "#cdd6f4";
+          subtext1 = "#bac2de";
+          subtext0 = "#a6adc8";
+          overlay2 = "#9399b2";
+          overlay1 = "#7f849c";
+          overlay0 = "#6c7086";
+          surface2 = "#585b70";
+          surface1 = "#45475a";
+          surface0 = "#313244";
+          base = "#1e1e2e";
+          mantle = "#181825";
+          crust = "#11111b";
+        };
+        catppuccin_frappe = {
+          rosewater = "#f2d5cf";
+          flamingo = "#eebebe";
+          pink = "#f4b8e4";
+          mauve = "#ca9ee6";
+          red = "#e78284";
+          maroon = "#ea999c";
+          peach = "#ef9f76";
+          yellow = "#e5c890";
+          green = "#a6d189";
+          teal = "#81c8be";
+          sky = "#99d1db";
+          sapphire = "#85c1dc";
+          blue = "#8caaee";
+          lavender = "#babbf1";
+          text = "#c6d0f5";
+          subtext1 = "#b5bfe2";
+          subtext0 = "#a5adce";
+          overlay2 = "#949cbb";
+          overlay1 = "#838ba7";
+          overlay0 = "#737994";
+          surface2 = "#626880";
+          surface1 = "#51576d";
+          surface0 = "#414559";
+          base = "#303446";
+          mantle = "#292c3c";
+          crust = "#232634";
+        };
+        catppuccin_latte = {
+          rosewater = "#dc8a78";
+          flamingo = "#dd7878";
+          pink = "#ea76cb";
+          mauve = "#8839ef";
+          red = "#d20f39";
+          maroon = "#e64553";
+          peach = "#fe640b";
+          yellow = "#df8e1d";
+          green = "#40a02b";
+          teal = "#179299";
+          sky = "#04a5e5";
+          sapphire = "#209fb5";
+          blue = "#1e66f5";
+          lavender = "#7287fd";
+          text = "#4c4f69";
+          subtext1 = "#5c5f77";
+          subtext0 = "#6c6f85";
+          overlay2 = "#7c7f93";
+          overlay1 = "#8c8fa1";
+          overlay0 = "#9ca0b0";
+          surface2 = "#acb0be";
+          surface1 = "#bcc0cc";
+          surface0 = "#ccd0da";
+          base = "#eff1f5";
+          mantle = "#e6e9ef";
+          crust = "#dce0e8";
+        };
+        catppuccin_macchiato = {
+          rosewater = "#f4dbd6";
+          flamingo = "#f0c6c6";
+          pink = "#f5bde6";
+          mauve = "#c6a0f6";
+          red = "#ed8796";
+          maroon = "#ee99a0";
+          peach = "#f5a97f";
+          yellow = "#eed49f";
+          green = "#a6da95";
+          teal = "#8bd5ca";
+          sky = "#91d7e3";
+          sapphire = "#7dc4e4";
+          blue = "#8aadf4";
+          lavender = "#b7bdf8";
+          text = "#cad3f5";
+          subtext1 = "#b8c0e0";
+          subtext0 = "#a5adcb";
+          overlay2 = "#939ab7";
+          overlay1 = "#8087a2";
+          overlay0 = "#6e738d";
+          surface2 = "#5b6078";
+          surface1 = "#494d64";
+          surface0 = "#363a4f";
+          base = "#24273a";
+          mantle = "#1e2030";
+          crust = "#181926";
+        };
+      };
    };
  };
 }
--- a/homeConfigurations/vinzenz/vscode.nix
+++ b/homeConfigurations/vinzenz/vscode.nix
@ -22,6 +22,7 @@
            mkhl.direnv
            muhammad-sammy.csharp
            davidanson.vscode-markdownlint
+            #mermaidchart.vscode-mermaid-chart
          ]
          ++ (with pkgs.vscode-extensions; [
            vadimcn.vscode-lldb
@ -70,7 +71,8 @@
            };
          };

-          "dotnetAcquisitionExtension.sharedExistingDotnetPath" = "${lib.getBin pkgs.dotnet-sdk}/bin/dotnet";
+          "dotnetAcquisitionExtension.sharedExistingDotnetPath" =
+            "${lib.getBin pkgs.dotnetCorePackages.sdk_9_0}/bin/dotnet";

          "\[makefile\]" = {
            "editor.insertSpaces" = false;
--- a/nixosConfigurations/vinzenz-lpt2/default.nix
+++ b/nixosConfigurations/vinzenz-lpt2/default.nix
@ -42,5 +42,16 @@
      8776
      1337
    ];
+
+    services.servicepoint-tanks = {
+      enable = false;
+      urls = [
+        "http://localhost:5666"
+        "http://localhost:5667"
+      ];
+    };
+    nixpkgs.config.permittedInsecurePackages = [
+      "mbedtls-2.28.10"
+    ];
  };
 }
--- a/nixosModules/nix-ld.nix
+++ b/nixosModules/nix-ld.nix
@ -17,6 +17,7 @@
      util-linux
      xz
      systemd
+      icu
    ];
  };
 }
--- a/nixosModules/user-vinzenz.nix
+++ b/nixosModules/user-vinzenz.nix
@ -3,7 +3,7 @@
  users.users.vinzenz = {
    isNormalUser = true;
    name = "vinzenz";
-    description = "Vinzenz";
+    description = "müde";
    home = "/home/vinzenz";
    extraGroups = [
      "networkmanager"
Author	SHA1	Message	Date
Vinzenz Schroeter	00a12701b2	switch dotnet version for vscodium	2025-10-23 21:36:15 +02:00
Vinzenz Schroeter	60dc4b72b0	disable servicepoint-tanks	2025-10-23 21:17:58 +02:00
Vinzenz Schroeter	e3423c9b61	nix flake update, use nixosModule from tanks repo	2025-10-23 20:15:48 +02:00
Vinzenz Schroeter	f59d3f25ba	rename user	2025-10-23 20:15:13 +02:00
Vinzenz Schroeter	9c840ba61d	add servicepoint-tanks service	2025-10-12 15:16:44 +02:00
Vinzenz Schroeter	8d9f5edc2e	the most starship configuration	2025-10-12 13:43:38 +02:00