From 1cf166ab2a9a9ef6ef3d8d70a8c693c04baefc01 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Wed, 29 May 2024 11:37:09 +0200 Subject: [PATCH] xwayland not working --- flake.lock | 180 ++++++++++------------------- hosts/vali/temperance/programs.nix | 1 + modules/gui/spicetify.nix | 2 +- modules/wms/wayland/hypr/land.nix | 5 +- modules/wms/wayland/variables.nix | 1 - 5 files changed, 68 insertions(+), 121 deletions(-) diff --git a/flake.lock b/flake.lock index cff6a30..6bb6569 100644 --- a/flake.lock +++ b/flake.lock @@ -261,11 +261,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1716714348, - "narHash": "sha256-BKe2l6j185w6NCD5o2WbT3v6Ul8CYIUGlmI04MbS6QE=", + "lastModified": 1716972855, + "narHash": "sha256-u09wfqXJGMpmU6WRo0sYa16wfz/GPr5OQvUFS0VgPJo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "929e09706815a9e10cc749393eaa5895761de32a", + "rev": "30b19743d243f97e0a6d71ff9fe3522e1b7bc581", "type": "github" }, "original": { @@ -282,11 +282,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1716704729, - "narHash": "sha256-Yk0L1JdBTdC9ZtDreqcMMolOtTp0XnPjrACT8oTw2Wg=", + "lastModified": 1716877613, + "narHash": "sha256-GOCKwLphClUGKw0gFDZZmF2UM3vLLLnWrFbAH2AINCI=", "owner": "nix-community", "repo": "fenix", - "rev": "aaa27b4cf3729b6562cd4dd65ba24eeda3731002", + "rev": "08ea8011dd25421c104a5f44d16a713a27d93fde", "type": "github" }, "original": { @@ -372,22 +372,6 @@ "type": "github" } }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -615,11 +599,38 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_3", + "gitignore": "gitignore", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ "nixvim", - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, @@ -707,11 +718,11 @@ ] }, "locked": { - "lastModified": 1716711219, - "narHash": "sha256-TnZETiQPXbyT5mdCHMOyrJnx2+BwroMBRrguciz1vEo=", + "lastModified": 1716930911, + "narHash": "sha256-t4HT5j3Jy7skRB5PINnxcEBCkgE89rGBpwTI7YS4Ffo=", "owner": "nix-community", "repo": "home-manager", - "rev": "05e6ba83eb3585ce0aff7b41e4bd0e317d05ad4a", + "rev": "a9b36cbe9292a649222b89fdb9ae9907e9c74086", "type": "github" }, "original": { @@ -822,11 +833,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716669967, - "narHash": "sha256-wq91XpwR0tv7e7KwSp0qzvu31EMssznl8DzbNy4M4Hk=", + "lastModified": 1716968065, + "narHash": "sha256-kuVKS98JUgJ71Z3sRUo+YnQgmX8xdXoZZbBPyIZMWYs=", "ref": "refs/heads/main", - "rev": "553232a3e4c112c8511309e6b685cb614895e714", - "revCount": 4743, + "rev": "a60c7283e677ed81a466d1c0c864c8a05e192cac", + "revCount": 4750, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1110,11 +1121,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716361217, - "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", + "lastModified": 1716633019, + "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", + "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", "type": "github" }, "original": { @@ -1132,11 +1143,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1716726516, - "narHash": "sha256-hP2w967kUOj7o3dIeCUQpuz5B0sDWNEjGUGLqrFfr5M=", + "lastModified": 1716974396, + "narHash": "sha256-w11TUayMJNfMGsHLf2cls6eEd7iXZ6sW5AiTrU3NcAQ=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "fac2b5867654ec71d351bf3de98b979e746bf5a3", + "rev": "00cc3d49f5814783295348d168caddd84059c71f", "type": "github" }, "original": { @@ -1257,42 +1268,26 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_4", "flake-root": "flake-root", + "git-hooks": "git-hooks", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1716717390, - "narHash": "sha256-Hd8ky86xAFDrUqNPPx0bO/1x6WUEyWNLrdTEVShAMb8=", + "lastModified": 1716972603, + "narHash": "sha256-rfOOyiBW42bI+Nj3Cs7H3dZL4vdRelUWL5YSDniVcYM=", "owner": "nix-community", "repo": "nixvim", - "rev": "beb86eec7cad226d100d2841aae09fc2d4e152a8", + "rev": "b113bc69ea5c04c37020a63afa687abfb2d43474", "type": "github" }, "original": { @@ -1303,11 +1298,11 @@ }, "nur": { "locked": { - "lastModified": 1716724003, - "narHash": "sha256-6h1tHpbhOXxXHkSGjrkURbOjXEdb39etHBCIdz9tdu8=", + "lastModified": 1716972321, + "narHash": "sha256-iB8kNkc+p/9NwmrXgnChB6JFcUtSBSdGESRVliiTCMI=", "owner": "nix-community", "repo": "NUR", - "rev": "d11d17cf532b29a0b19564b8d6dfd66faf4e4f3e", + "rev": "3ced449a2fdd845ffde002790691bedf6958f00c", "type": "github" }, "original": { @@ -1316,33 +1311,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_3", - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -1362,18 +1330,17 @@ "schizofox": "schizofox", "spicetify-nix": "spicetify-nix", "split-monitor-workspaces": "split-monitor-workspaces", - "stylix": "stylix", - "waybar": "waybar" + "stylix": "stylix" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1716572615, - "narHash": "sha256-mVUbarr4PNjERDk+uaoitPq7eL7De0ythZehezAzug8=", + "lastModified": 1716828004, + "narHash": "sha256-mUZtVS2S+leFcMpBgbqkMnZm4II1qBM21pW8UnivVSo=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "a55e8bf09cdfc25066b77823cc98976a51af8a8b", + "rev": "b32f181f477576bb203879f7539608f3327b6178", "type": "github" }, "original": { @@ -1461,11 +1428,11 @@ "nix-filter": "nix-filter" }, "locked": { - "lastModified": 1716403535, - "narHash": "sha256-4iG/+feETnV/8W6HNXt33q6LBfjHkhvlDutZ2m4fyDk=", + "lastModified": 1716923053, + "narHash": "sha256-1KV6CErlIu73948+EVfH2OZeyIdUJlRIZLZMlo0Yqis=", "owner": "Duckonaut", "repo": "split-monitor-workspaces", - "rev": "5df9830acf7c710544c41e47172a6171f2859d15", + "rev": "df17c6f2d17d0156220a514d0ee622d734411905", "type": "github" }, "original": { @@ -1489,11 +1456,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1716456264, - "narHash": "sha256-s9Tyj5pEivl/AsvrpkUkfR1Iu3zHfXpviPfe4HbPJ5I=", + "lastModified": 1716895458, + "narHash": "sha256-W9Y/+K4L7JcF5xcXO4MVGQk/0DgzHrp/IjlHyLeYExY=", "owner": "danth", "repo": "stylix", - "rev": "290c8aef476ce98fff9cefc059284429d561a085", + "rev": "5234b3d467aa803ad8d3fe898ef5673246045984", "type": "github" }, "original": { @@ -1650,25 +1617,6 @@ "type": "github" } }, - "waybar": { - "inputs": { - "flake-compat": "flake-compat_6", - "nixpkgs": "nixpkgs_9" - }, - "locked": { - "lastModified": 1716524201, - "narHash": "sha256-5+c0w1KegSmT4W2AzsW433YmmBm+SlNHlpcaXWVcg08=", - "owner": "Alexays", - "repo": "Waybar", - "rev": "63bb338343cad3337726739704b75d1b0b13a8a5", - "type": "github" - }, - "original": { - "owner": "Alexays", - "repo": "Waybar", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols", diff --git a/hosts/vali/temperance/programs.nix b/hosts/vali/temperance/programs.nix index 3e73711..9c5ce95 100644 --- a/hosts/vali/temperance/programs.nix +++ b/hosts/vali/temperance/programs.nix @@ -36,6 +36,7 @@ in { gcc gdb gnumake + gnutls grc grimblast git diff --git a/modules/gui/spicetify.nix b/modules/gui/spicetify.nix index 889aee8..cf6cf9a 100644 --- a/modules/gui/spicetify.nix +++ b/modules/gui/spicetify.nix @@ -17,7 +17,7 @@ in { programs.spicetify = { enable = true; spotifyPackage = pkgs.spotify; - theme = spicePkgs.themes.Onepunch; + #theme = spicePkgs.themes.Onepunch; colorScheme = "mocha"; enabledExtensions = with spicePkgs.extensions; [ shuffle diff --git a/modules/wms/wayland/hypr/land.nix b/modules/wms/wayland/hypr/land.nix index e119bf4..da89d53 100644 --- a/modules/wms/wayland/hypr/land.nix +++ b/modules/wms/wayland/hypr/land.nix @@ -15,7 +15,6 @@ swww wlsunset ; - inherit (inputs.waybar.packages.${pkgs.system}) waybar; inherit (inputs.split-monitor-workspaces.packages.${pkgs.system}) split-monitor-workspaces @@ -241,7 +240,7 @@ in { # Reload hyprland "$mainMod, R, exec, ${hyprland}/bin/hyprctl reload" # Restart waybar - "$mainMod CONTROL, B, exec, ${pkgs.procps}/bin/pkill waybar || ${waybar}/bin/waybar" + "$mainMod CONTROL, B, exec, ${pkgs.procps}/bin/pkill waybar || ${pkgs.waybar}/bin/waybar" ]; binde = [ # window focus @@ -296,7 +295,7 @@ in { "${swww}/bin/swww-daemon" "${wlsunset}/bin/wlsunset -S 06:00 -s 20:00" - "${waybar}/bin/waybar" + "${pkgs.waybar}/bin/waybar" ]; exec = [ diff --git a/modules/wms/wayland/variables.nix b/modules/wms/wayland/variables.nix index e37a1b7..95f38eb 100644 --- a/modules/wms/wayland/variables.nix +++ b/modules/wms/wayland/variables.nix @@ -44,7 +44,6 @@ in { XDG_CURRENT_DESKTOP = "Hyprland"; XDG_SESSION_DESKTOP = "Hyprland"; ELECTRON_OZONE_PLATFORM_HINT = "auto"; - # GDK_BACKEND = "wayland"; WLR_RENDERER_ALLOW_SOFTWARE = "1"; # QT_QPA_PLATFORM = "wayland"; # Needed anymore?