Update nix

This commit is contained in:
muon 2024-07-13 22:42:39 +00:00
parent 652b8599f8
commit 4e26aadf87
5 changed files with 19 additions and 19 deletions

18
flake.lock generated
View file

@ -53,11 +53,11 @@
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696727917, "lastModified": 1720809814,
"narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -276,11 +276,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1720542800, "lastModified": 1720768451,
"narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "feb2849fdeb70028c70d73b848214b00d324a497", "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -329,11 +329,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1719525570, "lastModified": 1720818679,
"narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=", "narHash": "sha256-u9PqY7O6TN42SLeb0e6mnYAgQOoQmclaVSHfLKMpmu0=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116", "rev": "29148118cc33f08b71058e1cda7ca017f5300b51",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -33,7 +33,7 @@ in {
# Hardware preferences # Hardware preferences
## Mouse ## Mouse
services.xserver.libinput.mouse.accelProfile = "flat"; services.libinput.mouse.accelProfile = "flat";
## Monitors ## Monitors
mods.monitors = { mods.monitors = {

View file

@ -2,7 +2,7 @@
monitorModule = lib.types.submodule { monitorModule = lib.types.submodule {
options = { options = {
name = lib.mkOption { name = lib.mkOption {
type = lib.types.string; type = lib.types.str;
description = "monitor name"; description = "monitor name";
example = "HDMI-1"; example = "HDMI-1";
}; };
@ -34,8 +34,8 @@ in {
services.xserver.xkb.options = "caps:escape"; services.xserver.xkb.options = "caps:escape";
services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.enable = true;
services.xserver.displayManager.autoLogin.enable = true; services.displayManager.autoLogin.enable = true;
services.xserver.displayManager.autoLogin.user = services.displayManager.autoLogin.user =
config.mods.user.name; config.mods.user.name;
systemd.services.display-manager.wants = startupTargets; systemd.services.display-manager.wants = startupTargets;

View file

@ -1,8 +1,8 @@
{ pkgs, lib, config, ... }: let { pkgs, lib, config, ... }: let
steam-xinit = pkgs.writeShellScriptBin "steam-xinit" '' steam-xinit = pkgs.writeShellScriptBin "steam-xinit" ''
${lib.getExe pkgs.steam} & ${lib.getExe pkgs.steam} &
exec ${lib.getExe pkgs.openbox} & exec ${pkgs.openbox}/bin/openbox &
exec ${lib.getExe pkgs.xterm} exec ${pkgs.xterm}/bin/xterm
''; '';
in { in {
@ -92,9 +92,9 @@ in {
}; };
}; };
hardware.opengl = { hardware.graphics = {
enable = true; enable = true;
driSupport32Bit = true; enable32Bit = true;
}; };
# programs.ssh.forwardX11 = true; # programs.ssh.forwardX11 = true;

View file

@ -19,9 +19,9 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# nixos.wiki/wiki/Nvidia # nixos.wiki/wiki/Nvidia
hardware.opengl = { hardware.graphics = {
enable = true; enable = true;
driSupport32Bit = true; enable32Bit = true;
}; };
services.xserver.videoDrivers = [ "nvidia" "nvidia-dkms" ]; services.xserver.videoDrivers = [ "nvidia" "nvidia-dkms" ];