diff --git a/hmModules/apps/fish/functions/git_prompt.fish b/hmModules/apps/fish/functions/git_prompt.fish index b02ecc6..a0bb65b 100644 --- a/hmModules/apps/fish/functions/git_prompt.fish +++ b/hmModules/apps/fish/functions/git_prompt.fish @@ -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 diff --git a/hosts/juri/host.nix b/hosts/juri/host.nix index 8a016b6..4d32aa2 100644 --- a/hosts/juri/host.nix +++ b/hosts/juri/host.nix @@ -56,8 +56,6 @@ in { }; }; - postgres.enable = true; - shell.enabledShells = [ "fish" ]; shell.defaultShell = "fish"; diff --git a/nixosModules/services/forgejo/service.nix b/nixosModules/services/forgejo/service.nix index e27e24d..2a1b2c2 100644 --- a/nixosModules/services/forgejo/service.nix +++ b/nixosModules/services/forgejo/service.nix @@ -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; }; }; diff --git a/nixosModules/services/postgresql/service.nix b/nixosModules/services/postgresql/service.nix deleted file mode 100644 index fe6eaa3..0000000 --- a/nixosModules/services/postgresql/service.nix +++ /dev/null @@ -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 - ''; - }; - }; -}