flake update

Signed-off-by: cy <cy@cy7.sh>

flake.lock

@@ -683,11 +683,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1739035579,
+        "lastModified": 1739137265,
-        "narHash": "sha256-Zc7KAA3iC5Ak9reV/peqELKXJn6rLcSZptq1Tzcx9Nc=",
+        "narHash": "sha256-WejZuOso5ElVYLA/17uVw7Noqi72ZbydPwMrbqNzC0c=",
         "ref": "refs/heads/main",
-        "rev": "132d11c2d85425b7d23785ec306acb9b1d1ddba6",
+        "rev": "7d4912bcf9028db491fe1061d3efcf2392c4bd76",
-        "revCount": 17397,
+        "revCount": 17398,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/lix"
       },
@@ -723,6 +723,32 @@
         "url": "https://git.lix.systems/lix-project/nixos-module"
       }
     },
+    "nil": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": [
+          "rust-overlay"
+        ]
+      },
+      "locked": {
+        "lastModified": 1732053863,
+        "narHash": "sha256-DCIVdlb81Fct2uwzbtnawLBC/U03U2hqx8trqTJB7WA=",
+        "owner": "oxalica",
+        "repo": "nil",
+        "rev": "2e24c9834e3bb5aa2a3701d3713b43a6fb106362",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "nil",
+        "type": "github"
+      }
+    },
     "niri": {
       "inputs": {
         "niri-stable": "niri-stable",
@@ -737,11 +763,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1739042449,
+        "lastModified": 1739136145,
-        "narHash": "sha256-9zLFUpEebwhjCgtznsI61gTzefI3+fuXATHUOFzJi5w=",
+        "narHash": "sha256-KgADxpdWMVevqNaxpJzlocRU+DclrFSyzvUiGFsARcQ=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "98e3666a9dc4143cbf93d957a15d749b5acef046",
+        "rev": "c5a3826e2bf96f3092b79415e17703a7b194e1a8",
         "type": "github"
       },
       "original": {
@@ -1001,11 +1027,11 @@
     },
     "nixpkgs-stable_4": {
       "locked": {
-        "lastModified": 1738843498,
+        "lastModified": 1739055578,
-        "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=",
+        "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f",
+        "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e",
         "type": "github"
       },
       "original": {
@@ -1249,6 +1275,7 @@
         "lanzaboote": "lanzaboote",
         "lix": "lix",
         "lix-module": "lix-module",
+        "nil": "nil",
         "niri": "niri",
         "nix-ld": "nix-ld",
         "nixpkgs": "nixpkgs_5",
@@ -1258,7 +1285,8 @@
         "plasma-manager": "plasma-manager",
         "rust-overlay": "rust-overlay",
         "sops-nix": "sops-nix",
-        "treefmt": "treefmt"
+        "treefmt": "treefmt",
+        "vscode-extensions": "vscode-extensions"
       }
     },
     "rust-analyzer-src": {
@@ -1285,11 +1313,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739068147,
+        "lastModified": 1739154531,
-        "narHash": "sha256-3DtLkjQFlIUOXw3TBH+iP0jglpqO6Lv2KaQc+ADg39I=",
+        "narHash": "sha256-QGeN6e0nMJlNLzm3Y2A7P6riXhQXMeCXLZ7yajZYFQM=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "f61820fa2c3844d6940cce269a6afdec30aa2e6c",
+        "rev": "035dac86ab7ce5c1e8a4d59dfe85e6911a3526ea",
         "type": "github"
       },
       "original": {
@@ -1368,6 +1396,32 @@
         "type": "github"
       }
     },
+    "vscode-extensions": {
+      "inputs": {
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739152168,
+        "narHash": "sha256-Zv6eGe+c5f9Chyw6O3ePJ4hbscetuzZxYShwjn3ACEs=",
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "rev": "bd6b70f681b2561f53c9522be64330c7ff9d08d8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-vscode-extensions",
+        "type": "github"
+      }
+    },
     "xwayland-satellite-stable": {
       "flake": false,
       "locked": {

flake.nix

@@ -78,6 +78,18 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
+    nil = {
+      url = "github:oxalica/nil";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.rust-overlay.follows = "rust-overlay";
+      inputs.flake-utils.follows = "flake-utils";
+    };
+    vscode-extensions = {
+      url = "github:nix-community/nix-vscode-extensions";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.flake-compat.follows = "flake-compat";
+    };
 
     nvim-github-theme = {
       url = "github:projekt0n/github-nvim-theme";
@@ -157,6 +169,7 @@
               overlays = [
                 inputs.niri.overlays.niri
                 inputs.rust-overlay.overlays.default
+                inputs.vscode-extensions.overlays.default
               ] ++ (import ./overlay { inherit inputs; });
             };
           in

home/codium.nix

@@ -6,19 +6,21 @@
     enableUpdateCheck = false;
     enableExtensionUpdateCheck = false;
     mutableExtensionsDir = false;
-    extensions = with pkgs.vscode-extensions; [
+    extensions = (with pkgs.open-vsx; [
       vscodevim.vim
       jnoortheen.nix-ide
       editorconfig.editorconfig
       github.github-vscode-theme
-      github.copilot
       rust-lang.rust-analyzer
-    ];
+    ]) ++
+    (with pkgs.vscode-marketplace; [
+      github.codespaces
+    ]);
     userSettings = {
       "workbench.colorTheme" = "GitHub Dark Default";
       "files.autoSave" = "afterDelay";
       "nix.enableLanguageServer" = true;
-      "nix.serverPath" = "nixd";
+      "nix.serverPath" = "nil";
       "editor.fontFamily" = "IBM Plex Mono";
       "editor.fontSize" = 16;
       "editor.wordWrap" = "on";

home/plasma.nix

@@ -35,7 +35,12 @@
       "launch-browser" = {
         name = "launch browser";
         key = "Meta+B";
-        command = "librewolf";
+        command = "chromium";
+      };
+      "launch-fuzzel" = {
+        name = "launch-fuzzel";
+        key = "Meta+d";
+        command = "fuzzel";
       };
     };
 

home/yt/ytnix.nix

@@ -10,7 +10,7 @@
     ../niri
     ../irssi.nix
     ../kitty.nix
-    ../vscode.nix
+    ../codium.nix
     ../plasma.nix
   ];
   home = {
@@ -127,6 +127,8 @@
     radare2
     p7zip
     qbittorrent
+    # vscodium
+    nil
   ];
 
   programs.waybar.enable = true;

hosts/ytnix/default.nix

@@ -280,10 +280,10 @@
   services.tumbler.enable = true;
 
   virtualisation = {
-    libvirtd.enable = true;
+    libvirtd.enable = false;
-    docker.enable = true;
+    docker.enable = false;
   };
-  programs.virt-manager.enable = true;
+  programs.virt-manager.enable = false;
 
   services.usbmuxd.enable = true;
   programs.nix-ld.dev = {
@@ -358,7 +358,7 @@
     ];
   };
 
-  services.ollama.enable = true;
+  services.ollama.enable = false;
 
   # wireguard setup
   networking.wg-quick.interfaces.wg0 = {
@@ -382,9 +382,9 @@
     ];
   };
 
-  services.trezord.enable = true;
+  services.trezord.enable = false;
 
-  programs.niri.enable = true;
+  programs.niri.enable = false;
   programs.niri.package = pkgs.niri-unstable;
   programs.xwayland.enable = true;
 

justfile

@@ -15,3 +15,8 @@ upgrade:
     git switch main
     git merge update
     git branch -d update
+
+switch:
+    sudo nixos-rebuild switch -L --flake . --use-substitutes
+    nixos-rebuild switch -L --flake .#chunk --target-host root@2a0f:85c1:840:2bfb::1 --use-substitutes
+    home-manager -L switch --flake .

overlay/default.nix

@@ -3,7 +3,6 @@ let
   overlays = [
     ./conduwuit
     ./attic
-    ./vscode.nix
   ];
   importedOverlays = map (m: import m) overlays;
 in
@@ -20,6 +19,7 @@ importedOverlays
       roundcube = pkgFrom stable "roundcube";
       lldb = pkgFrom stable "lldb";
       calibre = pkgFrom stable "calibre";
+      nil = inputs.nil.packages.${prev.system}.nil;
     }
   )
 ]