From ec1251c8f70743e17f9cbc956626cefaa9b70857 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 22 Mar 2025 17:16:45 -0400 Subject: [PATCH] Move stuff, rm nix-gaming --- .../quadraticpc}/hardware-configuration.nix | 0 {quadraticpc => clients/quadraticpc}/monitor.nix | 0 clients/quadraticpc/name.nix | 1 + clients/quadraticserver/name.nix | 1 + clients/quadraticserver/ssh.nix | 10 ++++++++++ .../quadtop}/hardware-configuration.nix | 0 clients/quadtop/name.nix | 1 + .../configuration.nix => clients/quadtop/nvidia.nix | 1 - flake.nix | 4 +--- modules/common-desktop/packages.nix | 11 +---------- modules/common/nix-gaming.nix | 6 ------ modules/common/packages.nix | 9 +++++++-- quadraticpc/configuration.nix | 4 ---- 13 files changed, 22 insertions(+), 26 deletions(-) rename {quadraticpc => clients/quadraticpc}/hardware-configuration.nix (100%) rename {quadraticpc => clients/quadraticpc}/monitor.nix (100%) create mode 100755 clients/quadraticpc/name.nix create mode 100644 clients/quadraticserver/name.nix create mode 100644 clients/quadraticserver/ssh.nix rename {quadtop => clients/quadtop}/hardware-configuration.nix (100%) create mode 100755 clients/quadtop/name.nix rename quadtop/configuration.nix => clients/quadtop/nvidia.nix (93%) mode change 100755 => 100644 delete mode 100644 modules/common/nix-gaming.nix delete mode 100755 quadraticpc/configuration.nix diff --git a/quadraticpc/hardware-configuration.nix b/clients/quadraticpc/hardware-configuration.nix similarity index 100% rename from quadraticpc/hardware-configuration.nix rename to clients/quadraticpc/hardware-configuration.nix diff --git a/quadraticpc/monitor.nix b/clients/quadraticpc/monitor.nix similarity index 100% rename from quadraticpc/monitor.nix rename to clients/quadraticpc/monitor.nix diff --git a/clients/quadraticpc/name.nix b/clients/quadraticpc/name.nix new file mode 100755 index 0000000..eda8ad5 --- /dev/null +++ b/clients/quadraticpc/name.nix @@ -0,0 +1 @@ +{networking.hostName = "quadraticpc";} diff --git a/clients/quadraticserver/name.nix b/clients/quadraticserver/name.nix new file mode 100644 index 0000000..fa958aa --- /dev/null +++ b/clients/quadraticserver/name.nix @@ -0,0 +1 @@ +{networking.hostName = "quadraticserver";} diff --git a/clients/quadraticserver/ssh.nix b/clients/quadraticserver/ssh.nix new file mode 100644 index 0000000..22b0bad --- /dev/null +++ b/clients/quadraticserver/ssh.nix @@ -0,0 +1,10 @@ +{ + services.openssh = { + enable = true; + settings = { + PasswordAuthentication = true; + AllowUsers = ["quadradical"]; + PermitRootLogin = "no"; + }; + }; +} diff --git a/quadtop/hardware-configuration.nix b/clients/quadtop/hardware-configuration.nix similarity index 100% rename from quadtop/hardware-configuration.nix rename to clients/quadtop/hardware-configuration.nix diff --git a/clients/quadtop/name.nix b/clients/quadtop/name.nix new file mode 100755 index 0000000..0d7bb8c --- /dev/null +++ b/clients/quadtop/name.nix @@ -0,0 +1 @@ +{networking.hostName = "quadtop";} diff --git a/quadtop/configuration.nix b/clients/quadtop/nvidia.nix old mode 100755 new mode 100644 similarity index 93% rename from quadtop/configuration.nix rename to clients/quadtop/nvidia.nix index 7a709cf..d14c106 --- a/quadtop/configuration.nix +++ b/clients/quadtop/nvidia.nix @@ -19,5 +19,4 @@ programs.gamemode.enable = true; environment.sessionVariables.GAMEMODERUNEXEC = "nvidia-offload"; services.xserver.videoDrivers = ["nvidia"]; - networking.hostName = "quadtop"; } diff --git a/flake.nix b/flake.nix index d6b771c..ad2d364 100755 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; stylix.url = "github:danth/stylix"; - nix-gaming.url = "github:fufexan/nix-gaming"; firefox-gnome-theme = { url = "github:rafaelmardojai/firefox-gnome-theme"; flake = false; @@ -42,9 +41,8 @@ [ ./wrappers inputs.agenix.nixosModules.default - inputs.nix-gaming.nixosModules.pipewireLowLatency ] - ++ dirFiles ".nix" "${inputs.self}/${hostname}" + ++ dirFiles ".nix" "${./clients}/${hostname}" ++ dirFiles ".nix" ./modules/common ++ opt isDesktop ( (dirFiles ".nix" ./modules/common-desktop) diff --git a/modules/common-desktop/packages.nix b/modules/common-desktop/packages.nix index f944c3d..77d3128 100644 --- a/modules/common-desktop/packages.nix +++ b/modules/common-desktop/packages.nix @@ -1,12 +1,6 @@ -{ - pkgs, - inputs, - ... -}: { +{pkgs, ...}: { services.xserver.excludePackages = [pkgs.xterm]; environment.systemPackages = with pkgs; [ - fd - tldr tuba gimp deno @@ -16,8 +10,6 @@ aspell muzika fractal - killall - ripgrep foliate inkscape r2modman @@ -33,6 +25,5 @@ android-studio nexusmods-app-unfree hunspellDicts.en_CA-large - inputs.nix-gaming.packages.${system}.wine-ge ]; } diff --git a/modules/common/nix-gaming.nix b/modules/common/nix-gaming.nix deleted file mode 100644 index 5bea6f5..0000000 --- a/modules/common/nix-gaming.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - nix.settings = { - substituters = ["https://nix-gaming.cachix.org"]; - trusted-public-keys = ["nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="]; - }; -} diff --git a/modules/common/packages.nix b/modules/common/packages.nix index 7c12c8b..1f3ac13 100644 --- a/modules/common/packages.nix +++ b/modules/common/packages.nix @@ -1,3 +1,8 @@ -{ - # Todo +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + fd + tldr + killall + ripgrep + ]; } diff --git a/quadraticpc/configuration.nix b/quadraticpc/configuration.nix deleted file mode 100755 index 2accfe6..0000000 --- a/quadraticpc/configuration.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - imports = [./monitor.nix]; - networking.hostName = "quadraticpc"; -}