diff --git a/common/desktop.nix b/common/desktop.nix index a17f9ba..dc8b6ef 100644 --- a/common/desktop.nix +++ b/common/desktop.nix @@ -2,21 +2,17 @@ { - # Enable the GNOME Desktop Environment. - services.xserver.enable = true; - services.xserver.displayManager.gdm = { + services.xserver = { enable = true; - wayland = false; + displayManager = { + startx.enable = true; + gdm = { + enable = true; + wayland = false; + }; + }; + desktopManager.gnome.enable = true; }; - services.xserver.desktopManager.gnome.enable = true; - services.logrotate.checkConfig = false; - - services.xserver.displayManager = { - autoLogin.enable = true; - autoLogin.user = "dave"; - job.preStart = "sleep 5"; - }; - } diff --git a/common/packages.nix b/common/packages.nix index f5a5a0b..ffd9ec1 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -181,6 +181,7 @@ in minecraft mojave-gtk-theme netdata + nvfancontrol pavucontrol pinentry-curses postman diff --git a/flake.lock b/flake.lock index 524da52..f56216e 100644 --- a/flake.lock +++ b/flake.lock @@ -81,11 +81,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1653533365, - "narHash": "sha256-tPFBnXXBf2fxHtk5e9//7BL6LbxthtYkgznjNMrx9Ls=", + "lastModified": 1653602345, + "narHash": "sha256-HJOCS3nrZn9XmdtrRYtE3c/THGSduROYN7c4eXkM6gY=", "owner": "neovim", "repo": "neovim", - "rev": "7b952793d5c46e862a9cdec3d6ac4762370296ed", + "rev": "e2940d3c79586503c0a645010ae56c7097ca7c3f", "type": "github" }, "original": { @@ -102,11 +102,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1653553105, - "narHash": "sha256-jyWSZMHmaGUmHq3Susugsf6a1/ejR9aaUaZHJ+qoOcs=", + "lastModified": 1653639429, + "narHash": "sha256-pzGqMCjWzluNLelTsEf6ZvNqfit8tRlOqoK3MsGZtgs=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "548165a9d107cb9d4ac84ede0ec6ff5dc815a447", + "rev": "b2cf1606e66564f1d277e76aec8bf7474ffffd04", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 59e992f..9dd499a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -365,4 +365,14 @@ in home.file."..aws/config".source = ./.aws/config; + # https://github.com/foucault/nvfancontrol#use-and-configure + home.file.".config/nvfancontrol.conf".text = '' + 25 45 + 45 50 + 50 60 + 60 75 + 70 80 + 80 90 + ''; + } diff --git a/machines/hephaestus/configuration.nix b/machines/hephaestus/configuration.nix index e0617c0..5cf2b91 100644 --- a/machines/hephaestus/configuration.nix +++ b/machines/hephaestus/configuration.nix @@ -10,9 +10,8 @@ hardware.nvidia.modesetting.enable = true; hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; - networking.hostName = "hephaestus"; - networking = { + hostName = "hephaestus"; interfaces.enp34s0 = { useDHCP = true; /* ipv4.addresses = [ */ @@ -38,6 +37,12 @@ services.sshd.enable = true; services.tailscale = { enable = true; }; - services.xserver.videoDrivers = [ "nvidia" ]; + services.xserver = { + videoDrivers = [ "nvidia" ]; + deviceSection = '' + Option "Coolbits" "4" + ''; + exportConfiguration = true; + }; }