Compare commits
3 commits
4b708b5fb3
...
90f4128164
| Author | SHA1 | Date | |
|---|---|---|---|
| 90f4128164 | |||
| 8cd1945b3b | |||
| b5eea3d798 |
4 changed files with 29 additions and 8 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
|
if test (command git ls-files --others --exclude-standard | wc -w 2> /dev/null) -gt 0
|
||||||
set git_meta "$git_meta?"
|
set git_meta "$git_meta?"
|
||||||
end
|
end
|
||||||
if test (command git rev-list --walk-reflogs --count refs/stash 2> /dev/null)
|
# if test (command git rev-list --walk-reflogs --count refs/stash 2> /dev/null)
|
||||||
set git_meta "$git_meta\$"
|
# set git_meta "$git_meta\$"
|
||||||
end
|
# end
|
||||||
if git_is_touched
|
if git_is_touched
|
||||||
git_is_dirty && set git_meta "$git_meta⨯"
|
git_is_dirty && set git_meta (string join "$git_meta" "x")
|
||||||
git_is_staged && set git_meta "$git_meta●"
|
git_is_staged && set git_meta (string join "$git_meta" "o")
|
||||||
end
|
end
|
||||||
set -l commit_count (command git rev-list --count --left-right (git remote)/(git_branch_name)"...HEAD" 2> /dev/null)
|
set -l commit_count (command git rev-list --count --left-right (git remote)/(git_branch_name)"...HEAD" 2> /dev/null)
|
||||||
if test $commit_count
|
if test $commit_count
|
||||||
set -l behind (echo $commit_count | cut -f 1)
|
set -l behind (echo $commit_count | cut -f 1)
|
||||||
set -l ahead (echo $commit_count | cut -f 2)
|
set -l ahead (echo $commit_count | cut -f 2)
|
||||||
if test $behind -gt 0
|
if test $behind -gt 0
|
||||||
set git_meta "$git_meta🠋"
|
set git_meta "$git_meta«"
|
||||||
end
|
end
|
||||||
if test $ahead -gt 0
|
if test $ahead -gt 0
|
||||||
set git_meta "$git_meta🠉"
|
set git_meta "$git_meta»"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if test $git_meta
|
if test $git_meta
|
||||||
|
|
|
||||||
|
|
@ -56,6 +56,8 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
postgres.enable = true;
|
||||||
|
|
||||||
shell.enabledShells = [ "fish" ];
|
shell.enabledShells = [ "fish" ];
|
||||||
shell.defaultShell = "fish";
|
shell.defaultShell = "fish";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,10 +24,11 @@
|
||||||
DOMAIN = config.forgejo.server.domain; #"winry.woach.me";
|
DOMAIN = config.forgejo.server.domain; #"winry.woach.me";
|
||||||
HTTP_PORT = config.forgejo.server.port;
|
HTTP_PORT = config.forgejo.server.port;
|
||||||
ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}/";
|
ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}/";
|
||||||
|
SSH_PORT = config.sshd.port;
|
||||||
};
|
};
|
||||||
# SSH_PORT = config.sshd.port;
|
|
||||||
session.COOKIE_SECURE = true;
|
session.COOKIE_SECURE = true;
|
||||||
service.DISABLE_REGISTRATION = true;
|
service.DISABLE_REGISTRATION = true;
|
||||||
|
repository.DISABLE_HTTP_GIT = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
18
nixosModules/services/postgresql/service.nix
Normal file
18
nixosModules/services/postgresql/service.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
{ 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