From b3b55c36d8397f627f6113dc99bb964a462a0f05 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sat, 20 Jul 2024 11:43:16 +0800 Subject: [PATCH] fix: hyprland - crash --- flake.lock | 89 ++++++++++++--------- flake.nix | 8 +- home/linux/gui/base/note-taking.nix | 4 +- home/linux/gui/hyprland/values/hyprland.nix | 7 +- hosts/idols-ai/default.nix | 2 - modules/nixos/desktop/peripherals.nix | 2 - 6 files changed, 64 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index c55dd349..0b6393dc 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1717576207, - "narHash": "sha256-LU6d1xX7jN1zt10YU7Oym07MtzVfziSmUEznGFdbuaw=", + "lastModified": 1721135360, + "narHash": "sha256-ZhSA0e45UxiOAjEVqkym/aULh0Dt+KHJLNda7bjx9UI=", "owner": "Kirottu", "repo": "anyrun", - "rev": "7aabad8d5bb7d1bffae903ce86427b888ab824b4", + "rev": "c6101a31a80b51e32e96f6a77616b609770172e0", "type": "github" }, "original": { @@ -200,11 +200,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1721017423, - "narHash": "sha256-eKtkKSEm1bSYrwK5VGiREGDeXNkr6l9vOdiQ3GTMI58=", + "lastModified": 1721356739, + "narHash": "sha256-AW30n1Nr8sbgN6vvyfFmgL7Jh9PwDRYDH0HmVIlsvqs=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "ba3f30ef67f948438c4b8ec65d502108702be333", + "rev": "36e7aaa619342eff61b1daf3ac664f94d5272db7", "type": "github" }, "original": { @@ -605,16 +605,16 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1721135958, + "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -670,11 +670,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1720034501, - "narHash": "sha256-fzZpuVnhw5uOtA4OuXw3a+Otpy8C+QV0Uu5XfhGEPSg=", + "lastModified": 1721171275, + "narHash": "sha256-GKdodvwT9Suh6V0qJ0N/YWTIADWwto/x3XnFO86iXDs=", "owner": "astro", "repo": "microvm.nix", - "rev": "a808af7775f508a2afedd1e4940a382fe1194f21", + "rev": "36e261aa2c15a4020663cef87905f436b15305f7", "type": "github" }, "original": { @@ -707,11 +707,11 @@ ] }, "locked": { - "lastModified": 1720845312, - "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", + "lastModified": 1721270582, + "narHash": "sha256-MdZmYPPExntE5rJu88IhJSy8Um4UyZCTXhOwvzbjDVI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", + "rev": "a3e4a7b8ffc08c7dc1973822a77ad432e1ec3dec", "type": "github" }, "original": { @@ -747,11 +747,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1720920199, - "narHash": "sha256-0dNwRhtUVQha5S+NFeoeMXEt/6v0x56DCdyUk+vEFeY=", + "lastModified": 1721381874, + "narHash": "sha256-fA78AQqvEUTyPlq7KYkYldAzV9eaGTCs8yj16nJy52U=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "fce565402d5b1ed4e92c4a9dfcd094d0172d8f0b", + "rev": "35c551a783b53adae0b9ce81b94cf70e363411fa", "type": "github" }, "original": { @@ -857,11 +857,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720737798, - "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", + "lastModified": 1721413321, + "narHash": "sha256-0GdiQScDceUrVGbxYpV819LHesK3szHOhJ09e6sgES4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", + "rev": "ab165a8a6cd12781d76fe9cbccb9e975d0fb634f", "type": "github" }, "original": { @@ -928,11 +928,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1720970785, - "narHash": "sha256-gRyLiF5ae1822DFjfOp+6+c/sexYz0BmsNGpxYnDUWM=", + "lastModified": 1721396254, + "narHash": "sha256-IpPVxufZfE8qy9Vp18LBNaDaxQThM4kS3PsFJHxMcdU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa4dd14e99394b6888a3913af42a04a9110e3bcc", + "rev": "83bb0d311cc9b1f6f4c860f4a9b30b8a1466126c", "type": "github" }, "original": { @@ -999,6 +999,22 @@ } }, "nixpkgs-stable_3": { + "locked": { + "lastModified": 1721226092, + "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c716603a63aca44f39bef1986c13402167450e0a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_4": { "locked": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -1016,11 +1032,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1721041886, - "narHash": "sha256-++QkbIIyDpJygScgIa/QqjJB4uh2k2zelvFgvY9LFGw=", + "lastModified": 1721393053, + "narHash": "sha256-xNiw9gIxyF6xsyXCiFESPjxMjuVAfmr4sBpM9u2l5io=", "owner": "nixos", "repo": "nixpkgs", - "rev": "75686331f0a24b0d04e82db7411777a521f51f4f", + "rev": "a0691657e9634cfc001f02995cca394025e3e940", "type": "github" }, "original": { @@ -1064,11 +1080,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1720781449, - "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", + "lastModified": 1721303309, + "narHash": "sha256-/+Yw4tW/mcTRKmkEAO64ObzCQClpSUZpk2flUD9GDHE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b5a3d5a1d951344d683b442c0739010b80039db", + "rev": "7e2fb8e0eb807e139d42b05bf8e28da122396bed", "type": "github" }, "original": { @@ -1112,16 +1128,16 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1720954236, - "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", + "lastModified": 1721379653, + "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", + "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1300,7 +1316,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1721042469, @@ -1337,6 +1353,7 @@ "nixos-rk3588": "nixos-rk3588", "nixpkgs": "nixpkgs_7", "nixpkgs-darwin": "nixpkgs-darwin", + "nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-unstable": "nixpkgs-unstable", "nuenv": "nuenv", "nur-ryan4yin": "nur-ryan4yin", diff --git a/flake.nix b/flake.nix index 4f2dcb1f..51fe4dc4 100644 --- a/flake.nix +++ b/flake.nix @@ -34,9 +34,9 @@ # which represents the GitHub repository URL + branch/commit-id/tag. # Official NixOS package source, using nixos's unstable branch by default - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small"; - # nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; # for macos nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin"; @@ -48,8 +48,8 @@ # home-manager, used for managing user configuration home-manager = { - url = "github:nix-community/home-manager/release-24.05"; - # url = "github:nix-community/home-manager/master"; + url = "github:nix-community/home-manager/master"; + # url = "github:nix-community/home-manager/release-24.05"; # The `follows` keyword in inputs is used for inheritance. # Here, `inputs.nixpkgs` of home-manager is kept consistent with the `inputs.nixpkgs` of the current flake, diff --git a/home/linux/gui/base/note-taking.nix b/home/linux/gui/base/note-taking.nix index 6afde3e2..5dcfed39 100644 --- a/home/linux/gui/base/note-taking.nix +++ b/home/linux/gui/base/note-taking.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { home.packages = with pkgs; [ # https://joplinapp.org/help/ - joplin # joplin-cli - joplin-desktop + # joplin # joplin-cli + # joplin-desktop ]; } diff --git a/home/linux/gui/hyprland/values/hyprland.nix b/home/linux/gui/hyprland/values/hyprland.nix index 43a7371b..c6fe9d45 100644 --- a/home/linux/gui/hyprland/values/hyprland.nix +++ b/home/linux/gui/hyprland/values/hyprland.nix @@ -4,7 +4,7 @@ nur-ryan4yin, ... }: let - package = pkgs.hyprland.override {debug = true;}; + package = pkgs.hyprland; in { # NOTE: # We have to enable hyprland/i3's systemd user service in home-manager, @@ -29,7 +29,10 @@ in { }; extraConfig = builtins.readFile ../conf/hyprland.conf; # gammastep/wallpaper-switcher need this to be enabled. - systemd.enable = true; + systemd = { + enable = true; + variables = ["--all"]; + }; }; # NOTE: this executable is used by greetd to start a wayland session when system boot up diff --git a/hosts/idols-ai/default.nix b/hosts/idols-ai/default.nix index 3748966d..dd0a8b62 100644 --- a/hosts/idols-ai/default.nix +++ b/hosts/idols-ai/default.nix @@ -43,8 +43,6 @@ in { hardware.opengl = { enable = true; - # if hardware.opengl.driSupport is enabled, mesa is installed and provides Vulkan for supported hardware. - driSupport = true; # needed by nvidia-docker driSupport32Bit = true; }; diff --git a/modules/nixos/desktop/peripherals.nix b/modules/nixos/desktop/peripherals.nix index c1a5e609..d1645f91 100644 --- a/modules/nixos/desktop/peripherals.nix +++ b/modules/nixos/desktop/peripherals.nix @@ -24,8 +24,6 @@ }; # rtkit is optional but recommended security.rtkit.enable = true; - # Remove sound.enable or turn it off if you had it set previously, it seems to cause conflicts with pipewire - sound.enable = false; # Disable pulseaudio, it conflicts with pipewire too. hardware.pulseaudio.enable = false;