Compare commits
No commits in common. "cec9dd4d8559358a9c00dde79f2715323eae2e36" and "d6c218859c2b22fcac463f17c848c8e176f60865" have entirely different histories.
cec9dd4d85
...
d6c218859c
14
flake.lock
14
flake.lock
|
@ -173,17 +173,17 @@
|
||||||
"nixpkgs": "nixpkgs_5"
|
"nixpkgs": "nixpkgs_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706453774,
|
"lastModified": 1703687896,
|
||||||
"narHash": "sha256-uUxN8ZHfTu2XGSOwwVej8Ou2ikNCSEiGFAHv+VcTWOM=",
|
"narHash": "sha256-7M6D/9UawWneUjmGRLJ78f9mkK4HEBoTDxyih082UcQ=",
|
||||||
"ref": "refs/heads/dtth-fork",
|
"ref": "refs/heads/main",
|
||||||
"rev": "f07236307abb34d4b1a56780d0dea10f70cf339a",
|
"rev": "f2d2e63020527db1a5ed947b3eac5f4be60d0f6a",
|
||||||
"revCount": 2250,
|
"revCount": 2146,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://gitea@git.dtth.ch/nki/phanpy?branch=dtth-fork"
|
"url": "ssh://gitea@git.dtth.ch/nki/phanpy"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://gitea@git.dtth.ch/nki/phanpy?branch=dtth-fork"
|
"url": "ssh://gitea@git.dtth.ch/nki/phanpy"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"eza": {
|
"eza": {
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
url = github:natsukagami/mpd-mpris;
|
url = github:natsukagami/mpd-mpris;
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
dtth-phanpy.url = "git+ssh://gitea@git.dtth.ch/nki/phanpy?branch=dtth-fork";
|
dtth-phanpy.url = "git+ssh://gitea@git.dtth.ch/nki/phanpy";
|
||||||
conduit = {
|
conduit = {
|
||||||
url = gitlab:famedly/conduit/next;
|
url = gitlab:famedly/conduit/next;
|
||||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
|
|
|
@ -51,8 +51,6 @@ in
|
||||||
pkgs.unstable.gajim
|
pkgs.unstable.gajim
|
||||||
# Note taking
|
# Note taking
|
||||||
pkgs.unstable.logseq
|
pkgs.unstable.logseq
|
||||||
# Audio
|
|
||||||
qpwgraph # Pipewire graph
|
|
||||||
|
|
||||||
# (if stdenv.isAarch64 then zotero else pkgs.unstable.zotero) // kinda fucked for now from CVE
|
# (if stdenv.isAarch64 then zotero else pkgs.unstable.zotero) // kinda fucked for now from CVE
|
||||||
libreoffice
|
libreoffice
|
||||||
|
|
51
home/osu.nix
51
home/osu.nix
|
@ -1,32 +1,39 @@
|
||||||
{ pkgs, config, lib, ... }:
|
{ pkgs, config, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
# osu-pkg = pkgs.unstable.osu-lazer-bin;
|
osu-pkg = pkgs.unstable.osu-lazer-bin;
|
||||||
osu-pkg = with pkgs; with lib;
|
# pkgs.unstable.osu-lazer-bin.overrideAttrs (attrs: rec {
|
||||||
appimageTools.wrapType2 rec {
|
# version = "2023.1130.0";
|
||||||
pname = "osu-lazer-bin";
|
# src = pkgs.fetchurl {
|
||||||
version = "2024.130.2";
|
# url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
|
||||||
src = pkgs.fetchurl {
|
# hash = "sha256-dQuyKjCZaIl3uaI81qRMt5NzBxfmyROVbJrVAqzuZxg=";
|
||||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
|
# };
|
||||||
hash = "sha256-4NG/3lHqQVfNa6zME/HD9m/bEkV79Vu64+aMDgCKqw0=";
|
# });
|
||||||
};
|
# with pkgs; with lib;
|
||||||
|
# appimageTools.wrapType2 rec {
|
||||||
|
# pname = "osu-lazer-bin";
|
||||||
|
# version = "2023.1229.1";
|
||||||
|
# src = pkgs.fetchurl {
|
||||||
|
# url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
|
||||||
|
# hash = "sha256-x2LqBbQCswwJ5iENjad17dzWV95lY03P7FXGQwMRNE8=";
|
||||||
|
# # hash = fakeHash;
|
||||||
|
# };
|
||||||
|
|
||||||
extraPkgs = pkgs: with pkgs; [ icu ];
|
# extraPkgs = pkgs: with pkgs; [ icu ];
|
||||||
|
|
||||||
extraInstallCommands =
|
# extraInstallCommands =
|
||||||
let contents = appimageTools.extract { inherit pname version src; };
|
# let contents = appimageTools.extract { inherit pname version src; };
|
||||||
in
|
# in
|
||||||
''
|
# ''
|
||||||
mv -v $out/bin/${pname}-${version} $out/bin/osu\!
|
# mv -v $out/bin/${pname}-${version} $out/bin/osu\!
|
||||||
install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications
|
# install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications
|
||||||
for i in 16 32 48 64 96 128 256 512 1024; do
|
# for i in 16 32 48 64 96 128 256 512 1024; do
|
||||||
install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png
|
# install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png
|
||||||
done
|
# done
|
||||||
'';
|
# '';
|
||||||
};
|
# };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
home.packages = [ osu-pkg ];
|
home.packages = [ osu-pkg ];
|
||||||
# home.packages = [ pkgs.osu-lazer ];
|
# home.packages = [ pkgs.osu-lazer ];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,8 +22,8 @@ let
|
||||||
};
|
};
|
||||||
authentik = mkImage {
|
authentik = mkImage {
|
||||||
imageName = "ghcr.io/goauthentik/server";
|
imageName = "ghcr.io/goauthentik/server";
|
||||||
finalImageTag = "2023.10.7";
|
finalImageTag = "2023.10.6";
|
||||||
imageDigest = "sha256:8ebdd51a95d3efdcb0cf3b26ed849cc0f9a8c032adb8cd595cabb59a1f321161";
|
imageDigest = "sha256:101f83c43ccb80de1f8035d1153ce8ebcdba35e6bf98ac7168d8d7fc5d09827f";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
authentikEnv = pkgs.writeText "authentik.env" ''
|
authentikEnv = pkgs.writeText "authentik.env" ''
|
||||||
|
|
Loading…
Reference in a new issue