v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Actions Packages Projects Releases Activity

updates

Browse source
This commit is contained in:
Vivian 2022-10-06 11:54:43 +02:00
parent 124cf496ea
commit f4eeb27b20
8 changed files with 2931 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
flake.lock
View file

@ -154,11 +154,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1663678795,
"narHash": "sha256-SkROcpe7lb46fpBnwMYooExP6WqttsRPeao1d9ykHho=",
"lastModified": 1664882193,
"narHash": "sha256-uiAYOxN/M4dpaB6ieY3xOvOH6XgHP9NVXDTzSRa3pMc=",
"owner": "nix-community",
"repo": "dream2nix",
"rev": "0f3b6c5dd1630d601ae6f456421b4dfed178f260",
"rev": "785b76894263fd76a0e69955e4cd990b7b735bdf",
"type": "github"
},
"original": {
@ -420,11 +420,11 @@
"utils": "utils_3"
},
"locked": {
"lastModified": 1664783440,
"narHash": "sha256-KlMwR7mUf5h8MPnzV7nGFUAt6ih/euW5xgvZ5x+hwvI=",
"lastModified": 1664983332,
"narHash": "sha256-KyQvgFRwk3qW3Qr+lO5UDqfpST/HaCJY1yB7wPgPUqo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e4e639dd4dc3e431aa5b5f95325f9a66ac7e0dd9",
"rev": "1a8e35d2e53ed2ccd9818fad9c9478d56c655661",
"type": "github"
},
"original": {
@ -439,11 +439,11 @@
"wlroots": "wlroots"
},
"locked": {
"lastModified": 1664835015,
"narHash": "sha256-7XpQRUhO1rgklw976lXpEcz5piCbWF1UUTqiUn0CZxc=",
"lastModified": 1665044765,
"narHash": "sha256-/ubu4NLIxQmKoD4al6L8qFE74FbFWmIrtjwwnyOYv0A=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "63dfe305dd5ff00d4de74f0cb9fea9b9901e6b40",
"rev": "d7ef19e2e745c2184fcf5c2ce6ac4208d6a81594",
"type": "github"
},
"original": {
@ -550,11 +550,11 @@
"utils": "utils_5"
},
"locked": {
"lastModified": 1664848276,
"narHash": "sha256-sS3CiLiBM9XUy+QuW54XqjhvNroEwLnFGaEwDVYd9HE=",
"lastModified": 1665020519,
"narHash": "sha256-1DdFTskxpBw/McAuNNvUkWpNtSN1tUywpsBjNfsSBLY=",
"owner": "jyooru",
"repo": "nix-minecraft-servers",
"rev": "7717252ee5246ad22cfc24891a67377561af54ac",
"rev": "d34bbd2bbb2afb2f43365238c218f97365686742",
"type": "github"
},
"original": {
@ -667,11 +667,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1664687381,
"narHash": "sha256-9czSuDzS+OGGwq2kC4KXBLXWfYaup+oLB+AA1Md25U4=",
"lastModified": 1664780719,
"narHash": "sha256-Oxe6la5dSqRfJogjtY4sRzJjDDqvroJIVkcGEOT87MA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "59d2991d4256cdca1c0cda45d876c80a0fe45c31",
"rev": "fd54651f5ffb4a36e8463e0c327a78442b26cbe7",
"type": "github"
},
"original": {
@ -698,11 +698,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1664872841,
"narHash": "sha256-IYTe6nvULk7TnltI1qSxh2zdT3lbn2ZqqhUXyAADD2w=",
"lastModified": 1665049962,
"narHash": "sha256-d3KxQQyrq0YXwoDFHXaIsCSB9ZNMwnAJjChO85j4kZE=",
"owner": "NULLx76",
"repo": "nixpkgs",
"rev": "7802eb63130185de1022a1bfbc8e9ba2e0b5d9e6",
"rev": "581a16b4db39d6ead5dba08ebe9405a9e4b19d94",
"type": "github"
},
"original": {
@ -760,11 +760,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1663684946,
"narHash": "sha256-2+miCrlBWC3ELfz862mJ4U8qQyfiD+XLzD9p6k/WzCs=",
"lastModified": 1664876616,
"narHash": "sha256-OxZntLnFgKbGUrPJJNLMxxj4yUaN/30+LG9N81ADqZE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0d7222c92f0503d15176281c7182d2782dc1b6da",
"rev": "0490b307e5556a8804e710d0c744d29c80fbce48",
"type": "github"
},
"original": {
@ -826,11 +826,11 @@
]
},
"locked": {
"lastModified": 1664557358,
"narHash": "sha256-ok/e+vBUyt3OhdG0ND7d0INxAA5w9+SRxGlUtao0nv4=",
"lastModified": 1664896222,
"narHash": "sha256-jaK5TW4W5hEif/4lpoMRSr/8oWapGVc/ac7X5DPYYv4=",
"owner": "DeterminateSystems",
"repo": "riff",
"rev": "8a11573a00386a5849af5534b5d0336092299eef",
"rev": "25b8d0dfdeaa9f325737b704285b2738223b8c3d",
"type": "github"
},
"original": {
@ -1053,11 +1053,11 @@
"webcord": "webcord_2"
},
"locked": {
"lastModified": 1664817607,
"narHash": "sha256-1c9doRBUy61lrkA5MTRF4xIE9VcnBxfWUGzXMnMm0CM=",
"lastModified": 1664913401,
"narHash": "sha256-OQEQl0THKfnvBfboOFyWPzLhQejf539q1j4TD6dC64k=",
"owner": "fufexan",
"repo": "webcord-flake",
"rev": "6fdcb79b9aa692acf95c2c9e05b7cd7fa426a385",
"rev": "8d52a20956de918df1b63df2ebc18d598b06df48",
"type": "github"
},
"original": {
@ -1069,11 +1069,11 @@
"webcord_2": {
"flake": false,
"locked": {
"lastModified": 1663533822,
"narHash": "sha256-TvlaaWu40La+CRD2+zXXRmyAF6LEU63eH/BuEQgUiQ4=",
"lastModified": 1664742535,
"narHash": "sha256-QoXBlhCM97haNlkbU4O2oXITnzrkiM9hYAiNpduVjIQ=",
"owner": "SpacingBat3",
"repo": "WebCord",
"rev": "2df618b4669eaca06b2f635145d1293a612fa24c",
"rev": "cb6938bde4f57b252b167b23fc0c2d6120326fff",
"type": "github"
},
"original": {

41
nixos/hosts/thalassa/null/home/default.nix
View file

@ -18,6 +18,7 @@ in {
];
home.packages = with pkgs; [
appimage-run
brightnessctl
btop
calibre
@ -42,7 +43,6 @@ in {
nixpkgs-review
plex-media-player
plexamp
pulseview
python3
retroarchFull
ripgrep
@ -52,7 +52,6 @@ in {
solo2-cli
steam-run
tex
# texlive.combined.scheme-full
thunderbird-wayland
wf-recorder # Screenrecorder
wl-clipboard # Clipboard manager
@ -137,24 +136,28 @@ in {
"nix.serverPath" =
"${pkgs.nil}/bin/nil"; # The path to the LSP server executable.
"[nix]" = { "editor.defaultFormatter" = "brettm12345.nixfmt-vscode"; };
# "platformio-ide.useBuiltinPIOCore" = false;
# "platformio-ide.useBuiltinPython" = false;
};
extensions = with pkgs.vscode-extensions; [
catppuccin.catppuccin-vsc
brettm12345.nixfmt-vscode
codezombiech.gitignore
editorconfig.editorconfig
foxundermoon.shell-format
james-yu.latex-workshop
jnoortheen.nix-ide
matklad.rust-analyzer
mkhl.direnv
ms-vscode-remote.remote-ssh
ms-vscode.cpptools
tamasfe.even-better-toml
valentjn.vscode-ltex
vscodevim.vim
xaver.clang-format
];
extensions = with pkgs.vscode-extensions;
with pkgs.v.vscode-extensions; [
brettm12345.nixfmt-vscode
catppuccin.catppuccin-vsc
codezombiech.gitignore
editorconfig.editorconfig
foxundermoon.shell-format
james-yu.latex-workshop
jnoortheen.nix-ide
matklad.rust-analyzer
mkhl.direnv
ms-vscode-remote.remote-ssh
ms-vscode.cpptools
platformio.platformio-ide
tamasfe.even-better-toml
valentjn.vscode-ltex
vscodevim.vim
xaver.clang-format
];
};
programs.direnv = {

3
nixos/hosts/thalassa/null/networking.nix
View file

@ -33,6 +33,9 @@
"sha256('yeet')" = {
psk = "@SHA256_PASSWORD@";
};
"wired" = {
psk = "@WIRED_PASSWORD@";
};
};
};

46
nixos/pkgs/deemix-gui/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ pkgs, stdenv, electron_14, mkYarnPackage, fetchFromGitLab, lib }:
let electron = electron_14;
in mkYarnPackage rec {
pname = "deemix-gui";
version = "0.1.0";
src = fetchFromGitLab {
owner = "RemixDev";
repo = "deemix-gui";
rev = "06305de9cf65639620eeaee408f1c64cb8610387";
sha256 = "sha256-498ivYIFUWDamtI38PUEag9ydWpXfhtzgI3rTOcmTJQ=";
};
packageJSON = ./package.json;
yarnLock = ./yarn.lock;
buildInputs = [ electron ];
installPhase = ''
ls -al
runHook preInstall
mkdir -p $out/{bin,libexec/${pname}}
mv node_modules $out/libexec/${pname}/node_modules
mv deps $out/libexec/${pname}/deps
runHook postInstall
'';
distPhase = ''
true
'';
# distPhase = ''
# cd $out
# unlink "$out/libexec/${pname}/deps/${pname}/node_modules"
# ln -s "$out/libexec/${pname}/node_modules" "$out/libexec/${pname}/deps/${pname}/desktop/node_modules"
# ls -al
# ls -al libexec
# mkdir -p bin
# cd bin
# echo '#!/bin/sh' > ${pname}
# echo "cd $out/libexec/${pname}/deps/${pname}" >> ${pname}
# echo "${electron}/bin/electron $out/libexec/${pname}/deps/${pname}/desktop" >> ${pname}
# chmod 0755 $out/bin/${pname}
# true
# '';
}

84
nixos/pkgs/deemix-gui/package.json Normal file
View file

@ -0,0 +1,84 @@
{
"name": "deemix-gui",
"version": "0.0.0",
"main": "index.js",
"repository": "https://gitlab.com/RemixDev/deemix-gui.git",
"author": "RemixDev <RemixDev64@gmail.com>",
"license": "GPL-3.0-only",
"scripts": {
"install-all": "yarn install && yarn --cwd server install --production && yarn --cwd webui install --production",
"install-all-dev": "yarn install && yarn --cwd server install && yarn --cwd webui install",
"dev": "yarn --cwd webui dev",
"start": "electron . --dev",
"predist": "yarn build-server && yarn build-webui",
"dist": "yarn set-version && electron-builder && yarn reset-version",
"dist:dir": "yarn set-version && yarn predist && electron-builder --dir && yarn reset-version",
"dist-server": "yarn set-version && yarn predist && ./node_modules/.bin/pkg --out-dir dist ./server/package.json && yarn reset-version",
"start-server": "yarn --cwd server start",
"build-server": "yarn --cwd server build",
"build-webui": "yarn --cwd webui build",
"set-version": "node scripts/set-version.js",
"reset-version": "node scripts/reset-version.js"
},
"devDependencies": {
"electron": "^14.2.0",
"electron-builder": "^22.14.0",
"pkg": "^5.5.0"
},
"dependencies": {
"electron-context-menu": "^3.1.0",
"electron-window-state-manager": "^0.3.2",
"yargs": "^17.3.0"
},
"build": {
"appId": "app.deemix.gui",
"productName": "deemix-gui",
"files": [
"index.js",
"preload.js",
"server/dist/**/*",
"webui/public/**/*",
"build/**/*",
"package.json"
],
"mac": {
"target": "dmg",
"artifactName": "deemix-gui.${ext}",
"category": "public.app-category.music"
},
"win": {
"target": [
{
"target": "nsis",
"arch": "x64"
},
{
"target": "portable",
"arch": "x64"
}
]
},
"linux": {
"target": [
"appimage",
"deb"
],
"artifactName": "deemix-gui.${ext}",
"category": "AudioVideo,Audio",
"icon": "build/icon.icns"
},
"nsis": {
"artifactName": "${productName}_setup.${ext}",
"oneClick": false,
"license": "LICENSE.txt",
"allowToChangeInstallationDirectory": true,
"uninstallDisplayName": "${productName}",
"deleteAppDataOnUninstall": true
},
"portable": {
"artifactName": "${productName}.${ext}",
"requestExecutionLevel": "user"
}
}
}

2727
nixos/pkgs/deemix-gui/yarn.lock Normal file
View file

File diff suppressed because it is too large Load diff

7
nixos/pkgs/default.nix
View file

@ -1,3 +1,4 @@
# nix-build -E 'with import <nixpkgs> {}; callPackage ./platformio.nix {}'
final: prev: {
catppuccin.cursors = prev.callPackage ./catppuccin/cursors { };
@ -6,6 +7,8 @@ final: prev: {
v = {
glitch-soc = prev.callPackage ./glitch-soc { };
deemix-gui = prev.callPackage ./deemix-gui { };
unbound = prev.unbound.override {
withSystemd = true;
withDoH = true;
@ -16,5 +19,9 @@ final: prev: {
dnd-5e-latex-template = prev.callPackage ./dnd-5e-latex-template { };
gitea-agatheme = prev.callPackage ./gitea-agatheme { };
vscode-extensions = {
platformio.platformio-ide = prev.callPackage ./vscode-extensions/platformio.nix { };
};
};
}

12
nixos/pkgs/vscode-extensions/platformio.nix Normal file
View file

@ -0,0 +1,12 @@
{ vscode-utils, lib }:
let inherit (vscode-utils) buildVscodeMarketplaceExtension;
in buildVscodeMarketplaceExtension {
# TODO: Auto install settings: `"platformio-ide.useBuiltinPIOCore": false`
mktplcRef = {
name = "platformio-ide";
publisher = "platformio";
version = "2.5.4";
sha256 = "sha256-/vBdZ6Mu1KlF+glqp5CNt9WeK1ECqfaivCnK8TisChg=";
};
# meta = { license = lib.licenses.apache; };
}