From 98e487b199c9fbf2230fb0e0da787eb057e2c9ad Mon Sep 17 00:00:00 2001
From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>
Date: Sat, 16 Dec 2023 00:06:39 +0100
Subject: [PATCH] update

---
 custom-pkgs/cargo-mommy.nix |  8 ++++----
 flake.lock                  | 35 ++++++++++++++++++++++++++---------
 flake.nix                   |  3 ++-
 home-manager/vscode.nix     |  9 ++++-----
 nixos/configuration.nix     |  4 +++-
 5 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/custom-pkgs/cargo-mommy.nix b/custom-pkgs/cargo-mommy.nix
index 8873dc6..54aa31e 100644
--- a/custom-pkgs/cargo-mommy.nix
+++ b/custom-pkgs/cargo-mommy.nix
@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "cargo-mommy";
-  version = "0.1.1";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "Gankra";
     repo = "cargo-mommy";
-    rev = "0d96506db241003166e32deb22ad0ab0fc52c16c";
-    hash = "sha256-SIL7ExSRVBXr7Z+ye+rjjUpK6WS/fytvfhj3WPPdenc=";
+    rev = "0ec17361d8b0573d0155984403e576b788abeb60";
+    hash = "sha256-Mf0VGxQ90PjNhFA2OnDIFkNZjYDCuMqPsexqy5+gRdI=";
   };
 
-  cargoSha256 = "sha256-hdWYvWNOko6wlffv2Vb3xTYfh9mQgLlON8EVKVkWUV0=";
+  cargoSha256 = "sha256-iQt6eTCcpzhFnrDkUmT4x7JX+Z7fWdW5ovbB/9Ui7Sw=";
 
   meta = with lib; {
     description = "Cargo wrapper that encourages you after running commands";
diff --git a/flake.lock b/flake.lock
index f8c1a1c..e219b75 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701728041,
-        "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=",
+        "lastModified": 1702538064,
+        "narHash": "sha256-At5GwJPu2tzvS9dllhBoZmqK6lkkh/sOp2YefWRlaL8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf",
+        "rev": "0e2e443ff24f9d75925e91b89d1da44b863734af",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701718080,
-        "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
+        "lastModified": 1702312524,
+        "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
+        "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
         "type": "github"
       },
       "original": {
@@ -57,13 +57,29 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1702346276,
+        "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "locked": {
-        "lastModified": 1702060431,
-        "narHash": "sha256-8/yGvqBUx/oR2rDhY8+iWZ1nErjpsNCe2O8PvzFaerM=",
+        "lastModified": 1702673133,
+        "narHash": "sha256-WWLJaaCSufoQ4kNyIeKJvEFuAMgCvd9BdBeoJEm7YQ0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "d854884a8c7d2014ff44a27cfe9cac8dd78cc7ea",
+        "rev": "cdf58b69ab208e77fa1d6195983a151c9cd20e9e",
         "type": "github"
       },
       "original": {
@@ -77,6 +93,7 @@
         "home-manager": "home-manager",
         "minegrub-theme": "minegrub-theme",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur"
       }
     }
diff --git a/flake.nix b/flake.nix
index 58061d9..ec88d2d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,6 +6,7 @@
   inputs = {
     # Nixpkgs
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
 
     nur.url = "github:nix-community/NUR";
 
@@ -26,7 +27,7 @@
     nixosConfigurations = {
       nixos = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        specialArgs = { inherit inputs; }; # Pass flake inputs to our config
+        specialArgs = { inherit inputs; };
         modules = [
           ./nixos/configuration.nix
           inputs.minegrub-theme.nixosModules.default
diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix
index 39b7e72..84fe309 100644
--- a/home-manager/vscode.nix
+++ b/home-manager/vscode.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, inputs, ... }: {
   programs.vscode = {
     enable = true;
     package = pkgs.vscode;
@@ -44,14 +44,13 @@
       jnoortheen.nix-ide
       mads-hartmann.bash-ide-vscode
       ms-azuretools.vscode-docker
-      # the server fails to build temporarily
-      # https://github.com/NixOS/nixpkgs/issues/263493
-      # ms-python.python
+      ms-python.python
       ms-vscode-remote.remote-ssh
       ms-vscode.cmake-tools
       ms-vscode.cpptools
       ms-vscode.hexeditor
-      nvarner.typst-lsp
+      # https://github.com/NixOS/nixpkgs/issues/273835
+      (import inputs.nixpkgs-stable { system = "x86_64-linux"; }).vscode-extensions.nvarner.typst-lsp
       redhat.vscode-yaml
       rust-lang.rust-analyzer
       tamasfe.even-better-toml
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 11ba81b..57d3a9c 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -37,7 +37,9 @@ in
       # Disable if you don't want unfree packages
       allowUnfree = true;
       nvidia.acceptLicense = true;
-      # allowUnfreePredicate = (_: true);
+      permittedInsecurePackages = [
+        "electron-25.9.0" # Temporary fix until the next obsidian release: https://github.com/NixOS/nixpkgs/issues/273611
+      ];
     };
   };