From d430a17321e5ad29a3d6669a9c4cf34e96a7681d Mon Sep 17 00:00:00 2001 From: Tyler Kelley Date: Mon, 22 Jan 2024 15:33:59 -0600 Subject: [PATCH] Trying to get rid of gdm and apparently lightdm --- config/system/services.nix | 5 ----- flake.lock | 6 +++--- system.nix | 12 +++++++++++- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/config/system/services.nix b/config/system/services.nix index e0dcd5f..b13cb19 100644 --- a/config/system/services.nix +++ b/config/system/services.nix @@ -10,10 +10,6 @@ xkbVariant = ""; libinput.enable = true; videoDrivers = [ "amdgpu" ]; - displayManager.gdm = { - enable = true; - wayland = true; - }; }; services.pipewire = { enable = true; @@ -31,5 +27,4 @@ hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot services.blueman.enable = true; - services.mpris-proxy.enable = true; # enables playback control from Bluetooth headphones } diff --git a/flake.lock b/flake.lock index 8eabff5..7ceea56 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705641746, - "narHash": "sha256-D6c2aH8HQbWc7ZWSV0BUpFpd94ImFyCP8jFIsKQ4Slg=", + "lastModified": 1705774713, + "narHash": "sha256-j6ADaDH9XiumUzkTPlFyCBcoWYhO83lfgiSqEJF2zcs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d2003f2223cbb8cd95134e4a0541beea215c1073", + "rev": "1b64fc1287991a9cce717a01c1973ef86cb1af0b", "type": "github" }, "original": { diff --git a/system.nix b/system.nix index f1046ab..5e3d1a1 100644 --- a/system.nix +++ b/system.nix @@ -49,10 +49,11 @@ v4l-utils ydotool wl-clipboard socat cowsay lsd pkg-config meson hugo gnumake ninja go nodejs symbola noto-fonts-color-emoji material-icons brightnessctl + gnome.adwaita-icon-theme ]; programs.java.enable = true; - + programs.dconf.enable = true; programs.steam.gamescopeSession.enable = true; # Some programs need SUID wrappers, can be configured further or are @@ -67,6 +68,15 @@ POLKIT_BIN = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; }; + xdg = { + portal = { + extraPortals = with pkgs; [ + xdg-desktop-portal + xdg-desktop-portal-hyprland + ]; + }; + }; + # Optimization settings and garbage collection automation nix = { settings.auto-optimise-store = true;