chaos/nixfiles
1
0
Fork 0
Code Issues 2 Releases Activity

downgrade piped but w/ new java, add session, tidy'd and updates

Browse source
This commit is contained in:
Chaos 2023-05-03 16:45:10 +01:00
parent 7f7754272e
commit 1b080446c0
No known key found for this signature in database
13 changed files with 779 additions and 855 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

215
flake.lock
View file

@ -2,18 +2,22 @@
"nodes": {
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat",
"flake-compat": [
"flake-compat"
],
"nixpkgs": [
"nixpkgs-fixed"
],
"utils": "utils"
"utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1674127017,
"narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=",
"lastModified": 1682063650,
"narHash": "sha256-VaDHh2z6xlnTHaONlNVHP7qEMcK5rZ8Js3sT6mKb2XY=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77",
"rev": "c2ea4e642dc50fd44b537e9860ec95867af30d39",
"type": "github"
},
"original": {
@ -25,11 +29,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
@ -38,61 +42,35 @@
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_3": {
"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"
}
},
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitlab_archiver": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-compat": [
"flake-compat"
],
"nixpkgs": [
"nixpkgs-fixed"
],
"utils": "utils_2"
"utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1661345778,
@ -110,11 +88,15 @@
},
"gitlab_artifacts_sync": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-compat": [
"flake-compat"
],
"nixpkgs": [
"nixpkgs-fixed"
],
"utils": "utils_3"
"utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1661347022,
@ -134,15 +116,14 @@
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
],
"utils": "utils_4"
]
},
"locked": {
"lastModified": 1675935446,
"narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=",
"lastModified": 1682977601,
"narHash": "sha256-F1Va/Uiw2tVNn27FLqWyBkiqDyIm/eCamw9wA/GK8Fw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2dce7f1a55e785a22d61668516df62899278c9e4",
"rev": "0e4c33d76006c9080d2f228ba1c2308e3e4d7be6",
"type": "github"
},
"original": {
@ -153,11 +134,15 @@
},
"musicutil": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-compat": [
"flake-compat"
],
"nixpkgs": [
"nixpkgs-fixed"
],
"utils": "utils_5"
"utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1674038300,
@ -191,11 +176,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1676110339,
"narHash": "sha256-kOS/L8OOL2odpCOM11IevfHxcUeE0vnZUQ74EOiwXcs=",
"lastModified": 1683014792,
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e5530aba13caff5a4f41713f1265b754dc2abfd8",
"rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42",
"type": "github"
},
"original": {
@ -207,11 +192,11 @@
},
"nur": {
"locked": {
"lastModified": 1676281484,
"narHash": "sha256-dWZXiud69G6LwzpFCaKFD4wpKarTRYY3605rLN9fw50=",
"lastModified": 1683123657,
"narHash": "sha256-/RRubLn+P61uwruoELBD/xZtwdyjgLUH0YosbiV67lc=",
"owner": "nix-community",
"repo": "NUR",
"rev": "d44ab24d70b4e0080630730c42793fdff8ea0ace",
"rev": "bf213c6f18981ae52cc11d5fc07f8e94c9f5755e",
"type": "github"
},
"original": {
@ -223,6 +208,8 @@
"root": {
"inputs": {
"deploy-rs": "deploy-rs",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"gitlab_archiver": "gitlab_archiver",
"gitlab_artifacts_sync": "gitlab_artifacts_sync",
"home-manager-unstable": "home-manager-unstable",
@ -248,6 +235,21 @@
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tree-input": {
"inputs": {
"nixpkgs": [
@ -256,11 +258,11 @@
"std": "std"
},
"locked": {
"lastModified": 1674066361,
"narHash": "sha256-1f7L1be7u3x0jNDJ+W641kM9pZfd2ZLkjziRvKIZMvw=",
"lastModified": 1676505934,
"narHash": "sha256-jeqZtNLOKXRSDmD1v+b9+v+hwVyH6kcKzZ9f0gcJpdk=",
"owner": "kittywitch",
"repo": "tree",
"rev": "638ad6549febe360b0120375cae2bc3bb3b477f3",
"rev": "a831f6fd209e3d00c5026303994de28d0031ab3b",
"type": "github"
},
"original": {
@ -268,81 +270,6 @@
"repo": "tree",
"type": "github"
}
},
"utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_2": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_3": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_4": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_5": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
}
},
"root": "root",

18
flake.nix
View file

@ -2,10 +2,20 @@
description = "NixOS configuration";
inputs = {
# flake-utils which everyone uses for default systems list
flake-utils.url = "github:numtide/flake-utils";
# flake-compat which is used for non-flake stuff but added anyway to reduce dupes
flake-compat = {
url = "github:edolstra/flake-compat";
flake = false;
};
# nixpkgs Unstable Inputs
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager-unstable.url = "github:nix-community/home-manager";
home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable";
home-manager-unstable.inputs.utils.follows = "flake-utils";
#nix-darwin-unstable.url = "github:lnl7/nix-darwin/master";
#nix-darwin-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable";
@ -19,15 +29,23 @@
deploy-rs.url = "github:serokell/deploy-rs";
deploy-rs.inputs.nixpkgs.follows = "nixpkgs-fixed";
deploy-rs.inputs.utils.follows = "flake-utils";
deploy-rs.inputs.flake-compat.follows = "flake-compat";
musicutil.url = "gitlab:ChaotiCryptidz/musicutil";
musicutil.inputs.nixpkgs.follows = "nixpkgs-fixed";
musicutil.inputs.utils.follows = "flake-utils";
musicutil.inputs.flake-compat.follows = "flake-compat";
gitlab_archiver.url = "gitlab:ChaotiCryptidz/gitlab_archiver";
gitlab_archiver.inputs.nixpkgs.follows = "nixpkgs-fixed";
gitlab_archiver.inputs.utils.follows = "flake-utils";
gitlab_archiver.inputs.flake-compat.follows = "flake-compat";
gitlab_artifacts_sync.url = "gitlab:ChaotiCryptidz/gitlab_artifacts_sync";
gitlab_artifacts_sync.inputs.nixpkgs.follows = "nixpkgs-fixed";
gitlab_artifacts_sync.inputs.utils.follows = "flake-utils";
gitlab_artifacts_sync.inputs.flake-compat.follows = "flake-compat";
};
outputs = {...} @ inputs: import ./outputs.nix inputs;

1
home/apps/session.nix Normal file
View file

@ -0,0 +1 @@
{pkgs, ...}: {home.packages = with pkgs; [session-desktop];}

17
hosts/tablet/profiles/misskey-dev.nix
View file

@ -1,17 +0,0 @@
{...}: {
services.postgresql = {
enable = true;
ensureUsers = [
{
name = "misskey";
ensurePermissions."DATABASE misskey" = "ALL PRIVILEGES";
}
];
ensureDatabases = ["misskey"];
};
services.redis.servers."misskey" = {
enable = true;
port = 6379;
};
networking.firewall.allowedTCPPorts = [8024];
}

2
hosts/tablet/tablet.nix
View file

@ -15,10 +15,8 @@
hosts.tablet.profiles.wireguard
hosts.tablet.profiles.harry-vpn
hosts.tablet.profiles.misskey-dev
./secrets.nix
./profiles/wireguard.nix
];
home-manager.users.root = {

4
overlay/default.nix
View file

@ -4,8 +4,8 @@ final: _prev: {
roc-toolkit-patched = final.callPackage ./roc-toolkit-patched {};
roc-send-pcm = final.callPackage ./roc-send-pcm {};
piped-backend = final.callPackage ./piped/backend {
jre = final.openjdk17_headless;
jdk = final.openjdk17;
jre = final.openjdk19_headless;
jdk = final.openjdk19;
};
piped-frontend = final.callPackage ./piped/frontend {};
piped-proxy = final.callPackage ./piped/proxy {};

3
overlay/piped/backend/default.nix
View file

@ -55,9 +55,10 @@ in
buildPhase = ''
runHook preBuild
export JAVA_HOME=${jdk}
export GRADLE_USER_HOME=$(mktemp -d)
gradle --offline --init-script ${gradleInit} shadowJar
gradle -P org.gradle.java.installations.fromEnv=JAVA_HOME --offline --init-script ${gradleInit} shadowJar
runHook postBuild
'';

3
overlay/piped/backend/deps.nix
View file

@ -21,8 +21,9 @@ in
nativeBuildInputs = [gradle jdk perl];
buildPhase = ''
export JAVA_HOME=${jdk}
export GRADLE_USER_HOME=$(mktemp -d);
gradle --no-daemon assemble shadowJar
gradle -P org.gradle.java.installations.fromEnv=JAVA_HOME --no-daemon assemble shadowJar
'';
# perl code mavenizes paths (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)

1350
overlay/piped/frontend/yarn.nix
View file

File diff suppressed because it is too large Load diff

1
presets/nixos/desktop.nix
View file

@ -22,6 +22,7 @@
home.apps.firefox
home.apps.telegram
home.apps.quassel
home.apps.session
home.apps.obsidian
home.apps.strawberry

2
profiles/base/boot.nix
View file

@ -1 +1 @@
{...}: {boot.tmpOnTmpfs = true;}
{...}: {boot.tmp.useTmpfs = true;}

1
profiles/base/zsh.nix
View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
environment.pathsToLink = ["/share/zsh"];
environment.shells = with pkgs; [zsh];
programs.zsh.enable = true;
}

17
profiles/sound/pipewire/default.nix
View file

@ -7,14 +7,13 @@ _: {
alsa.support32Bit = true;
pulse.enable = true;
jack.enable = true;
config.pipewire = {
"context.properties" = {
# So fiio btr3k works,
"default.clock.rate" = "48000";
};
};
wireplumber.enable = false;
media-session.enable = true;
# TODO: fix config
#config.pipewire = {
# "context.properties" = {
# # So fiio btr3k works,
# "default.clock.rate" = "48000";
# };
#};
wireplumber.enable = true;
};
}