Compare commits

...

3 Commits

7 changed files with 14 additions and 31 deletions

3
.gitmodules vendored
View File

@@ -1,3 +1,6 @@
[submodule "nixpkgs"]
path = nixpkgs
url = https://github.com/CHN-beta/nixpkgs.git
[submodule "packages/ufo"]
path = packages/ufo
url = https://git.chn.moe/chn/ufo.git

19
flake.lock generated
View File

@@ -1491,7 +1491,6 @@
"sticker": "sticker",
"stickerpicker": "stickerpicker",
"tgbot-cpp": "tgbot-cpp",
"ufo": "ufo",
"v-sim": "v-sim",
"vaspberry": "vaspberry",
"winapps": "winapps",
@@ -1777,24 +1776,6 @@
"type": "github"
}
},
"ufo": {
"flake": false,
"locked": {
"lastModified": 1767597695,
"lfs": true,
"narHash": "sha256-JNCSBKjslaT4kjMCWCImN1iS9ZRwfCN4GpP7dWECdas=",
"ref": "refs/heads/main",
"rev": "19736049c9e117c642f3f0a5e81af5cf2a40b392",
"revCount": 86,
"type": "git",
"url": "https://git.chn.moe/chn/ufo.git"
},
"original": {
"lfs": true,
"type": "git",
"url": "https://git.chn.moe/chn/ufo.git"
}
},
"v-sim": {
"flake": false,
"locked": {

View File

@@ -3,7 +3,7 @@
inputs =
{
self.submodules = true;
self = { submodules = true; lfs = true; };
nixpkgs.url = ./nixpkgs;
nixpkgs-2505.url = "github:CHN-beta/nixpkgs/nixos-25.05";
nixpkgs-2411.url = "github:CHN-beta/nixpkgs/nixos-24.11";
@@ -54,7 +54,6 @@
pocketfft = { url = "github:mreineck/pocketfft"; flake = false; };
blog = { url = "git+https://git.chn.moe/chn/blog-public.git?lfs=1"; flake = false; };
vaspberry = { url = "github:Infant83/VASPBERRY"; flake = false; };
ufo = { url = "git+https://git.chn.moe/chn/ufo.git?lfs=1"; flake = false; };
stickerpicker = { url = "github:maunium/stickerpicker"; flake = false; };
fancy-motd = { url = "github:CHN-beta/fancy-motd"; flake = false; };
mac-style = { url = "github:SergioRibera/s4rchiso-plymouth-theme?lfs=1"; flake = false; };

View File

@@ -4,7 +4,6 @@ inputs:
{
type = types.nullOr (types.submodule { options =
{
timeout = mkOption { type = types.int; default = 15; };
windowsEntries = mkOption { type = types.attrsOf types.nonEmptyStr; default = {}; };
# "efi" using efi, "efiRemovable" using efi with install grub removable, or dev path like "/dev/sda" using bios
installDevice = mkOption { type = types.str; default = "efi"; };
@@ -15,9 +14,13 @@ inputs:
(inputs.lib.mkMerge
[
# general settings
{ boot.loader.grub = { enable = true; useOSProber = false; }; }
# grub timeout
{ boot.loader.timeout = grub.timeout; }
{
boot.loader =
{
grub = { enable = true; useOSProber = false; };
timeout = if inputs.config.nixos.model.type == "desktop" then null else 15;
};
}
# grub install
{
boot.loader =

View File

@@ -3,11 +3,7 @@ inputs:
config =
{
# only preserve the last 7 days of logs
services =
{
journald.extraConfig = "MaxRetentionSec=7d";
logind.settings.Login.HandleLidSwitch = "ignore";
};
services.journald.extraConfig = "MaxRetentionSec=7d";
systemd =
{
settings.Manager =

View File

@@ -72,7 +72,7 @@ inputs: rec
sqlite-orm = inputs.pkgs.callPackage ./sqlite-orm.nix { src = inputs.topInputs.sqlite-orm; };
mkPnpmPackage = inputs.pkgs.callPackage ./mkPnpmPackage.nix {};
sbatch-tui = inputs.pkgs.callPackage ./sbatch-tui { inherit biu; };
ufo = inputs.pkgs.callPackage inputs.topInputs.ufo { inherit biu matplotplusplus; tbb = inputs.pkgs.tbb_2022; };
ufo = inputs.pkgs.callPackage ./ufo { inherit biu matplotplusplus; tbb = inputs.pkgs.tbb_2022; };
chn-bsub = inputs.pkgs.callPackage ./chn-bsub { inherit biu; };
py4vasp = inputs.pkgs.python3Packages.callPackage ./py4vasp.nix { src = inputs.topInputs.py4vasp; };
pocketfft = inputs.pkgs.callPackage ./pocketfft.nix { src = inputs.topInputs.pocketfft; };

1
packages/ufo Submodule

Submodule packages/ufo added at 19736049c9