diff --git a/flake.lock b/flake.lock index 99a6ba3b..1620d37d 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1721236582, - "narHash": "sha256-MAYLNlFBDY8Ufd2BgwUN5SO6UYqp+5AfLZQYob3B5tk=", + "lastModified": 1721305797, + "narHash": "sha256-6ZXDxEqq11tHivRGKSFuOkrpfvoSuNbGMSjXFIQx2cE=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "36870759aca01fbc590f0ab9b199bc961145b70a", + "rev": "96dbe6709c070c0329e7fee3385784ade6b07703", "type": "github" }, "original": { @@ -320,11 +320,11 @@ }, "hardware": { "locked": { - "lastModified": 1720737798, - "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", + "lastModified": 1721323232, + "narHash": "sha256-T4K2P8FayLshsIkY04i7M8qs0aQY5ugf8HsghqGONCc=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", + "rev": "ede1f14cc21e811a605f16c6b69bd3e8425383d7", "type": "github" }, "original": { @@ -504,11 +504,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720954236, - "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", + "lastModified": 1721226092, + "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", "owner": "nixos", "repo": "nixpkgs", - "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", + "rev": "c716603a63aca44f39bef1986c13402167450e0a", "type": "github" }, "original": { @@ -520,11 +520,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720957393, - "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "lastModified": 1721138476, + "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", "type": "github" }, "original": { diff --git a/home/core/gui/hypr/default.nix b/home/core/gui/hypr/default.nix index 7d5c89ac..dd46580e 100644 --- a/home/core/gui/hypr/default.nix +++ b/home/core/gui/hypr/default.nix @@ -19,10 +19,4 @@ ]; }; }; - - home.sessionVariables = { - QT_QPA_PLATFORM = "wayland"; - SDL_VIDEODRIVER = "wayland"; - XDG_SESSION_TYPE = "wayland"; - }; } diff --git a/home/users/cnst/imports.nix b/home/users/cnst/imports.nix index c08c6986..6e7e9721 100644 --- a/home/users/cnst/imports.nix +++ b/home/users/cnst/imports.nix @@ -43,6 +43,9 @@ BROWSER = "firefox"; EDITOR = "nvim"; TERM = "foot"; + QT_QPA_PLATFORM = "wayland"; + SDL_VIDEODRIVER = "wayland"; + XDG_SESSION_TYPE = "wayland"; }; }; } diff --git a/home/users/toothpick/imports.nix b/home/users/toothpick/imports.nix index 0725da74..8abc874c 100644 --- a/home/users/toothpick/imports.nix +++ b/home/users/toothpick/imports.nix @@ -32,6 +32,7 @@ adwaita-icon-theme qt5.qtwayland qt6.qtwayland + egl-wayland # thefuck wireguard-tools wl-clipboard @@ -43,6 +44,9 @@ BROWSER = "firefox"; EDITOR = "nvim"; TERM = "foot"; + QT_QPA_PLATFORM = "wayland-egl"; + SDL_VIDEODRIVER = "wayland"; + XDG_SESSION_TYPE = "wayland"; }; }; } diff --git a/nixos/hardware/toothpc.nix b/nixos/hardware/toothpc.nix index 8aa3e392..2623165d 100644 --- a/nixos/hardware/toothpc.nix +++ b/nixos/hardware/toothpc.nix @@ -6,10 +6,6 @@ zramSwap.enable = true; hardware = { - bluetooth = { - enable = true; - powerOnBoot = true; - }; logitech.wireless = { enable = true; enableGraphical = true; diff --git a/nixos/hosts/toothpc/imports.nix b/nixos/hosts/toothpc/imports.nix index e53d4d09..d4535820 100644 --- a/nixos/hosts/toothpc/imports.nix +++ b/nixos/hosts/toothpc/imports.nix @@ -12,7 +12,7 @@ ../../locale # services - ../../services/blueman.nix + #../../services/blueman.nix ../../services/dbus.nix ../../services/gnome-keyring.nix ../../services/greetd.nix @@ -28,7 +28,7 @@ ../../extra/gaming.nix ../../extra/android #../../extra/workstation - # ../../extra/nix-ld + #../../extra/nix-ld ]; environment = {