Compare commits
3 Commits
a86eea72df
...
5f3dabf56a
Author | SHA1 | Date |
---|---|---|
Jill | 5f3dabf56a | |
Jill | 6b0f130b97 | |
Jill | 5251310b99 |
30
flake.lock
30
flake.lock
|
@ -55,11 +55,11 @@
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1704923501,
|
"lastModified": 1707059042,
|
||||||
"narHash": "sha256-Kz3pymvpNHTlKruepOZ3lbiWxfGhtlK5JiqF0Hk+h6I=",
|
"narHash": "sha256-6tomg1cTo7cwd7U3hIyDMA5iBuHg82cTr9TrUGnfxMw=",
|
||||||
"owner": "catppuccin",
|
"owner": "catppuccin",
|
||||||
"repo": "vscode",
|
"repo": "vscode",
|
||||||
"rev": "cf7019fdeba269650940fb0bd2c4e50c7bf498d8",
|
"rev": "50aa91ba31192bef8563a96e246d469091502d10",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -187,11 +187,11 @@
|
||||||
},
|
},
|
||||||
"hardware": {
|
"hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706182238,
|
"lastModified": 1707211557,
|
||||||
"narHash": "sha256-Ti7CerGydU7xyrP/ow85lHsOpf+XMx98kQnPoQCSi1g=",
|
"narHash": "sha256-LTKTzZ6fM5j8XWXf51IMBzDaOaJg9kYWLUZxoIhzRN8=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "f84eaffc35d1a655e84749228cde19922fcf55f1",
|
"rev": "6e5cc385fc8cf5ca6495d70243074ccdea9f64c7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -207,11 +207,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1705659542,
|
"lastModified": 1706981411,
|
||||||
"narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=",
|
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9",
|
"rev": "652fda4ca6dafeb090943422c34ae9145787af37",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -291,11 +291,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706589919,
|
"lastModified": 1707205916,
|
||||||
"narHash": "sha256-pNHnDITxSI3a17GOF1RUF3jBO1OiNYTRH2yV/cJG4m4=",
|
"narHash": "sha256-fmRJilYGlB7VCt3XsdYxrA0u8e/K84O5xYucerUY0iM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "222c1940fafeda4dea161858ffe6ebfc853d3db5",
|
"rev": "8cc79aa39bbc6eaedaf286ae655b224c71e02907",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -322,11 +322,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706515015,
|
"lastModified": 1707091808,
|
||||||
"narHash": "sha256-eFfY5A7wlYy3jD/75lx6IJRueg4noE+jowl0a8lIlVo=",
|
"narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4",
|
"rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -53,8 +53,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
#packages."${system}" = mapModules ./packages (p: pkgs.callPackage p {});
|
packages."${system}" = mapModules ./packages (p: pkgs.callPackage p {});
|
||||||
packages."${system}" = {};
|
|
||||||
|
|
||||||
nixosModules = mapModulesRec ./modules import;
|
nixosModules = mapModulesRec ./modules import;
|
||||||
|
|
||||||
|
|
|
@ -20,8 +20,10 @@
|
||||||
# compatilibility
|
# compatilibility
|
||||||
wineWowPackages.waylandFull winetricks
|
wineWowPackages.waylandFull winetricks
|
||||||
# misc
|
# misc
|
||||||
cowsay file which tree gnused yt-dlp
|
cowsay file which tree gnused yt-dlp prismlauncher
|
||||||
];
|
] ++ (with pkgs.my; [
|
||||||
|
olympus
|
||||||
|
]);
|
||||||
|
|
||||||
# usually you don't need to do this, but this is a workaround for https://github.com/flameshot-org/flameshot/issues/3328
|
# usually you don't need to do this, but this is a workaround for https://github.com/flameshot-org/flameshot/issues/3328
|
||||||
hm.services.flameshot.enable = true;
|
hm.services.flameshot.enable = true;
|
||||||
|
@ -85,6 +87,7 @@
|
||||||
# distractions
|
# distractions
|
||||||
distractions.steam.enable = true;
|
distractions.steam.enable = true;
|
||||||
distractions.discord.enable = true;
|
distractions.discord.enable = true;
|
||||||
|
distractions.discord.armcord = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,32 +6,38 @@ let
|
||||||
in {
|
in {
|
||||||
options.modules.software.distractions.discord = {
|
options.modules.software.distractions.discord = {
|
||||||
enable = mkEnableOption "Enable Discord, a social messaging app";
|
enable = mkEnableOption "Enable Discord, a social messaging app";
|
||||||
|
armcord = mkEnableOption "Use Armcord, an alternative Electron client";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable (mkMerge [
|
||||||
user.packages = let
|
(mkIf (!cfg.armcord) {
|
||||||
flags =
|
user.packages = let
|
||||||
[
|
flags =
|
||||||
"--flag-switches-begin"
|
[
|
||||||
"--flag-switches-end"
|
"--flag-switches-begin"
|
||||||
"--disable-gpu-memory-buffer-video-frames"
|
"--flag-switches-end"
|
||||||
"--enable-accelerated-mjpeg-decode"
|
"--disable-gpu-memory-buffer-video-frames"
|
||||||
"--enable-accelerated-video"
|
"--enable-accelerated-mjpeg-decode"
|
||||||
"--enable-gpu-rasterization"
|
"--enable-accelerated-video"
|
||||||
"--enable-native-gpu-memory-buffers"
|
"--enable-gpu-rasterization"
|
||||||
"--enable-zero-copy"
|
"--enable-native-gpu-memory-buffers"
|
||||||
"--ignore-gpu-blocklist"
|
"--enable-zero-copy"
|
||||||
"--disable-features=UseOzonePlatform"
|
"--ignore-gpu-blocklist"
|
||||||
"--enable-features=VaapiVideoDecoder"
|
"--disable-features=UseOzonePlatform"
|
||||||
];
|
"--enable-features=VaapiVideoDecoder"
|
||||||
discord = (pkgs.unstable.discord-canary.override {
|
];
|
||||||
withOpenASAR = false;
|
discord = (pkgs.unstable.discord-canary.override {
|
||||||
withVencord = true;
|
withOpenASAR = false;
|
||||||
}).overrideAttrs (old: {
|
withVencord = true;
|
||||||
preInstall = ''
|
}).overrideAttrs (old: {
|
||||||
gappsWrapperArgs+=("--add-flags" "${concatStringsSep " " flags}")
|
preInstall = ''
|
||||||
'';
|
gappsWrapperArgs+=("--add-flags" "${concatStringsSep " " flags}")
|
||||||
});
|
'';
|
||||||
in [ discord ];
|
});
|
||||||
};
|
in [ discord ];
|
||||||
|
})
|
||||||
|
(mkIf cfg.armcord {
|
||||||
|
user.packages = with pkgs.unstable; [ armcord ];
|
||||||
|
})
|
||||||
|
]);
|
||||||
}
|
}
|
|
@ -0,0 +1,51 @@
|
||||||
|
# Borrowed from https://raw.githubusercontent.com/VergeDX/config-nixpkgs/341684da8ccb6699fad399b998aa0caad723d882/packages/gui/olympus.nix
|
||||||
|
|
||||||
|
{ pkgs, makeDesktopItem }:
|
||||||
|
let
|
||||||
|
olympus = pkgs.stdenv.mkDerivation rec {
|
||||||
|
pname = "olympus";
|
||||||
|
version = "3813";
|
||||||
|
|
||||||
|
# https://everestapi.github.io/
|
||||||
|
src = pkgs.fetchzip {
|
||||||
|
url = "https://dev.azure.com/EverestAPI/Olympus/_apis/build/builds/${version}/artifacts?artifactName=linux.main&$format=zip#linux.main.zip";
|
||||||
|
hash = "sha256-thnHPPsuUne0zX1Fx+BjQiOoKseXDDUIvrczhOdSZmY=";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ pkgs.unzip pkgs.makeWrapper ];
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p "$out/opt/olympus/"
|
||||||
|
mv dist.zip "$out/opt/olympus/" && cd "$out/opt/olympus/"
|
||||||
|
|
||||||
|
unzip dist.zip && rm dist.zip
|
||||||
|
mkdir $out && echo XDG_DATA_HOME=$out
|
||||||
|
|
||||||
|
echo y | XDG_DATA_HOME="$out/share/" bash install.sh
|
||||||
|
rm ./love
|
||||||
|
rm ./find-love
|
||||||
|
cp ${pkgs.love}/bin/love ./find-love
|
||||||
|
|
||||||
|
sed -i "s/Exec=.*/Exec=olympus %u/g" ../../share/applications/Olympus.desktop
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
in
|
||||||
|
pkgs.buildFHSEnv {
|
||||||
|
name = "olympus";
|
||||||
|
runScript = "${olympus}/opt/olympus/olympus";
|
||||||
|
targetPkgs = pkgs: [
|
||||||
|
pkgs.freetype
|
||||||
|
pkgs.zlib
|
||||||
|
pkgs.SDL2
|
||||||
|
pkgs.curl
|
||||||
|
pkgs.libpulseaudio
|
||||||
|
pkgs.gtk3
|
||||||
|
pkgs.glib
|
||||||
|
pkgs.xdg-utils
|
||||||
|
pkgs.icu
|
||||||
|
pkgs.openssl
|
||||||
|
];
|
||||||
|
|
||||||
|
# https://github.com/EverestAPI/Olympus/blob/main/lib-linux/olympus.desktop
|
||||||
|
# https://stackoverflow.com/questions/8822097/how-to-replace-a-whole-line-with-sed
|
||||||
|
extraInstallCommands = ''cp -r "${olympus}/share/" $out'';
|
||||||
|
}
|
Loading…
Reference in New Issue