refactor!: import modules recursively
This commit is contained in:
parent
f9fd542206
commit
9567cce5fa
GPG key ID:
970C6E89EB0547A9
35 changed files with 227 additions and 178 deletions
13
flake.nix
13
flake.nix
|
|
@ -121,16 +121,8 @@
|
|||
║ Modules ║
|
||||
╚══════════════════════════════════════════════════════════╝
|
||||
*/
|
||||
nixosModules = utils.lib.exportModules [
|
||||
./modules/profiles/base.nix
|
||||
./modules/profiles/gaming.nix
|
||||
./modules/profiles/desktop.nix
|
||||
./modules/profiles/personal.nix
|
||||
];
|
||||
|
||||
hostDefaults.modules = [
|
||||
./modules/default.nix
|
||||
self.nixosModules.base
|
||||
inputs.home-manager.nixosModule
|
||||
{
|
||||
home-manager = {
|
||||
|
|
@ -145,16 +137,11 @@
|
|||
|
||||
hosts.nixos-laptop.modules = [
|
||||
./hosts/nixos-laptop
|
||||
self.nixosModules.desktop
|
||||
self.nixosModules.personal
|
||||
];
|
||||
|
||||
|
||||
hosts.nixos-desktop.modules = [
|
||||
./hosts/nixos-desktop
|
||||
self.nixosModules.desktop
|
||||
self.nixosModules.gaming
|
||||
self.nixosModules.personal
|
||||
];
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -10,7 +10,13 @@
|
|||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
my = {
|
||||
profiles = {
|
||||
desktop.enable = true;
|
||||
gaming.enable = true;
|
||||
personal.enable = true;
|
||||
};
|
||||
programs.hyprland.nvidiaSupport = true;
|
||||
services.mullvad.enable = true;
|
||||
programs.ledger.enable = true;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,11 @@
|
|||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
my.profiles = {
|
||||
desktop.enable = true;
|
||||
personal.enable = true;
|
||||
};
|
||||
|
||||
# BOOT
|
||||
boot = {
|
||||
supportedFilesystems = [ "btrfs" ];
|
||||
|
|
|
|||
|
|
@ -47,4 +47,34 @@ lib.makeExtensible (_: rec {
|
|||
mapModules' = f: dir: lib.attrValues (mapModules f dir);
|
||||
|
||||
listModules = mapModules' (path: path);
|
||||
|
||||
mapModulesRec = f: dir:
|
||||
let
|
||||
filterDirs = name: type:
|
||||
let
|
||||
isPublic = !(lib.hasPrefix "_" name);
|
||||
isSomething = type != null;
|
||||
isDir = type == "directory";
|
||||
isDefault = isDir && builtins.pathExists "${toString dir}/${name}/default.nix";
|
||||
in
|
||||
isPublic && isSomething && isDir && !isDefault;
|
||||
|
||||
subDirs = lib.filterAttrs filterDirs (builtins.readDir dir);
|
||||
|
||||
mkSubModule = name: _:
|
||||
let
|
||||
path = "${toString dir}/${name}";
|
||||
in
|
||||
lib.nameValuePair name (mapModulesRec f path);
|
||||
in
|
||||
mapModules f dir //
|
||||
(lib.mapAttrs' mkSubModule subDirs);
|
||||
|
||||
mapModulesRec' = f: dir:
|
||||
let
|
||||
attrValuesRec = attrs: map (values: if lib.isAttrs values then attrValuesRec values else values) (lib.attrValues attrs);
|
||||
in
|
||||
lib.flatten (attrValuesRec (mapModulesRec f dir));
|
||||
|
||||
listModulesRec = mapModulesRec' (path: path);
|
||||
})
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
with lib;
|
||||
let
|
||||
cfg = config.my.bin;
|
||||
cycleSinks = import ./cycleSinks.nix { inherit pkgs; };
|
||||
protonge = import ./protonge.nix { inherit pkgs; };
|
||||
share = import ./share.nix { inherit pkgs; };
|
||||
sxhkdHelp = import ./sxhkdHelp.nix { inherit pkgs; };
|
||||
cycleSinks = import ./_cycleSinks.nix { inherit pkgs; };
|
||||
protonge = import ./_protonge.nix { inherit pkgs; };
|
||||
share = import ./_share.nix { inherit pkgs; };
|
||||
sxhkdHelp = import ./_sxhkdHelp.nix { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
options.my.bin.enable = mkEnableOption "bin";
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
{ lib, ... }:
|
||||
|
||||
{
|
||||
imports = lib.my.listModules ./.;
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@ let
|
|||
in
|
||||
{
|
||||
config = mkIf (cfg.enable && cfg.scheme == "catppuccin-frappe")
|
||||
(import ./catppuccin.nix
|
||||
(import ./_catppuccin.nix
|
||||
{
|
||||
inherit config lib pkgs;
|
||||
flavor = "mocha";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ let
|
|||
in
|
||||
{
|
||||
config = mkIf (cfg.enable && cfg.scheme == "catppuccin-latte")
|
||||
(import ./catppuccin.nix
|
||||
(import ./_catppuccin.nix
|
||||
{
|
||||
inherit config lib pkgs;
|
||||
flavor = "mocha";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ let
|
|||
in
|
||||
{
|
||||
config = mkIf (cfg.enable && cfg.scheme == "catppuccin-macchiato")
|
||||
(import ./catppuccin.nix
|
||||
(import ./_catppuccin.nix
|
||||
{
|
||||
inherit config lib pkgs;
|
||||
flavor = "mocha";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ let
|
|||
in
|
||||
{
|
||||
config = mkIf (cfg.enable && cfg.scheme == "catppuccin-mocha")
|
||||
(import ./catppuccin.nix
|
||||
(import ./_catppuccin.nix
|
||||
{
|
||||
inherit config lib pkgs;
|
||||
flavor = "mocha";
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 12 MiB After Width: | Height: | Size: 12 MiB |
|
Before Width: | Height: | Size: 5.2 MiB After Width: | Height: | Size: 5.2 MiB |
|
Before Width: | Height: | Size: 118 KiB After Width: | Height: | Size: 118 KiB |
|
Before Width: | Height: | Size: 4.6 MiB After Width: | Height: | Size: 4.6 MiB |
|
Before Width: | Height: | Size: 10 MiB After Width: | Height: | Size: 10 MiB |
|
Before Width: | Height: | Size: 501 KiB After Width: | Height: | Size: 501 KiB |
|
Before Width: | Height: | Size: 635 KiB After Width: | Height: | Size: 635 KiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |
|
|
@ -1,9 +1,4 @@
|
|||
{ lib, ... }:
|
||||
{
|
||||
imports = [
|
||||
./config
|
||||
./programs
|
||||
./security
|
||||
./services
|
||||
./virtualisation
|
||||
];
|
||||
imports = lib.my.listModulesRec ./.;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,73 +1,83 @@
|
|||
{ lib
|
||||
, config
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
with lib; {
|
||||
my = {
|
||||
yubikey = {
|
||||
enable = mkDefault true;
|
||||
luksSupport = {
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.my.profiles.desktop;
|
||||
in
|
||||
{
|
||||
options.my.profiles.desktop.enable = mkEnableOption "desktop profile";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
my = {
|
||||
yubikey = {
|
||||
enable = mkDefault true;
|
||||
devices = mkDefault [ "enc" ];
|
||||
luksSupport = {
|
||||
enable = mkDefault true;
|
||||
devices = mkDefault [ "enc" ];
|
||||
};
|
||||
};
|
||||
wallpapers.enable = mkDefault true;
|
||||
theming = {
|
||||
enable = mkDefault true;
|
||||
scheme = mkDefault "catppuccin-macchiato";
|
||||
};
|
||||
virtualisation.podman.enable = mkDefault true;
|
||||
|
||||
programs = {
|
||||
chromium.enable = mkDefault true;
|
||||
firefox.enable = mkDefault true;
|
||||
gpg.enable = mkDefault true;
|
||||
hyprland.enable = mkDefault true;
|
||||
logseq.enable = mkDefault true;
|
||||
nvim.enable = mkDefault true;
|
||||
python.versions."311".enable = mkDefault true;
|
||||
spotify.enable = mkDefault true;
|
||||
ssh.enable = mkDefault true;
|
||||
thunar.enable = mkDefault true;
|
||||
wallpaper.enable = mkDefault true;
|
||||
zathura.enable = mkDefault true;
|
||||
};
|
||||
services = {
|
||||
dunst.enable = mkDefault true;
|
||||
gammastep.enable = true;
|
||||
kdeconnect.enable = mkDefault true;
|
||||
printing.enable = true;
|
||||
wireguard.enable = true;
|
||||
};
|
||||
};
|
||||
wallpapers.enable = mkDefault true;
|
||||
theming = {
|
||||
enable = mkDefault true;
|
||||
scheme = mkDefault "catppuccin-macchiato";
|
||||
};
|
||||
virtualisation.podman.enable = mkDefault true;
|
||||
|
||||
programs = {
|
||||
chromium.enable = mkDefault true;
|
||||
firefox.enable = mkDefault true;
|
||||
gpg.enable = mkDefault true;
|
||||
hyprland.enable = mkDefault true;
|
||||
logseq.enable = mkDefault true;
|
||||
nvim.enable = mkDefault true;
|
||||
python.versions."311".enable = mkDefault true;
|
||||
spotify.enable = mkDefault true;
|
||||
ssh.enable = mkDefault true;
|
||||
thunar.enable = mkDefault true;
|
||||
wallpaper.enable = mkDefault true;
|
||||
zathura.enable = mkDefault true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
anki
|
||||
calibre
|
||||
keepassxc
|
||||
nixpkgs-review
|
||||
pavucontrol
|
||||
stable.libreoffice # HACK to fix build error
|
||||
stable.signal-desktop
|
||||
texlive.combined.scheme-full
|
||||
thunderbird
|
||||
vlc
|
||||
];
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
home-manager.users.moritz = {
|
||||
services.nextcloud-client = {
|
||||
enable = true;
|
||||
startInBackground = true;
|
||||
};
|
||||
};
|
||||
services = {
|
||||
dunst.enable = mkDefault true;
|
||||
gammastep.enable = true;
|
||||
kdeconnect.enable = mkDefault true;
|
||||
printing.enable = true;
|
||||
wireguard.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
anki
|
||||
calibre
|
||||
keepassxc
|
||||
nixpkgs-review
|
||||
pavucontrol
|
||||
stable.libreoffice # HACK to fix build error
|
||||
stable.signal-desktop
|
||||
texlive.combined.scheme-full
|
||||
thunderbird
|
||||
vlc
|
||||
];
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
home-manager.users.moritz = {
|
||||
services.nextcloud-client = {
|
||||
enable = true;
|
||||
startInBackground = true;
|
||||
};
|
||||
};
|
||||
services = {
|
||||
gnome.gnome-keyring.enable = true;
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
pulse.enable = true;
|
||||
gnome.gnome-keyring.enable = true;
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,23 @@
|
|||
{ pkgs
|
||||
{ lib
|
||||
, config
|
||||
, pkgs
|
||||
, ...
|
||||
}: {
|
||||
programs.steam.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
lutris
|
||||
legendary-gl
|
||||
heroic
|
||||
mangohud
|
||||
];
|
||||
}:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.my.profiles.gaming;
|
||||
in
|
||||
{
|
||||
options.my.profiles.gaming.enable = mkEnableOption "Enable gaming profile";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.steam.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
lutris
|
||||
legendary-gl
|
||||
heroic
|
||||
mangohud
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,63 +1,74 @@
|
|||
{ lib, ... }:
|
||||
{ lib
|
||||
, config
|
||||
, ...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.my.profiles.personal;
|
||||
in
|
||||
{
|
||||
my = {
|
||||
services = {
|
||||
openconnect.enable = true;
|
||||
synology-drive.enable = true;
|
||||
};
|
||||
programs = {
|
||||
ssh.includeSecrets = mkDefault [ ../../secrets/ssh-home.age ];
|
||||
git.signing = mkDefault true;
|
||||
hub.enable = mkDefault true;
|
||||
firefox.arkenfox = {
|
||||
enable = mkDefault true;
|
||||
overrides = mkDefault {
|
||||
## arkenfox overrides
|
||||
# automatic search
|
||||
"keyword.enabled" = true;
|
||||
"browser.search.suggest.enabled" = true;
|
||||
"browser.urlbar.suggest.searches" = true;
|
||||
options.my.profiles.personal.enable = mkEnableOption "personal profile";
|
||||
|
||||
# startup page
|
||||
"browser.startup.homepage" = "https://searxng.moritzboeh.me/";
|
||||
"browser.startup.page" = 1;
|
||||
config = mkIf cfg.enable
|
||||
{
|
||||
my = {
|
||||
services = {
|
||||
openconnect.enable = true;
|
||||
synology-drive.enable = true;
|
||||
};
|
||||
programs = {
|
||||
ssh.includeSecrets = mkDefault [ ../../secrets/ssh-home.age ];
|
||||
git.signing = mkDefault true;
|
||||
hub.enable = mkDefault true;
|
||||
firefox.arkenfox = {
|
||||
enable = mkDefault true;
|
||||
overrides = mkDefault {
|
||||
## arkenfox overrides
|
||||
# automatic search
|
||||
"keyword.enabled" = true;
|
||||
"browser.search.suggest.enabled" = true;
|
||||
"browser.urlbar.suggest.searches" = true;
|
||||
|
||||
# drm
|
||||
"media.eme.enabled" = true;
|
||||
# startup page
|
||||
"browser.startup.homepage" = "https://searxng.moritzboeh.me/";
|
||||
"browser.startup.page" = 1;
|
||||
|
||||
# sanitisation
|
||||
"privacy.clearOnShutdown.history" = false;
|
||||
# drm
|
||||
"media.eme.enabled" = true;
|
||||
|
||||
# disable letterboxing
|
||||
"privacy.resistFingerprinting.letterboxing" = false;
|
||||
# sanitisation
|
||||
"privacy.clearOnShutdown.history" = false;
|
||||
|
||||
## OTHER
|
||||
# Dont show warning when accessing about:config
|
||||
"browser.aboutConfig.showWarning" = false;
|
||||
# disable letterboxing
|
||||
"privacy.resistFingerprinting.letterboxing" = false;
|
||||
|
||||
# Hide bookmarks
|
||||
"browser.toolbars.bookmarks.visibility" = "never";
|
||||
## OTHER
|
||||
# Dont show warning when accessing about:config
|
||||
"browser.aboutConfig.showWarning" = false;
|
||||
|
||||
# Smooth scrolling
|
||||
"general.smoothScroll.lines.durationMaxMS" = 125;
|
||||
"general.smoothScroll.lines.durationMinMS" = 125;
|
||||
"general.smoothScroll.mouseWheel.durationMaxMS" = 200;
|
||||
"general.smoothScroll.mouseWheel.durationMinMS" = 100;
|
||||
"general.smoothScroll.msdPhysics.enabled" = true;
|
||||
"general.smoothScroll.other.durationMaxMS" = 125;
|
||||
"general.smoothScroll.other.durationMinMS" = 125;
|
||||
"general.smoothScroll.pages.durationMaxMS" = 125;
|
||||
"general.smoothScroll.pages.durationMinMS" = 125;
|
||||
"mousewheel.min_line_scroll_amount" = 40;
|
||||
"mousewheel.system_scroll_override_on_root_content.enabled" = true;
|
||||
"mousewheel.system_scroll_override_on_root_content.horizontal.factor" = 175;
|
||||
"mousewheel.system_scroll_override_on_root_content.vertical.factor" = 175;
|
||||
"toolkit.scrollbox.horizontalScrollDistance" = 6;
|
||||
"toolkit.scrollbox.verticalScrollDistance" = 2;
|
||||
# Hide bookmarks
|
||||
"browser.toolbars.bookmarks.visibility" = "never";
|
||||
|
||||
# Smooth scrolling
|
||||
"general.smoothScroll.lines.durationMaxMS" = 125;
|
||||
"general.smoothScroll.lines.durationMinMS" = 125;
|
||||
"general.smoothScroll.mouseWheel.durationMaxMS" = 200;
|
||||
"general.smoothScroll.mouseWheel.durationMinMS" = 100;
|
||||
"general.smoothScroll.msdPhysics.enabled" = true;
|
||||
"general.smoothScroll.other.durationMaxMS" = 125;
|
||||
"general.smoothScroll.other.durationMinMS" = 125;
|
||||
"general.smoothScroll.pages.durationMaxMS" = 125;
|
||||
"general.smoothScroll.pages.durationMinMS" = 125;
|
||||
"mousewheel.min_line_scroll_amount" = 40;
|
||||
"mousewheel.system_scroll_override_on_root_content.enabled" = true;
|
||||
"mousewheel.system_scroll_override_on_root_content.horizontal.factor" = 175;
|
||||
"mousewheel.system_scroll_override_on_root_content.vertical.factor" = 175;
|
||||
"toolkit.scrollbox.horizontalScrollDistance" = 6;
|
||||
"toolkit.scrollbox.verticalScrollDistance" = 2;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,23 @@
|
|||
{ pkgs }:
|
||||
{ lib
|
||||
, config
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.my.profiles.ripping;
|
||||
in
|
||||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
# ripping
|
||||
abcde
|
||||
handbrake
|
||||
picard
|
||||
];
|
||||
options.my.profiles.ripping.enable = mkEnableOption "ripping profile";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
# ripping
|
||||
abcde
|
||||
handbrake
|
||||
picard
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
{ lib, ... }:
|
||||
|
||||
{
|
||||
imports = lib.my.listModules ./.;
|
||||
}
|
||||
|
|
@ -48,7 +48,7 @@ in
|
|||
enable = true;
|
||||
package = hyprland;
|
||||
recommendedEnvironment = true;
|
||||
extraConfig = import ./config.nix args;
|
||||
extraConfig = import ./_config.nix args;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ WALLPAPERS=$(find "$WALLPAPERS_PATH" -type f,l)
|
|||
|
||||
function help() {
|
||||
echo "Usage:"
|
||||
echo -e " wallpaper [OPTIONS] [PATH]"
|
||||
echo -e " wallpaper [OPTIONS] [PATH]"
|
||||
echo ""
|
||||
echo "Options:"
|
||||
echo -e " -h, --help \n\t Show this help message and exit"
|
||||
|
|
@ -60,12 +60,12 @@ done
|
|||
set -- "${POSITIONAL[@]}" # restore positional arguments
|
||||
|
||||
if [[ $# -gt 1 ]]; then
|
||||
help
|
||||
exit 1
|
||||
help
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ $# -eq 1 ]]; then
|
||||
WALLPAPER="$1"
|
||||
WALLPAPER="$1"
|
||||
fi
|
||||
|
||||
if [[ -z ${WALLPAPER+x} ]]; then
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
{ lib, ... }:
|
||||
|
||||
{
|
||||
imports = lib.my.listModules ./.;
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{ lib, ... }:
|
||||
|
||||
{
|
||||
imports = lib.my.listModules ./.;
|
||||
}
|
||||
Loading…
Reference in a new issue