chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 04:19:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source
This commit is contained in:
陈浩南
2023-10-30 19:53:15 +08:00
parent 44d8553aef 7b73bdb9f3
commit 36f71df435
7 changed files with 71 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
flake.lock generated
View File

@@ -197,11 +197,11 @@
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
@@ -398,11 +398,11 @@
"systems": "systems_4"
},
"locked": {
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
@@ -528,11 +528,11 @@
]
},
"locked": {
"lastModified": 1695684520,
"narHash": "sha256-yORqGB0i1OtEf9MOCCT2BIbOd8txPZn216CM+ylMmhY=",
"lastModified": 1697031886,
"narHash": "sha256-oTMPX8dGC7yxSwrbF4NuPNQsUEcHB1dusW2yEbFD5zg=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "91fae5824f5f1199f61693c6590b4a89abaed9d7",
"rev": "178b36dc3a75c96efc25477d45eafc37ba1fafc3",
"type": "github"
},
"original": {
@@ -564,11 +564,11 @@
},
"impermanence": {
"locked": {
"lastModified": 1694622745,
"narHash": "sha256-z397+eDhKx9c2qNafL1xv75lC0Q4nOaFlhaU1TINqb8=",
"lastModified": 1697303681,
"narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "e9643d08d0d193a2e074a19d4d90c67a874d932e",
"rev": "0f317c2e9e56550ce12323eb39302d251618f5b5",
"type": "github"
},
"original": {
@@ -682,17 +682,18 @@
"inputs": {
"flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_4",
"nix-filter": "nix-filter",
"nix-index-database": [
"nix-index-database"
],
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1695714965,
"narHash": "sha256-uukcDCyFOIMo5vJWJbLJk2phHZtJ1DE7YrypSV48gII=",
"lastModified": 1698367638,
"narHash": "sha256-8g4HAU+kwTxb/RZBFxJw3wLckMGpKdN+7yDbTIGupVU=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "a948cf76e084f4ac770793c6ff9c57ad8b8c099f",
"rev": "7b3be1a706c8db4dcca777b6638bdb2ca4849176",
"type": "github"
},
"original": {
@@ -701,6 +702,21 @@
"type": "github"
}
},
"nix-filter": {
"locked": {
"lastModified": 1694857738,
"narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "41fd48e00c22b4ced525af521ead8792402de0ea",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-index-database": {
"inputs": {
"nixpkgs": [
@@ -708,11 +724,11 @@
]
},
"locked": {
"lastModified": 1696131323,
"narHash": "sha256-Y47r8Jo+9rs+XUWHcDPZtkQs6wFeZ24L4CQTfVwE+vY=",
"lastModified": 1697946153,
"narHash": "sha256-7k7qIwWLaYPgQ4fxmEdew3yCffhK6rM4I4Jo3X/79DA=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "031d4b22505fdea47bd53bfafad517cd03c26a4f",
"rev": "5a2006282caaf32663cdcd582c5b18809c7d7d8d",
"type": "github"
},
"original": {
@@ -752,11 +768,11 @@
]
},
"locked": {
"lastModified": 1695137077,
"narHash": "sha256-wJ8EpYjsqrR4GFAF67wJKmZd4q86KuODWAag4acQL5Q=",
"lastModified": 1697038389,
"narHash": "sha256-hbzFPXyQQxJObRdb+CsylUXii29UfFV7866WWgWYs6Y=",
"owner": "nix-community",
"repo": "nixd",
"rev": "e8f144ca50fe71e74d247e5308ae7ce122f0a0e6",
"rev": "29904e121cc775e7caaf4fffa6bc7da09376a43b",
"type": "github"
},
"original": {
@@ -795,11 +811,11 @@
]
},
"locked": {
"lastModified": 1696478570,
"narHash": "sha256-Zqktub0f4M8K0jDHFYaTwsGUddkH3UqHU0NNfGJmIKY=",
"lastModified": 1697683120,
"narHash": "sha256-sd0bjuGoUroCTkwjY2p1FwBPgAitK4qsN/P3jXk7rz0=",
"owner": "nixpak",
"repo": "nixpak",
"rev": "271e01d3912c5c622ca7fa99d63d790bea980de0",
"rev": "6b0b69f793390b4fe12821588b6c254b462a3e85",
"type": "github"
},
"original": {
@@ -894,11 +910,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1697904207,
"narHash": "sha256-XnPRcBBIYiF7u7kStqgFQcfdEyNlUuS9/hcH0Yb5h0s=",
"lastModified": 1698416297,
"narHash": "sha256-Ne6TWm5lOaQAjT8aLimLmCufJbPAr8Z3GdPZNIj2HeA=",
"owner": "CHN-beta",
"repo": "nixpkgs",
"rev": "cad11601e9b0f3191778d4a7bfd39622ea033f0b",
"rev": "4a5eef80f12698646b237de30d94fc1556eccaee",
"type": "github"
},
"original": {
@@ -910,16 +926,16 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1692007866,
"narHash": "sha256-X8w0vPZjZxMm68VCwh/BHDoKRGp+BgzQ6w7Nkif6IVM=",
"lastModified": 1697723726,
"narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "de2b8ddf94d6cc6161b7659649594c79bd66c13b",
"rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@@ -942,11 +958,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1698218924,
"narHash": "sha256-zqLXy/Ux+xOhgyOO6UELOmPF89PxJtfNdbFSxqiVXYk=",
"lastModified": 1698414670,
"narHash": "sha256-EwK5DXR5hkEummkfyjJBpqAloGMG8laOj4acPtqOk8E=",
"owner": "CHN-beta",
"repo": "nixpkgs",
"rev": "c33a629f98f62a317ee1155fa63c3a48c30e1ce5",
"rev": "8ae2ac9ab42083dea0f28542eb2becf1c3d85351",
"type": "github"
},
"original": {
@@ -958,11 +974,11 @@
},
"nur": {
"locked": {
"lastModified": 1696506445,
"narHash": "sha256-ozu7YxmHsvxSyQazVlkajF8A8U7TaXz3asCL5hFxgNk=",
"lastModified": 1698414381,
"narHash": "sha256-dqeFzaYrkL3swiQFY919hSqmd2D6D0AFBT6zvk/EUUE=",
"owner": "nix-community",
"repo": "NUR",
"rev": "0178289e0bd913fe9847605b01d6e15b7d076f6e",
"rev": "55831c4f594b877658d454d2a51aa06b989d79cc",
"type": "github"
},
"original": {
@@ -981,11 +997,11 @@
"nvfetcher": "nvfetcher"
},
"locked": {
"lastModified": 1696487499,
"narHash": "sha256-wvrBwhLpdF+oK5v3Lzgb1Yhz3vT1DHzIL3HKST/tCwU=",
"lastModified": 1698390460,
"narHash": "sha256-BSIac9PrpXaX6iFnUAljrHlFhx/+QhvUzY9Ublw1t1M=",
"owner": "xddxdd",
"repo": "nur-packages",
"rev": "9e53a952689cacfd88987c55466450e3076ced05",
"rev": "6f9992fe054792014bda7355f60f470956c1fe84",
"type": "github"
},
"original": {
@@ -1066,11 +1082,11 @@
]
},
"locked": {
"lastModified": 1696260682,
"narHash": "sha256-iccjl57qw6aEe9nsCYFbF2bl7NEI/3Y4cn1U+QYvrFk=",
"lastModified": 1698164032,
"narHash": "sha256-YzlHV9N22v8WRTCyt/kMlAX7ntJGboHOh8heaPMfbG0=",
"owner": "Nix-QChem",
"repo": "NixOS-QChem",
"rev": "7324cb54b7687718ed7b05581998f105fe2fd3e3",
"rev": "77633a73b12ee27b9c64dcbbb627a91a904efad9",
"type": "github"
},
"original": {
@@ -1114,11 +1130,11 @@
]
},
"locked": {
"lastModified": 1696320910,
"narHash": "sha256-fbuEc6wylH+0VxG48lhPBK+SQJHfo2lusUwWHZNipIM=",
"lastModified": 1698273636,
"narHash": "sha256-swsqg/ckSVJnravx7ie9NFQSKIH27owtlk0wh4+xStk=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "746c7fa1a64c1671a4bf287737c27fdc7101c4c2",
"rev": "014e44d334a39481223a5d163530d4c4ca2e75cb",
"type": "github"
},
"original": {

4
local/pkgs/rsshub/default.nix
View File

@@ -8,8 +8,8 @@ let
{
owner = "DIYgod";
repo = "RSSHub";
rev = "67d4a7ed3f877a8ceac6caebe874c4ce5c210bd8";
sha256 = "baJQWGrr1RdZoI2uAGp2uJO9epbjAUjks76knJSwVdE=";
rev = "4356fad91a268c81b8dacd2e3d9d07dbdce231a0";
sha256 = "rUfXHtePIkBGF1U/tqrXHEsYC5jah2A7hoJZfEAnCoQ=";
};
originalPnpmPackage = mkPnpmPackage { inherit name src nodejs; };
nodeModules = originalPnpmPackage.nodeModules.overrideAttrs { PUPPETEER_SKIP_DOWNLOAD = true; };

4
local/pkgs/typora/default.nix
View File

@@ -3,11 +3,11 @@ let
typora-dist = stdenv.mkDerivation rec
{
pname = "typora-dist";
version = "1.6.6";
version = "1.7.6";
src = fetchurl
{
url = "https://download.typora.io/linux/typora_${version}_amd64.deb";
sha256 = "sha256-77mCgmsROLhfuOmOOyl2C5Ug2NfqEvcD+kMA3aiAQtA=";
sha256 = "19xgv83zk3mhniswwrb341sr9j4sb9pqy47jamrmkc3w8famxpd3";
};
dontFixup = true;

4
modules/packages/default.nix
View File

@@ -328,7 +328,8 @@ inputs:
{
permittedInsecurePackages = with inputs.pkgs;
[
openssl_1_1.name electron_19.name nodejs-16_x.name python2.name electron_12.name
openssl_1_1.name electron_19.name nodejs-16_x.name python2.name electron_12.name electron_24.name
zotero.name
];
allowUnfree = true;
};
@@ -473,7 +474,6 @@ inputs:
{
enable = true;
languagePacks = [ "zh-CN" "en-US" ];
nativeMessagingHosts.firefoxpwa = true;
};
vim.package = inputs.pkgs.genericPackages.vim-full;
};

2
modules/services/default.nix
View File

@@ -38,6 +38,7 @@ inputs:
smartd.enable = mkOption { type = types.bool; default = false; };
fileshelter.enable = mkOption { type = types.bool; default = false; };
wallabag.enable = mkOption { type = types.bool; default = false; };
noisetorch.enable = mkOption { type = types.bool; default = inputs.config.nixos.system.gui.preferred; };
};
config =
let
@@ -189,5 +190,6 @@ inputs:
# };
}
)
(mkIf services.noisetorch.enable { programs.noisetorch.enable = true; })
];
}

1
modules/system/security.nix
View File

@@ -32,7 +32,6 @@ inputs:
{
enable = true;
id = "91291";
authFile = inputs.pkgs.writeText "yubikey_mappings" "chn:cccccbgrhnub";
};
};
};

1
modules/users/default.nix
View File

@@ -181,6 +181,7 @@ inputs:
))
)
];
pam.yubico.authorizedYubiKeys.ids = [ "cccccbgrhnub" ];
};
};
nixos.services.groupshare.mountPoints = [ "/home/chn/groupshare" ];