Reformat
This commit is contained in:
@ -68,7 +68,7 @@
|
||||
|
||||
# NOTE: Obsidian 1.5.3 depends on an unsupported Electron version. As long as Obsidian isn't updated, allow this version.
|
||||
config.permittedInsecurePackages = pkgs.lib.optional (pkgs.obsidian.version == "1.5.3") "electron-25.9.0";
|
||||
|
||||
|
||||
# NOTE: Probably shouldn't enable CUDA globally, but in the environment flakes where it is needed?
|
||||
# Would it even work here? Since the flake imports its own nixpkgs...
|
||||
# config.cudaSupport = true;
|
||||
|
@ -460,19 +460,21 @@ rec {
|
||||
# vale # Why not lint everything (including english)?
|
||||
|
||||
# TODO: Development module, I need multiple modules to be able to add python packages to a single python install...
|
||||
(python311.withPackages (p: with p; [
|
||||
# p.rich
|
||||
# p.numpy
|
||||
# p.scipy
|
||||
# p.matplotlib
|
||||
# p.pillow # for ranger
|
||||
# p.pygments # for emacs
|
||||
(python311.withPackages (p:
|
||||
with p; [
|
||||
# p.rich
|
||||
# p.numpy
|
||||
# p.scipy
|
||||
# p.matplotlib
|
||||
# p.pillow # for ranger
|
||||
# p.pygments # for emacs
|
||||
|
||||
# For nvim CHADtree
|
||||
pyyaml
|
||||
std2
|
||||
pynvim
|
||||
]))
|
||||
# For nvim CHADtree
|
||||
pyyaml
|
||||
std2
|
||||
pynvim
|
||||
pynvim-pp
|
||||
]))
|
||||
jetbrains.clion
|
||||
jetbrains.rust-rover
|
||||
jetbrains.pycharm-professional
|
||||
|
@ -14,12 +14,13 @@ in {
|
||||
options.modules.chromium = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; builtins.concatLists [
|
||||
(optionals cfg.google [
|
||||
google-chrome # Trash, but required for decker pdf export
|
||||
(pkgs.writeShellScriptBin "chrome" "exec -a $0 ${google-chrome}/bin/google-chrome-stable $@")
|
||||
])
|
||||
];
|
||||
home.packages = with pkgs;
|
||||
builtins.concatLists [
|
||||
(optionals cfg.google [
|
||||
google-chrome # Trash, but required for decker pdf export
|
||||
(pkgs.writeShellScriptBin "chrome" "exec -a $0 ${google-chrome}/bin/google-chrome-stable $@")
|
||||
])
|
||||
];
|
||||
|
||||
programs.chromium = {
|
||||
enable = true;
|
||||
|
@ -30,7 +30,10 @@
|
||||
linkConfig = {
|
||||
# This corresponds to the [LINK] section
|
||||
# RequiredForOnline = "routable";
|
||||
RequiredForOnline = if routable then "routable" else "no"; # Don't make nixos-rebuild wait for systemd-networkd-wait-online.service
|
||||
RequiredForOnline =
|
||||
if routable
|
||||
then "routable"
|
||||
else "no"; # Don't make nixos-rebuild wait for systemd-networkd-wait-online.service
|
||||
};
|
||||
};
|
||||
|
||||
@ -76,7 +79,10 @@
|
||||
linkConfig = {
|
||||
# This corresponds to the [LINK] section
|
||||
# RequiredForOnline = "routable";
|
||||
RequiredForOnline = if routable then "routable" else "no"; # Don't make nixos-rebuild wait for systemd-networkd-wait-online.service
|
||||
RequiredForOnline =
|
||||
if routable
|
||||
then "routable"
|
||||
else "no"; # Don't make nixos-rebuild wait for systemd-networkd-wait-online.service
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -26,7 +26,7 @@ in {
|
||||
wait-online.timeout = 10;
|
||||
|
||||
# Don't wait for all networks to be configured, as e.g. wg0 will only be upon manual activation
|
||||
wait-online.anyInterface = true;
|
||||
wait-online.anyInterface = true;
|
||||
|
||||
# TODO: Apparently anyInterface doesn't work?
|
||||
# wait-online.ignoredInterfaces = [
|
||||
|
@ -96,18 +96,18 @@
|
||||
# videoDrivers = ["amdgpu"];
|
||||
};
|
||||
|
||||
# NOTE: This has been relocated here from the default config, because it forces en-US keyboard layout
|
||||
# The laptop needs de-DE...
|
||||
# Chinese Input
|
||||
i18n.inputMethod.enabled = "fcitx5";
|
||||
i18n.inputMethod.fcitx5 = {
|
||||
waylandFrontend = true;
|
||||
# NOTE: This has been relocated here from the default config, because it forces en-US keyboard layout
|
||||
# The laptop needs de-DE...
|
||||
# Chinese Input
|
||||
i18n.inputMethod.enabled = "fcitx5";
|
||||
i18n.inputMethod.fcitx5 = {
|
||||
waylandFrontend = true;
|
||||
|
||||
addons = with pkgs; [
|
||||
fcitx5-gtk
|
||||
libsForQt5.fcitx5-qt
|
||||
fcitx5-chinese-addons
|
||||
fcitx5-configtool # TODO: Remove this and set config through HomeManager
|
||||
];
|
||||
};
|
||||
addons = with pkgs; [
|
||||
fcitx5-gtk
|
||||
libsForQt5.fcitx5-qt
|
||||
fcitx5-chinese-addons
|
||||
fcitx5-configtool # TODO: Remove this and set config through HomeManager
|
||||
];
|
||||
};
|
||||
}
|
||||
|
Reference in New Issue
Block a user