nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: nix:85572d38f053393f260418b4f611b50b67c2c796
Branches Tags
nix:trunk
..
compare: nix:838e019185c853144ae8ef70f2ac4286499701fc
Branches Tags
nix:trunk

No commits in common. "85572d38f053393f260418b4f611b50b67c2c796" and "838e019185c853144ae8ef70f2ac4286499701fc" have entirely different histories.
85572d38f0 ... 838e019185

4 changed files with 30 additions and 33 deletions
Show Stats Expand all files Collapse all files

34
flake.lock
View File

@ -29,11 +29,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1679104561, "lastModified": 1678990527,
"narHash": "sha256-JVyv+GeyJr7Zlxjt54sjHo90KpUGSUiVs/6tUBUuvQc=", "narHash": "sha256-mbSgwu13v8X/Mqle0rBien6QHpVm7Cxka9ObpMRZSLU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "65c5d30a355533e3f0b7b6f0417270744978134e", "rev": "9adcd1787f765eee44bc27d9c930c53260982c98",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -50,11 +50,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1679069674, "lastModified": 1678947834,
"narHash": "sha256-/azgwXXcmZ1rAJhOzokLx6XfM81fyU/5GXfOyGAocN8=", "narHash": "sha256-2+f3NAociAJV/Ux+dVZBbeDm94VxxoX6rFIVALMF1Y0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "47ac04d42227141940ed77b4f4f1c336f99f1d99", "rev": "65537912ff6741f88271f11a0a48c293f865dd9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -177,11 +177,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1679067101, "lastModified": 1678673526,
"narHash": "sha256-tMI1inGT9u4KWQml0w30dhWqQPlth1e9K/68sfDkEQA=", "narHash": "sha256-tMI1inGT9u4KWQml0w30dhWqQPlth1e9K/68sfDkEQA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9154cd519a8942728038819682d6b3ff33f321bb", "rev": "74e0b590c0c8eb99548b8db40c323ff61a2f37c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -359,11 +359,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1679075297, "lastModified": 1678397099,
"narHash": "sha256-8TwS7NPQWW9iPejBwWzmjLnK8bQhdOMPpsj3KPAL6x8=", "narHash": "sha256-5xq8YJe+h19TlD+EI4AE/3H3jcCcQ2AWU6CWBVc5tRc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "994584bb26ffa1deeaf56099601ef4bcc487273e", "rev": "556101ff85bd6e20900ec73ee525b935154bc8ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -374,11 +374,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1678972866, "lastModified": 1678872516,
"narHash": "sha256-YV8BcNWfNVgS449B6hFYFUg4kwVIQMNehZP+FNDs1LY=", "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cd34d6ed7ba7d5c4e44b04a53dc97edb52f2766c", "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -690,11 +690,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1679013700, "lastModified": 1678648312,
"narHash": "sha256-MOEWKOEaeQvD6ve6vZUvbZhYqdf2nLtqmvGqK+/McKQ=", "narHash": "sha256-aY3CBNyenTUkStQhwigm30+BjXQyA8rCChGD+Z98qqE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "d151883dc0d81cf4b1cffa9cf880db85c76c6040", "rev": "c6f663e8583912059605b55c07583b6e96b5e690",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View File

@ -223,11 +223,11 @@
pname = "discord-electron"; pname = "discord-electron";
binaryName = "DiscordCanary"; binaryName = "DiscordCanary";
desktopName = "Discord (Wayland)"; desktopName = "Discord (Wayland)";
version = "0.0.150"; version = "0.0.149";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = url =
"https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
hash = "sha256-8huDp1u0t9/kZbeB7bPqQUw8+HQ6rIyzKYUVN02gQfo="; hash = "sha256-8DHr7adczIv9FXaxPxSfZPn+8ogWLWHRp9l0JpKhoiY=";
}; };
electron = pkgs.electron_22; electron = pkgs.electron_22;
}; };

23
home-manager/linux/programs/communications.nix
View File

@ -16,13 +16,15 @@
++ [ pkgs.wayland ]; ++ [ pkgs.wayland ];
postFixup = (old.postFixup or "") + '' postFixup = (old.postFixup or "") + ''
wrapProgram $out/bin/${bin} \ wrapProgram $out/bin/${bin} \
--add-flags "--ozone-platform-hint=auto" --add-flags "--enable-features=UseOzonePlatform" \
--add-flags "--ozone-platform=wayland"
''; '';
}); });
zulipWayland = pkgs.makeDesktopItem { zulipWayland = pkgs.makeDesktopItem {
name = "zulip-wayland"; name = "zulip-wayland";
desktopName = "Zulip (Wayland)"; desktopName = "Zulip (Wayland)";
exec = "${unstable.zulip}/bin/zulip --ozone-platform-hint=auto"; exec =
"${unstable.zulip}/bin/zulip --enable-features=UseOzonePlatform --ozone-platform=wayland";
terminal = false; terminal = false;
icon = "zulip"; icon = "zulip";
type = "Application"; type = "Application";
@ -32,7 +34,7 @@
name = "messenger-chrome"; name = "messenger-chrome";
desktopName = "Messenger (chrome)"; desktopName = "Messenger (chrome)";
exec = '' exec = ''
${pkgs.ungoogled-chromium}/bin/chromium "--app=https://messenger.com"''; ${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform -ozone-platform=wayland "--app=https://messenger.com"'';
terminal = false; terminal = false;
}; };
# Teams # Teams
@ -40,7 +42,7 @@
name = "teams-wayland"; name = "teams-wayland";
desktopName = "Teams (Wayland)"; desktopName = "Teams (Wayland)";
exec = '' exec = ''
${pkgs.ungoogled-chromium}/bin/chromium "--app=https://teams.microsoft.com"''; ${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform -ozone-platform=wayland "--app=https://teams.microsoft.com"'';
terminal = false; terminal = false;
}; };
# Cinny # Cinny
@ -48,14 +50,14 @@
name = "cinny"; name = "cinny";
desktopName = "Cinny"; desktopName = "Cinny";
exec = '' exec = ''
${pkgs.ungoogled-chromium}/bin/chromium "--app=https://app.cinny.in"''; ${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform -ozone-platform=wayland "--app=https://app.cinny.in"'';
terminal = false; terminal = false;
}; };
messagesItem = pkgs.makeDesktopItem { messagesItem = pkgs.makeDesktopItem {
name = "messages"; name = "messages";
desktopName = "Messages (Chromium)"; desktopName = "Messages (Chromium)";
exec = '' exec = ''
${pkgs.ungoogled-chromium}/bin/chromium "--app=https://messages.google.com/web"''; ${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform -ozone-platform=wayland "--app=https://messages.google.com/web"'';
terminal = false; terminal = false;
}; };
in [ in [
@ -72,6 +74,7 @@
# Desktop telegram client # Desktop telegram client
tdesktop tdesktop
# Desktop mastodon client # Desktop mastodon client
# TODO: Reenable when unbroken on unstable
tootle tootle
# zulip # zulip
unstable.zulip unstable.zulip
@ -79,17 +82,11 @@
# Cinny for pretty matrix # Cinny for pretty matrix
cinnyItem cinnyItem
# chromium # chromium
# (enableWayland ungoogled-chromium "Chromium (Wayland)") (enableWayland chromium "chromium")
# Wayland workaround packages # Wayland workaround packages
fbChromeDesktopItem fbChromeDesktopItem
# Messages # Messages
messagesItem messagesItem
]; ];
programs.chromium = {
enable = true;
package = pkgs.ungoogled-chromium;
extensions = [{ id = "bphagiicbkoknlhmmbiokkdobkiglpio"; }];
};
}; };
} }

2
home-manager/linux/programs/media.nix
View File

@ -8,7 +8,7 @@ let
name = "iris"; name = "iris";
desktopName = "Iris"; desktopName = "Iris";
exec = '' exec = ''
${pkgs.ungoogled-chromium}/bin/chromium --enable-features=UseOzonePlatform -ozone-platform=wayland "--app=http://localhost:6680/iris/"''; ${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform -ozone-platform=wayland "--app=http://localhost:6680/iris/"'';
terminal = false; terminal = false;
}; };
in { in {