Compare commits
6 changed files with 75 additions and 47 deletions
82
flake.lock
generated
82
flake.lock
generated
|
|
@ -1,8 +1,27 @@
|
|||
{
|
||||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1783545128,
|
||||
|
|
@ -35,6 +54,21 @@
|
|||
}
|
||||
},
|
||||
"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": {
|
||||
"systems": "systems"
|
||||
},
|
||||
|
|
@ -54,8 +88,8 @@
|
|||
},
|
||||
"gl": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762090880,
|
||||
|
|
@ -95,7 +129,7 @@
|
|||
"mc": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -116,7 +150,7 @@
|
|||
"inputs": {
|
||||
"niri-stable": "niri-stable",
|
||||
"niri-unstable": "niri-unstable",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"xwayland-satellite-stable": "xwayland-satellite-stable",
|
||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
|
|
@ -170,15 +204,17 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1782918843,
|
||||
"narHash": "sha256-mFP086y1bNA1g9AsY/pCue3H3W2R7ayroHyRbZrcMf0=",
|
||||
"rev": "e8273b29fe1390ec8d4603f2477357555291432e",
|
||||
"type": "tarball",
|
||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1025900.e8273b29fe13/nixexprs.tar.xz"
|
||||
"lastModified": 1767313136,
|
||||
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-25.05",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
|
|
@ -198,6 +234,19 @@
|
|||
}
|
||||
},
|
||||
"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": {
|
||||
"lastModified": 1746378225,
|
||||
"narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=",
|
||||
|
|
@ -212,7 +261,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1769461804,
|
||||
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
|
||||
|
|
@ -228,7 +277,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1783224372,
|
||||
"narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
|
||||
|
|
@ -244,7 +293,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1783224372,
|
||||
"narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
|
||||
|
|
@ -262,12 +311,13 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"cp": "cp",
|
||||
"ctp": "ctp",
|
||||
"gl": "gl",
|
||||
"hm": "hm",
|
||||
"mc": "mc",
|
||||
"niri": "niri",
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
|
||||
niri.url = "github:sodiboo/niri-flake";
|
||||
mc.url = "github:Infinidoge/nix-minecraft";
|
||||
cp.url = "github:9001/copyparty";
|
||||
};
|
||||
|
||||
outputs = inputs: let
|
||||
|
|
|
|||
|
|
@ -49,6 +49,8 @@
|
|||
"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";
|
||||
|
||||
"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";
|
||||
"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}";
|
||||
|
|
@ -64,8 +66,6 @@
|
|||
"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";
|
||||
"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";
|
||||
"mc" = "ferium upgrade; mcl";
|
||||
|
|
|
|||
|
|
@ -54,8 +54,7 @@
|
|||
"Mod+V".action.spawn = [ "rofi" "-modi" "clipboard:cliphist-rofi-img" "-show" "clipboard" "-show-icons" ];
|
||||
"Mod+A".action.spawn = [ "zeditor" ];
|
||||
"Mod+C".action.spawn = [ "kitty" "btop" ];
|
||||
"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+F".action.spawn-sh = "${lib.getExe pkgs.labwc} & WAYLAND_DISPLAY=wayland-1 ${lib.getExe pkgs.kitty}";
|
||||
"Mod+Shift+C".action.spawn = [ "kitty" "zsh" "-c" "fastfetch; exec zsh -i" ];
|
||||
"Mod+Shift+D".action.spawn = [ "steam" "-system-composer" "steam://open/bigpicture" ];
|
||||
"Mod+D".action.spawn = [ "prismlauncher" ];
|
||||
|
|
|
|||
|
|
@ -1,18 +1,14 @@
|
|||
{ pkgs, ... }: let
|
||||
version = "v1.20.18";
|
||||
executable = pkgs.fetchurl {
|
||||
url = "https://github.com/9001/copyparty/releases/download/${version}/copyparty-en.py";
|
||||
hash = "sha256-8SBrKaLPat80n8sONKQYFeFSQXUnCYtwcOU7SR52h7E=";
|
||||
};
|
||||
in {
|
||||
{ inputs, pkgs, ... }: {
|
||||
environment.systemPackages = with pkgs; [ copyparty-most ];
|
||||
imports = [ inputs.cp.nixosModules.default ];
|
||||
|
||||
systemd.services.copyparty = {
|
||||
description = "File Sharing Service";
|
||||
enable = true;
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
# ExecStart = "${pkgs.copyparty-most}/bin/copyparty -c /mnt/share/cfg/files.conf";
|
||||
ExecStart = "${pkgs.python3}/bin/python3 ${executable} -c /mnt/share/cfg/files.conf";
|
||||
ExecStart = "${pkgs.copyparty-most}/bin/copyparty -c /mnt/share/cfg/files.conf";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -57,24 +57,6 @@
|
|||
];
|
||||
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 = {
|
||||
"gitea-runner-nixos-deploy".restartIfChanged = false;
|
||||
|
|
|
|||
Loading…
Reference in a new issue