From de1493ef9100cf9d698ecadc543769d4229aa204 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Mon, 15 Jan 2024 17:58:05 -0600 Subject: [PATCH] chore: move from LFS to hosted image Signed-off-by: jolheiser --- .gitattributes | 3 --- apps/gui/default.nix | 9 +++++++-- apps/gui/wallpaper/nixppuccin.png | 3 --- apps/nogui/git.nix | 5 ++++- 4 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 apps/gui/wallpaper/nixppuccin.png diff --git a/.gitattributes b/.gitattributes index bfa108f..3a43866 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,3 @@ # Age apps/gui/firefox/work.nix filter=git-age diff=git-age machines/chai/cifs.nix filter=git-age diff=git-age - -# Git LFS -*.png filter=lfs diff=lfs merge=lfs -text diff --git a/apps/gui/default.nix b/apps/gui/default.nix index 129d932..4e7ee74 100644 --- a/apps/gui/default.nix +++ b/apps/gui/default.nix @@ -34,9 +34,14 @@ jolheiser.nur.kv ]; }; - dconf.settings = { + dconf.settings = let + wallpaper = pkgs.fetchurl { + url = "https://user.fm/files/v2-3834da30df507c4ba97a551571e98e33/nixppuccin.png"; + hash = "sha256-dwM+Wi2gse7Eu4f/suU2BsVACPHMfSaXYOpZPqx6/SQ="; + }; + in { "org/cinnamon/desktop/background" = { - picture-uri = "file://${./wallpaper/nixppuccin.png}"; + picture-uri = "file://${wallpaper}"; }; "org/cinnamon/desktop/interface" = { font-name = "Monaspace Neon 10"; diff --git a/apps/gui/wallpaper/nixppuccin.png b/apps/gui/wallpaper/nixppuccin.png deleted file mode 100644 index 9969579..0000000 --- a/apps/gui/wallpaper/nixppuccin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:77033e5a2da0b1eec4bb87ffb2e53606c54008f1cc7d269760ea593eac7afd24 -size 194081 diff --git a/apps/nogui/git.nix b/apps/nogui/git.nix index 2e51a87..b93beda 100644 --- a/apps/nogui/git.nix +++ b/apps/nogui/git.nix @@ -42,7 +42,10 @@ in { }; pull.rebase = true; url = - insteadOf "gh" "github.com" + { + "ugit@git.jolheiser.com:".insteadOf = "ssh:jo:"; + } + // insteadOf "gh" "github.com" // insteadOf "jj" "git.jojodev.com" // insteadOf "gt" "gitea.com" // insteadOf "gl" "gitlab.com"