From 6a62fed7d4e77de42361a72d6d1d36c5059de05d Mon Sep 17 00:00:00 2001 From: Superredstone Date: Sun, 12 Oct 2025 08:41:56 +0200 Subject: [PATCH] Made server config easier --- flake.nix | 3 ++- machines/bomba/configuration.nix | 6 +++--- modules/nix-config/default.nix | 9 +++++---- modules/packages.nix | 9 +++++---- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index a7a40a1..ec6d6d6 100644 --- a/flake.nix +++ b/flake.nix @@ -50,7 +50,7 @@ user = "r3ddy"; email = personalEmail; gamingSystem = true; - # Currently supported: plasma, gnome, hyprland + # Currently supported: plasma, gnome, hyprland and none desktopEnvironment = "gnome"; }; nixosConfigurations.workstation = mkSystem "workstation" { @@ -64,6 +64,7 @@ system = "x86_64-linux"; email = personalEmail; user = "r3ddy"; + desktopEnvironment = "none"; }; }; } diff --git a/machines/bomba/configuration.nix b/machines/bomba/configuration.nix index fc84513..b09845e 100644 --- a/machines/bomba/configuration.nix +++ b/machines/bomba/configuration.nix @@ -24,7 +24,7 @@ networking.firewall.allowedUDPPorts = [ ]; # Or disable the firewall altogether. networking.firewall.enable = true; - xdg.portal.extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - ]; + # xdg.portal.extraPortals = with pkgs; [ + # xdg-desktop-portal-gtk + # ]; } diff --git a/modules/nix-config/default.nix b/modules/nix-config/default.nix index 86449ce..4e09d84 100644 --- a/modules/nix-config/default.nix +++ b/modules/nix-config/default.nix @@ -1,11 +1,12 @@ -{ pkgs, currentSystemUser, ... }: +{ pkgs, currentSystemUser, currentSystemDe, ... }: { imports = [ + ./keyboard.nix + ] ++ (if (currentSystemDe != "none") then [ + ./sound.nix ./fonts.nix ./de.nix - ./sound.nix - ./keyboard.nix - ]; + ] else []); time.timeZone = "Europe/Rome"; diff --git a/modules/packages.nix b/modules/packages.nix index 4d044d7..b82cdd3 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -41,7 +41,7 @@ vim # The only and one great editor inputs.nixvim.packages.${system}.default # The only and one great editor improved even further - + ] ++ (if currentSystemDe != "none" then [ # Video card vulkan-tools @@ -53,7 +53,8 @@ mpv piper telegram-desktop - ] ++ (if gamingSystem then [ + ] else []) + ++ (if gamingSystem then [ archipelago dolphin-emu heroic @@ -63,12 +64,12 @@ prismlauncher protonplus vesktop - ] else [] + ] else []) ++ (if workSystem then [ android-studio ansible virt-manager - ] else [])) + ] else []) ++ (if currentSystemDe == "plasma" then [ kdePackages.wallpaper-engine-plugin ] else [])