From 7f2945d8ee0cd80f29ff86b4ab5ce831a4e29b6f Mon Sep 17 00:00:00 2001 From: ISnortPennies Date: Sat, 4 Feb 2023 01:15:31 -0500 Subject: [PATCH] switched laptop to gnome --- modules/boot.nix | 2 +- modules/gaming.nix | 21 ++++++++--------- modules/gnome.nix | 59 ++++++++++++++++++++++++++-------------------- 3 files changed, 45 insertions(+), 37 deletions(-) diff --git a/modules/boot.nix b/modules/boot.nix index d1b3705..ff39307 100644 --- a/modules/boot.nix +++ b/modules/boot.nix @@ -7,7 +7,7 @@ }; boot = { blacklistedKernelModules = ["nouveau" "lbm-nouveau" "pcspkr"]; - kernelParams = ["fbcon=nodefer" "bgrt_disable" "quiet" "splash" "systemd.show_status=false" "rd.udev.log_level=3" "vt.global_cursor_default=0"]; + kernelParams = ["fbcon=nodefer" "bgrt_disable" "quiet" "systemd.show_status=false" "rd.udev.log_level=3" "vt.global_cursor_default=0"]; consoleLogLevel = 0; initrd.verbose = false; plymouth = { diff --git a/modules/gaming.nix b/modules/gaming.nix index df64a33..9f3a1cf 100644 --- a/modules/gaming.nix +++ b/modules/gaming.nix @@ -3,15 +3,14 @@ inputs, ... }: { - environment.systemPackages = with pkgs; - [ - heroic - legendary-gl - prismlauncher - ]; - programs.steam = { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server -}; + environment.systemPackages = with pkgs; [ + heroic + legendary-gl + prismlauncher + ]; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; } diff --git a/modules/gnome.nix b/modules/gnome.nix index 4025409..161ee05 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -1,28 +1,36 @@ - { pkgs, settings, ... }: { -environment.gnome.excludePackages = (with pkgs; [ - gnome-photos - gnome-tour -]) ++ (with pkgs.gnome; [ - cheese # webcam tool - gnome-music - gnome-terminal - gedit # text editor - epiphany # web browser - geary # email reader - evince # document viewer - gnome-characters - totem # video player - tali # poker game - iagno # go game - hitori # sudoku game - atomix # puzzle game -]); - + environment.gnome.excludePackages = + (with pkgs; [ + gnome-photos + gnome-tour + ]) + ++ (with pkgs.gnome; [ + cheese # webcam tool + gnome-music + gnome-terminal + gedit # text editor + epiphany # web browser + geary # email reader + evince # document viewer + gnome-characters + totem # video player + tali # poker game + iagno # go game + hitori # sudoku game + atomix # puzzle game + ]); + dconf.settings = { + "org/gnome/desktop/background" = { + "picture-uri" = "${../images/recursion.png}"; + }; + "org/gnome/desktop/screensaver" = { + "picture-uri" = "${../images/recursion.png}"; + }; + }; services.xserver = { enable = true; exportConfiguration = true; #make config debuggable @@ -31,12 +39,13 @@ environment.gnome.excludePackages = (with pkgs; [ xautolock.enable = false; desktopManager.xterm.enable = false; excludePackages = [pkgs.xterm]; - desktopManager.gnome.enable = true; + desktopManager.gnome.enable = true; displayManager = { - sessionCommands = '' - feh --bg-scale ${../images/recursion.png} - ''; + autoLogin = { + enable = true; + user = settings.username; + }; gdm.enable = true; -}; }; + }; }