Compare commits

...

3 commits

Author SHA1 Message Date
90f4128164
Fish, fix pull/push prompt and change characters
The prompt has been broken for a while now on pull/push, this is because
it was using unicode characters that were larger in the terminal,
causing wraps that would reprint lines. I changed the characters for
push/pull because of it.

I also removed the stash character, and changed the dirty and staged
characters to match the new characters
2025-04-16 11:52:16 -07:00
8cd1945b3b
Postgres, service init 2025-04-09 14:06:04 -07:00
b5eea3d798
Forgejo, use sshd port internally, disable https 2025-03-27 09:26:52 -07:00
4 changed files with 29 additions and 8 deletions

View file

@ -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 "$git_meta"
git_is_staged && set git_meta "$git_meta"
git_is_dirty && set git_meta (string join "$git_meta" "x")
git_is_staged && set git_meta (string join "$git_meta" "o")
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

View file

@ -56,6 +56,8 @@ in {
};
};
postgres.enable = true;
shell.enabledShells = [ "fish" ];
shell.defaultShell = "fish";

View file

@ -24,10 +24,11 @@
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;
};
};

View 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
'';
};
};
}