use better discord

flake.lock

@@ -1,30 +1,23 @@
 {
   "nodes": {
-    "alejandra": {
+    "all-cabal-json": {
-      "inputs": {
+      "flake": false,
-        "fenix": "fenix",
-        "flakeCompat": "flakeCompat",
-        "nixpkgs": [
-          "webcord",
-          "dream2nix",
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1658427149,
+        "lastModified": 1665552503,
-        "narHash": "sha256-ToD/1z/q5VHsLMrS2h96vjJoLho59eNRtknOUd19ey8=",
+        "narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=",
-        "owner": "kamadorueda",
+        "owner": "nix-community",
-        "repo": "alejandra",
+        "repo": "all-cabal-json",
-        "rev": "f5a22afd2adfb249b4e68e0b33aa1f0fb73fb1be",
+        "rev": "d7c0434eebffb305071404edcf9d5cd99703878e",
         "type": "github"
       },
       "original": {
-        "owner": "kamadorueda",
+        "owner": "nix-community",
-        "repo": "alejandra",
+        "ref": "hackage",
+        "repo": "all-cabal-json",
         "type": "github"
       }
     },
-    "all-cabal-json": {
+    "all-cabal-json_2": {
       "flake": false,
       "locked": {
         "lastModified": 1665552503,
@@ -136,22 +129,6 @@
         "type": "github"
       }
     },
-    "crane_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1661875961,
-        "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
     "devshell": {
       "flake": false,
       "locked": {
@@ -171,27 +148,11 @@
     "devshell_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1660811669,
+        "lastModified": 1666548262,
-        "narHash": "sha256-V6lmsaLNFz41myppL0yxglta92ijkSvpZ+XVygAh+bU=",
+        "narHash": "sha256-4DyN4KXqQQsCw0vCXkMThw4b5Q4/q87ZZgRb4st8COc=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "c2feacb46ee69949124c835419861143c4016fb5",
+        "rev": "c8ce8ed81726079c398f5f29c4b68a7d6a3c2fa2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
-    "devshell_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1653917170,
-        "narHash": "sha256-FyxOnEE/V4PNEcMU62ikY4FfYPo349MOhMM97HS0XEo=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "fc7a3e3adde9bbcab68af6d1e3c6eb738e296a92",
         "type": "github"
       },
       "original": {
@@ -267,6 +228,7 @@
           "nci",
           "nixpkgs"
         ],
+        "all-cabal-json": "all-cabal-json_2",
         "crane": "crane_2",
         "devshell": [
           "helix",
@@ -278,6 +240,7 @@
           "nci",
           "nixpkgs"
         ],
+        "ghc-utils": "ghc-utils_2",
         "gomod2nix": [
           "helix",
           "nci",
@@ -305,40 +268,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1662176993,
+        "lastModified": 1666993587,
-        "narHash": "sha256-Sy7DsGAveDUFBb6YDsUSYZd/AcXfP/MOMIwMt/NgY84=",
+        "narHash": "sha256-4cLrs+CwWnceYXnCpL5gO3bybS9CjLxUoTEKjB2QFtg=",
         "owner": "nix-community",
         "repo": "dream2nix",
-        "rev": "809bc5940214744eb29778a9a0b03f161979c1b2",
+        "rev": "2b7456e3d2f0053bc2474fb0c461dd468545277f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "dream2nix",
-        "type": "github"
-      }
-    },
-    "dream2nix_3": {
-      "inputs": {
-        "alejandra": "alejandra",
-        "crane": "crane_3",
-        "devshell": "devshell_3",
-        "flake-utils-pre-commit": "flake-utils-pre-commit",
-        "gomod2nix": "gomod2nix",
-        "mach-nix": "mach-nix",
-        "nixpkgs": [
-          "webcord",
-          "nixpkgs"
-        ],
-        "poetry2nix": "poetry2nix",
-        "pre-commit-hooks": "pre-commit-hooks"
-      },
-      "locked": {
-        "lastModified": 1664882193,
-        "narHash": "sha256-uiAYOxN/M4dpaB6ieY3xOvOH6XgHP9NVXDTzSRa3pMc=",
-        "owner": "nix-community",
-        "repo": "dream2nix",
-        "rev": "785b76894263fd76a0e69955e4cd990b7b735bdf",
         "type": "github"
       },
       "original": {
@@ -409,30 +343,6 @@
         "type": "github"
       }
     },
-    "fenix": {
-      "inputs": {
-        "nixpkgs": [
-          "webcord",
-          "dream2nix",
-          "alejandra",
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src"
-      },
-      "locked": {
-        "lastModified": 1657607339,
-        "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -482,28 +392,13 @@
         "type": "github"
       }
     },
-    "flake-utils-pre-commit": {
-      "locked": {
-        "lastModified": 1644229661,
-        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "flake-utils_2": {
       "locked": {
-        "lastModified": 1656928814,
+        "lastModified": 1659877975,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -527,22 +422,6 @@
         "type": "github"
       }
     },
-    "flakeCompat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1650374568,
-        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "ghc-utils": {
       "flake": false,
       "locked": {
@@ -559,20 +438,20 @@
         "url": "https://gitlab.haskell.org/bgamari/ghc-utils"
       }
     },
-    "gomod2nix": {
+    "ghc-utils_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1627572165,
+        "lastModified": 1662774800,
-        "narHash": "sha256-MFpwnkvQpauj799b4QTBJQFEddbD02+Ln5k92QyHOSk=",
+        "narHash": "sha256-1Rd2eohGUw/s1tfvkepeYpg8kCEXiIot0RijapUjAkE=",
-        "owner": "tweag",
+        "ref": "refs/heads/master",
-        "repo": "gomod2nix",
+        "rev": "bb3a2d3dc52ff0253fb9c2812bd7aa2da03e0fea",
-        "rev": "67f22dd738d092c6ba88e420350ada0ed4992ae8",
+        "revCount": 1072,
-        "type": "github"
+        "type": "git",
+        "url": "https://gitlab.haskell.org/bgamari/ghc-utils"
       },
       "original": {
-        "owner": "tweag",
+        "type": "git",
-        "repo": "gomod2nix",
+        "url": "https://gitlab.haskell.org/bgamari/ghc-utils"
-        "type": "github"
       }
     },
     "haskell-flake": {
@@ -613,11 +492,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1667057786,
+        "lastModified": 1667455761,
-        "narHash": "sha256-YVf1oibhfQeFjahTdIto+928JYIZL+/CukECZ/JNU14=",
+        "narHash": "sha256-+1++fBJw6yIXpGrBHpDdYLLCD1XGNRh6CYCOWEAYb5o=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "2935e9da197442620578e07d87cd0607ae4145f1",
+        "rev": "ba394dca6d3a5b52622c4d7b0d3aba7c30af9701",
         "type": "github"
       },
       "original": {
@@ -634,11 +513,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1666903647,
+        "lastModified": 1667468181,
-        "narHash": "sha256-sFI1Gh9DTGzHnBINondupUGYbe+T0wZcpcZjkW0qffM=",
+        "narHash": "sha256-806/nrDW6e7bl4/oJEdAykYz/NaBuTUi7EUYArw2oic=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "213a06295dff96668a1d673b9fd1c03ce1de6745",
+        "rev": "93335810751f0404fe424e61ad58bc8e94bf8e9d",
         "type": "github"
       },
       "original": {
@@ -656,11 +535,11 @@
         "wlroots": "wlroots"
       },
       "locked": {
-        "lastModified": 1667061123,
+        "lastModified": 1667482534,
-        "narHash": "sha256-iCmV/HvYkCExjfK4FD0hE88vi87eHO3/q1rzNNhOETc=",
+        "narHash": "sha256-whsQ4dAdvOptYh3cHm5uu1Twik6TEZsU8FFOwS37El4=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "d994ad75e80df6c97c400f85e0fbdf11dbb5ca49",
+        "rev": "d0e47d9fe09dfa3be0c46833bee832ddbe0fcb51",
         "type": "github"
       },
       "original": {
@@ -689,21 +568,6 @@
         "type": "github"
       }
     },
-    "mach-nix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1634711045,
-        "narHash": "sha256-m5A2Ty88NChLyFhXucECj6+AuiMZPHXNbw+9Kcs7F6Y=",
-        "owner": "DavHau",
-        "repo": "mach-nix",
-        "rev": "4433f74a97b94b596fa6cd9b9c0402104aceef5d",
-        "type": "github"
-      },
-      "original": {
-        "id": "mach-nix",
-        "type": "indirect"
-      }
-    },
     "nci": {
       "inputs": {
         "devshell": "devshell",
@@ -742,11 +606,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1662177071,
+        "lastModified": 1667232647,
-        "narHash": "sha256-x6XF//RdZlw81tFAYM1TkjY+iQIpyMCWZ46r9o4wVQY=",
+        "narHash": "sha256-cFo7G8BqYShgL9m7yD6p+SHAZ+aIt2guuF69LV235n8=",
         "owner": "yusdacra",
         "repo": "nix-cargo-integration",
-        "rev": "65270dea87bb82fc02102a15221677eea237680e",
+        "rev": "16082f7b4e42ce140a562fa630bcf8e96eadeb59",
         "type": "github"
       },
       "original": {
@@ -783,11 +647,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1664216202,
+        "lastModified": 1667165773,
-        "narHash": "sha256-7qXPLkgsXpi2nmxGN14DVZWMFw4QIx7foqEN6GXeTj8=",
+        "narHash": "sha256-47gEPN7UKrNM+a3OKAFtNQeyc1/sSPgDm3OGCgphCyo=",
         "owner": "Misterio77",
         "repo": "nix-colors",
-        "rev": "bb56fe29c3e16029a783b7a85354fc14098f2560",
+        "rev": "a58fb210eb285920ec10f204d007185b3629cadc",
         "type": "github"
       },
       "original": {
@@ -818,11 +682,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1666873549,
+        "lastModified": 1667283320,
-        "narHash": "sha256-a6Eu1Qv/EndjepSMja5SvcG+4vM5Rl2gzJD7xscRHss=",
+        "narHash": "sha256-qHvB/6XBKVjjJJCUM+z6/t9HzUC7J55wdY3KJ/ZWSHo=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "419dcc0ec767803182ed01a326f134230578bf60",
+        "rev": "18934557eeba8fa2e575b0fd4ab95186e2e3bde3",
         "type": "github"
       },
       "original": {
@@ -880,11 +744,11 @@
     "nixpkgs-wayland": {
       "flake": false,
       "locked": {
-        "lastModified": 1667061846,
+        "lastModified": 1667477532,
-        "narHash": "sha256-i0sXATbCUGGEh4MxJes9iE2IVEuiavd+81fHgvUHMJk=",
+        "narHash": "sha256-tGy6lGMf0ElLDDKxGX15tJRC44rbqtIU8vDvFUHfbNY=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "1cdf234dac33f3b6dccfd72aeb72b83319e631e2",
+        "rev": "6bc549f2f03a1f6ea7fa6536b8870b48b8c86ebe",
         "type": "github"
       },
       "original": {
@@ -911,11 +775,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1662019588,
+        "lastModified": 1667142599,
-        "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
+        "narHash": "sha256-OLJxsg9VqfKjFkerOxWtNIkibsCvxsv5A8wNWO1MeWk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2da64a81275b68fdad38af669afeda43d401e94b",
+        "rev": "412b9917cea092f3d39f9cd5dead4effd5bc4053",
         "type": "github"
       },
       "original": {
@@ -927,11 +791,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1666959691,
+        "lastModified": 1667231093,
-        "narHash": "sha256-TRpWA3t8ata79HOGtFd5dDCl1kJQmIE16PDF53/Hcxo=",
+        "narHash": "sha256-RERXruzBEBuf0c7OfZeX1hxEKB+PTCUNxWeB6C1jd8Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "448a599c49978c2794401bfc3a2e1fba1a8663be",
+        "rev": "d40fea9aeb8840fea0d377baa4b38e39b9582458",
         "type": "github"
       },
       "original": {
@@ -943,11 +807,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1667063044,
+        "lastModified": 1667496346,
-        "narHash": "sha256-vuykJu3nzNaUfyoqXiEwLdWiZFz+JsYcXsf5mezKZVs=",
+        "narHash": "sha256-n0bHzcQ/sx+E96FumgF2OeT6bbTendRDtmQHijTrQg0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "f08d913bb99af6f1e6b3036d72f47c8edf84b23b",
+        "rev": "04d9c7bd3c4a2ce32f44cc970cc3e03d5a4aa334",
         "type": "github"
       },
       "original": {
@@ -956,50 +820,6 @@
         "type": "github"
       }
     },
-    "poetry2nix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1632969109,
-        "narHash": "sha256-jPDclkkiAy5m2gGLBlKgH+lQtbF7tL4XxBrbSzw+Ioc=",
-        "owner": "nix-community",
-        "repo": "poetry2nix",
-        "rev": "aee8f04296c39d88155e05d25cfc59dfdd41cc77",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "1.21.0",
-        "repo": "poetry2nix",
-        "type": "github"
-      }
-    },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-utils": [
-          "webcord",
-          "dream2nix",
-          "flake-utils-pre-commit"
-        ],
-        "nixpkgs": [
-          "webcord",
-          "dream2nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1646153636,
-        "narHash": "sha256-AlWHMzK+xJ1mG267FdT8dCq/HvLCA6jwmx2ZUy5O8tY=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "b6bc0b21e1617e2b07d8205e7fae7224036dfa4b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "bernbot": "bernbot",
@@ -1016,25 +836,7 @@
         "nixos-persistence": "nixos-persistence",
         "nixpkgs": "nixpkgs_4",
         "nixpkgs-wayland": "nixpkgs-wayland",
-        "nur": "nur",
+        "nur": "nur"
-        "webcord": "webcord"
-      }
-    },
-    "rust-analyzer-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1657557289,
-        "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "caf23f29144b371035b864a1017dbc32573ad56d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
       }
     },
     "rust-overlay": {
@@ -1084,11 +886,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1662087605,
+        "lastModified": 1667184938,
-        "narHash": "sha256-Gpf2gp2JenKGf+TylX/YJpttY2bzsnvAMLdLaxoZRyU=",
+        "narHash": "sha256-/kuCiXuAxiD0c0zrfDvJ1Yba3FuVdRk/ROfb393AeX4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "60c2cfaa8b90ed8cebd18b214fac8682dcf222dd",
+        "rev": "8f81faec35508647ced65c44fd3e8648a5518afb",
         "type": "github"
       },
       "original": {
@@ -1141,11 +943,11 @@
     },
     "utils": {
       "locked": {
-        "lastModified": 1659877975,
+        "lastModified": 1667077288,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
         "type": "github"
       },
       "original": {
@@ -1154,44 +956,6 @@
         "type": "github"
       }
     },
-    "webcord": {
-      "inputs": {
-        "dream2nix": "dream2nix_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "webcord": "webcord_2"
-      },
-      "locked": {
-        "lastModified": 1666097086,
-        "narHash": "sha256-6WKh4NwItcz9IGY5rGkkeWCtGOmpU3nf85dX29suDjE=",
-        "owner": "fufexan",
-        "repo": "webcord-flake",
-        "rev": "9098504f2a08ac848ea43de40496925c450e7111",
-        "type": "github"
-      },
-      "original": {
-        "owner": "fufexan",
-        "repo": "webcord-flake",
-        "type": "github"
-      }
-    },
-    "webcord_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1664742535,
-        "narHash": "sha256-QoXBlhCM97haNlkbU4O2oXITnzrkiM9hYAiNpduVjIQ=",
-        "owner": "SpacingBat3",
-        "repo": "WebCord",
-        "rev": "cb6938bde4f57b252b167b23fc0c2d6120326fff",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SpacingBat3",
-        "repo": "WebCord",
-        "type": "github"
-      }
-    },
     "wlroots": {
       "flake": false,
       "locked": {

flake.nix

@@ -33,9 +33,6 @@
     nil.url = "github:oxalica/nil";
     nil.inputs.nixpkgs.follows = "nixpkgs";
 
-    webcord.url = "github:fufexan/webcord-flake";
-    webcord.inputs.nixpkgs.follows = "nixpkgs";
-
     eww.url = "github:elkowar/eww";
     eww.inputs.nixpkgs.follows = "nixpkgs";
 

modules/de/gnome/default.nix

@@ -45,6 +45,6 @@
     "autovt@tty1".enable = false;
   };
   services.power-profiles-daemon.enable = false;
-  environment.systemPackages = with pkgs; [gnome.gnome-tweaks ffmpegthumbnailer webp-pixbuf-loader];
+  environment.systemPackages = with pkgs; [gnomeExtensions.unite gnome.gnome-tweaks ffmpegthumbnailer webp-pixbuf-loader];
   environment.gnome.excludePackages = with pkgs; [gnome-console gnome-tour gnome.gnome-maps];
 }

users/modules/discord/default.nix

@@ -6,16 +6,48 @@
   ...
 }: let
   theme = pkgs.fetchurl {
-    url = "https://raw.githubusercontent.com/catppuccin/discord/c162aee9d71a06908abf285f9a5239c6bea8b5e9/themes/mocha.theme.css";
+    url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css";
-    hash = "sha256-dPKW+Mru+KvivvobwbOgj2g8mSiSspdVOXrxbXCel8M=";
+    hash = "sha256-LCjw3k2NuPKGwAEvPUnJeQk9zQQ+TyHpZ/eNrETkWSM=";
   };
 in {
   home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [
-    ".config/WebCord"
+    ".config/discord"
   ];
-  home.packages = let
+  xdg.configFile."discordcanary/settings.json".text = builtins.toJSON {
-    pkg = inputs.webcord.packages.${pkgs.system}.webcord.override {
+    openasar = {
-      flags = ["--add-css-theme=${theme}"];
+      setup = true;
+      noTyping = true;
+      quickstart = true;
+      theme = builtins.readFile theme;
     };
+    SKIP_HOST_UPDATE = true;
+    IS_MAXIMIZED = true;
+    IS_MINIMIZED = false;
+    trayBalloonShown = true;
+  };
+  home.packages = let
+    flags = [
+      "--flag-switches-begin"
+      "--enable-features=UseOzonePlatform,WebRTCPipeWireCapturer,Vulkan"
+      "--flag-switches-end"
+      "--ozone-platform=wayland"
+      "--enable-webrtc-pipewire-capturer"
+      # "--disable-gpu-memory-buffer-video-frames"
+      # "--enable-accelerated-mjpeg-decode"
+      # "--enable-accelerated-video"
+      # "--enable-gpu-rasterization"
+      # "--enable-native-gpu-memory-buffers"
+      # "--enable-zero-copy"
+      # "--ignore-gpu-blocklist"
+    ];
+    pkg =
+      (pkgs.discord-canary.override {
+        withOpenASAR = true;
+      })
+      .overrideAttrs (old: {
+        preInstall = ''
+          gappsWrapperArgs+=("--add-flags" "${lib.concatStringsSep " " flags}")
+        '';
+      });
   in [pkg];
 }

users/modules/wayland/default.nix

@@ -8,4 +8,12 @@
     MOZ_ENABLE_WAYLAND = "1";
     XDG_SESSION_TYPE = "wayland";
   };
+
+  xdg.configFile = {
+    "environment.d/10-apply-wayland-env.conf".text = ''
+      NIXOS_OZONE_WL=1
+      MOZ_ENABLE_WAYLAND=1
+      XDG_SESSION_TYPE=wayland
+    '';
+  };
 }

users/patriot/default.nix

@@ -10,6 +10,7 @@
 
   nixosConfig = globalAttrs.config;
 in {
+  imports = [../../modules/de/gnome];
   users.users.patriot = {
     isNormalUser = true;
     createHome = true;
@@ -97,8 +98,9 @@ in {
     imports = let
       modulesToEnable = l.flatten [
         # wm
-        ["hyprland" "foot"]
+        # ["hyprland" "foot"]
         # desktop stuff
+        ["wayland"]
         ["firefox" "discord"]
         # cli stuff
         ["zoxide" "zsh" "fzf" "starship" "direnv"]
@@ -140,10 +142,12 @@ in {
         ]
         ++ mkPaths ".config" [
           "lutris"
+          "dconf"
         ];
       files = l.flatten [
         ".config/wallpaper"
         ".config/wallpaper.mp4"
+        ".config/gnome-initial-setup-done"
         (lib.removePrefix "~/" config.programs.ssh.userKnownHostsFile)
       ];
       allowOther = true;
@@ -162,8 +166,8 @@ in {
     };
 
     settings.iconTheme = {
-      name = "Papirus-Dark";
+      name = "Yaru";
-      package = pkgs.papirus-icon-theme;
+      package = pkgs.yaru-theme;
     };
 
     home.pointerCursor = {
@@ -186,8 +190,8 @@ in {
       iconTheme = config.settings.iconTheme;
 
       theme = {
-        name = "Catppuccin-Orange-Dark-Compact";
+        name = "Yaru-Dark";
-        package = pkgs.catppuccin-gtk.override {size = "compact";};
+        package = pkgs.yaru-theme;
       };
     };
 
@@ -239,11 +243,11 @@ in {
         userName = name;
         userEmail = email;
       };
-      zsh.loginExtra = ''
+      # zsh.loginExtra = ''
-        if [[ "$(tty)" == "/dev/tty1" ]]; then
+      #   if [[ "$(tty)" == "/dev/tty1" ]]; then
-          exec Hyprland
+      #     exec Hyprland
-        fi
+      #   fi
-      '';
+      # '';
     };
     services = {
       gpg-agent = let