delta/dotfiles
1
0
Fork 0
mirror of https://github.com/deltathetawastaken/dotfiles.git synced 2025-12-06 07:16:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

git huanan use noveau+wayland

Browse source
This commit is contained in:
delta 2024-06-08 01:40:38 +03:00
parent 240763631e
commit 9b2f7cd897
2 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
hosts/huanan/system.nix
View file

@ -1,11 +1,12 @@
{ lib, pkgs, inputs, self, ... }: { lib, pkgs, inputs, self, homeSettings, ... }:
{ {
imports = [ imports = [
./hardware.nix ./hardware.nix
"${self}/pkgs/gnome.nix" "${self}/pkgs/gnome.nix"
"${self}/pkgs/apps.nix" "${self}/pkgs/apps.nix"
inputs.home-manager.nixosModules.home-manager "${self}/pkgs/work.nix"
inputs.home-manager.nixosModules.home-manager homeSettings
]; ];
time.timeZone = "Europe/Moscow"; time.timeZone = "Europe/Moscow";
@ -13,11 +14,11 @@
services.xserver = { services.xserver = {
enable = true; enable = true;
videoDrivers = [ "nvidia" ]; videoDrivers = [ "noveau" ];
displayManager = { displayManager = {
gdm = { gdm = {
enable = true; enable = true;
wayland = false; wayland = true;
}; };
}; };
desktopManager.gnome.enable = true; desktopManager.gnome.enable = true;
@ -50,4 +51,4 @@
services.openssh.enable = true; services.openssh.enable = true;
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "23.11"; # Did you read the comment?
} }

19
pkgs/gnome.nix
View file

@ -30,19 +30,6 @@ in
# }) # })
# ]; # ];
nixpkgs.overlays = [
(self: super: {
qt6 = super.qt6 // {
qtwayland = super.qt6.qtwayland.overrideAttrs (oldAttrs: {
patches = (oldAttrs.patches or []) ++ [
./patches/0004-fix-gtk4-embedding.patch
];
});
};
}
)
];
#system.activationScripts."gnome_setup_misc".text = '' #system.activationScripts."gnome_setup_misc".text = ''
# rm -f /home/delta/.config/gtk-4.0/gtk.css # rm -f /home/delta/.config/gtk-4.0/gtk.css
# rm -f /home/delta/.config/gtk-3.0/gtk.css # rm -f /home/delta/.config/gtk-3.0/gtk.css
@ -163,15 +150,11 @@ in
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gnomeExtensions.appindicator
gnomeExtensions.activate-window-by-title gnomeExtensions.activate-window-by-title
stable.gnomeExtensions.unite
gnomeExtensions.tailscale-qs gnomeExtensions.tailscale-qs
gnomeExtensions.gsconnect gnomeExtensions.gsconnect
gnomeExtensions.clipboard-indicator gnomeExtensions.clipboard-indicator
gnomeExtensions.pip-on-top
gnomeExtensions.cloudflare-warp-toggle gnomeExtensions.cloudflare-warp-toggle
gnomeExtensions.tiling-assistant
gnomeExtensions.overview-background gnomeExtensions.overview-background
gnome.gnome-tweaks gnome.gnome-tweaks
mojave-gtk-theme mojave-gtk-theme
@ -209,4 +192,4 @@ in
gnome-initial-setup.enable = false; gnome-initial-setup.enable = false;
gnome-online-accounts.enable = false; gnome-online-accounts.enable = false;
}; };
} }