diff --git a/.gitattributes b/.gitattributes index 3a438665222ece4bfb526e149ae423fa4c24318a..bfa108fde3af2a1d40a4dfc0b951e5cc249fe1b2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,6 @@ # 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 4e7ee748e18f0859d34b78c6de73a2dcf97f8a09..129d932ed0dedbc1b4dc65d5bd7ab60862499c44 100644 --- a/apps/gui/default.nix +++ b/apps/gui/default.nix @@ -34,15 +34,9 @@ jolheiser.nur.imp jolheiser.nur.kv ]; }; - dconf.settings = let - ../nogui ./ghostty.nix - url = "https://user.fm/files/v2-3834da30df507c4ba97a551571e98e33/nixppuccin.png"; - hash = "sha256-dwM+Wi2gse7Eu4f/suU2BsVACPHMfSaXYOpZPqx6/SQ="; - }; - in { "org/cinnamon/desktop/background" = { - ./firefox.nix + ./ghostty.nix {pkgs, ...}: { }; "org/cinnamon/desktop/interface" = { diff --git a/apps/gui/wallpaper/nixppuccin.png b/apps/gui/wallpaper/nixppuccin.png new file mode 100644 index 0000000000000000000000000000000000000000..9969579f24982caac342faae4c3102fca0d894b2 --- /dev/null +++ b/apps/gui/wallpaper/nixppuccin.png @@ -0,0 +1,3 @@ +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 b93bedaa3c105994f37450f41a7c16ba7facd47d..2e51a87efd9088fd6b858f6a0a45f33fa340d9fc 100644 --- a/apps/nogui/git.nix +++ b/apps/nogui/git.nix @@ -42,11 +42,8 @@ gpgSign = "if-asked"; }; pull.rebase = true; url = - { - "ugit@git.jolheiser.com:".insteadOf = "ssh:jo:"; - "https://${domain}/".insteadOf = "${prefix}:"; }; - // insteadOf "gh" "github.com" + programs.git = { // insteadOf "jj" "git.jojodev.com" // insteadOf "gt" "gitea.com" // insteadOf "gl" "gitlab.com"