Signed-off-by: Oliver Davies <oliver@oliverdavies.uk>
This commit is contained in:
parent
1c1862e582
commit
aae4bdcda9
8 changed files with 12 additions and 11 deletions
8
flake.lock
generated
8
flake.lock
generated
|
|
@ -197,11 +197,11 @@
|
||||||
"rev": "19591ad8e1f3c261e84b487307c8534dd67a3707",
|
"rev": "19591ad8e1f3c261e84b487307c8534dd67a3707",
|
||||||
"revCount": 37,
|
"revCount": 37,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://code.oliverdavies.uk/opdavies/git-repo-updater"
|
"url": "https://git.oliverdavies.uk/opdavies/git-repo-updater"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://code.oliverdavies.uk/opdavies/git-repo-updater"
|
"url": "https://git.oliverdavies.uk/opdavies/git-repo-updater"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
|
|
@ -588,11 +588,11 @@
|
||||||
"rev": "2e92d07eb740acce9ebadacd0507bda33521e04b",
|
"rev": "2e92d07eb740acce9ebadacd0507bda33521e04b",
|
||||||
"revCount": 156,
|
"revCount": 156,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://code.oliverdavies.uk/opdavies/z"
|
"url": "https://git.oliverdavies.uk/opdavies/z"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://code.oliverdavies.uk/opdavies/z"
|
"url": "https://git.oliverdavies.uk/opdavies/z"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
inputs.flake-parts.follows = "flake-parts";
|
inputs.flake-parts.follows = "flake-parts";
|
||||||
inputs.import-tree.follows = "import-tree";
|
inputs.import-tree.follows = "import-tree";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
url = "git+https://code.oliverdavies.uk/opdavies/git-repo-updater";
|
url = "git+https://git.oliverdavies.uk/opdavies/git-repo-updater";
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
|
|
@ -71,7 +71,7 @@
|
||||||
z = {
|
z = {
|
||||||
inputs.flake-parts.follows = "flake-parts";
|
inputs.flake-parts.follows = "flake-parts";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
url = "git+https://code.oliverdavies.uk/opdavies/z";
|
url = "git+https://git.oliverdavies.uk/opdavies/z";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@
|
||||||
"eric"
|
"eric"
|
||||||
"florida-drupalcamp-tailwind-css"
|
"florida-drupalcamp-tailwind-css"
|
||||||
"freshrss"
|
"freshrss"
|
||||||
|
"git"
|
||||||
"home"
|
"home"
|
||||||
"jellyfin"
|
"jellyfin"
|
||||||
"luke"
|
"luke"
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
server = {
|
server = {
|
||||||
DOMAIN = "code.oliverdavies.uk";
|
DOMAIN = "git.oliverdavies.uk";
|
||||||
LANDING_PAGE = "explore";
|
LANDING_PAGE = "explore";
|
||||||
ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}";
|
ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}";
|
||||||
SSH_DOMAIN = "ssh.oliverdavies.uk";
|
SSH_DOMAIN = "ssh.oliverdavies.uk";
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
systemCronJobs = [
|
systemCronJobs = [
|
||||||
"*/15 * * * * opdavies ${pkgs.imapfilter}/bin/imapfilter -c ~/Repos/code.oliverdavies.uk/opdavies/email-filters/config.lua"
|
"*/15 * * * * opdavies ${pkgs.imapfilter}/bin/imapfilter -c ~/Repos/git.oliverdavies.uk/opdavies/email-filters/config.lua"
|
||||||
"0 8,20 * * * opdavies ${pkgs.isync}/bin/mbsync -a"
|
"0 8,20 * * * opdavies ${pkgs.isync}/bin/mbsync -a"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
domain="''${BASH_REMATCH[2]}"
|
domain="''${BASH_REMATCH[2]}"
|
||||||
|
|
||||||
if [[ "$domain" == "ssh.oliverdavies.uk" ]]; then
|
if [[ "$domain" == "ssh.oliverdavies.uk" ]]; then
|
||||||
domain="code.oliverdavies.uk"
|
domain="git.oliverdavies.uk"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
user="''${BASH_REMATCH[3]}"
|
user="''${BASH_REMATCH[3]}"
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ in
|
||||||
text = ''
|
text = ''
|
||||||
repo_url=$(git remote get-url origin | sed -E 's#(git|forgejo)@([A-Za-z0-9.-]+):#https://\2/#;s#.git$##')
|
repo_url=$(git remote get-url origin | sed -E 's#(git|forgejo)@([A-Za-z0-9.-]+):#https://\2/#;s#.git$##')
|
||||||
|
|
||||||
repo_url="''${repo_url//ssh.oliverdavies.uk/code.oliverdavies.uk}"
|
repo_url="''${repo_url//ssh.oliverdavies.uk/git.oliverdavies.uk}"
|
||||||
|
|
||||||
xdg-open "$repo_url"
|
xdg-open "$repo_url"
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
Running Neovim as a package:
|
Running Neovim as a package:
|
||||||
|
|
||||||
nix run .#neovim
|
nix run .#neovim
|
||||||
nix run git+https://code.oliverdavies.uk/opdavies/nix-config#neovim
|
nix run git+https://git.oliverdavies.uk/opdavies/nix-config#neovim
|
||||||
|
|
||||||
nixos-rebuild --flake .#nixedo --target-host 192.168.1.116 --sudo test
|
nixos-rebuild --flake .#nixedo --target-host 192.168.1.116 --sudo test
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue