From 7b3f4c3e8fa2a652df02b6c58d5d7270671c96fe Mon Sep 17 00:00:00 2001 From: Ahwx Date: Mon, 15 Jul 2024 07:47:56 +0200 Subject: [PATCH 1/6] fix: wrong path --- hosts/violet/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/violet/default.nix b/hosts/violet/default.nix index 5081bf4..dcd790c 100644 --- a/hosts/violet/default.nix +++ b/hosts/violet/default.nix @@ -3,7 +3,6 @@ imports = [ ./hardware-configuration.nix ./../../modules/core - ./../../modules/core/sshd ]; networking.hostName = "violet"; From 84ce300e0e6037d592bd6842b13a76fc16d397b6 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Mon, 15 Jul 2024 07:54:26 +0200 Subject: [PATCH 2/6] fix: move hostname to host itself --- modules/core/default.nix | 19 ++++++++++--------- modules/core/network.nix | 7 +++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/core/default.nix b/modules/core/default.nix index bdb2456..b7b9e22 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -1,18 +1,19 @@ { ... }: { imports = - [(import ./bootloader.nix)] - ++ [(import ./hardware.nix)] - ++ [(import ./xserver.nix)] + # [(import ./bootloader.nix)] + [(import ./hardware.nix)] + # ++ [(import ./xserver.nix)] ++ [(import ./network.nix)] - ++ [(import ./pipewire.nix)] + # ++ [(import ./pipewire.nix)] ++ [(import ./program.nix)] + ++ [(import ./sshd.nix)] ++ [(import ./security.nix)] ++ [(import ./services.nix)] ++ [(import ./system.nix)] - ++ [(import ./user.nix)] - ++ [(import ./bluetooth.nix)] - ++ [(import ./yubikey.nix)] - ++ [(import ./steam.nix)] - ++ [(import ./wayland.nix)]; + ++ [(import ./user.nix)]; + # ++ [(import ./bluetooth.nix)] + # ++ [(import ./yubikey.nix)] + # ++ [(import ./steam.nix)] + # ++ [(import ./wayland.nix)]; } diff --git a/modules/core/network.nix b/modules/core/network.nix index 90db713..2c80cdb 100644 --- a/modules/core/network.nix +++ b/modules/core/network.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { networking = { - hostName = "sakura"; networkmanager.enable = true; nameservers = [ "9.9.9.9" ]; firewall = { @@ -15,7 +14,7 @@ }; }; - environment.systemPackages = with pkgs; [ - networkmanagerapplet - ]; + # environment.systemPackages = with pkgs; [ + # networkmanagerapplet + # ]; } From f01d71d5628cde2fffb1c05adb22785ee6cdd3e5 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Mon, 15 Jul 2024 07:54:38 +0200 Subject: [PATCH 3/6] feat: adds hostname --- hosts/sakura/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix index f07e763..61a9bd0 100644 --- a/hosts/sakura/default.nix +++ b/hosts/sakura/default.nix @@ -5,6 +5,8 @@ ./../../modules/core ]; + networking.hostName = "sakura"; + environment.systemPackages = with pkgs; [ acpi brightnessctl From 256e60911c7fdb48bdbd4d2eb2286a84e8225b9d Mon Sep 17 00:00:00 2001 From: Ahwx Date: Mon, 15 Jul 2024 10:08:16 +0200 Subject: [PATCH 4/6] feat: adds `violet`-specific config --- modules/home/default.violet.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 modules/home/default.violet.nix diff --git a/modules/home/default.violet.nix b/modules/home/default.violet.nix new file mode 100644 index 0000000..ef42f98 --- /dev/null +++ b/modules/home/default.violet.nix @@ -0,0 +1,10 @@ +{ ...}: { + imports = + [(import ./bat.nix)] # better cat command + ++ [(import ./git.nix)] # version control + ++ [(import ./nvim.nix)] # neovim editor + ++ [(import ./packages.nix)] # other packages + ++ [(import ./scripts/scripts.nix)] # personal scripts + ++ [(import ./zsh.nix)] # shell + ++ [(import ./tmux.nix)]; # terminal multiplexer +} From d646321d71497cb1fa79f9b405a6ffe1c33cefbd Mon Sep 17 00:00:00 2001 From: Ahwx Date: Mon, 15 Jul 2024 10:09:04 +0200 Subject: [PATCH 5/6] fix: disable `cpupower-gui` --- hosts/violet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/violet/default.nix b/hosts/violet/default.nix index dcd790c..08a8c8e 100644 --- a/hosts/violet/default.nix +++ b/hosts/violet/default.nix @@ -18,7 +18,7 @@ services = { thermald.enable = true; - cpupower-gui.enable = true; + # cpupower-gui.enable = true; # power-profiles-daemon.enable = true; upower = { From 0bf365b417a630f02b2b2d99dd0630478b4c6943 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Mon, 15 Jul 2024 10:09:49 +0200 Subject: [PATCH 6/6] feat: make it so all changes can be synced a bit cleaner for all machines --- modules/core/user.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/core/user.nix b/modules/core/user.nix index 95b9fc4..283aecc 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -9,6 +9,8 @@ imports = if (host == "desktop") then [ ./../home/default.desktop.nix ] + else if (host == "violet") then + [ ./../home/default.violet.nix ] else [ ./../home ]; home = { username = "${username}";