manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Store app configs under programs

Browse source
This commit is contained in:
Manuel Thalmann 2024-10-13 19:52:28 +02:00
parent 95d079bcaf
commit 561ac46073
11 changed files with 80 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/modules/packages/git.nix
View file

@ -40,13 +40,13 @@ let
in {
options = {
valhalla = {
git = gitOption;
programs.git = gitOption;
users = mkOption {
type = types.attrsOf (types.submodule (
{ ... }: {
options = {
git = gitOption;
programs.git = gitOption;
};
}));
};

2
lib/modules/packages/nextcloud.nix
View file

@ -25,7 +25,7 @@ in {
type = types.attrsOf (types.submodule (
{ ... }: {
options = {
nextcloud = {
programs.nextcloud = {
folderSyncs = mkOption {
type = types.listOf syncType;
description = "The folders to synchronize.";

2
lib/modules/packages/oh-my-posh.nix
View file

@ -40,7 +40,7 @@ in {
type = types.attrsOf (types.submodule (
{ ... }: {
options = {
oh-my-posh = mkOption {
programs.oh-my-posh = mkOption {
type = ompType;
description = "The Oh My Posh configuration to apply.";
default = { };

2
lib/modules/packages/rclone.nix
View file

@ -23,7 +23,7 @@ in {
type = types.attrsOf (types.submodule (
{ ... }: {
options = {
rclone = {
programs.rclone = {
configurations = mkOption {
type = types.attrsOf syncType;
description = "The configurations of the rclone mounts.";

72
profiles/machines/manuel/Generic/config.nix
View file

@ -45,43 +45,45 @@ in {
};
};
git = let defaultBranch = "main";
in {
inherit defaultBranch;
programs = {
git = let defaultBranch = "main";
in {
inherit defaultBranch;
flow = {
mainBranch = defaultBranch;
devBranch = "dev";
};
flow = {
mainBranch = defaultBranch;
devBranch = "dev";
};
aliases = {
ahfange = "init";
tuedezue = "add";
beschuldig = "blame";
zieh = "pull";
druck = "push";
machnah = "clone";
hol = "fetch";
zwiigab = "branch";
buechiih = "commit";
eich = "rebase";
erd = "rebase";
gahufwiifelde = "rebase";
vergliich = "diff";
tuezemme = "merge";
versorg = "stash";
markier = "tag";
pflueckoepfel = "cherry-pick";
pflueckhimbeeri = "cherry-pick";
buechuus = "checkout";
quaetsch = "merge --squash";
pfudle = "push --force";
beschuldigung = "blame";
zwiigli = "branch";
tagebuech = "log";
versteck = "stash";
zuestand = "status";
markierig = "tag";
aliases = {
ahfange = "init";
tuedezue = "add";
beschuldig = "blame";
zieh = "pull";
druck = "push";
machnah = "clone";
hol = "fetch";
zwiigab = "branch";
buechiih = "commit";
eich = "rebase";
erd = "rebase";
gahufwiifelde = "rebase";
vergliich = "diff";
tuezemme = "merge";
versorg = "stash";
markier = "tag";
pflueckoepfel = "cherry-pick";
pflueckhimbeeri = "cherry-pick";
buechuus = "checkout";
quaetsch = "merge --squash";
pfudle = "push --force";
beschuldigung = "blame";
zwiigli = "branch";
tagebuech = "log";
versteck = "stash";
zuestand = "status";
markierig = "tag";
};
};
};
};

58
profiles/users/manuel/config.nix
View file

@ -7,9 +7,11 @@
displayName = "Manuel Thalmann";
mailAddress = "m@nuth.ch";
oh-my-posh = {
theme = {
source = ./manuel.omp.json;
programs = {
oh-my-posh = {
theme = {
source = ./manuel.omp.json;
};
};
};
};
@ -22,36 +24,40 @@
"nix-users"
];
rclone = {
configurations = {
nextcloud = {
dirName = "Nextcloud";
};
programs = {
rclone = {
configurations = {
nextcloud = {
dirName = "Nextcloud";
};
proton = {
dirName = "Proton";
cacheDuration = "2w";
proton = {
dirName = "Proton";
cacheDuration = "2w";
};
};
};
};
};
windows.users.manuel = {
nextcloud = {
folderSyncs = let
localPath = "C:/tools/RetroArch-Win64";
remotePath = "/Saved Games/RetroArch";
in [
{
remotePath = "${remotePath}/Saves";
localPath = "${localPath}/saves";
virtualFiles = false;
}
{
remotePath = "${remotePath}/System";
localPath = "${localPath}/system";
}
];
programs = {
nextcloud = {
folderSyncs = let
localPath = "C:/tools/RetroArch-Win64";
remotePath = "/Saved Games/RetroArch";
in [
{
remotePath = "${remotePath}/Saves";
localPath = "${localPath}/saves";
virtualFiles = false;
}
{
remotePath = "${remotePath}/System";
localPath = "${localPath}/system";
}
];
};
};
};
};

2
scripts/Common/Software/git/Main.ps1
View file

@ -21,7 +21,7 @@
$configArgs = @("--system");
}
$config = & $getConfig "git";
$config = & $getConfig "programs.git";
<#
.SYNOPSIS

4
scripts/Common/Software/oh-my-posh/Main.ps1
View file

@ -23,7 +23,7 @@ Start-SoftwareInstaller @args `
)
$user = $Arguments.Name;
$theme = Get-UserConfig -UserName "$user" "oh-my-posh.theme";
$theme = Get-UserConfig -UserName "$user" "programs.oh-my-posh.theme";
function New-Theme {
param($info)
@ -52,7 +52,7 @@ Start-SoftwareInstaller @args `
return $path;
}
foreach ($additionalTheme in (Get-UserConfig -UserName "$user" "oh-my-posh.additionalThemes")) {
foreach ($additionalTheme in (Get-UserConfig -UserName "$user" "programs.oh-my-posh.additionalThemes")) {
Write-Host "creating theme $additionalTheme";
$null = New-Theme $additionalTheme;
}

2
scripts/Common/Software/rclone/main.fish
View file

@ -9,7 +9,7 @@ begin
function userConfig -V dir -a name
source "$dir/../../Scripts/config.fish"
set -l key "rclone.configurations"
set -l key "programs.rclone.configurations"
set -l configs (getUserConfig "$name" "$key" --apply "builtins.attrNames" --json)
if [ (echo "$configs" | jq "length") -gt 0 ]

2
scripts/Windows/Software/git/Main.ps1
View file

@ -7,7 +7,7 @@ Start-SoftwareInstaller @args `
-Inherit "$PSScriptRoot/../../../Common/Software/git/Main.ps1" `
-Installer {
$params = "/WindowsTerminalProfile";
$defaultBranch = Get-OSConfig "git.defaultBranch";
$defaultBranch = Get-OSConfig "programs.git.defaultBranch";
if ($defaultBranch) {
$params += " /DefaultBranchName:`"$defaultBranch`"";

2
scripts/Windows/Software/nextcloud/Main.ps1
View file

@ -87,7 +87,7 @@
$user = $Arguments.Name;
& {
$syncs = Get-UserConfig -UserName $user "nextcloud.folderSyncs";
$syncs = Get-UserConfig -UserName $user "programs.nextcloud.folderSyncs";
$configExists = { (Test-Path (Get-ConfigFile) ) };
if ($syncs.Count -gt 0) {