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

Enable software properly

Browse source
This commit is contained in:
Manuel Thalmann 2024-10-14 01:55:19 +02:00
parent 6f2583063c
commit a3b79159e6
14 changed files with 512 additions and 398 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/modules/hardware.nix
View file

@ -1,5 +1,8 @@
{ lib, ... }: { config, lib, ... }:
let inherit (lib) mkOption types; let
inherit (lib) mkOption types;
optionalAttrs = lib.attrsets.optionalAttrs;
hw = config.valhalla.hardware;
in { in {
options = { options = {
valhalla = { valhalla = {
@ -51,13 +54,22 @@ in {
description = "A value indicating whether an Elgato Wave device is present."; description = "A value indicating whether an Elgato Wave device is present.";
default = false; default = false;
}; };
logitechG = mkOption {
type = types.bool;
description = "A value indicating whether a Logitech G device is present.";
default = false;
};
}; };
}; };
}; };
config = {
valhalla = {
linux.programs = (optionalAttrs hw.nvidiaGPU {
nvidia-dkms.enable = true;
}) // (optionalAttrs hw.xoneReceiver {
xone.enable = true;
});
windows.programs = (optionalAttrs hw.eyeX {
tobii-gamehub.enable = lib.mkDefault true;
tobii-ghost.enable = lib.mkDefault true;
});
};
};
} }

145
lib/modules/programs.nix
View file

@ -3,24 +3,84 @@ let
inherit (lib) mkEnableOption mkDefault mkOption types; inherit (lib) mkEnableOption mkDefault mkOption types;
cfg = config.valhalla; cfg = config.valhalla;
mkUsersOption = osConfig: mkOption { mkUsersOption = programs: osConfig: mkOption {
type = types.attrsOf (types.submodule ( type = types.attrsOf (types.submodule (
{ ... }: { { ... }: {
config = { options = {
programs = builtins.mapAttrs ( inherit programs;
name: config: { };
enable = mkDefault config.enable;
}) osConfig.programs; config = {
programs = builtins.mapAttrs (
name: config: {
enable = mkDefault config.enable;
}) osConfig.programs;
}; };
})); }));
}; };
mkPrograms = infos: builtins.foldl' (info: programs: mkPrograms = infos: builtins.foldl' (programs: info:
programs // { programs // {
"${info.0}" = { ${builtins.elemAt info 0} = {
enable = mkEnableOption info.1; enable = mkEnableOption (builtins.elemAt info 1);
}; };
}) { } infos; }) { } infos;
programs = mkPrograms [
["aliae" "aliae"]
["brave" "Brave Browser"]
["discord" "Discord"]
["docker" "docker"]
["firefox" "Firefox Web Browser"]
["openssh" "OpenSSH"]
["osu!lazer" "osu!lazer"]
["pennywise" "Pennywise"]
["powershell" "PowerShell Core"]
["retroarch" "RetroArch"]
["steam" "Steam"]
["thunderbird" "Thunderbird"]
["vscode" "Visual Studio Code"]
["zoxide" "zoxide"]
];
linuxPrograms = mkPrograms [
["bash" "Bash"]
["fish" "fish"]
["icedtea" "IcedTea"]
["grub" "GRUB"]
["logo-ls" "logo-ls"]
["lutris" "Lutris"]
["minegrub-theme" "Minegrub Theme"]
["nodejs-n" "n"]
["nuke-usb" "nuke-usb"]
["nvidia-dkms" "Nvidia Drivers"]
["plasma" "Plasma"]
["pyenv" "pyenv"]
["sddm" "SDDM"]
["vim" "Vim"]
["virt-manager" "Virtual Machine Manager"]
["waydroid" "Waydroid"]
["xone" "xone"]
];
windowsPrograms = mkPrograms [
["lghub" "Logitech G Hub"]
["maniaplanet" "ManiaPlanet"]
["msedge-redirect" "MSEdgeRedirect"]
["nvs" "Node Version Switcher"]
["osu!" "Osu!"]
["posh-git" "posh-git"]
["putty" "PuTTY"]
["rewasd" "reWASD"]
["terminal-icons" "Terminal Icons"]
["tm-nations-forever" "TrackMania Nations Forever"]
["tm-united-forever" "TrackMania United Forever"]
["tobii-gamehub" "Tobii Game Hub"]
["tobii-ghost" "Tobii Ghost"]
["ubiquiti-unifi-controller" "Ubiquiti UniFi Controller"]
["visualstudio" "Visual Studio"]
["winscp" "WinSCP"]
];
in { in {
imports = [ imports = [
./programs/git.nix ./programs/git.nix
@ -31,68 +91,13 @@ in {
options = { options = {
valhalla = { valhalla = {
users = mkUsersOption cfg; users = mkUsersOption programs cfg;
linux.users = mkUsersOption cfg.linux; linux.users = mkUsersOption linuxPrograms cfg.linux;
windows.users = mkUsersOption cfg.windows; windows.users = mkUsersOption windowsPrograms cfg.windows;
programs = mkPrograms [ inherit programs;
["aliae" "aliae"] linux.programs = linuxPrograms;
["brave" "Brave Browser"] windows.programs = windowsPrograms;
["discord" "Discord"]
["docker" "docker"]
["firefox" "Firefox Web Browser"]
["git" "git"]
["nextcloud" "Nextcloud Client"]
["oh-my-posh" "Oh My Posh"]
["openssh" "OpenSSH"]
["osu!lazer" "osu!lazer"]
["pennywise" "Pennywise"]
["powershell" "PowerShell Core"]
["retroarch" "RetroArch"]
["steam" "Steam"]
["thunderbird" "Thunderbird"]
["vscode" "Visual Studio Code"]
["zoxide" "zoxide"]
];
linux.programs = mkPrograms [
["bash" "Bash"]
["fish" "fish"]
["icedtea" "IcedTea"]
["grub" "GRUB"]
["lghub" "Logitech G Hub"]
["logo-ls" "logo-ls"]
["lutris" "Lutris"]
["minegrub-theme" "Minegrub Theme"]
["nodejs-n" "n"]
["nuke-usb" "nuke-usb"]
["nvidia-dkms" "Nvidia Drivers"]
["plasma" "Plasma"]
["pyenv" "pyenv"]
["rclone" "rclone"]
["sddm" "SDDM"]
["vim" "Vim"]
["virt-manager" "Virtual Machine Manager"]
["waydroid" "Waydroid"]
["xone" "xone"]
];
windows.programs = mkPrograms [
["maniaplanet" "ManiaPlanet"]
["msedge-redirect" "MSEdgeRedirect"]
["nvs" "Node Version Switcher"]
["osu!" "Osu!"]
["putty" "PuTTY"]
["rewasd" "reWASD"]
["terminal-icons" "Terminal Icons"]
["tm-nations-forever" "TrackMania Nations Forever"]
["tm-united-forever" "TrackMania United Forever"]
["tobii-gamehub" "Tobii Game Hub"]
["tobii-ghost" "Tobii Ghost"]
["ubiquiti-unifi-controller" "Ubiquiti UniFi Controller"]
["visualstudio" "Visual Studio"]
["winscp" "WinSCP"]
];
}; };
}; };
} }

215
lib/modules/software.nix
View file

@ -1,89 +1,154 @@
{ lib, config, ... }: { lib, ... }:
let let inherit (lib) mkOption types;
inherit (lib) mkOption types; in {
cfg = config.valhalla; imports = [
in { ./programs.nix
imports = [ ];
./programs.nix
];
options = { options = {
valhalla = { valhalla = mkOption {
software = let type = types.submodule (
inherit (cfg.software) coding common desktopExperience school server; { config, ... }:
in { let
essential = mkOption { optionalAttrs = lib.attrsets.optionalAttrs;
type = types.bool; cfg = config;
description = "A value indicating whether essentials should be installed."; inherit (cfg.software) coding desktopExperience essential gaming socialMedia;
default = true;
};
common = mkOption { mkPrograms = programs: builtins.foldl' (
type = types.bool; programs: name: programs // {
description = "A value indicating whether common software should be installed."; ${name}.enable = true;
default = true; }) {} programs;
}; in {
options = {
software = {
essential = mkOption {
type = types.bool;
description = "A value indicating whether essentials should be installed.";
default = false;
};
server = mkOption { common = mkOption {
type = types.bool; type = types.bool;
description = "A value indicating whether server applications should be installed."; description = "A value indicating whether common software should be installed.";
default = false; default = false;
}; };
desktopExperience = mkOption { server = mkOption {
type = types.bool; type = types.bool;
description = "A value indicating whether GUI apps should be installed."; description = "A value indicating whether server applications should be installed.";
default = common && !server; default = false;
}; };
fileSync = mkOption { desktopExperience = mkOption {
type = types.bool; type = types.bool;
description = "A value indicating whether file syncs should be installed."; description = "A value indicating whether GUI apps should be installed.";
default = common && !server; default = false;
}; };
school = mkOption { school = mkOption {
type = types.bool; type = types.bool;
description = "A value indicating whether software for studies should be installed."; description = "A value indicating whether software for studies should be installed.";
default = false; default = false;
}; };
productivity = mkOption { productivity = mkOption {
type = types.bool; type = types.bool;
description = "A value indicating whether productivity apps should be installed."; description = "A value indicating whether productivity apps should be installed.";
default = common || school; default = false;
}; };
socialMedia = mkOption { socialMedia = mkOption {
type = types.bool; type = types.bool;
description = "A value indicating whether social media apps should be installed."; description = "A value indicating whether social media apps should be installed.";
default = common && desktopExperience; default = false;
}; };
media = mkOption { media = mkOption {
type = types.bool; type = types.bool;
description = "A value indicating whether media apps should be installed."; description = "A value indicating whether media apps should be installed.";
default = common && desktopExperience; default = false;
}; };
gaming = mkOption { gaming = mkOption {
type = types.bool; type = types.bool;
description = "A value indicating whether gaming apps should be installed."; description = "A value indicating whether gaming apps should be installed.";
default = common && desktopExperience; default = false;
}; };
coding = mkOption { coding = mkOption {
type = types.bool; type = types.bool;
description = "A value indicating whether development apps should be installed."; description = "A value indicating whether development apps should be installed.";
default = common; default = false;
}; };
};
};
python = mkOption { config = {
type = types.bool; programs = (optionalAttrs essential (mkPrograms [
description = "A value indicating whether apps for coding python should be installed."; "aliae"
default = coding; "git"
}; "oh-my-posh"
"openssh"
"powershell"
"zoxide"
])) // (optionalAttrs desktopExperience (mkPrograms [
"brave"
"firefox"
"pennywise"
"thunderbird"
])) // (optionalAttrs socialMedia (mkPrograms [
"discord"
])) // (optionalAttrs coding (mkPrograms [
"docker"
"vscode"
])) // (optionalAttrs gaming (mkPrograms [
"osu!lazer"
"retroarch"
"steam"
]));
linux.programs = (optionalAttrs essential (mkPrograms [
"bash"
"logo-ls"
"minegrub-theme"
"nuke-usb"
"vim"
])) // (optionalAttrs desktopExperience (mkPrograms [
"icedtea"
"plasma"
"sddm"
"waydroid"
"virt-manager"
])) // (optionalAttrs coding (mkPrograms [
"nodejs-n"
"pyenv"
])) // (optionalAttrs gaming (mkPrograms [
"lutris"
]));
# Essentials
windows.programs = (optionalAttrs essential (mkPrograms [
"posh-git"
"terminal-icons"
# Desktop Experience
])) // (optionalAttrs desktopExperience (mkPrograms [
"msedge-redirect"
"putty"
"winscp"
# Development
])) // (optionalAttrs coding (mkPrograms [
"nvs"
"visualstudio"
# Gaming
])) // (optionalAttrs gaming (mkPrograms [
"maniaplanet"
"osu!"
"rewasd"
"tm-nations-forever"
"tm-united-forever"
]));
};
});
}; };
}; };
}; }
}

5
profiles/machines/manuel/DerGeret/config.nix
View file

@ -18,6 +18,10 @@
microsoftAccount = true; microsoftAccount = true;
groups = [ "Administrators" ]; groups = [ "Administrators" ];
}; };
programs = {
lghub.enable = true;
};
}; };
partition.os.partitions = { partition.os.partitions = {
@ -45,7 +49,6 @@
eyeX = true; eyeX = true;
amdCPU = true; amdCPU = true;
nvidiaGPU = true; nvidiaGPU = true;
logitechG = true;
corsairDevice = true; corsairDevice = true;
elgatoWave = true; elgatoWave = true;
}; };

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

@ -45,6 +45,19 @@ in {
}; };
}; };
software = {
essential = true;
common = true;
desktopExperience = true;
productivity = true;
socialMedia = true;
media = true;
gaming = true;
coding = true;
};
linux.programs.grub.enable = true;
programs = { programs = {
git = let defaultBranch = "main"; git = let defaultBranch = "main";
in { in {
@ -86,6 +99,8 @@ in {
}; };
}; };
}; };
windows.programs.ubiquiti-unifi-controller.enable = true;
}; };
}; };
} }

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

@ -3,6 +3,14 @@
config = { config = {
valhalla = { valhalla = {
programs = {
nextcloud.enable = true;
};
linux.programs = {
rclone.enable = true;
};
users.manuel = { users.manuel = {
displayName = "Manuel Thalmann"; displayName = "Manuel Thalmann";
mailAddress = "m@nuth.ch"; mailAddress = "m@nuth.ch";

2
scripts/Arch/Config/SecureBoot/main.fish
View file

@ -31,5 +31,5 @@ begin
sudo secure-grub-install sudo secure-grub-install
end end
runInstaller $argv runInstaller --force $argv
end end

2
scripts/Arch/Drivers/Surface/main.fish
View file

@ -40,5 +40,5 @@ begin
fish "$dir/../../Software/grub/main.fish" configure fish "$dir/../../Software/grub/main.fish" configure
end end
runInstaller $argv runInstaller --force $argv
end end

2
scripts/Arch/Drivers/SurfaceBook2/main.fish
View file

@ -21,6 +21,6 @@ begin
sudo systemctl enable --global surface-dtx-userd.service sudo systemctl enable --global surface-dtx-userd.service
end end
runInstaller $argv runInstaller --force $argv
fish "$dir/../Surface/main.fish" $argv fish "$dir/../Surface/main.fish" $argv
end end

355
scripts/Arch/Scripts/deploy.fish
View file

@ -45,142 +45,130 @@ function deploySoftware -d "Deploys a the specified software action" -a action
yayinst bt-dualboot yayinst bt-dualboot
end end
and if collectionActive essential and if collectionActive essential && $isInstall
if $isInstall yayinst \
yayinst \ mkinitcpio-firmware \
mkinitcpio-firmware \ neofetch \
neofetch \ bash-completion \
bash-completion \ wget \
wget \ screen \
screen \ tmux \
tmux \ htop \
htop \ lsof \
lsof \ zsh \
zsh \ fish \
fish \ pkgfile \
pkgfile \ sl \
sl \ rar
rar
and sudo pkgfile --update and sudo pkgfile --update
end
and source "$dir/../../Common/Software/bash/main.fish" $argv yayinst \
and source "$dir/../../Common/Software/nuke-usb/main.fish" $argv tldr \
and source "$dir/../Software/sudo/main.fish" $argv btop \
and source "$dir/../Software/aliae/main.fish" $argv terminal-parrot
and source "$dir/../Software/oh-my-posh/main.fish" $argv
and source "$dir/../Software/openssh/main.fish" $argv
and source "$dir/../Software/vim/main.fish" $argv
and source "$dir/../Software/git/main.fish" $argv
and source "$dir/../Software/zoxide/main.fish" $argv
and source "$dir/../Software/logo-ls/main.fish" $argv
# GRUB Shenanigans - if that's not essential I don't know what is!
and source "$dir/../Software/minegrub-theme/main.fish" $argv
end end
and if collectionActive common and source "$dir/../../Common/Software/bash/main.fish" $argv
if $isInstall and source "$dir/../../Common/Software/nuke-usb/main.fish" $argv
yayinst \ and source "$dir/../Software/sudo/main.fish" $argv
tldr \ and source "$dir/../Software/aliae/main.fish" $argv
btop \ and source "$dir/../Software/oh-my-posh/main.fish" $argv
terminal-parrot and source "$dir/../Software/openssh/main.fish" $argv
end and source "$dir/../Software/vim/main.fish" $argv
end and source "$dir/../Software/git/main.fish" $argv
and source "$dir/../Software/zoxide/main.fish" $argv
and source "$dir/../Software/logo-ls/main.fish" $argv
and if collectionActive desktopExperience # GRUB Shenanigans - if that's not essential I don't know what is!
source "$dir/../Software/plasma/main.fish" $argv and source "$dir/../Software/minegrub-theme/main.fish" $argv
and source "$dir/../Software/sddm/main.fish" $argv
and if $isInstall # Desktop Experience
yayinst \ source "$dir/../Software/plasma/main.fish" $argv
maliit-keyboard \ and source "$dir/../Software/sddm/main.fish" $argv
dconf-editor \ and source "$dir/../Software/icedtea/main.fish" $argv
flatpak (
# Fixes: https://www.reddit.com/r/flatpak/comments/168tav2/how_to_fix_blurry_flatpaks_on_high_resolution/
) xdg-desktop-portal-gtk
# Fonts and if collectionActive desktopExperience && $isInstall
and yayinst \ yayinst \
ttf-cascadia-code-nerd \ maliit-keyboard \
ttf-ms-win11-auto \ dconf-editor \
otf-cascadia-code \ flatpak (
ttf-droid # Fixes: https://www.reddit.com/r/flatpak/comments/168tav2/how_to_fix_blurry_flatpaks_on_high_resolution/
) xdg-desktop-portal-gtk
# Password Management # Fonts
and yayinst \ and yayinst \
bitwarden \ ttf-cascadia-code-nerd \
keepass \ ttf-ms-win11-auto \
keepassxc otf-cascadia-code \
ttf-droid
# Tools # Password Management
and yayinst \ and yayinst \
android-tools \ bitwarden \
blackbox-terminal \ keepass \
cpu-x \ keepassxc
gnome-calculator \
yubikey-manager-qt \
wireshark-qt \
linux-wifi-hotspot
# Remote Access # Tools
and yayinst \ and yayinst \
remmina ( android-tools \
# RDP support for Remmina blackbox-terminal \
) freerdp cpu-x \
gnome-calculator \
yubikey-manager-qt \
wireshark-qt \
linux-wifi-hotspot
# Creativity # Remote Access
and yayinst \ and yayinst \
gimp \ remmina (
inkscape # RDP support for Remmina
) freerdp
# Office stuff # Creativity
and yayinst \ and yayinst \
libreoffice-fresh \ gimp \
naps2-bin \ inkscape
pdfarranger \
protonmail-bridge \
thunderbird
and yayinst \ # Office stuff
texlive \ and yayinst \
texlive-langgerman libreoffice-fresh \
naps2-bin \
pdfarranger \
protonmail-bridge
# Virtualization and yayinst \
and yayinst propertree-git # mac .plist config file editor texlive \
texlive-langgerman
and if collectionActive school
yayinst \
teams-for-linux \
xournalpp-git \
rnote
end
end
# Internet Access
and source "$dir/../Software/firefox/main.fish" $argv
and source "$dir/../Software/brave/main.fish" $argv
and source "$dir/../Software/pennywise/main.fish" $argv
# Virtualization # Virtualization
and source "$dir/../Software/waydroid/main.fish" $argv and yayinst propertree-git # mac .plist config file editor
and source "$dir/../Software/virt-manager/main.fish" $argv
and if collectionActive coding
if $isInstall
yayinst \
devdocs-desktop \
godot-mono
end
and source "$dir/../Software/vscode/main.fish" $argv
end
end end
and if collectionActive server and if isProgramEnabled "thunderbird" && $isInstall
else yayinst thunderbird
if $isInstall end
# School & Studies
and if collectionActive school && $isInstall
yayinst \
teams-for-linux \
xournalpp-git \
rnote
end
# Internet Access
and source "$dir/../Software/firefox/main.fish" $argv
and source "$dir/../Software/brave/main.fish" $argv
and source "$dir/../Software/pennywise/main.fish" $argv
# Virtualization
and source "$dir/../Software/waydroid/main.fish" $argv
and source "$dir/../Software/virt-manager/main.fish" $argv
and if $isInstall
if collectionActive server
else
# Energy Saving # Energy Saving
yayinst power-profiles-daemon yayinst power-profiles-daemon
and sudo systemctl enable --now power-profiles-daemon and sudo systemctl enable --now power-profiles-daemon
@ -191,70 +179,71 @@ function deploySoftware -d "Deploys a the specified software action" -a action
networkmanager-openconnect \ networkmanager-openconnect \
proton-vpn-gtk-app \ proton-vpn-gtk-app \
protonvpn-cli-community protonvpn-cli-community
end
and if collectionActive common and if collectionActive common
if $isInstall yayinst \
and yayinst \
img2pdf \ img2pdf \
numbat-bin \ numbat-bin \
nvtop \ nvtop \
pdf2svg \ pdf2svg \
tnef tnef
end end
and source "$dir/../Software/icedtea/main.fish" $argv
end end
end
and if collectionActive media && $isInstall and if collectionActive media
yayinst \ yayinst \
ytmdesktop-bin \ ytmdesktop-bin \
netflix \ netflix \
spotube-bin \ spotube-bin \
stremio \ stremio \
tidal-dl-ng \ tidal-dl-ng \
tidal-hifi-bin \ tidal-hifi-bin \
nuclear-player-bin \ nuclear-player-bin \
audius-client-bin audius-client-bin
end end
and if collectionActive fileSync and if isProgramEnabled "nextcloud"
if $isInstall
yayinst nextcloud-client yayinst nextcloud-client
end end
and source "$dir/../Software/rclone/main.fish" $argv
end end
and if collectionActive socialMedia && $isInstall and source "$dir/../Software/rclone/main.fish" $argv
yayinst \
signal-desktop \
vesktop-bin
and begin if $isInstall
yes y | runYay threema-desktop if collectionActive socialMedia
yayinst signal-desktop
and begin
yes y | runYay threema-desktop
end
and begin
yes y | runYay nodejs
end
end end
and begin and if isProgramEnabled discord
yes y | runYay nodejs yayinst vesktop-bin
end
and if collectionActive productivity
yayinst \
anki-bin
end end
end end
and if collectionActive productivity && $isInstall and if collectionActive school
yayinst \ if $isInstall
anki-bin yayinst \
end jdk17-temurin \
gradle \
and if collectionActive school && $isInstall jetbrains-toolbox
yayinst \ end
jdk17-temurin \
gradle \
jetbrains-toolbox
and source "$dir/../../Common/Software/udev/ct-board.fish" and source "$dir/../../Common/Software/udev/ct-board.fish"
end end
# Development
and if collectionActive coding and if collectionActive coding
if $isInstall if $isInstall
yayinst \ yayinst \
@ -267,40 +256,44 @@ function deploySoftware -d "Deploys a the specified software action" -a action
# AsciiDocs # AsciiDocs
) python-docutils ( ) python-docutils (
# reStructuredText # reStructuredText
) esbonio ) esbonio \
end devdocs-desktop \
godot-mono \
and source "$dir/../Software/nodejs-n/main.fish" $argv
and source "$dir/../Software/docker/main.fish" $argv
end
and if collectionActive python
if $isInstall
yayinst \
python \ python \
python-pip \ python-pip \
python-pipenv python-pipenv
end end
and source "$dir/../Software/pyenv/main.fish" $argv
end end
and if collectionActive gaming and source "$dir/../Software/pyenv/main.fish" $argv
if $isInstall and source "$dir/../Software/nodejs-n/main.fish" $argv
yayinst \ and source "$dir/../Software/docker/main.fish" $argv
chiaki-ng \ and source "$dir/../Software/vscode/main.fish" $argv
osu-lazer-bin \
libretro \
supertux \
gamepad-tool-bin
and sudo flatpak install -y flathub com.usebottles.bottles if $isInstall
if collectionActive gaming
if $isInstall
yayinst \
chiaki-ng \
supertux \
gamepad-tool-bin
and sudo flatpak install -y flathub com.usebottles.bottles
end
end end
and source "$dir/../Software/lutris/main.fish" $argv and if isProgramEnabled "osu!lazer"
and source "$dir/../Software/steam/main.fish" $argv yayinst osu-lazer-bin
end
and if isProgramEnabled "retroarch"
yayinst libretro
end
end end
and source "$dir/../Software/lutris/main.fish" $argv
and source "$dir/../Software/steam/main.fish" $argv
and if collectionActive essential && $isInstall and if collectionActive essential && $isInstall
yayinst bb yayinst bb
end end

2
scripts/Common/Drivers/Logitech G903/main.fish
View file

@ -8,5 +8,5 @@ begin
addInputConfig 1133 16519 "Logitech G903 LS" "PointerAccelerationProfile=1" addInputConfig 1133 16519 "Logitech G903 LS" "PointerAccelerationProfile=1"
end end
runInstaller $argv runInstaller --force $argv
end end

2
scripts/Common/Drivers/SurfaceBook2/main.fish
View file

@ -8,5 +8,5 @@ begin
addInputConfig 1118 2338 "Microsoft Surface Keyboard Touchpad" "NaturalScroll=true" addInputConfig 1118 2338 "Microsoft Surface Keyboard Touchpad" "NaturalScroll=true"
end end
runInstaller $argv runInstaller --force $argv
end end

127
scripts/Windows/Scripts/Deployment.ps1
View file

@ -1,5 +1,6 @@
. "$PSScriptRoot/PowerManagement.ps1"; . "$PSScriptRoot/PowerManagement.ps1";
. "$PSScriptRoot/SoftwareManagement.ps1"; . "$PSScriptRoot/SoftwareManagement.ps1";
. "$PSScriptRoot/../../Common/Scripts/Config.ps1";
. "$PSScriptRoot/../../Common/Scripts/SoftwareManagement.ps1"; . "$PSScriptRoot/../../Common/Scripts/SoftwareManagement.ps1";
. "$PSScriptRoot/../../Common/Types/InstallerAction.ps1"; . "$PSScriptRoot/../../Common/Types/InstallerAction.ps1";
@ -93,26 +94,24 @@ function Deploy-SoftwareAction {
# Windows Config # Windows Config
& "$softwarePath/windows/Main.ps1" @arguments; & "$softwarePath/windows/Main.ps1" @arguments;
if ($hardware.logitechG) { # Driver Programs
& "$softwarePath/lghub/Main.ps1" @arguments; & "$softwarePath/lghub/Main.ps1" @arguments;
& "$softwarePath/aliae/Main.ps1" @arguments;
& "$softwarePath/git/Main.ps1" @arguments;
& "$softwarePath/openssh/Main.ps1" @arguments;
& "$softwarePath/powershell/Main.ps1" @arguments;
& "$softwarePath/chocolatey/Main.ps1" @arguments;
& "$softwarePath/zoxide/Main.ps1" @arguments;
& "$commonSoftware/posh-git/Main.ps1" @arguments;
& "$commonSoftware/terminal-icons/Main.ps1" @arguments;
& "$softwarePath/oh-my-posh/Main.ps1" @arguments;
if (Get-OSConfig "dualboot") {
& "$softwarePath/ext4fsd/Main.ps1" @arguments;
} }
# Essentials # Essentials
if ($collections.essential) { if ($collections.essential) {
& "$softwarePath/aliae/Main.ps1" @arguments;
& "$softwarePath/git/Main.ps1" @arguments;
& "$softwarePath/openssh/Main.ps1" @arguments;
& "$softwarePath/powershell/Main.ps1" @arguments;
& "$softwarePath/chocolatey/Main.ps1" @arguments;
& "$softwarePath/zoxide/Main.ps1" @arguments;
& "$commonSoftware/posh-git/Main.ps1" @arguments;
& "$commonSoftware/terminal-icons/Main.ps1" @arguments;
& "$softwarePath/oh-my-posh/Main.ps1" @arguments;
if (Get-OSConfig "dualboot") {
& "$softwarePath/ext4fsd/Main.ps1" @arguments;
}
if ($install) { if ($install) {
Install-ChocoPackage ` Install-ChocoPackage `
procexp ` procexp `
@ -126,11 +125,11 @@ function Deploy-SoftwareAction {
} }
# Common Software # Common Software
if ($collections.common) { & "$softwarePath/winscp/Main.ps1" @arguments;
& "$softwarePath/winscp/Main.ps1" @arguments; & "$softwarePath/thunderbird/Main.ps1" @arguments;
& "$softwarePath/thunderbird/Main.ps1" @arguments; & "$softwarePath/putty/Main.ps1" @arguments;
& "$softwarePath/putty/Main.ps1" @arguments;
if ($collections.common) {
if ($install) { if ($install) {
Install-ChocoPackage ` Install-ChocoPackage `
7zip ` 7zip `
@ -149,17 +148,28 @@ function Deploy-SoftwareAction {
} }
} }
# Internet Access
if ($install) {
if (Test-Program "brave") {
Install-WingetPackage Brave.Brave;
Remove-DesktopIcon "*Brave*";
Remove-TaskbarItem "*Brave*";
}
if (Test-Program "pennywise") {
Install-WingetPackage kamranahmedse.pennywise;
Remove-DesktopIcon "Pennywise*";
}
}
& "$softwarePath/firefox/Main.ps1" @arguments;
& "$softwarePath/msedge-redirect/Main.ps1" @arguments;
if ($collections.desktopExperience) { if ($collections.desktopExperience) {
if ($install) { if ($install) {
# Fonts # Fonts
Install-ChocoPackage nerd-fonts-CascadiaCode; Install-ChocoPackage nerd-fonts-CascadiaCode;
# Internet Access
Install-WingetPackage Brave.Brave kamranahmedse.pennywise;
Remove-DesktopIcon "*Brave*";
Remove-TaskbarItem "*Brave*";
Remove-DesktopIcon "Pennywise*";
# Tools # Tools
Install-SetupPackage -Source "https://github.com/mRemoteNG/mRemoteNG/releases/download/2023.03.03-v1.77.3-nb/mRemoteNG-Installer-1.77.3.nb-1784.msi" -ArgumentList "/Quiet"; Install-SetupPackage -Source "https://github.com/mRemoteNG/mRemoteNG/releases/download/2023.03.03-v1.77.3-nb/mRemoteNG-Installer-1.77.3.nb-1784.msi" -ArgumentList "/Quiet";
Remove-DesktopIcon "mRemoteNG*"; Remove-DesktopIcon "mRemoteNG*";
@ -196,19 +206,12 @@ function Deploy-SoftwareAction {
Remove-DesktopIcon "JDownloader*"; Remove-DesktopIcon "JDownloader*";
} }
# ToDo: Consider hiding behind own config?
& "$softwarePath/ubiquiti-unifi-controller/Main.ps1" @arguments;
# Internet Access
& "$softwarePath/firefox/Main.ps1" @arguments;
& "$softwarePath/msedge-redirect/Main.ps1" @arguments;
if ($collections.fileSync) {
& "$softwarePath/nextcloud/Main.ps1" @arguments;
}
} }
# ToDo: Consider hiding behind own config?
& "$softwarePath/ubiquiti-unifi-controller/Main.ps1" @arguments;
& "$softwarePath/nextcloud/Main.ps1" @arguments;
if ($collections.socialMedia) { if ($collections.socialMedia) {
if ($install) { if ($install) {
Install-ChocoPackage ` Install-ChocoPackage `
@ -221,10 +224,10 @@ function Deploy-SoftwareAction {
Remove-DesktopIcon "*Element*"; Remove-DesktopIcon "*Element*";
Remove-DesktopIcon "*TeamSpeak*"; Remove-DesktopIcon "*TeamSpeak*";
} }
. "$softwarePath/discord/Main.ps1" @arguments;
} }
. "$softwarePath/discord/Main.ps1" @arguments;
if ($collections.media) { if ($collections.media) {
if ($install) { if ($install) {
Install-ChocoPackage ` Install-ChocoPackage `
@ -249,24 +252,36 @@ function Deploy-SoftwareAction {
github-desktop ` github-desktop `
ida-free ` ida-free `
HxD ` HxD `
docker-desktop `
imhex ` imhex `
dotpeek ` dotpeek `
; ;
Remove-DesktopIcon "IDA *"; Remove-DesktopIcon "IDA *";
Remove-DesktopIcon "GitHub*"; Remove-DesktopIcon "GitHub*";
Remove-DesktopIcon "Docker*";
if (Test-Program "docker") {
Install-ChocoPackage docker-desktop;
Remove-DesktopIcon "Docker*";
}
} }
& "$softwarePath/vscode/Main.ps1" @arguments;
& "$softwarePath/visualstudio/Main.ps1" @arguments;
# Node.js
& "$softwarePath/nvs/Main.ps1" @arguments;
} }
& "$softwarePath/vscode/Main.ps1" @arguments;
& "$softwarePath/visualstudio/Main.ps1" @arguments;
# Node.js
& "$softwarePath/nvs/Main.ps1" @arguments;
# Gaming # Gaming
if (Test-Program "steam") {
Install-ChocoPackage `
steam `
-ArgumentList "--ignore-checksums" `
;
Remove-DesktopIcon "*Steam*";
}
if ($collections.gaming) { if ($collections.gaming) {
if ($install) { if ($install) {
Install-ChocoPackage ` Install-ChocoPackage `
@ -280,25 +295,23 @@ function Deploy-SoftwareAction {
Remove-DesktopIcon "*PPSSPP *-Bit*"; Remove-DesktopIcon "*PPSSPP *-Bit*";
Install-ChocoPackage ` Install-ChocoPackage `
steam `
ubisoft-connect ` ubisoft-connect `
-ArgumentList "--ignore-checksums" ` -ArgumentList "--ignore-checksums" `
; ;
Remove-DesktopIcon "*Steam*";
Remove-DesktopIcon "*Ubisoft Connect*"; Remove-DesktopIcon "*Ubisoft Connect*";
Install-WingetPackage ElectronicArts.EADesktop; Install-WingetPackage ElectronicArts.EADesktop;
Remove-DesktopIcon "EA.*"; Remove-DesktopIcon "EA.*";
} }
& "$softwarePath/tm-nations-forever/Main.ps1" @arguments;
& "$softwarePath/tm-united-forever/Main.ps1" @arguments;
& "$softwarePath/maniaplanet/Main.ps1" @arguments;
& "$softwarePath/osu!/Main.ps1" @arguments;
& "$softwarePath/osu!lazer/Main.ps1" @arguments;
& "$softwarePath/retroarch/Main.ps1" @arguments;
& "$softwarePath/rewasd/Main.ps1" @arguments;
} }
& "$softwarePath/tm-nations-forever/Main.ps1" @arguments;
& "$softwarePath/tm-united-forever/Main.ps1" @arguments;
& "$softwarePath/maniaplanet/Main.ps1" @arguments;
& "$softwarePath/osu!/Main.ps1" @arguments;
& "$softwarePath/osu!lazer/Main.ps1" @arguments;
& "$softwarePath/retroarch/Main.ps1" @arguments;
& "$softwarePath/rewasd/Main.ps1" @arguments;
}; };
} }

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

@ -3,7 +3,7 @@ using namespace Microsoft.Win32;
. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; . "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
. "$PSScriptRoot/../../../Common/Software/powershell/Profile.ps1"; . "$PSScriptRoot/../../../Common/Software/powershell/Profile.ps1";
Start-SoftwareInstaller @args ` Start-SoftwareInstaller -Force @args `
-Configurator { -Configurator {
param([string] $Name) param([string] $Name)
[string] $backup = $null; [string] $backup = $null;