From 9943aec1af5203196d5bf68e689a1236009b2f13 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Thu, 7 Sep 2023 22:15:58 +0200 Subject: [PATCH] refactor --- hosts/yodaTab/configuration.nix | 21 ++++++++++++++++--- hosts/yodaTab/home-manager.nix | 18 ---------------- hosts/yodaTux/configuration.nix | 21 ++++++++++++++++--- hosts/yodaTux/home-manager.nix | 18 ---------------- ...gnome-config.home.nix => gnome-config.nix} | 0 ...tensions.home.nix => gnome-extensions.nix} | 0 ....home.nix => gnome-fractional-scaling.nix} | 0 ...-ssh-gpg.home.nix => nitrokey-ssh-gpg.nix} | 0 .../{thunderbird.home.nix => thunderbird.nix} | 0 modules/{zsh.home.nix => zsh.nix} | 0 10 files changed, 36 insertions(+), 42 deletions(-) delete mode 100644 hosts/yodaTab/home-manager.nix delete mode 100644 hosts/yodaTux/home-manager.nix rename modules/{gnome-config.home.nix => gnome-config.nix} (100%) rename modules/{gnome-extensions.home.nix => gnome-extensions.nix} (100%) rename modules/{gnome-fractional-scaling.home.nix => gnome-fractional-scaling.nix} (100%) rename modules/{nitrokey-ssh-gpg.home.nix => nitrokey-ssh-gpg.nix} (100%) rename modules/{thunderbird.home.nix => thunderbird.nix} (100%) rename modules/{zsh.home.nix => zsh.nix} (100%) diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix index 4a958e2..c7089f2 100644 --- a/hosts/yodaTab/configuration.nix +++ b/hosts/yodaTab/configuration.nix @@ -3,15 +3,22 @@ # and in the NixOS manual (accessible by running `nixos-help`). { config, pkgs, ... }: - +let + # Import Home Manager with niv. + home-manager = (import ../../nix/sources.nix).home-manager; +in { # Paths to other modules. # Compose this module out of smaller ones. # https://nixos.wiki/wiki/NixOS_modules imports = - [ # Include the results of the hardware scan. + [ + # Include the results of the hardware scan. ./hardware-configuration.nix - ./home-manager.nix + + (import "${home-manager}/nixos") + ../../modules/home-manager.nix + ../../modules/base.nix ../../modules/programs.nix ../../modules/autostart.nix @@ -19,6 +26,14 @@ ../../modules/print-and-scan.nix #../../modules/fde-ssh-unlock.nix ../../modules/nextcloud-integration.nix + + ../../modules/gnome-config.nix + ../../modules/gnome-extensions.nix + #../../modules/gnome-fractional-scaling.nix + ../../modules/git.nix + ../../modules/zsh.nix + ../../modules/nitrokey-ssh-gpg.nix + ../../modules/thunderbird.nix ]; networking.hostName = "yodaTab"; diff --git a/hosts/yodaTab/home-manager.nix b/hosts/yodaTab/home-manager.nix deleted file mode 100644 index 749f554..0000000 --- a/hosts/yodaTab/home-manager.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, pkgs, ... }: -let - # Import Home Manager with niv. - home-manager = (import ../../nix/sources.nix).home-manager; -in -{ - imports = [ - (import "${home-manager}/nixos") - ../../modules/home-manager.nix - ../../modules/gnome-config.home.nix - ../../modules/gnome-extensions.home.nix - #../../modules/gnome-fractional-scaling.home.nix - ../../modules/git.nix - ../../modules/zsh.home.nix - ../../modules/nitrokey-ssh-gpg.home.nix - ../../modules/thunderbird.home.nix - ]; -} diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix index cc77b9c..d13eee7 100644 --- a/hosts/yodaTux/configuration.nix +++ b/hosts/yodaTux/configuration.nix @@ -3,15 +3,22 @@ # and in the NixOS manual (accessible by running `nixos-help`). { config, pkgs, ... }: - +let + # Import Home Manager with niv. + home-manager = (import ../../nix/sources.nix).home-manager; +in { # Paths to other modules. # Compose this module out of smaller ones. # https://nixos.wiki/wiki/NixOS_modules imports = - [ # Include the results of the hardware scan. + [ + # Include the results of the hardware scan. ./hardware-configuration.nix - ./home-manager.nix + + (import "${home-manager}/nixos") + ../../modules/home-manager.nix + ../../modules/base.nix ../../modules/programs.nix ../../modules/autostart.nix @@ -19,6 +26,14 @@ ../../modules/print-and-scan.nix ../../modules/fde-ssh-unlock.nix ../../modules/nextcloud-integration.nix + + ../../modules/gnome-config.nix + ../../modules/gnome-extensions.nix + ../../modules/gnome-fractional-scaling.nix + ../../modules/git.nix + ../../modules/zsh.nix + ../../modules/nitrokey-ssh-gpg.nix + ../../modules/thunderbird.nix ]; networking.hostName = "yodaTux"; diff --git a/hosts/yodaTux/home-manager.nix b/hosts/yodaTux/home-manager.nix deleted file mode 100644 index 56ba6b2..0000000 --- a/hosts/yodaTux/home-manager.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, pkgs, ... }: -let - # Import Home Manager with niv. - home-manager = (import ../../nix/sources.nix).home-manager; -in -{ - imports = [ - (import "${home-manager}/nixos") - ../../modules/home-manager.nix - ../../modules/gnome-config.home.nix - ../../modules/gnome-extensions.home.nix - ../../modules/gnome-fractional-scaling.home.nix - ../../modules/git.nix - ../../modules/zsh.home.nix - ../../modules/nitrokey-ssh-gpg.home.nix - ../../modules/thunderbird.home.nix - ]; -} diff --git a/modules/gnome-config.home.nix b/modules/gnome-config.nix similarity index 100% rename from modules/gnome-config.home.nix rename to modules/gnome-config.nix diff --git a/modules/gnome-extensions.home.nix b/modules/gnome-extensions.nix similarity index 100% rename from modules/gnome-extensions.home.nix rename to modules/gnome-extensions.nix diff --git a/modules/gnome-fractional-scaling.home.nix b/modules/gnome-fractional-scaling.nix similarity index 100% rename from modules/gnome-fractional-scaling.home.nix rename to modules/gnome-fractional-scaling.nix diff --git a/modules/nitrokey-ssh-gpg.home.nix b/modules/nitrokey-ssh-gpg.nix similarity index 100% rename from modules/nitrokey-ssh-gpg.home.nix rename to modules/nitrokey-ssh-gpg.nix diff --git a/modules/thunderbird.home.nix b/modules/thunderbird.nix similarity index 100% rename from modules/thunderbird.home.nix rename to modules/thunderbird.nix diff --git a/modules/zsh.home.nix b/modules/zsh.nix similarity index 100% rename from modules/zsh.home.nix rename to modules/zsh.nix