From 66e1f407fe4894f7265f19a510169159ec3b8e8f Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Wed, 29 Jan 2025 20:09:56 +0100 Subject: [PATCH] refactor to base.nix --- hosts/yodaGaming/configuration.nix | 3 --- hosts/yodaHedgehog/configuration.nix | 3 --- hosts/yodaNas/configuration.nix | 3 --- hosts/yodaTab/configuration.nix | 3 --- hosts/yodaTux/configuration.nix | 3 --- hosts/yodaYoga/configuration.nix | 3 --- modules/base.nix | 7 +++++-- 7 files changed, 5 insertions(+), 20 deletions(-) diff --git a/hosts/yodaGaming/configuration.nix b/hosts/yodaGaming/configuration.nix index b38b1be..55642a1 100644 --- a/hosts/yodaGaming/configuration.nix +++ b/hosts/yodaGaming/configuration.nix @@ -17,9 +17,6 @@ ../../modules/ssh-client.nix ../../modules/ssh-server.nix - ../../modules/btrfs-scrub.nix - ../../modules/btrfs-mount-options.nix - #../../modules/headless.nix # #../../modules/kde.nix diff --git a/hosts/yodaHedgehog/configuration.nix b/hosts/yodaHedgehog/configuration.nix index e61d860..485e95f 100644 --- a/hosts/yodaHedgehog/configuration.nix +++ b/hosts/yodaHedgehog/configuration.nix @@ -27,9 +27,6 @@ ../../modules/de-p1st-monitor.nix ../../modules/spin-down/hdparm.nix ../../modules/spin-down/hd-idle.nix - - ../../modules/btrfs-scrub.nix - ../../modules/btrfs-mount-options.nix ]; networking.hostName = "yodaHedgehog"; diff --git a/hosts/yodaNas/configuration.nix b/hosts/yodaNas/configuration.nix index 596cfb5..ddf9681 100644 --- a/hosts/yodaNas/configuration.nix +++ b/hosts/yodaNas/configuration.nix @@ -31,9 +31,6 @@ ../../modules/de-p1st-monitor.nix ../../modules/spin-down/hdparm.nix ../../modules/spin-down/hd-idle.nix - - ../../modules/btrfs-scrub.nix - ../../modules/btrfs-mount-options.nix ]; networking.hostName = "yodaNas"; diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix index ac1ea67..0413bfc 100644 --- a/hosts/yodaTab/configuration.nix +++ b/hosts/yodaTab/configuration.nix @@ -19,9 +19,6 @@ ../../modules/ssh-server.nix ../../modules/lid-switch-handling.nix - ../../modules/btrfs-scrub.nix - ../../modules/btrfs-mount-options.nix - #../../modules/headless.nix # #../../modules/kde.nix diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix index 9928348..346e421 100644 --- a/hosts/yodaTux/configuration.nix +++ b/hosts/yodaTux/configuration.nix @@ -39,9 +39,6 @@ ../../modules/lid-switch-handling.nix #../../modules/package-list.nix - ../../modules/btrfs-scrub.nix - ../../modules/btrfs-mount-options.nix - #../../modules/headless.nix # #../../modules/kde.nix diff --git a/hosts/yodaYoga/configuration.nix b/hosts/yodaYoga/configuration.nix index 7c01978..380e545 100644 --- a/hosts/yodaYoga/configuration.nix +++ b/hosts/yodaYoga/configuration.nix @@ -18,9 +18,6 @@ ../../modules/lid-switch-handling.nix ../../modules/sendmail-mta.nix ../../modules/journalwatch.nix - - ../../modules/btrfs-scrub.nix - ../../modules/btrfs-mount-options.nix ]; #foo = throw "NixOS rebuild boot required to update to 24.05"; diff --git a/modules/base.nix b/modules/base.nix index a7152d8..c313ca5 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -1,8 +1,11 @@ { config, pkgs, ... }: { imports = [ - # Shell settings - #. + # Filesystem settings. + ./btrfs-scrub.nix + ./btrfs-mount-options.nix + + # Shell settings. ./bash.nix # bash settings. ./zsh.nix # zsh as default shell for yoda and root. ./fzf.nix # Fuzzy command history and file search.