Compare commits
No commits in common. "90f412816424edf5e5ee3aec8aca518eb76a0c2d" and "4b708b5fb393d224f21c3af24b0b128993bd589e" have entirely different histories.
90f4128164
...
4b708b5fb3
4 changed files with 8 additions and 29 deletions
|
|
@ -43,22 +43,22 @@ if git_is_repo
|
|||
if test (command git ls-files --others --exclude-standard | wc -w 2> /dev/null) -gt 0
|
||||
set git_meta "$git_meta?"
|
||||
end
|
||||
# if test (command git rev-list --walk-reflogs --count refs/stash 2> /dev/null)
|
||||
# set git_meta "$git_meta\$"
|
||||
# end
|
||||
if test (command git rev-list --walk-reflogs --count refs/stash 2> /dev/null)
|
||||
set git_meta "$git_meta\$"
|
||||
end
|
||||
if git_is_touched
|
||||
git_is_dirty && set git_meta (string join "$git_meta" "x")
|
||||
git_is_staged && set git_meta (string join "$git_meta" "o")
|
||||
git_is_dirty && set git_meta "$git_meta⨯"
|
||||
git_is_staged && set git_meta "$git_meta●"
|
||||
end
|
||||
set -l commit_count (command git rev-list --count --left-right (git remote)/(git_branch_name)"...HEAD" 2> /dev/null)
|
||||
if test $commit_count
|
||||
set -l behind (echo $commit_count | cut -f 1)
|
||||
set -l ahead (echo $commit_count | cut -f 2)
|
||||
if test $behind -gt 0
|
||||
set git_meta "$git_meta«"
|
||||
set git_meta "$git_meta🠋"
|
||||
end
|
||||
if test $ahead -gt 0
|
||||
set git_meta "$git_meta»"
|
||||
set git_meta "$git_meta🠉"
|
||||
end
|
||||
end
|
||||
if test $git_meta
|
||||
|
|
|
|||
|
|
@ -56,8 +56,6 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
postgres.enable = true;
|
||||
|
||||
shell.enabledShells = [ "fish" ];
|
||||
shell.defaultShell = "fish";
|
||||
|
||||
|
|
|
|||
|
|
@ -24,11 +24,10 @@
|
|||
DOMAIN = config.forgejo.server.domain; #"winry.woach.me";
|
||||
HTTP_PORT = config.forgejo.server.port;
|
||||
ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}/";
|
||||
SSH_PORT = config.sshd.port;
|
||||
};
|
||||
# SSH_PORT = config.sshd.port;
|
||||
session.COOKIE_SECURE = true;
|
||||
service.DISABLE_REGISTRATION = true;
|
||||
repository.DISABLE_HTTP_GIT = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
options.postgres = {
|
||||
enable = lib.mkEnableOption "";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.postgres.enable {
|
||||
services.postgresql = {
|
||||
enable = true;
|
||||
package = pkgs.postgresql_17;
|
||||
authentication = ''
|
||||
#type database DBuser auth-method
|
||||
local all all trust
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue