rolling update in 20241126

Signed-off-by: iosmanthus <[email protected]>
iosmanthus · Nov 26, 2024 · a6f4a78 · a6f4a78
1 parent 859a131
commit a6f4a78
Show file tree

Hide file tree

Showing 42 changed files with 769 additions and 511 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 /.direnv
-/result
+**/result
diff --git a/Makefile b/Makefile
@@ -7,8 +7,10 @@ switch:
 	@nixos-rebuild switch --use-remote-sudo |& nom
 
 format:
-	@fd --glob "*.nix" --exec-batch "nixfmt"
-	@fd --glob "*.py" --exec-batch "yapf" "-i"
+	@echo "Format nix files"
+	fd --glob "*.nix" --exec-batch "nixfmt"
+	@echo "Format python files"
+	fd --glob "*.py" --exec-batch "black"
 
 update:
 	@nix flake update

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "God does not play dice";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     master.url = "github:NixOS/nixpkgs";
 
@@ -141,7 +141,9 @@
           system = "x86_64-linux";
           config = {
             allowUnfree = true;
-            permittedInsecurePackages = [ "openssl-1.1.1w" ];
+            permittedInsecurePackages = [
+              "electron-27.3.11"
+            ];
           };
           packages = [
             "bat"
@@ -156,6 +158,7 @@
             "i3"
             "kitty"
             "lens"
+            "logseq"
             "neovim"
             "nixos-artwork"
             "oh-my-zsh"
@@ -166,9 +169,9 @@
             "starship"
             "tmux"
             "vscode"
+            "wechat-uos"
             "zoxide"
             "zsh"
-            "wechat-uos"
           ];
         };
         jetbrains = this.branchOverlay {
@@ -350,7 +353,7 @@
             sops
             statix
             terraform
-            yapf
+            black
           ];
         };
       }

diff --git a/infra/cloudflare/terraform.tfstate b/infra/cloudflare/terraform.tfstate