From 14d49173af812cd2bdd8f50cc548baa7cad46182 Mon Sep 17 00:00:00 2001 From: Madeleine Date: Fri, 26 May 2023 18:22:13 +0100 Subject: [PATCH] some fixes for nixos --- flake.lock | 18 +++++++++--------- maddie/nixos/openrgb.nix | 3 +++ maddie/nixos/qt.nix | 6 +++++- maddie/nixos/xorg.nix | 1 + systems/mdesktop/avahi.nix | 14 ++++++++++++++ 5 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 systems/mdesktop/avahi.nix diff --git a/flake.lock b/flake.lock index 2920f65..a1e82e9 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1684148371, - "narHash": "sha256-CEVaArsziqantqU418XXruNDjPZN/HC3x1rqr2D4g+o=", + "lastModified": 1684343812, + "narHash": "sha256-ZTEjiC8PDKeP8JRchuwcFXUNlMcyQ4U+DpyVZ3pB6Q4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "0dbf1c2fb1a5a0372a324eff1ba44f9da66febd2", + "rev": "dfbdabbb3e797334172094d4f6c0ffca8c791281", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1684189380, - "narHash": "sha256-GUp9OkZynocyppLur1VX8oAjtXGue0oKRHbsksOMUm0=", + "lastModified": 1684321175, + "narHash": "sha256-V4EbM+jK7pvjKBaj0dgAiW9ultzDE27Nz5fRyu/ceMk=", "owner": "nix-community", "repo": "home-manager", - "rev": "b7d814c5744dca7e70b3dc2638f06568dce96ca6", + "rev": "59659243cd4ababda605e79b4a9c2e6d83e24c86", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684242266, - "narHash": "sha256-uaCQ2k1bmojHKjWQngvnnnxQJMY8zi1zq527HdWgQf8=", + "lastModified": 1684363872, + "narHash": "sha256-jkvhzrICFSmj+NBHksKTWzs8Q3+D7RsVK0wLKacbu8s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e0743a5aea1dc755d4b761daf75b20aa486fdad", + "rev": "1d77f3b72756ca36f16440c59e6b89a957908647", "type": "github" }, "original": { diff --git a/maddie/nixos/openrgb.nix b/maddie/nixos/openrgb.nix index e84aac9..6e86f15 100644 --- a/maddie/nixos/openrgb.nix +++ b/maddie/nixos/openrgb.nix @@ -8,5 +8,8 @@ home.file.".xinitrc".text = '' # Set RGB perhipherals to white ${pkgs.openrgb}/bin/openrgb -c white -m static & + + # Start my razer keyboard script + ${pkgs.python3Full}/bin/python ${config.home.homeDirectory}/Documents/Code/Razer/system.py & ''; } diff --git a/maddie/nixos/qt.nix b/maddie/nixos/qt.nix index a0f7efc..57185ae 100644 --- a/maddie/nixos/qt.nix +++ b/maddie/nixos/qt.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { qt = { @@ -8,4 +8,8 @@ name = "adwaita-dark"; }; }; + + home.sessionVariables = { + QT_STYLE_OVERRIDE = "adwaita-dark"; + }; } diff --git a/maddie/nixos/xorg.nix b/maddie/nixos/xorg.nix index 596bfab..d6a3d27 100644 --- a/maddie/nixos/xorg.nix +++ b/maddie/nixos/xorg.nix @@ -5,6 +5,7 @@ programs.zsh.profileExtra = '' # If on /dev/tty1 then run startx automatically if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then + sleep 2 exec ${pkgs.xorg.xinit}/bin/startx fi ''; diff --git a/systems/mdesktop/avahi.nix b/systems/mdesktop/avahi.nix new file mode 100644 index 0000000..f28d394 --- /dev/null +++ b/systems/mdesktop/avahi.nix @@ -0,0 +1,14 @@ +{ config, ... }: + +{ + services.avahi = { + enable = true; + nssmdns = true; + publish = { + enable = true; + addresses = true; + workstation = true; + userServices = true; + }; + }; +}