nix flake update

get most extensions from open-vsx
add nix-vscode-extensions, deduplicate inputs
2025-06-28 09:47:59 +02:00 · 2025-06-28 09:46:50 +02:00 · 2025-06-28 09:46:08 +02:00
4 changed files with 108 additions and 59 deletions
--- a/flake.lock
+++ b/flake.lock
@ -40,11 +40,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749154018,
-        "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
+        "lastModified": 1750792728,
+        "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
+        "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557",
        "type": "github"
      },
      "original": {
@ -70,7 +70,9 @@
    },
    "lix-module": {
      "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": [
+          "flake-utils"
+        ],
        "flakey-profile": "flakey-profile",
        "lix": "lix",
        "nixpkgs": [
@ -123,11 +125,11 @@
        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
      },
      "locked": {
-        "lastModified": 1749144707,
-        "narHash": "sha256-JcSmySCB3pOtzeWMaEksZgaiNedEDIC6qyBezkK+92Q=",
+        "lastModified": 1751073903,
+        "narHash": "sha256-6pUwEiEJw8PGqUn2+Mf0IEJN4M0FMoXCM4sNa2EZuKk=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "32d49ef427be377c82d32ce74ff3082c2c992199",
+        "rev": "3667e998b5ad7a1ec56207f79c9629a919eafd43",
        "type": "github"
      },
      "original": {
@ -139,16 +141,16 @@
    "niri-stable": {
      "flake": false,
      "locked": {
-        "lastModified": 1740117926,
-        "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=",
+        "lastModified": 1748151941,
+        "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "b94a5db8790339cf9134873d8b490be69e02ac71",
+        "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7",
        "type": "github"
      },
      "original": {
        "owner": "YaLTeR",
-        "ref": "v25.02",
+        "ref": "v25.05.1",
        "repo": "niri",
        "type": "github"
      }
@ -156,11 +158,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1749112952,
-        "narHash": "sha256-ajI1cXa2AgdZSELvlVaQZd0XMi4eM8H3Ys0Ek8a/roI=",
+        "lastModified": 1750791124,
+        "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "242ebf294514cc22f4f9d83c0566c8ffe1cb8d8a",
+        "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c",
        "type": "github"
      },
      "original": {
@ -184,28 +186,36 @@
        "type": "github"
      }
    },
-    "nix-filter_2": {
+    "nix-vscode-extensions": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
      "locked": {
-        "lastModified": 1731533336,
-        "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
+        "lastModified": 1751076164,
+        "narHash": "sha256-to92MoMF7QC2K2gdpkYoN/Y9wuF6Q/qlvNyHca6uPjQ=",
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "rev": "7f443f5e4125f9aad3885542c04653f29b15b92a",
        "type": "github"
      },
      "original": {
-        "owner": "numtide",
-        "repo": "nix-filter",
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1749086602,
-        "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=",
+        "lastModified": 1750969886,
+        "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4792576cb003c994bd7cc1edada3129def20b27d",
+        "rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
        "type": "github"
      },
      "original": {
@ -217,11 +227,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1749174413,
-        "narHash": "sha256-urN9UMK5cd1dzhR+Lx0xHeTgBp2MatA5+6g9JaxjuQs=",
+        "lastModified": 1750994206,
+        "narHash": "sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6ad174a6dc07c7742fc64005265addf87ad08615",
+        "rev": "80d50fc87924c2a0d346372d242c27973cf8cdbf",
        "type": "github"
      },
      "original": {
@ -233,10 +243,13 @@
    },
    "root": {
      "inputs": {
+        "flake-utils": "flake-utils",
        "home-manager": "home-manager",
        "lix-module": "lix-module",
        "naersk": "naersk",
        "niri": "niri",
+        "nix-filter": "nix-filter",
+        "nix-vscode-extensions": "nix-vscode-extensions",
        "nixpkgs": "nixpkgs",
        "nixpkgs-unstable": "nixpkgs-unstable",
        "servicepoint-cli": "servicepoint-cli",
@ -249,7 +262,9 @@
        "naersk": [
          "naersk"
        ],
-        "nix-filter": "nix-filter",
+        "nix-filter": [
+          "nix-filter"
+        ],
        "nixpkgs": [
          "nixpkgs"
        ]
@ -273,7 +288,9 @@
        "naersk": [
          "naersk"
        ],
-        "nix-filter": "nix-filter_2",
+        "nix-filter": [
+          "nix-filter"
+        ],
        "nixpkgs": [
          "nixpkgs"
        ]
@ -310,16 +327,16 @@
    "xwayland-satellite-stable": {
      "flake": false,
      "locked": {
-        "lastModified": 1739246919,
-        "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=",
+        "lastModified": 1748488455,
+        "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d",
+        "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
        "type": "github"
      },
      "original": {
        "owner": "Supreeeme",
-        "ref": "v0.5.1",
+        "ref": "v0.6",
        "repo": "xwayland-satellite",
        "type": "github"
      }
@ -327,11 +344,11 @@
    "xwayland-satellite-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1748488455,
-        "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
+        "lastModified": 1750821680,
+        "narHash": "sha256-Bu5unTxnqok2RoU5P394Gh0vRaoyI/5xlOOJDF6akrc=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
+        "rev": "2e7c318ac2bbf699b6ab92ef91e661e16415dfac",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -11,7 +11,10 @@

    lix-module = {
      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
    };

    niri = {
@ -32,15 +35,33 @@

    servicepoint-cli = {
      url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.naersk.follows = "naersk";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        naersk.follows = "naersk";
+        nix-filter.follows = "nix-filter";
+      };
    };

    servicepoint-simulator = {
      url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.naersk.follows = "naersk";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        naersk.follows = "naersk";
+        nix-filter.follows = "nix-filter";
+      };
    };
+
+    nix-vscode-extensions = {
+      url = "github:nix-community/nix-vscode-extensions";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
+    };
+
+    # this is used to pin transitive dependencies to the same version
+    flake-utils.url = "github:numtide/flake-utils";
+    nix-filter.url = "github:numtide/nix-filter";
  };

  outputs =
@ -55,6 +76,8 @@
      servicepoint-cli,
      servicepoint-simulator,
      naersk,
+      nix-vscode-extensions,
+      ...
    }:
    let
      devices = {
@ -113,6 +136,7 @@
                nixpkgs.overlays = [
                  niri.overlays.niri
                  overlays.servicepoint-packages
+                  nix-vscode-extensions.overlays.default
                ];
              }
            ]);
--- a/home/vinzenz/default.nix
+++ b/home/vinzenz/default.nix
@ -47,6 +47,8 @@
      "jetbrains-toolbox"

      "anydesk"
+
+      "vscode-extension-ms-dotnettools-csharp"
    ];
  };
 }
--- a/home/vinzenz/vscode.nix
+++ b/home/vinzenz/vscode.nix
@ -7,23 +7,27 @@
      package = pkgs.vscodium;
      profiles.default = {
        enableUpdateCheck = false;
-        extensions = with pkgs.vscode-extensions; [
-          jnoortheen.nix-ide
-          ms-python.python
-          editorconfig.editorconfig
-          yzhang.markdown-all-in-one
-          redhat.vscode-yaml
-          pkief.material-icon-theme
-          rust-lang.rust-analyzer
-          tamasfe.even-better-toml
-          llvm-vs-code-extensions.vscode-clangd
-          mkhl.direnv
-          vadimcn.vscode-lldb
-          # ms-dotnettools.csharp
-          # ms-vscode-remote.remote-ssh
-          RoweWilsonFrederiskHolme.wikitext
-          davidanson.vscode-markdownlint
-        ];
+        extensions =
+          with pkgs.nix-vscode-extensions.open-vsx;
+          [
+            jnoortheen.nix-ide
+            ms-python.python
+            editorconfig.editorconfig
+            yzhang.markdown-all-in-one
+            redhat.vscode-yaml
+            pkief.material-icon-theme
+            rust-lang.rust-analyzer
+            tamasfe.even-better-toml
+            llvm-vs-code-extensions.vscode-clangd
+            mkhl.direnv
+            muhammad-sammy.csharp
+            davidanson.vscode-markdownlint
+          ]
+          ++ (with pkgs.vscode-extensions; [
+            vadimcn.vscode-lldb
+            RoweWilsonFrederiskHolme.wikitext
+            ms-dotnettools.csharp
+          ]);
        userSettings = {
          "files.autoSave" = "afterDelay";
          "files.autoSaveWhenNoErrors" = true;
@ -66,6 +70,8 @@
            };
          };

+          "dotnetAcquisitionExtension.sharedExistingDotnetPath" = "${lib.getBin pkgs.dotnet-sdk}/bin/dotnet";
+
          "\[makefile\]" = {
            "editor.insertSpaces" = false;
            "editor.detectIndentation" = false;
Author	SHA1	Message	Date
Vinzenz Schroeter	12a1359d31	nix flake update	2025-06-28 09:47:59 +02:00
Vinzenz Schroeter	316e88afd3	get most extensions from open-vsx	2025-06-28 09:46:50 +02:00
Vinzenz Schroeter	be565adff6	add nix-vscode-extensions, deduplicate inputs	2025-06-28 09:46:08 +02:00