Compare commits

...
3 Commits
6 changed files with 21 additions and 25 deletions
+6 -8
View File
@@ -13,7 +13,7 @@ let
nixpkgs = lib.mkMerge [
pkgsParams
{
overlays = (import ./overlays args);
overlays = import ./overlays args;
}
];
};
@@ -57,13 +57,11 @@ in
modules = lib.mkOption {
type = lib.types.listOf lib.types.deferredModule;
default = (
lib.umport {
paths = [ ../hosts/${name} ];
extraExcludePredicate = path: lib.hasInfix "/_" (toString path);
recursive = true;
}
);
default = lib.umport {
paths = [ ../hosts/${name} ];
extraExcludePredicate = path: lib.hasInfix "/_" (toString path);
recursive = true;
};
description = "Additional NixOS modules specific to this host";
};
+2 -3
View File
@@ -6,15 +6,14 @@
...
}:
{
nixpkgs.config.permittedInsecurePackages = (
nixpkgs.config.permittedInsecurePackages =
lib.warn
''
mautrix-telegram still using olm-3.2.16
''
[
"olm-3.2.16"
]
);
];
sops.secrets.tuwunel-reg-token = {
sopsFile = secrets.tuwunel-reg-token;
restartUnits = [ "tuwunel.service" ];
+3 -3
View File
@@ -19,8 +19,8 @@ let
with lib;
with fileset;
let
excludedFiles = filter (path: pathIsRegularFile path) exclude;
excludedDirs = filter (path: pathIsDirectory path) exclude;
excludedFiles = filter pathIsRegularFile exclude;
excludedDirs = filter pathIsDirectory exclude;
isExcluded =
path:
(elem path excludedFiles)
@@ -39,7 +39,7 @@ let
) (builtins.readDir path)
) (unique (if path == null then paths else [ path ] ++ paths))
))
++ (if recursive then concatMap (path: toList path) (unique include) else unique include)
++ (if recursive then concatMap toList (unique include) else unique include)
);
in
umport
+6 -7
View File
@@ -2,7 +2,6 @@
lib,
config,
pkgs,
username,
...
}:
let
@@ -51,12 +50,12 @@ in
};
};
gtk.gtk3.bookmarks = [
"file://${homedir}/Documents "
"file://${homedir}/Downloads "
"file://${homedir}/Pictures "
"file://${homedir}/Videos "
"file://${homedir}/Music "
"file://${homedir}/workspace "
"file://${homedir}/Documents Documents"
"file://${homedir}/Downloads Downloads"
"file://${homedir}/Pictures Pictures"
"file://${homedir}/Videos Videos"
"file://${homedir}/Music Music"
"file://${homedir}/workspace Workspace"
];
};
};
+1 -1
View File
@@ -2,7 +2,7 @@
Name=Light
Version=1
Author=Fcitx
Description="从 Plasma 主题 lightly 生成的主题"
Description="Generated from Lightly Plasma Theme"
[InputPanel]
NormalColor=#282a2f
File diff suppressed because one or more lines are too long