refactor
This commit is contained in:
1 parent
ae505657a0
commit
9b6f4905c1
3 files changed
+12
-45
No files matched your search
@@ -9,45 +9,19 @@ ROOT_FOLDER=$(realpath $0 | xargs dirname | xargs dirname)
|
||||
# Bootstrap
|
||||
|
||||
MENAME=$(basename $0)
|
||||
LOCKS_FOLDER=/tmp/skyg/$ROOT_FOLDER/.tmp/.locks
|
||||
LOCK_FILE=$LOCKS_FOLDER/.built_via_skg
|
||||
|
||||
mkdir -p $LOCKS_FOLDER
|
||||
|
||||
function lock() {
|
||||
touch $LOCK_FILE
|
||||
}
|
||||
function unlock() {
|
||||
rm -f $LOCK_FILE
|
||||
}
|
||||
|
||||
function run-build() {
|
||||
: Run nixos build and emits difference
|
||||
:
|
||||
unlock
|
||||
echo "sudo nixos-rebuild build --flake ."
|
||||
sudo nixos-rebuild build --flake .
|
||||
lock
|
||||
run-diff
|
||||
nh os build --flake . --show-trace --print-build-logs --verbose
|
||||
}
|
||||
|
||||
function run-switch() {
|
||||
: Runs nixos switch and ensures that we actually saw a build\'s difference
|
||||
:
|
||||
if [ ! -f $LOCK_FILE ]; then
|
||||
run-build
|
||||
echo "Do you want to continue? (y/N)"
|
||||
read -r answer
|
||||
if [[ $answer =~ ^[yY]$ ]]; then
|
||||
echo "Continuing..."
|
||||
else
|
||||
echo "Exiting."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
sudo nixos-rebuild switch --flake . --show-trace --print-build-logs --verbose
|
||||
unlock
|
||||
nh os switch --flake . --show-trace --print-build-logs --verbose
|
||||
|
||||
}
|
||||
|
||||
|
||||
Generated
+9
-9
@@ -7,11 +7,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1751468302,
|
||||
"narHash": "sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA=",
|
||||
"lastModified": 1753592768,
|
||||
"narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "501cfec8277f931a9c9af9f23d3105c537faeafe",
|
||||
"rev": "fc3add429f21450359369af74c2375cb34a2d204",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -59,11 +59,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1751432711,
|
||||
"narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=",
|
||||
"lastModified": 1754316476,
|
||||
"narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f",
|
||||
"rev": "9368056b73efb46eb14fd4667b99e0f81b805f28",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -75,11 +75,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1751211869,
|
||||
"narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
|
||||
"lastModified": 1754292888,
|
||||
"narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51",
|
||||
"rev": "ce01daebf8489ba97bd1609d185ea276efdeb121",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -12,6 +12,7 @@ let
|
||||
stateDir = "/var/lib/sosnovsky/gitea";
|
||||
sshPort = 2222;
|
||||
httpPort = 3000;
|
||||
sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPXJ3NWIHsFMKhNp5FUSJcZU4eevhKyfcHR9dyCSbo19 ari@fwbook";
|
||||
};
|
||||
openPorts = [
|
||||
ports.nixServe
|
||||
@@ -84,14 +85,6 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
users.groups.${gitea.group} = { };
|
||||
users.users.${gitea.user} = {
|
||||
isSystemUser = true;
|
||||
useDefaultShell = true;
|
||||
group = gitea.group;
|
||||
extraGroups = [ gitea.group ];
|
||||
home = gitea.stateDir;
|
||||
};
|
||||
# Firewall
|
||||
networking.firewall.allowedUDPPorts = openPorts;
|
||||
networking.firewall.allowedTCPPorts = openPorts;
|
||||
|
||||
Reference in new issue
Block a user