satr14/nix-flake
Watch
1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: satr14:c573a72350001dff53ea5e625be0db3be8f40471
Branches Tags
satr14:main
satr14:renovate/lock-file-maintenance
satr14:mc-backup
satr14:sops-implementation
..
compare: satr14:946109445df09278790298fff7b0c55a6b42d594
Branches Tags
satr14:main
satr14:renovate/lock-file-maintenance
satr14:mc-backup
satr14:sops-implementation
3 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/home/desktop.nix
View file

@ -24,7 +24,7 @@
home = { home = {
packages = with pkgs; [ packages = with pkgs; [
playerctl brightnessctl playerctl brightnessctl
networkmanagerapplet networkmanagerapplet tailscale-systray
qt6Packages.qt6ct kdePackages.qtstyleplugin-kvantum qt6Packages.qt6ct kdePackages.qtstyleplugin-kvantum
nwg-displays nwg-displays
lxqt.pcmanfm-qt lxqt.pcmanfm-qt

2
modules/home/rice/compositor.nix
View file

@ -36,7 +36,7 @@
"uwsm app -s b -- blueman-applet &" "uwsm app -s b -- blueman-applet &"
"uwsm app -s b -- nm-applet &" "uwsm app -s b -- nm-applet &"
"uwsm app -s b -- tailscale systray &" "uwsm app -s b -- tailscale-systray &"
#"keepassxc &" #"keepassxc &"
]; ];

16
modules/system/homelab/mc.nix
View file

@ -9,18 +9,7 @@
packHash = "sha256-xB9Oc/aneogSQ9r7L42vyVM6xwq+QkoTaXYNuUzeo6M="; packHash = "sha256-xB9Oc/aneogSQ9r7L42vyVM6xwq+QkoTaXYNuUzeo6M=";
url = "https://git.satr14.my.id/satr14/server-modpack/raw/${path}/pack.toml"; url = "https://git.satr14.my.id/satr14/server-modpack/raw/${path}/pack.toml";
}; };
packsquash-binary = pkgs.runCommand "packsquash" {
src = pkgs.fetchurl {
url = "https://github.com/ComunidadAylas/PackSquash/releases/download/v0.4.1/packsquash-x86_64-unknown-linux-gnu.zip";
sha256 = "sha256-VsGZewoiO5MjhIhwjlLO5d5uHynlAK5Jh16jH2k2rPs=";
};
nativeBuildInputs = [ pkgs.unzip ];
} ''
mkdir -p $out/bin
unzip $src -d $out/bin
chmod +x $out/bin/packsquash
'';
in { in {
imports = [ inputs.mc.nixosModules.minecraft-servers ]; imports = [ inputs.mc.nixosModules.minecraft-servers ];
nixpkgs.overlays = [ inputs.mc.overlay ]; nixpkgs.overlays = [ inputs.mc.overlay ];
@ -97,8 +86,7 @@ in {
symlinks = lib.mapAttrs' symlinks = lib.mapAttrs'
(name: _: lib.nameValuePair "mods/${name}" "${modpack}/mods/${name}") (name: _: lib.nameValuePair "mods/${name}" "${modpack}/mods/${name}")
(builtins.readDir "${modpack}/mods") (builtins.readDir "${modpack}/mods");
// { "polymer/packsquash" = "${packsquash-binary}/bin/packsquash"; };
package = pkgs.fabricServers.fabric-1_21_11.override { package = pkgs.fabricServers.fabric-1_21_11.override {
jre_headless = pkgs.javaPackages.compiler.temurin-bin.jdk-25; jre_headless = pkgs.javaPackages.compiler.temurin-bin.jdk-25;