Update apps on marauder

This commit is contained in:
Nettika 2025-10-12 01:01:00 -07:00
parent 690b2e2deb
commit f00ab5b5ae
4 changed files with 66 additions and 30 deletions

37
flake.lock generated
View file

@ -98,6 +98,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1758690382,
"narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e643668fd71b949c53f8626614b21ff71a07379d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"phps": { "phps": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@ -124,7 +140,8 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"phps": "phps" "phps": "phps",
"winboat": "winboat"
} }
}, },
"systems": { "systems": {
@ -174,6 +191,24 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"winboat": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1760183562,
"narHash": "sha256-lauscAI61WXjLTuGiRDMUAEeTqvOTSWhRoHDaor5sfE=",
"owner": "TibixDev",
"repo": "winboat",
"rev": "ae60de6c2cba7a2001fef1027d5c2e06614e6904",
"type": "github"
},
"original": {
"owner": "TibixDev",
"repo": "winboat",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -11,6 +11,7 @@
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
winboat.url = "github:TibixDev/winboat";
}; };
outputs = inputs: { outputs = inputs: {

View file

@ -1,4 +1,4 @@
{ self, nixpkgs, phps, agenix, ... }: { self, nixpkgs, phps, agenix, winboat }:
let let
baseSpecialArgs = { baseSpecialArgs = {
inherit (self) nixosModules; inherit (self) nixosModules;
@ -11,7 +11,7 @@ in {
marauder = nixosSystem { marauder = nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ ./marauder ]; modules = [ ./marauder ];
specialArgs = { inherit phps; }; specialArgs = { inherit phps winboat; };
}; };
astral = nixosSystem { astral = nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";

View file

@ -1,4 +1,4 @@
{ pkgs, nixosModules, phps, agenix, ... }: { pkgs, nixosModules, phps, agenix, winboat, ... }:
let let
fortune = pkgs.writeShellScript "cgi" '' fortune = pkgs.writeShellScript "cgi" ''
echo "Content-type: text/html" echo "Content-type: text/html"
@ -102,69 +102,69 @@ in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Chat clients # Chat clients
discord discord
slack
element-desktop element-desktop
telegram-desktop
signal-desktop signal-desktop
slack
telegram-desktop
# Browsers # Browsers
firefox
filezilla filezilla
firefox
# Creative # Creative
inkscape bambu-studio
blender
gimp gimp
inkscape
krita krita
openscad-unstable openscad-unstable
bambu-studio
orca-slicer orca-slicer
# Multimedia # Multimedia
vlc
ffmpeg
ffcheck ffcheck
aonsoku ffmpeg
vlc
# Code Editors # Editors
abiword
obsidian
vscode vscode
arduino-ide
# Dev Tools # Dev Tools
fossil
nixd nixd
nixfmt-classic nixfmt-classic
nixpkgs-fmt nixpkgs-fmt
pyenv pyenv
rustup rustup
electron
uv
ruff
fossil
just
dioxus-cli
# Languages # Languages
gcc
kotlin kotlin
nodejs nodejs
php php
# Command line # Command line
agenix.packages.x86_64-linux.default
backblaze-b2
dig
htop htop
jq jq
backblaze-b2 just
unzip
zip
# Misc # Network
obsidian
intiface-central
prismlauncher
blender
mullvad-vpn mullvad-vpn
qbittorrent qbittorrent
system-config-printer
# Misc
gcc
intiface-central
openssl openssl
pkg-config pkg-config
agenix.packages.x86_64-linux.default prismlauncher
abiword system-config-printer
winboat.packages.x86_64-linux.winboat
]; ];
programs.git = { programs.git = {