Compare commits
4 commits
fe1820fdb8
...
564fc0778f
| Author | SHA1 | Date | |
|---|---|---|---|
| 564fc0778f | |||
| e90b71760f | |||
| 1d6b887eaa | |||
| 2e44ab13f4 |
6 changed files with 47 additions and 75 deletions
82
flake.lock
generated
82
flake.lock
generated
|
|
@ -1,27 +1,8 @@
|
||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"cp": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils",
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1783637983,
|
|
||||||
"narHash": "sha256-zKYemA+ZGFiW7ac5+9w8FEounKLt4eOb7HI17wp1Rxs=",
|
|
||||||
"owner": "9001",
|
|
||||||
"repo": "copyparty",
|
|
||||||
"rev": "96bafb8f4af83bb7473b75e4b77ab8e1445e6b46",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "9001",
|
|
||||||
"repo": "copyparty",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ctp": {
|
"ctp": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1783545128,
|
"lastModified": 1783545128,
|
||||||
|
|
@ -54,21 +35,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1678901627,
|
|
||||||
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils_2": {
|
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
|
|
@ -88,8 +54,8 @@
|
||||||
},
|
},
|
||||||
"gl": {
|
"gl": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils",
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762090880,
|
"lastModified": 1762090880,
|
||||||
|
|
@ -129,7 +95,7 @@
|
||||||
"mc": {
|
"mc": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_3",
|
||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -150,7 +116,7 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"niri-stable": "niri-stable",
|
"niri-stable": "niri-stable",
|
||||||
"niri-unstable": "niri-unstable",
|
"niri-unstable": "niri-unstable",
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_4",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"xwayland-satellite-stable": "xwayland-satellite-stable",
|
"xwayland-satellite-stable": "xwayland-satellite-stable",
|
||||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||||
|
|
@ -204,17 +170,15 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767313136,
|
"lastModified": 1782918843,
|
||||||
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
"narHash": "sha256-mFP086y1bNA1g9AsY/pCue3H3W2R7ayroHyRbZrcMf0=",
|
||||||
"owner": "NixOS",
|
"rev": "e8273b29fe1390ec8d4603f2477357555291432e",
|
||||||
"repo": "nixpkgs",
|
"type": "tarball",
|
||||||
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1025900.e8273b29fe13/nixexprs.tar.xz"
|
||||||
"type": "github"
|
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"type": "tarball",
|
||||||
"ref": "nixos-25.05",
|
"url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
|
||||||
"type": "indirect"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
|
|
@ -234,19 +198,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1782918843,
|
|
||||||
"narHash": "sha256-mFP086y1bNA1g9AsY/pCue3H3W2R7ayroHyRbZrcMf0=",
|
|
||||||
"rev": "e8273b29fe1390ec8d4603f2477357555291432e",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1025900.e8273b29fe13/nixexprs.tar.xz"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_3": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746378225,
|
"lastModified": 1746378225,
|
||||||
"narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=",
|
"narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=",
|
||||||
|
|
@ -261,7 +212,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769461804,
|
"lastModified": 1769461804,
|
||||||
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
|
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
|
||||||
|
|
@ -277,7 +228,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1783224372,
|
"lastModified": 1783224372,
|
||||||
"narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
|
"narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
|
||||||
|
|
@ -293,7 +244,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1783224372,
|
"lastModified": 1783224372,
|
||||||
"narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
|
"narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
|
||||||
|
|
@ -311,13 +262,12 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"cp": "cp",
|
|
||||||
"ctp": "ctp",
|
"ctp": "ctp",
|
||||||
"gl": "gl",
|
"gl": "gl",
|
||||||
"hm": "hm",
|
"hm": "hm",
|
||||||
"mc": "mc",
|
"mc": "mc",
|
||||||
"niri": "niri",
|
"niri": "niri",
|
||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_5"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,6 @@
|
||||||
|
|
||||||
niri.url = "github:sodiboo/niri-flake";
|
niri.url = "github:sodiboo/niri-flake";
|
||||||
mc.url = "github:Infinidoge/nix-minecraft";
|
mc.url = "github:Infinidoge/nix-minecraft";
|
||||||
cp.url = "github:9001/copyparty";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs: let
|
outputs = inputs: let
|
||||||
|
|
|
||||||
|
|
@ -49,8 +49,6 @@
|
||||||
"fetch-update" ="rm -f ~/.fetch.sh && wget https://raw.githubusercontent.com/SX-9/fetch.sh/master/fetch.sh -O ~/.fetch.sh && chmod +x ~/.fetch.sh";
|
"fetch-update" ="rm -f ~/.fetch.sh && wget https://raw.githubusercontent.com/SX-9/fetch.sh/master/fetch.sh -O ~/.fetch.sh && chmod +x ~/.fetch.sh";
|
||||||
"fetch" = "~/.fetch.sh";
|
"fetch" = "~/.fetch.sh";
|
||||||
|
|
||||||
"hm-sw" = "home-manager switch -b bak-hm --flake";
|
|
||||||
"nix-sw" = "sudo nixos-rebuild switch --flake";
|
|
||||||
"nix-hw-conf" = "nixos-generate-config --show-hardware-config";
|
"nix-hw-conf" = "nixos-generate-config --show-hardware-config";
|
||||||
"nixos-diff" = "nix build .#nixosConfigurations.$(hostname).config.system.build.toplevel -o /tmp/nix-flake-diff && nvd diff /run/current-system /tmp/nix-flake-diff";
|
"nixos-diff" = "nix build .#nixosConfigurations.$(hostname).config.system.build.toplevel -o /tmp/nix-flake-diff && nvd diff /run/current-system /tmp/nix-flake-diff";
|
||||||
"cd-conf" = "cd ${flake-path}";
|
"cd-conf" = "cd ${flake-path}";
|
||||||
|
|
@ -66,6 +64,8 @@
|
||||||
"gh-author-setup" = "git config user.name $(gh api -H \"Accept: application/vnd.github+json\" -H \"X-GitHub-Api-Version: 2022-11-28\" /user | jq -r .login) && git config user.email $(gh api -H \"Accept: application/vnd.github+json\" -H \"X-GitHub-Api-Version: 2022-11-28\" /user/emails | jq -r \".[1].email\")";
|
"gh-author-setup" = "git config user.name $(gh api -H \"Accept: application/vnd.github+json\" -H \"X-GitHub-Api-Version: 2022-11-28\" /user | jq -r .login) && git config user.email $(gh api -H \"Accept: application/vnd.github+json\" -H \"X-GitHub-Api-Version: 2022-11-28\" /user/emails | jq -r \".[1].email\")";
|
||||||
"fg-create-repo" = "git remote add origin ${git.server}/${git.username}/$(basename $PWDw).git && git push";
|
"fg-create-repo" = "git remote add origin ${git.server}/${git.username}/$(basename $PWDw).git && git push";
|
||||||
"convert-pdf" = "libreoffice --headless --convert-to pdf";
|
"convert-pdf" = "libreoffice --headless --convert-to pdf";
|
||||||
|
"nix-fetch-hash" = "nix store prefetch-url --json";
|
||||||
|
"git-fix" = "git rebase --continue";
|
||||||
|
|
||||||
"mcl" = "portablemc start -l $(cat ~/.minecraft/portablemc-launch-params.json | jq -r .email) $(cat ~/.minecraft/portablemc-launch-params.json | jq -r .version) --jvm-args=-Xmx6G";
|
"mcl" = "portablemc start -l $(cat ~/.minecraft/portablemc-launch-params.json | jq -r .email) $(cat ~/.minecraft/portablemc-launch-params.json | jq -r .version) --jvm-args=-Xmx6G";
|
||||||
"mc" = "ferium upgrade; mcl";
|
"mc" = "ferium upgrade; mcl";
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,8 @@
|
||||||
"Mod+V".action.spawn = [ "rofi" "-modi" "clipboard:cliphist-rofi-img" "-show" "clipboard" "-show-icons" ];
|
"Mod+V".action.spawn = [ "rofi" "-modi" "clipboard:cliphist-rofi-img" "-show" "clipboard" "-show-icons" ];
|
||||||
"Mod+A".action.spawn = [ "zeditor" ];
|
"Mod+A".action.spawn = [ "zeditor" ];
|
||||||
"Mod+C".action.spawn = [ "kitty" "btop" ];
|
"Mod+C".action.spawn = [ "kitty" "btop" ];
|
||||||
"Mod+Shift+F".action.spawn-sh = "${lib.getExe pkgs.labwc} & WAYLAND_DISPLAY=wayland-1 ${lib.getExe pkgs.kitty}";
|
"Mod+Shift+T".action.spawn-sh = "WAYLAND_DISPLAY=wayland-0 ${lib.getExe pkgs.kitty}";
|
||||||
|
"Mod+Shift+F".action.spawn = [ (lib.getExe pkgs.labwc) ];
|
||||||
"Mod+Shift+C".action.spawn = [ "kitty" "zsh" "-c" "fastfetch; exec zsh -i" ];
|
"Mod+Shift+C".action.spawn = [ "kitty" "zsh" "-c" "fastfetch; exec zsh -i" ];
|
||||||
"Mod+Shift+D".action.spawn = [ "steam" "-system-composer" "steam://open/bigpicture" ];
|
"Mod+Shift+D".action.spawn = [ "steam" "-system-composer" "steam://open/bigpicture" ];
|
||||||
"Mod+D".action.spawn = [ "prismlauncher" ];
|
"Mod+D".action.spawn = [ "prismlauncher" ];
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,18 @@
|
||||||
{ inputs, pkgs, ... }: {
|
{ pkgs, ... }: let
|
||||||
environment.systemPackages = with pkgs; [ copyparty-most ];
|
version = "v1.20.18";
|
||||||
imports = [ inputs.cp.nixosModules.default ];
|
executable = pkgs.fetchurl {
|
||||||
|
url = "https://github.com/9001/copyparty/releases/download/${version}/copyparty-en.py";
|
||||||
|
hash = "sha256-8SBrKaLPat80n8sONKQYFeFSQXUnCYtwcOU7SR52h7E=";
|
||||||
|
};
|
||||||
|
in {
|
||||||
systemd.services.copyparty = {
|
systemd.services.copyparty = {
|
||||||
description = "File Sharing Service";
|
description = "File Sharing Service";
|
||||||
enable = true;
|
enable = true;
|
||||||
after = [ "network.target" ];
|
after = [ "network.target" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${pkgs.copyparty-most}/bin/copyparty -c /mnt/share/cfg/files.conf";
|
# ExecStart = "${pkgs.copyparty-most}/bin/copyparty -c /mnt/share/cfg/files.conf";
|
||||||
|
ExecStart = "${pkgs.python3}/bin/python3 ${executable} -c /mnt/share/cfg/files.conf";
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -57,6 +57,24 @@
|
||||||
];
|
];
|
||||||
hostPackages = with pkgs; [ bash coreutils git nix openssh bun ];
|
hostPackages = with pkgs; [ bash coreutils git nix openssh bun ];
|
||||||
};
|
};
|
||||||
|
renovate = {
|
||||||
|
enable = true;
|
||||||
|
schedule = "*:0"; # every hour
|
||||||
|
credentials.RENOVATE_TOKEN = "/mnt/data/apps/renovate/token.env";
|
||||||
|
settings = {
|
||||||
|
platform = "forgejo";
|
||||||
|
endpoint = "https://git.${homelab.domain}";
|
||||||
|
gitAuthor = "renovate <system@${homelab.domain}>";
|
||||||
|
autodiscover = true;
|
||||||
|
nix.enabled = true;
|
||||||
|
lockFileMaintenance = {
|
||||||
|
enabled = true;
|
||||||
|
commitMessageAction = "update lock file(s)";
|
||||||
|
schedule = [ "0 0 * * 0" ]; # weekly
|
||||||
|
};
|
||||||
|
};
|
||||||
|
runtimePackages = with pkgs; [ bun nodejs npm nix ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
systemd.services = {
|
systemd.services = {
|
||||||
"gitea-runner-nixos-deploy".restartIfChanged = false;
|
"gitea-runner-nixos-deploy".restartIfChanged = false;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue