From 67847b03c5a02e1cb6da5e6073b4eb491a0573c1 Mon Sep 17 00:00:00 2001 From: kat witch Date: Sun, 29 Aug 2021 03:47:12 +0100 Subject: [PATCH] New trusted ref, removed gitea templates, waybar length inc --- .../gitea/templates/admin/navbar.tmpl | 29 --- .../services/gitea/templates/custom/head.tmpl | 176 ------------------ .../gitea/templates/explore/navbar.tmpl | 16 -- config/services/gitea/templates/home.tmpl | 2 +- .../services/gitea/templates/repo/header.tmpl | 143 -------------- .../services/gitea/templates/repo/home.tmpl | 153 --------------- .../gitea/templates/repo/settings/navbar.tmpl | 29 --- .../templates/user/dashboard/dashboard.tmpl | 132 ------------- .../gitea/templates/user/settings/navbar.tmpl | 23 --- config/trusted | 2 +- config/users/kat/sway/waybar/default.nix | 1 - 11 files changed, 2 insertions(+), 704 deletions(-) delete mode 100644 config/services/gitea/templates/admin/navbar.tmpl delete mode 100644 config/services/gitea/templates/custom/head.tmpl delete mode 100644 config/services/gitea/templates/explore/navbar.tmpl delete mode 100644 config/services/gitea/templates/repo/header.tmpl delete mode 100644 config/services/gitea/templates/repo/home.tmpl delete mode 100644 config/services/gitea/templates/repo/settings/navbar.tmpl delete mode 100644 config/services/gitea/templates/user/dashboard/dashboard.tmpl delete mode 100644 config/services/gitea/templates/user/settings/navbar.tmpl diff --git a/config/services/gitea/templates/admin/navbar.tmpl b/config/services/gitea/templates/admin/navbar.tmpl deleted file mode 100644 index 545d67cc..00000000 --- a/config/services/gitea/templates/admin/navbar.tmpl +++ /dev/null @@ -1,29 +0,0 @@ -
- - {{.i18n.Tr "admin.dashboard"}} - - - {{.i18n.Tr "admin.users"}} - - - {{.i18n.Tr "admin.organizations"}} - - - {{.i18n.Tr "admin.repositories"}} - - - {{.i18n.Tr "admin.hooks"}} - - - {{.i18n.Tr "admin.authentication"}} - - - {{.i18n.Tr "admin.config"}} - - - {{.i18n.Tr "admin.notices"}} - - - {{.i18n.Tr "admin.monitor"}} - -
\ No newline at end of file diff --git a/config/services/gitea/templates/custom/head.tmpl b/config/services/gitea/templates/custom/head.tmpl deleted file mode 100644 index b6afe94b..00000000 --- a/config/services/gitea/templates/custom/head.tmpl +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - {{if .Title}}{{.Title}} - {{end}}{{AppName}} - - - - - - - - - - - - {{if .IsSigned}} - - {{end}} - {{if .ContextUser}} - - {{end}} - {{if .SearchLimit}} - - {{end}} -{{if .GoGetImport}} - - -{{end}} - - - - - - - - - -{{if .RequireSimpleMDE}} - -{{end}} - -{{if .RequireGitGraph}} - - -{{end}} - -{{if .RequireTribute}} - -{{end}} - - - - - - -{{if .RequireHighlightJS}} - -{{end}} -{{if .RequireMinicolors}} - -{{end}} -{{if .RequireDatetimepicker}} - -{{end}} -{{if .RequireDropzone}} - -{{end}} -{{if .EnableHeatmap}} - -{{end}} - - - - -{{if .PageIsUserProfile}} - - - - - -{{else if .Repository}} - - - - - {{if .Repository.Description}} - - {{end}} - -{{else}} - - - - - -{{end}} -{{if .IsSigned }} - {{ if ne .SignedUser.Theme "gitea" }} - - {{end}} -{{else if ne DefaultTheme "gitea"}} - -{{end}} -{{template "custom/header" .}} - - - {{template "custom/body_outer_pre" .}} - -
- - - {{template "custom/body_inner_pre" .}} - - {{if not .PageIsInstall}} -
- {{template "base/head_navbar" .}} -
- {{end}} -{{/* -
- - -*/}} diff --git a/config/services/gitea/templates/explore/navbar.tmpl b/config/services/gitea/templates/explore/navbar.tmpl deleted file mode 100644 index f804b364..00000000 --- a/config/services/gitea/templates/explore/navbar.tmpl +++ /dev/null @@ -1,16 +0,0 @@ -
- - {{svg "octicon-repo" 16}} {{.i18n.Tr "explore.repos"}} - - - {{svg "octicon-person" 16}} {{.i18n.Tr "explore.users"}} - - - {{svg "octicon-organization" 16}} {{.i18n.Tr "explore.organizations"}} - - {{if .IsRepoIndexerEnabled}} - - {{svg "octicon-code" 16}} {{.i18n.Tr "explore.code"}} - - {{end}} -
\ No newline at end of file diff --git a/config/services/gitea/templates/home.tmpl b/config/services/gitea/templates/home.tmpl index a1dbe7f0..8130f115 100644 --- a/config/services/gitea/templates/home.tmpl +++ b/config/services/gitea/templates/home.tmpl @@ -3,7 +3,7 @@
- +

diff --git a/config/services/gitea/templates/repo/header.tmpl b/config/services/gitea/templates/repo/header.tmpl deleted file mode 100644 index 2ae42a80..00000000 --- a/config/services/gitea/templates/repo/header.tmpl +++ /dev/null @@ -1,143 +0,0 @@ -
-{{with .Repository}} -
-
-
- {{if .RelAvatarLink}} - - {{else if .IsTemplate}} - {{if .IsPrivate}} - {{svg "octicon-repo-template-private" 32}} - {{else}} - {{svg "octicon-repo-template" 32}} - {{end}} - {{else}} - {{if .IsPrivate}} - {{svg "octicon-lock" 32}} - {{else if .IsMirror}} - {{svg "octicon-repo-clone" 32}} - {{else if .IsFork}} - {{svg "octicon-repo-fork" 32}} - {{else}} - {{svg "octicon-repo" 32}} - {{end}} - {{end}} - {{.Owner.Name}} -
/
- {{.Name}} - {{if .RelAvatarLink}} - {{if .IsTemplate}} - {{if .IsPrivate}} - {{svg "octicon-repo-template-private" 32}} - {{else}} - {{svg "octicon-repo-template" 32}} - {{end}} - {{else}} - {{if .IsPrivate}} - {{svg "octicon-lock" 32}} - {{else if .IsMirror}} - {{svg "octicon-repo-clone" 32}} - {{else if .IsFork}} - {{svg "octicon-repo-fork" 32}} - {{else}} - {{svg "octicon-repo" 32}} - {{end}} - {{end}} - {{end}} - {{if .IsArchived}}{{end}} - {{if .IsMirror}}
{{$.i18n.Tr "repo.mirror_from"}} {{if .SanitizedOriginalURL}}{{.SanitizedOriginalURL}}{{else}}{{MirrorAddress $.Mirror}}{{end}}
{{end}} - {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RelLink 1 -1}}
{{end}} - {{if .IsGenerated}}
{{$.i18n.Tr "repo.generated_from"}} {{SubStr .TemplateRepo.RelLink 1 -1}}
{{end}} -
- {{if not .IsBeingCreated}} -
-
- - {{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}} - - - {{.NumWatches}} - -
-
- - {{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}} - - - {{.NumStars}} - -
- {{if and (not .IsEmpty) ($.Permission.CanRead $.UnitTypeCode)}} -
- - {{svg "octicon-repo-forked" 16}}{{$.i18n.Tr "repo.fork"}} - - - {{.NumForks}} - -
- {{end}} -
- {{end}} -
-
-{{end}} -
- {{if not .Repository.IsBeingCreated}} -
- {{if .Permission.CanRead $.UnitTypeCode}} - - {{svg "octicon-code" 16}} {{.i18n.Tr "repo.code"}} - - {{end}} - - {{if .Permission.CanRead $.UnitTypeIssues}} - - {{svg "octicon-issue-opened" 16}} {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} - - {{end}} - - {{if .Permission.CanRead $.UnitTypeExternalTracker}} - - {{svg "octicon-link-external" 16}} {{.i18n.Tr "repo.issues"}} - - {{end}} - - {{if and .Repository.CanEnablePulls (.Permission.CanRead $.UnitTypePullRequests)}} - - {{svg "octicon-git-pull-request" 16}} {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} - - {{end}} - - {{if and (.Permission.CanRead $.UnitTypeReleases) (not .IsEmptyRepo) }} - - {{svg "octicon-tag" 16}} {{.i18n.Tr "repo.releases"}} {{.NumReleases}} - - {{end}} - - {{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}} - - {{svg "octicon-book" 16}} {{.i18n.Tr "repo.wiki"}} - - {{end}} - - {{if and (.Permission.CanReadAny $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsEmptyRepo)}} - - {{svg "octicon-pulse" 16}} {{.i18n.Tr "repo.activity"}} - - {{end}} - - {{template "custom/extra_tabs" .}} - - {{if .Permission.IsAdmin}} -
- - {{svg "octicon-tools" 16}} {{.i18n.Tr "repo.settings"}} - -
- {{end}} -
- {{end}} -
-
-
diff --git a/config/services/gitea/templates/repo/home.tmpl b/config/services/gitea/templates/repo/home.tmpl deleted file mode 100644 index 2397cb1b..00000000 --- a/config/services/gitea/templates/repo/home.tmpl +++ /dev/null @@ -1,153 +0,0 @@ -{{template "base/head" .}} -
- {{template "repo/header" .}} -
- {{template "base/alert" .}} -
-
- {{if .Repository.DescriptionHTML}}{{.Repository.DescriptionHTML}}{{else if .IsRepositoryAdmin}}{{.i18n.Tr "repo.no_desc"}}{{end}} - {{.Repository.Website}} -
- {{if .RepoSearchEnabled}} -
-
-
-
- - -
-
-
-
- {{end}} -
-
- {{range .Topics}}{{.Name}}{{end}} - {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{.i18n.Tr "repo.topic.manage_topics"}}{{end}} -
- {{if and .Permission.IsAdmin (not .Repository.IsArchived)}} - - {{end}} -
- {{.i18n.Tr "repo.topic.count_prompt"}} - {{.i18n.Tr "repo.topic.format_prompt"}} -
- {{if .Repository.IsArchived}} -
- {{.i18n.Tr "repo.archive.title"}} -
- {{end}} - {{template "repo/sub_menu" .}} -
- {{template "repo/branch_dropdown" .}} - {{ $n := len .TreeNames}} - {{ $l := Subtract $n 1}} - - {{if eq $n 0}} - {{if and .PullRequestCtx.Allowed .IsViewBranch (not .Repository.IsArchived)}} -
- - - -
- {{end}} - {{else}} -
{{EllipsisString .Repository.Name 30}}{{range $i, $v := .TreeNames}}/{{if eq $i $l}}{{EllipsisString $v 30}}{{else}}{{ $p := index $.Paths $i}}{{EllipsisString $v 30}}{{end}}{{end}}
- {{end}} -
-
- {{if .Repository.CanEnableEditor}} - {{if .CanAddFile}} - - {{.i18n.Tr "repo.editor.new_file"}} - - {{end}} - {{if .CanUploadFile}} - - {{.i18n.Tr "repo.editor.upload_file"}} - - {{end}} - {{end}} - {{if and (ne $n 0) (not .IsViewFile) (not .IsBlame) }} - - {{.i18n.Tr "repo.file_history"}} - - {{end}} -
- -
-
- {{if eq $n 0}} - {{if .Repository.IsTemplate}} -
- - {{.i18n.Tr "repo.use_template"}} - -
- {{end}} - {{end}} -
-
- - - {{if eq $n 0}} -
- {{if not $.DisableHTTP}} - - {{end}} - {{if and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH)}} - - {{end}} - {{if not $.DisableHTTP}} - - {{else if and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH)}} - - {{end}} - {{if or (not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH))}} - - {{end}} -
- -
- {{svg "octicon-file-zip" 16}} ZIP - {{svg "octicon-file-zip" 16}} TAR.GZ -
-
-
- {{end}} -
-
- {{if .IsViewFile}} - {{template "repo/view_file" .}} - {{else if .IsBlame}} - {{template "repo/blame" .}} - {{else}} - {{template "repo/view_list" .}} - {{end}} -
-
-{{template "base/footer" .}} diff --git a/config/services/gitea/templates/repo/settings/navbar.tmpl b/config/services/gitea/templates/repo/settings/navbar.tmpl deleted file mode 100644 index f8b5d529..00000000 --- a/config/services/gitea/templates/repo/settings/navbar.tmpl +++ /dev/null @@ -1,29 +0,0 @@ -
- - {{.i18n.Tr "repo.settings.options"}} - - - {{.i18n.Tr "repo.settings.collaboration"}} - - {{if not .Repository.IsEmpty}} - - {{.i18n.Tr "repo.settings.branches"}} - - {{end}} - - {{.i18n.Tr "repo.settings.hooks"}} - - {{if .SignedUser.CanEditGitHook}} - - {{.i18n.Tr "repo.settings.githooks"}} - - {{end}} - - {{.i18n.Tr "repo.settings.deploy_keys"}} - - {{if .LFSStartServer}} - - {{.i18n.Tr "repo.settings.lfs"}} - - {{end}} -
\ No newline at end of file diff --git a/config/services/gitea/templates/user/dashboard/dashboard.tmpl b/config/services/gitea/templates/user/dashboard/dashboard.tmpl deleted file mode 100644 index f37224c9..00000000 --- a/config/services/gitea/templates/user/dashboard/dashboard.tmpl +++ /dev/null @@ -1,132 +0,0 @@ -{{template "base/head" .}} -
- {{template "user/dashboard/navbar" .}} -
- {{template "base/alert" .}} -
-
- {{if .EnableHeatmap}} -
- -
-
{{.i18n.Tr "user.heatmap.loading"}}
-
- -
-
- {{end}} - {{template "user/dashboard/feeds" .}} -
- -
-
-
-{{template "base/footer" .}} \ No newline at end of file diff --git a/config/services/gitea/templates/user/settings/navbar.tmpl b/config/services/gitea/templates/user/settings/navbar.tmpl deleted file mode 100644 index 7702b147..00000000 --- a/config/services/gitea/templates/user/settings/navbar.tmpl +++ /dev/null @@ -1,23 +0,0 @@ -
- - {{.i18n.Tr "settings.profile"}} - - - {{.i18n.Tr "settings.account"}} - - - {{.i18n.Tr "settings.security"}} - - - {{.i18n.Tr "settings.applications"}} - - - {{.i18n.Tr "settings.ssh_gpg_keys"}} - - - {{.i18n.Tr "settings.organization"}} - - - {{.i18n.Tr "settings.repos"}} - -
\ No newline at end of file diff --git a/config/trusted b/config/trusted index 38f3089b..43a9796d 160000 --- a/config/trusted +++ b/config/trusted @@ -1 +1 @@ -Subproject commit 38f3089bcffe59f4ffd86d08ddade435b9890b7f +Subproject commit 43a9796d6844efb4e711773c971288c3417ee449 diff --git a/config/users/kat/sway/waybar/default.nix b/config/users/kat/sway/waybar/default.nix index 2663e42d..ad4a98fe 100644 --- a/config/users/kat/sway/waybar/default.nix +++ b/config/users/kat/sway/waybar/default.nix @@ -25,7 +25,6 @@ "sway/workspaces" = { format = "{name}"; }; "sway/window" = { format = " {}"; - max-length = 50; }; tray = { icon-size = 12;