From 04eb69dbc82c4b54c08164486d27c8412cb86a6d Mon Sep 17 00:00:00 2001 From: Don Harper Date: Thu, 4 May 2023 21:18:28 -0500 Subject: [PATCH 1/2] refactoring! --- workstation/kde.nix => dm/kde/default.nix | 0 workstation/sway.nix => dm/sway/default.nix | 0 {workstation/home => home}/default.nix | 0 {workstation/home => home}/mpv.nix | 0 {workstation/home => home}/neovim.nix | 0 {workstation/home => home}/services.nix | 0 {ace => hosts/ace}/configuration.nix | 0 {ace => hosts/ace}/hardware-configuration.nix | 0 {dragon => hosts/dragon}/configuration.nix | 0 {dragon => hosts/dragon}/hardware-configuration.nix | 0 {eve => hosts/eve}/configuration.nix | 0 {eve => hosts/eve}/hardware-configuration.nix | 0 {loki => hosts/loki}/configuration.nix | 0 {loki => hosts/loki}/kernel.nix | 0 {pocket2 => hosts/pocket2}/configuration.nix | 0 {pocket2 => hosts/pocket2}/hardware-configuration.nix | 0 {smaug => hosts/smaug}/configuration.nix | 0 {vm1 => hosts/vm1}/configuration.nix | 0 {vm1 => hosts/vm1}/hardware-configuration.nix | 0 {workstation => users}/vicky.nix | 0 workstation/{configuration.nix => default.nix} | 0 21 files changed, 0 insertions(+), 0 deletions(-) rename workstation/kde.nix => dm/kde/default.nix (100%) rename workstation/sway.nix => dm/sway/default.nix (100%) rename {workstation/home => home}/default.nix (100%) rename {workstation/home => home}/mpv.nix (100%) rename {workstation/home => home}/neovim.nix (100%) rename {workstation/home => home}/services.nix (100%) rename {ace => hosts/ace}/configuration.nix (100%) rename {ace => hosts/ace}/hardware-configuration.nix (100%) rename {dragon => hosts/dragon}/configuration.nix (100%) rename {dragon => hosts/dragon}/hardware-configuration.nix (100%) rename {eve => hosts/eve}/configuration.nix (100%) rename {eve => hosts/eve}/hardware-configuration.nix (100%) rename {loki => hosts/loki}/configuration.nix (100%) rename {loki => hosts/loki}/kernel.nix (100%) rename {pocket2 => hosts/pocket2}/configuration.nix (100%) rename {pocket2 => hosts/pocket2}/hardware-configuration.nix (100%) rename {smaug => hosts/smaug}/configuration.nix (100%) rename {vm1 => hosts/vm1}/configuration.nix (100%) rename {vm1 => hosts/vm1}/hardware-configuration.nix (100%) rename {workstation => users}/vicky.nix (100%) rename workstation/{configuration.nix => default.nix} (100%) diff --git a/workstation/kde.nix b/dm/kde/default.nix similarity index 100% rename from workstation/kde.nix rename to dm/kde/default.nix diff --git a/workstation/sway.nix b/dm/sway/default.nix similarity index 100% rename from workstation/sway.nix rename to dm/sway/default.nix diff --git a/workstation/home/default.nix b/home/default.nix similarity index 100% rename from workstation/home/default.nix rename to home/default.nix diff --git a/workstation/home/mpv.nix b/home/mpv.nix similarity index 100% rename from workstation/home/mpv.nix rename to home/mpv.nix diff --git a/workstation/home/neovim.nix b/home/neovim.nix similarity index 100% rename from workstation/home/neovim.nix rename to home/neovim.nix diff --git a/workstation/home/services.nix b/home/services.nix similarity index 100% rename from workstation/home/services.nix rename to home/services.nix diff --git a/ace/configuration.nix b/hosts/ace/configuration.nix similarity index 100% rename from ace/configuration.nix rename to hosts/ace/configuration.nix diff --git a/ace/hardware-configuration.nix b/hosts/ace/hardware-configuration.nix similarity index 100% rename from ace/hardware-configuration.nix rename to hosts/ace/hardware-configuration.nix diff --git a/dragon/configuration.nix b/hosts/dragon/configuration.nix similarity index 100% rename from dragon/configuration.nix rename to hosts/dragon/configuration.nix diff --git a/dragon/hardware-configuration.nix b/hosts/dragon/hardware-configuration.nix similarity index 100% rename from dragon/hardware-configuration.nix rename to hosts/dragon/hardware-configuration.nix diff --git a/eve/configuration.nix b/hosts/eve/configuration.nix similarity index 100% rename from eve/configuration.nix rename to hosts/eve/configuration.nix diff --git a/eve/hardware-configuration.nix b/hosts/eve/hardware-configuration.nix similarity index 100% rename from eve/hardware-configuration.nix rename to hosts/eve/hardware-configuration.nix diff --git a/loki/configuration.nix b/hosts/loki/configuration.nix similarity index 100% rename from loki/configuration.nix rename to hosts/loki/configuration.nix diff --git a/loki/kernel.nix b/hosts/loki/kernel.nix similarity index 100% rename from loki/kernel.nix rename to hosts/loki/kernel.nix diff --git a/pocket2/configuration.nix b/hosts/pocket2/configuration.nix similarity index 100% rename from pocket2/configuration.nix rename to hosts/pocket2/configuration.nix diff --git a/pocket2/hardware-configuration.nix b/hosts/pocket2/hardware-configuration.nix similarity index 100% rename from pocket2/hardware-configuration.nix rename to hosts/pocket2/hardware-configuration.nix diff --git a/smaug/configuration.nix b/hosts/smaug/configuration.nix similarity index 100% rename from smaug/configuration.nix rename to hosts/smaug/configuration.nix diff --git a/vm1/configuration.nix b/hosts/vm1/configuration.nix similarity index 100% rename from vm1/configuration.nix rename to hosts/vm1/configuration.nix diff --git a/vm1/hardware-configuration.nix b/hosts/vm1/hardware-configuration.nix similarity index 100% rename from vm1/hardware-configuration.nix rename to hosts/vm1/hardware-configuration.nix diff --git a/workstation/vicky.nix b/users/vicky.nix similarity index 100% rename from workstation/vicky.nix rename to users/vicky.nix diff --git a/workstation/configuration.nix b/workstation/default.nix similarity index 100% rename from workstation/configuration.nix rename to workstation/default.nix From d6c5c9a76708aa1fb93c71309513a2b343cc4146 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Thu, 4 May 2023 21:18:47 -0500 Subject: [PATCH 2/2] refactoring! pt 2 --- hosts/eve/configuration.nix | 7 +++---- workstation/default.nix | 9 +++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hosts/eve/configuration.nix b/hosts/eve/configuration.nix index 8fcaf34..33f7f93 100644 --- a/hosts/eve/configuration.nix +++ b/hosts/eve/configuration.nix @@ -5,10 +5,9 @@ [ /etc/nixos/hardware-configuration.nix - /home/don/nixos/workstation/configuration.nix - /home/don/nixos/workstation/home - /home/don/nixos/workstation/sway.nix - /home/don/nixos/workstation/systemd.nix + /home/don/nixos/workstation + /home/don/nixos/home + /home/don/nixos/dm/sway ]; networking.hostName = "eve"; } diff --git a/workstation/default.nix b/workstation/default.nix index b5609bb..d8d6dda 100644 --- a/workstation/default.nix +++ b/workstation/default.nix @@ -11,6 +11,11 @@ let python-with-my-packages = pkgs.python311Full.withPackages my-python-packages; in { + imports = + [ + ./detect-reboot-needed.nix + ./systemd.nix + ]; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -22,10 +27,6 @@ in networking.enableIPv6 = false; # FIXME this is to test connectivity @ the office via wireguard networking.networkmanager.wifi.powersave = true; networking.useDHCP = false; -# networking.extraHosts = -# '' -# 100.75.7.116 harper.tail harper bandwidth.duckland.org bandwidth2.duckland.org cal.duckland.org cloud.duckland.org dash.duckland.org git.duckland.org jelly.duckland.org music.duckland.org photos.duckland.org plex.duckland.org rss.duckland.org smart.duckland.org vault.duckland.org webhook.home.duckland.org -# ''; # Set your time zone. time.timeZone = "America/Chicago";