diff --git a/machines/renoir/configuration.nix b/machines/renoir/configuration.nix index d62ad49..090666a 100644 --- a/machines/renoir/configuration.nix +++ b/machines/renoir/configuration.nix @@ -1,55 +1,7 @@ -{ - self, - pkgs, - ... -}: { imports = [ - self.nixosModules.atuin-config - self.nixosModules.desktop - self.nixosModules.nix-defaults - self.nixosModules.steam - ../haze/syncthing.nix - { - services.nginx = { - enable = true; - # recommendedProxySettings = true; - # recommendedTlsSettings = true; - }; - - networking.firewall.interfaces."ygg".allowedTCPPorts = [ - 80 - 443 - ]; - } - - self.inputs.home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.rpqt = ./home.nix; - home-manager.extraSpecialArgs = { - inherit self; - }; - } - - { - programs.niri.enable = true; - - environment.systemPackages = with pkgs; [ - pavucontrol - playerctl - xwayland-satellite - ]; - - services.gnome.gnome-keyring.enable = true; - - environment.sessionVariables.NIXOS_OZONE_WL = "1"; - - programs.dms-shell.enable = true; - - security.acme.acceptTerms = true; - } ]; + + # New machine! } diff --git a/machines/renoir/home.nix b/machines/renoir/home.nix deleted file mode 100644 index 315bfe5..0000000 --- a/machines/renoir/home.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ self, ... }: -{ - imports = [ - self.homeModules.chat - self.homeModules.common - self.homeModules.desktop - self.homeModules.dev - self.homeModules.helix - self.homeModules.mail - self.homeModules.desktop - self.homeModules.niri - self.homeModules.vicinae - ]; -} diff --git a/nixosModules/desktop.nix b/nixosModules/desktop.nix index ab10a8b..dfb2a6c 100644 --- a/nixosModules/desktop.nix +++ b/nixosModules/desktop.nix @@ -42,7 +42,8 @@ hardware.bluetooth.enable = true; services.displayManager = { - gdm.enable = true; + sddm.enable = true; + sddm.wayland.enable = true; }; # Display manager keyboard layout @@ -50,6 +51,4 @@ enable = true; xkb.layout = "fr"; }; - - programs.kdeconnect.enable = true; }