update ovito

flake.lock

@@ -952,7 +952,6 @@
       },
       "original": {
         "owner": "CHN-beta",
-        "ref": "next",
         "repo": "nixos-hardware",
         "type": "github"
       }
@@ -991,16 +990,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728876263,
+        "lastModified": 1728890794,
-        "narHash": "sha256-qb9Pe2IyMJA22pDipl4RotAODgjCqvEDDphDky5g7y8=",
+        "narHash": "sha256-pmyfo4rTKYn5E7YyLxFGUBBo+d8FcjNFKHf7lLzU2Y8=",
         "owner": "CHN-beta",
         "repo": "nixpkgs",
-        "rev": "7cd275c5592c1c4a31a5b1d52b846ff96e3ed5dc",
+        "rev": "ececb0b840d74d9770cc7214f73b571792b9ec6c",
         "type": "github"
       },
       "original": {
         "owner": "CHN-beta",
-        "ref": "next",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -3,7 +3,7 @@
 
   inputs =
   {
-    nixpkgs.url = "github:CHN-beta/nixpkgs/next";
+    nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-unstable";
     "nixpkgs-23.11".url = "github:CHN-beta/nixpkgs/nixos-23.11";
     "nixpkgs-23.05".url = "github:CHN-beta/nixpkgs/nixos-23.05";
     "nixpkgs-22.11".url = "github:NixOS/nixpkgs/nixos-22.11";
@@ -26,7 +26,7 @@
       inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; };
     };
     nur-linyinfeng = { url = "github:linyinfeng/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
-    nixos-hardware.url = "github:CHN-beta/nixos-hardware/next";
+    nixos-hardware.url = "github:CHN-beta/nixos-hardware";
     envfs = { url = "github:Mic92/envfs"; inputs.nixpkgs.follows = "nixpkgs"; };
     nix-fast-build = { url = "github:/Mic92/nix-fast-build"; inputs.nixpkgs.follows = "nixpkgs"; };
     nix-flatpak.url = "github:gmodena/nix-flatpak";

modules/packages/helix.nix

@@ -0,0 +1,17 @@
+inputs:
+{
+  options.nixos.packages.helix = let inherit (inputs.lib) mkOption types; in mkOption
+    { type = types.nullOr (types.submodule {}); default = {}; };
+  config = let inherit (inputs.config.nixos.packages) helix; in inputs.lib.mkIf (helix != null)
+  {
+    nixos.user.sharedModules =
+    [{
+      config.programs.helix =
+      {
+        enable = true;
+        defaultEditor = true;
+        settings.theme = "catppuccin_latte";
+      };
+    }];
+  };
+}

modules/packages/vim.nix

@@ -1,30 +0,0 @@
-inputs:
-{
-  options.nixos.packages.vim = let inherit (inputs.lib) mkOption types; in mkOption
-    { type = types.nullOr (types.submodule {}); default = {}; };
-  config = let inherit (inputs.config.nixos.packages) vim; in inputs.lib.mkIf (vim != null)
-  {
-    nixos.user.sharedModules =
-    [{
-      config.programs.vim =
-      {
-        enable = true;
-        defaultEditor = true;
-        packageConfigurable = inputs.config.programs.vim.package;
-        settings =
-        {
-          number = true;
-          expandtab = false;
-          shiftwidth = 2;
-          tabstop = 2;
-        };
-        extraConfig =
-        ''
-          set clipboard=unnamedplus
-          colorscheme evening
-        '';
-      };
-    }];
-    programs.vim.package = inputs.pkgs.vim-full;
-  };
-}

modules/user/chn/git.nix

@@ -8,7 +8,7 @@ inputs:
       package = inputs.pkgs.gitFull;
       extraConfig =
       {
-        core.editor = if inputs.config.nixos.system.gui.preferred then "code --wait" else "vim";
+        core.editor = "hx";
         http.postBuffer = 624288000;
         advice.detachedHead = false;
         merge.conflictstyle = "diff3";