christoph/flake-nixinator
1
Fork 0
Code Activity

Reformat

Browse Source
This commit is contained in:
Christoph Urlacher
2024-06-01 19:33:30 +02:00
parent 95e88cbea7
commit 86d5a574b8
6 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -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. # 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"; 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? # 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... # Would it even work here? Since the flake imports its own nixpkgs...
# config.cudaSupport = true; # config.cudaSupport = true;

26
home/christoph/default.nix
View File

@ -460,19 +460,21 @@ rec {
# vale # Why not lint everything (including english)? # 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... # TODO: Development module, I need multiple modules to be able to add python packages to a single python install...
(python311.withPackages (p: with p; [ (python311.withPackages (p:
# p.rich with p; [
# p.numpy # p.rich
# p.scipy # p.numpy
# p.matplotlib # p.scipy
# p.pillow # for ranger # p.matplotlib
# p.pygments # for emacs # p.pillow # for ranger
# p.pygments # for emacs
# For nvim CHADtree # For nvim CHADtree
pyyaml pyyaml
std2 std2
pynvim pynvim
])) pynvim-pp
]))
jetbrains.clion jetbrains.clion
jetbrains.rust-rover jetbrains.rust-rover
jetbrains.pycharm-professional jetbrains.pycharm-professional

13
home/modules/chromium/default.nix
View File

@ -14,12 +14,13 @@ in {
options.modules.chromium = import ./options.nix {inherit lib mylib;}; options.modules.chromium = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; builtins.concatLists [ home.packages = with pkgs;
(optionals cfg.google [ builtins.concatLists [
google-chrome # Trash, but required for decker pdf export (optionals cfg.google [
(pkgs.writeShellScriptBin "chrome" "exec -a $0 ${google-chrome}/bin/google-chrome-stable $@") google-chrome # Trash, but required for decker pdf export
]) (pkgs.writeShellScriptBin "chrome" "exec -a $0 ${google-chrome}/bin/google-chrome-stable $@")
]; ])
];
programs.chromium = { programs.chromium = {
enable = true; enable = true;

10
lib/networking.nix
View File

@ -30,7 +30,10 @@
linkConfig = { linkConfig = {
# This corresponds to the [LINK] section # This corresponds to the [LINK] section
# RequiredForOnline = "routable"; # 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 = { linkConfig = {
# This corresponds to the [LINK] section # This corresponds to the [LINK] section
# RequiredForOnline = "routable"; # 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
}; };
}; };

2
system/modules/systemd-networkd/default.nix
View File

@ -26,7 +26,7 @@ in {
wait-online.timeout = 10; wait-online.timeout = 10;
# Don't wait for all networks to be configured, as e.g. wg0 will only be upon manual activation # 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? # TODO: Apparently anyInterface doesn't work?
# wait-online.ignoredInterfaces = [ # wait-online.ignoredInterfaces = [

26
system/nixinator/default.nix
View File

@ -96,18 +96,18 @@
# videoDrivers = ["amdgpu"]; # videoDrivers = ["amdgpu"];
}; };
# NOTE: This has been relocated here from the default config, because it forces en-US keyboard layout # NOTE: This has been relocated here from the default config, because it forces en-US keyboard layout
# The laptop needs de-DE... # The laptop needs de-DE...
# Chinese Input # Chinese Input
i18n.inputMethod.enabled = "fcitx5"; i18n.inputMethod.enabled = "fcitx5";
i18n.inputMethod.fcitx5 = { i18n.inputMethod.fcitx5 = {
waylandFrontend = true; waylandFrontend = true;
addons = with pkgs; [ addons = with pkgs; [
fcitx5-gtk fcitx5-gtk
libsForQt5.fcitx5-qt libsForQt5.fcitx5-qt
fcitx5-chinese-addons fcitx5-chinese-addons
fcitx5-configtool # TODO: Remove this and set config through HomeManager fcitx5-configtool # TODO: Remove this and set config through HomeManager
]; ];
}; };
} }