From 981bfcdd3b17a7f870c786f439231e67c89f461c Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Tue, 9 Jul 2024 21:22:08 +0200 Subject: [PATCH] Remove obsolete and unused packages --- flake.nix | 14 - home-manager/modules/obs-studio/default.nix | 7 +- overlays/default.nix | 28 - pkgs/bl3auto/default.nix | 22 - pkgs/coredns/default.nix | 98 - pkgs/gitu/default.nix | 46 - pkgs/incus-ui/default.nix | 89 - pkgs/incus-ui/favicon-32x32.png | Bin 2506 -> 0 bytes .../incus-ui/ui-canonical-0001-Branding.patch | 338 - .../ui-canonical-0002-Update-navigation.patch | 66 - ...l-0003-Update-certificate-generation.patch | 195 - ...canonical-0004-Remove-external-links.patch | 38 - ...-0005-Remove-Canonical-image-servers.patch | 106 - ...-canonical-0006-Remove-version-check.patch | 31 - .../ui-canonical-0007-Improve-openfga.patch | 32 - pkgs/lunarvim/default.nix | 46 - pkgs/nix-plugins/default.nix | 39 - .../cmake_fix_opencv_link.patch | 23 - .../cmake_set_version.patch | 85 - pkgs/obs-backgroundremoval/default.nix | 41 - pkgs/onnx-runtime/default.nix | 20 - pkgs/openfga/default.nix | 39 - pkgs/rofi-wayland/default.nix | 55 - pkgs/zed/Cargo.lock | 13007 ---------------- pkgs/zed/default.nix | 174 - 25 files changed, 4 insertions(+), 14635 deletions(-) delete mode 100644 pkgs/bl3auto/default.nix delete mode 100644 pkgs/coredns/default.nix delete mode 100644 pkgs/gitu/default.nix delete mode 100644 pkgs/incus-ui/default.nix delete mode 100644 pkgs/incus-ui/favicon-32x32.png delete mode 100644 pkgs/incus-ui/ui-canonical-0001-Branding.patch delete mode 100644 pkgs/incus-ui/ui-canonical-0002-Update-navigation.patch delete mode 100644 pkgs/incus-ui/ui-canonical-0003-Update-certificate-generation.patch delete mode 100644 pkgs/incus-ui/ui-canonical-0004-Remove-external-links.patch delete mode 100644 pkgs/incus-ui/ui-canonical-0005-Remove-Canonical-image-servers.patch delete mode 100644 pkgs/incus-ui/ui-canonical-0006-Remove-version-check.patch delete mode 100644 pkgs/incus-ui/ui-canonical-0007-Improve-openfga.patch delete mode 100644 pkgs/lunarvim/default.nix delete mode 100644 pkgs/nix-plugins/default.nix delete mode 100644 pkgs/obs-backgroundremoval/cmake_fix_opencv_link.patch delete mode 100644 pkgs/obs-backgroundremoval/cmake_set_version.patch delete mode 100644 pkgs/obs-backgroundremoval/default.nix delete mode 100644 pkgs/onnx-runtime/default.nix delete mode 100644 pkgs/openfga/default.nix delete mode 100644 pkgs/rofi-wayland/default.nix delete mode 100644 pkgs/zed/Cargo.lock delete mode 100644 pkgs/zed/default.nix diff --git a/flake.nix b/flake.nix index 20f2949..7826eac 100644 --- a/flake.nix +++ b/flake.nix @@ -224,7 +224,6 @@ perSystem = { - self', inputs', pkgs, config, @@ -269,22 +268,9 @@ }; packages = { - coredns = pkgs.callPackage ./pkgs/coredns { }; dnspyre = pkgs.callPackage ./pkgs/dnspyre { }; git-repo-go = pkgs.callPackage ./pkgs/git-repo-go { }; - gitu = pkgs.callPackage ./pkgs/gitu { }; - headscale-ui = pkgs.callPackage ./pkgs/headscale-ui { }; - incus-ui = pkgs.callPackage ./pkgs/incus-ui { }; - openfga = pkgs.callPackage ./pkgs/openfga { }; tinyows = pkgs.callPackage ./pkgs/tinyows { }; - zed = pkgs.callPackage ./pkgs/zed { }; - }; - - apps = { - zed = { - type = "app"; - program = "${self'.packages.zed}/bin/Zed"; - }; }; devShells.default = diff --git a/home-manager/modules/obs-studio/default.nix b/home-manager/modules/obs-studio/default.nix index 3e7d138..51ba7a1 100644 --- a/home-manager/modules/obs-studio/default.nix +++ b/home-manager/modules/obs-studio/default.nix @@ -17,13 +17,14 @@ in programs.obs-studio = { enable = true; plugins = - [ pkgs.obs-backgroundremoval ] + [ ] ++ (with pkgs.obs-studio-plugins; [ - wlrobs - obs-vaapi + obs-backgroundremoval obs-gstreamer obs-pipewire-audio-capture + obs-vaapi obs-vkcapture + wlrobs ]); }; }; diff --git a/overlays/default.nix b/overlays/default.nix index 33f2363..a70f4d5 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,4 @@ _final: prev: { - rofi-wayland = prev.pkgs.callPackage ../pkgs/rofi-wayland { }; - nix-plugins = prev.pkgs.callPackage ../pkgs/nix-plugins { }; - lunarvim = prev.pkgs.callPackage ../pkgs/lunarvim { }; backscrub = prev.pkgs.callPackage ../pkgs/backscrub { inherit (prev.pkgs) gcc @@ -14,27 +11,6 @@ _final: prev: { flatbuffers ; }; - onnx-runtime = prev.pkgs.callPackage ../pkgs/onnx-runtime { inherit (prev.pkgs) stdenv; }; - obs-backgroundremoval = prev.pkgs.callPackage ../pkgs/obs-backgroundremoval { - inherit (prev.pkgs) - stdenv - fetchFromGitHub - cmake - obs-studio - opencv - onnx-runtime - ; - }; - - # swaynotificationcenter = prev.swaynotificationcenter.overrideAttrs (finalAttrs: prevAttrs: { - # postInstall = '' - # ${prev.pkgs.glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ - # ''; - # }); - - bl3auto = prev.pkgs.callPackage ../pkgs/bl3auto { - inherit (prev.pkgs) lib buildGoModule fetchFromGitHub; - }; ddccontrol-db = prev.ddccontrol-db.overrideAttrs ( _finalAttrs: prevAttrs: { @@ -42,9 +18,5 @@ _final: prev: { } ); - incus-ui = prev.pkgs.callPackage ../pkgs/incus-ui { }; - openfga = prev.pkgs.callPackage ../pkgs/openfga { }; - gitu = prev.pkgs.callPackage ../pkgs/gitu { }; - zed = prev.pkgs.callPackage ../pkgs/zed { }; git-repo-go = prev.pkgs.callPackage ../pkgs/git-repo-go { }; } diff --git a/pkgs/bl3auto/default.nix b/pkgs/bl3auto/default.nix deleted file mode 100644 index 22815dc..0000000 --- a/pkgs/bl3auto/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ buildGoModule, fetchFromGitHub, ... }: -let - version = "2.2.18"; -in -buildGoModule { - pname = "bl3auto"; - inherit version; - - src = fetchFromGitHub { - owner = "jauderho"; - repo = "bl3auto"; - # rev = "c3126afa420a0d2117c473ef66564dfdb35d483c"; - rev = "v${version}"; - sha256 = "RaRND4HBBIjkz65k/1Xtb9nsJD82jEBkMoFPgelCJ4s="; - }; - - vendorSha256 = "Xfv6usoIkug7scM1ilzlIALfJd+fqiQlM9BY10EZdTU="; - - postInstall = '' - mv $out/bin/cmd $out/bin/bl3auto - ''; -} diff --git a/pkgs/coredns/default.nix b/pkgs/coredns/default.nix deleted file mode 100644 index c3750a2..0000000 --- a/pkgs/coredns/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ - lib, - gnused, - stdenv, - buildGoModule, - fetchFromGitHub, - installShellFiles, -}: -let - version = "1.11.3"; - - externalPlugins = [ - { - name = "tailscale"; - repo = "github.com/damomurf/coredns-tailscale"; - version = "c1a2b9d941edc6f701223d6e31be4edf46c9746f"; - } - ]; - - attrsToPlugins = - attrs: builtins.map ({ name, repo, ... }: lib.escapeShellArg "${name}:${repo}") attrs; - attrsToSources = - attrs: builtins.map ({ repo, version, ... }: lib.escapeShellArg "${repo}@${version}") attrs; -in -buildGoModule { - pname = "coredns"; - inherit version; - - src = fetchFromGitHub { - owner = "coredns"; - repo = "coredns"; - rev = "v${version}"; - # sha256 = lib.fakeSha256; - sha256 = "8LZMS1rAqEZ8k1IWSRkQ2O650oqHLP0P31T8oUeE4fw="; - }; - - # vendorHash = lib.fakeHash; - vendorHash = "sha256-9oq+oNxOmHuFDIn1hQu7BBb76s615B6Mm3JxqSpEOuI="; - - nativeBuildInputs = [ installShellFiles ]; - - outputs = [ - "out" - "man" - ]; - - # Override the go-modules fetcher derivation to fetch plugins - modBuildPhase = '' - for plugin in ${builtins.toString (attrsToPlugins externalPlugins)}; do - echo "Adding plugin $plugin" - ${gnused}/bin/sed -i "/forward:forward/i$plugin" plugin.cfg - done - - for src in ${builtins.toString (attrsToSources externalPlugins)}; do - echo "Retrieving $src" - go get $src - done - - go generate - go mod tidy - go mod vendor - ''; - - modInstallPhase = '' - mv -t vendor go.mod go.sum plugin.cfg - cp -r --reflink=auto vendor "$out" - ''; - - preBuild = '' - chmod -R u+w vendor - mv -t . vendor/go.{mod,sum} vendor/plugin.cfg - - go generate - ''; - - postPatch = - '' - substituteInPlace test/file_cname_proxy_test.go \ - --replace "TestZoneExternalCNAMELookupWithProxy" \ - "SkipZoneExternalCNAMELookupWithProxy" - - substituteInPlace test/readme_test.go \ - --replace "TestReadme" "SkipReadme" - - # this test fails if any external plugins were imported. - # it's a lint rather than a test of functionality, so it's safe to disable. - substituteInPlace test/presubmit_test.go \ - --replace "TestImportOrdering" "SkipImportOrdering" - '' - + lib.optionalString stdenv.isDarwin '' - # loopback interface is lo0 on macos - sed -E -i 's/\blo\b/lo0/' plugin/bind/setup_test.go - ''; - - postInstall = '' - installManPage man/* - ''; -} diff --git a/pkgs/gitu/default.nix b/pkgs/gitu/default.nix deleted file mode 100644 index b77902b..0000000 --- a/pkgs/gitu/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - libgit2, - openssl, - zlib, - stdenv, - darwin, - git, -}: - -rustPlatform.buildRustPackage rec { - pname = "gitu"; - version = "0.5.4"; - - src = fetchFromGitHub { - owner = "altsem"; - repo = "gitu"; - rev = "v${version}"; - hash = "sha256-a4hNgEizxanYE3XuHSCmbV6CkOqhXkznP3Sp0KLFFQs="; - }; - - cargoHash = "sha256-+CA3UG32oZedzRbt7b0wOlhH/subuym4BCL5SMNzrr8="; - - nativeBuildInputs = [ - pkg-config - git - ]; - - buildInputs = [ - libgit2 - openssl - zlib - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - - meta = with lib; { - description = "A TUI Git client inspired by Magit"; - homepage = "https://github.com/altsem/gitu"; - changelog = "https://github.com/altsem/gitu/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - mainProgram = "gitu"; - }; -} diff --git a/pkgs/incus-ui/default.nix b/pkgs/incus-ui/default.nix deleted file mode 100644 index f0980f0..0000000 --- a/pkgs/incus-ui/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchYarnDeps, - nodejs, - prefetch-yarn-deps, - fixup-yarn-lock, - yarn, - gnused, - rsync, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "incus-ui"; - version = "0.8"; - - src = fetchFromGitHub { - owner = "canonical"; - repo = "lxd-ui"; - rev = finalAttrs.version; - hash = "sha256-oD/GPm84oFXHcZ8vTUzNgQinrHwNuvpeVjsrp8ibIZY="; - }; - - offlineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-hRZ0vbksxnUv4XMrbhP2PI94UYYzwrydJHSx+uf+MbI="; - }; - - patches = [ - ./ui-canonical-0001-Branding.patch - ./ui-canonical-0002-Update-navigation.patch - ./ui-canonical-0003-Update-certificate-generation.patch - ./ui-canonical-0004-Remove-external-links.patch - ./ui-canonical-0005-Remove-Canonical-image-servers.patch - ./ui-canonical-0006-Remove-version-check.patch - ]; - - nativeBuildInputs = [ - nodejs - prefetch-yarn-deps - fixup-yarn-lock - yarn - ]; - - configurePhase = '' - runHook preConfigure - - ${gnused}/bin/sed -e "s/devlxd/guestapi/g" \ - -e "s/dev\/lxd/dev\/incus/g" \ - -e "s/LXD/Incus/g" \ - -e "s/Lxd/Incus_/g" \ - -e "s/lxd/incus/g" -i src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts* - - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror "$offlineCache" - fixup-yarn-lock yarn.lock - yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install - patchShebangs node_modules - cp ${./favicon-32x32.png} public/assets/img/favicon-32x32.png - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - yarn --offline build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - ${rsync}/bin/rsync -a build/ui/ $out/ - - runHook postInstall - ''; - - meta = with lib; { - description = "Easy and accessible container and virtual machine management. A browser interface for LXD"; - homepage = "https://github.com/canonical/lxd-ui"; - license = licenses.gpl3; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/incus-ui/favicon-32x32.png b/pkgs/incus-ui/favicon-32x32.png deleted file mode 100644 index 1d487b40cf5f55c824c7cecc206563738b7380d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2506 zcmV;*2{rbKP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 zVoOIv0RI600RN!9r;`8x00(qQO+^Ri3lqng9R@&PhZ;R9M5Umu+m7GP`b7t6cK7?co|U;B?fJ#z?5YsOExx*%M2_=mq8>kV=oCZL>HWX zaKXvU2`@5Qw3b2-oc8qXoSvTcy!D*(yxjXBtu3h3W!I-CPwxA={@3;Y z-`9QJFh!G6vVHsZ@$XnHR=#`p?mz9{zyA-3L?W2W<-}BdO*CyPi`v@S5aKic;cz&( zfB*iw&!0cPucf7BmSGsQw6uJ?sj2CSj*gC__4V~BfRT|A0)fCyeNP#+l#&An4%~6& z%9Wpf{PD++bai#1>pB3YX)<%>Om4mP)X*3=bn4+fU2rJHv=KQDDd#`FeN1=031Ac z@HgwvgRs|}e(ddhb zMB?r}d-ep*oH>Kr?dE0x#*)x94Y%8!S+i!%yE}L8{IL+CA0VI4<8rxf1Te8o$z*b4 zUtixo!!Ty*x-Qb`G$&4+;LxE%7=|$=5M!n&iVTH9!;e1t=u^$j&97V^YuuA%S)x!V zlqC|0-wzE9J!lvP4u=C>*U4tHxLht0i3Bgb^b+B47~8g|3_?nY-|uJLx^;hBym;}C z?z!ilUbowAjRQ!h)4_B){ZJ~E+LunJJ&K~Bswy6j2O$KxTn@{!0Py*I96NT5BS(%9 zkH>GS@`)e}!=SOT(OR)$#kP`?l7pKzZ5k4(RBGkGz`#?vT<(Elv53RrK+`ldO(UDl zBBjLR@c^G4w_>q~%jF^-kMqtu?{MziITDEknl`1Df@zxgd_I;gUHY%)=H_3C-rnAi zlF8(nMtXWmyyog^9-yhr@xx;Q*jeDByCr@caF2+qMnMvgqpS!Zghrj_36@ zM&11R^I5xgZBof(GC?5()2B~I(=p-`Z*vXbS?moqXlLL?F?QG7n1eNFjTmWAK%M+kwG@&*pQUN4HG zkW3~q3BRD7cWv(RYhZCBgJBI(*CjURjXD}Qc^-|Yb!lHJrs*Y)Q2B_ z_$ftErkSRRX_^>@K_C!7N;xh(MNtR@0^`+@QlhFV9UUFi)zuM?$BD&aBoYZSnG7pd ztRR!gkjv!&@caF&UcH*Owl<>CD28ER+cveewTRbWf4wV_NK`d7HKFS|LI`Zz#_RPW zgut?_NrD{9=)#2y^!4>2gdi9U5)OwsdGaKqqoW8RXlQ64lgSVa2Jw2my#N0DD2g&p ztzj6fU%wv3rRyS<$#DF=_vr5K#2>prAzVoeB|?aoK7dDXn+I;IW_>Y2 z&1ej3u$N-pBB23DRl~|<@LV}heLO;C!=0R&)yTlmFr$$OZnv9ID8#_P0J&W5OPh^t z+vvJJzIHGk$1qJwW|Z;7qB0ise1x7I!n7=;qJe;kL?Qu^N#Z|wn7hxu#y2Z`*b;KN z99OSiW%~5#R99Dj;YDQIHnV5Xrn0h<&dyHK=`?x6oM}F5pd{}0wWZ(@~Vtu&Nu!#NYwm7L#*$DCP@z9105tKP7baEJQxRR<%h9NXta^m!Q`y zI_auk_Co0ocfBcu_s`6wkDlAtbOD%yy=XHkC(nde9;%_{ z@D-$#YW9P-=jYD8yEpUC!|Uu^8lhe{aM(85yoE@!h#l=jUenFzSzD;yX?Ry{__yn} z)sOktZtf657&r8dFKZ}cqgM9Aqg#gG{M~_k+iBmV>}(rHMEJr(gcQ5TcWt*w=bcX5RbD_mY3!_p}-7T41Gz6@7LMvY5vl>_fPH zXfs3M;KnEROk4NJivX#=AH;v}cmKDi*(ACx3+394CZ(Ja`|ab;6h1w@1;k7{mqzjU zQ+oBnH!60%wp$1hnMmRPwF1THW%N0<03;9Xz0(?w{oEeSxfI{D-%S6(uA@STsXrF3 z*?$4_EmRrEqHe_i001R)MObuXVRU6WV{&C-bY%cCFfubOF)=MNGE_1!Ix;spGBGPK zFgh?WYjLmC0000bbVXQnWMOn=I&E)cX=Zr -Date: Wed, 22 Nov 2023 22:59:56 +0000 -Subject: [PATCH 1/8] Branding -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Stéphane Graber ---- - index.html | 2 +- - public/assets/img/favicon-32x32.png | Bin 1361 -> 2506 bytes - public/assets/img/incus-logo.svg | 129 ++++++++++++++++++++++++++++ - public/assets/img/lxd-logo.svg | 34 -------- - src/components/Logo.tsx | 6 +- - src/pages/login/Login.tsx | 1 - - src/sass/_pattern_icon.scss | 11 --- - src/sass/_pattern_navigation.scss | 8 +- - src/sass/styles.scss | 5 -- - src/util/title.tsx | 2 +- - 10 files changed, 138 insertions(+), 60 deletions(-) - create mode 100644 public/assets/img/incus-logo.svg - delete mode 100644 public/assets/img/lxd-logo.svg - -diff --git a/index.html b/index.html -index 6aa1283..85b46bd 100644 ---- a/index.html -+++ b/index.html -@@ -5,7 +5,7 @@ - - - -- LXD UI -+ Incus UI - - - -diff --git a/public/assets/img/incus-logo.svg b/public/assets/img/incus-logo.svg -new file mode 100644 -index 0000000..9caf711 ---- /dev/null -+++ b/public/assets/img/incus-logo.svg -@@ -0,0 +1,129 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/public/assets/img/lxd-logo.svg b/public/assets/img/lxd-logo.svg -deleted file mode 100644 -index 272ef59..0000000 ---- a/public/assets/img/lxd-logo.svg -+++ /dev/null -@@ -1,34 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -\ No newline at end of file -diff --git a/src/components/Logo.tsx b/src/components/Logo.tsx -index cf7faa8..b1b06d2 100644 ---- a/src/components/Logo.tsx -+++ b/src/components/Logo.tsx -@@ -15,11 +15,11 @@ const Logo: FC = () => { - return ( - - LXD-UI logo --
Canonical LXD
-+
Incus UI
- - ); - }; -diff --git a/src/pages/login/Login.tsx b/src/pages/login/Login.tsx -index c283cd5..9307844 100644 ---- a/src/pages/login/Login.tsx -+++ b/src/pages/login/Login.tsx -@@ -23,7 +23,6 @@ const Login: FC = () => { - return ( - -
-- -

Login

- {hasOidc && ( - <> -diff --git a/src/sass/_pattern_icon.scss b/src/sass/_pattern_icon.scss -index 21254c8..f6da7f9 100644 ---- a/src/sass/_pattern_icon.scss -+++ b/src/sass/_pattern_icon.scss -@@ -1,14 +1,3 @@ --@mixin lxdui-icon-sidebar-collapse() { -- background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 16 16' width='16px' height='16px' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M 0 7.743 L 6.742 14.485 L 7.899 13.329 L 2.311 7.743 L 7.899 2.157 L 6.742 1 L 0 7.743 Z M 7.899 7.743 L 14.642 14.485 L 15.797 13.329 L 10.21 7.743 L 15.797 2.157 L 14.642 1 L 7.899 7.743 Z' fill='%23FFF' style=''/%3E%3C/svg%3E"); --} -- --@mixin lxdui-p-icon { -- .p-icon--sidebar-toggle { -- @extend %icon; -- @include lxdui-icon-sidebar-collapse; -- } --} -- - .p-icon--info--notification { - @extend %icon; - @include vf-icon-info-coloured-themed; -diff --git a/src/sass/_pattern_navigation.scss b/src/sass/_pattern_navigation.scss -index 92236ef..1373ab0 100644 ---- a/src/sass/_pattern_navigation.scss -+++ b/src/sass/_pattern_navigation.scss -@@ -5,20 +5,20 @@ - - .p-panel__logo-image { - height: 36px; -- margin-top: -3px; -+ margin-top: 2px; - max-width: inherit; - } - - .logo-text { - color: #fff; -- left: 47px; -+ left: 70px; - position: absolute; - top: $spv--x-small; - } - - @include mobile { - .logo-text { -- left: 38px; -+ left: 66px; - } - } - -@@ -28,7 +28,7 @@ - } - - .logo-text { -- left: 52px; -+ left: 80px; - } - } - } -diff --git a/src/sass/styles.scss b/src/sass/styles.scss -index 34d155d..1f37774 100644 ---- a/src/sass/styles.scss -+++ b/src/sass/styles.scss -@@ -4,7 +4,6 @@ - @import "vanilla-framework/scss/build"; - @import "./breakpoints"; - @import "pattern_icon"; --@include lxdui-p-icon; - @include vf-p-icon-add-canvas; - @include vf-p-icon-applications; - @include vf-p-icon-begin-downloading; -@@ -148,10 +147,6 @@ body { - @include vf-icon-external-link($color-link); - } - --.lxd-icon { -- background-image: url("data:image/svg+xml,%0A%3Csvg width='38' height='38' viewBox='0 0 38 38' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M28.5311 15.7998V5.71128L18.6554 0L8.77977 5.71128V15.7998L0 20.8683V32.2887L9.87566 38L18.6554 32.9083L27.4352 37.9768L37.3108 32.2655V20.8451L28.5311 15.7998ZM18.6554 2.57113L26.3182 6.99684V15.7998L18.6554 20.2487L10.9694 15.823V7.02002L18.6554 2.57113ZM9.87566 35.431L2.21286 31.0053V22.1538L9.85037 17.7513L17.5595 22.2002V31.0032L9.87355 35.4289L9.87566 35.431ZM35.098 31.0053L27.4352 35.431L19.7724 31.0053V22.2023L27.4816 17.7534L35.1191 22.156V31.0074H35.0959L35.098 31.0053Z' fill='%23D9D9D9'/%3E%3Cpath d='M28.1978 31.9072L32.4085 29.4099V24.4594L28.1978 26.9357V31.9072Z' fill='%23D9D9D9'/%3E%3Cpath d='M27.4119 20.7966L23.2012 23.2223L27.4372 25.627L31.648 23.1507L27.4119 20.7966Z' fill='%23D9D9D9'/%3E%3Cpath d='M22.4635 29.4816L26.6995 31.9558V26.9357L22.415 24.5311L22.4635 29.4816Z' fill='%23D9D9D9'/%3E%3Cpath d='M9.85235 20.7966L5.6416 23.2223L9.87553 25.627L14.0884 23.1507L9.85235 20.7966Z' fill='%23D9D9D9'/%3E%3Cpath d='M4.90371 29.4816L9.13764 31.9558V26.9357L4.87842 24.5311L4.90371 29.4816Z' fill='%23D9D9D9'/%3E%3Cpath d='M10.6387 31.9072L14.8726 29.4099V24.4594L10.6387 26.9357V31.9072Z' fill='%23D9D9D9'/%3E%3Cpath d='M22.8455 7.97052L18.6326 5.63965L14.4219 8.06536L18.6326 10.4447L22.8455 7.97052Z' fill='%23D9D9D9'/%3E%3Cpath d='M17.8946 16.7755V11.7534L13.6606 9.35083L13.6838 14.3245L17.8946 16.7755Z' fill='%23D9D9D9'/%3E%3Cpath d='M19.3955 16.7503L23.6294 14.2529V9.2561L19.3955 11.7535V16.7503Z' fill='%23D9D9D9'/%3E%3C/svg%3E%0A"); --} -- - .actions-list { - display: inline-block; - min-width: 8.5rem; -diff --git a/src/util/title.tsx b/src/util/title.tsx -index 3ef659b..879efb9 100644 ---- a/src/util/title.tsx -+++ b/src/util/title.tsx -@@ -6,6 +6,6 @@ export const setTitle = (): void => { - - useEffect(() => { - const host = settings?.config?.["user.ui_title"] ?? location.hostname; -- document.title = `${host} | LXD UI`; -+ document.title = `${host} | Incus UI`; - }, [settings?.config]); - }; --- -2.34.1 - diff --git a/pkgs/incus-ui/ui-canonical-0002-Update-navigation.patch b/pkgs/incus-ui/ui-canonical-0002-Update-navigation.patch deleted file mode 100644 index cd53151..0000000 --- a/pkgs/incus-ui/ui-canonical-0002-Update-navigation.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 4a477c328eada5d3b3dfee39b6949dc97c36f813 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?St=C3=A9phane=20Graber?= -Date: Wed, 22 Nov 2023 23:02:27 +0000 -Subject: [PATCH 2/8] Update navigation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Stéphane Graber ---- - src/components/Navigation.tsx | 4 ++-- - src/components/NoMatch.tsx | 2 +- - src/context/useDocs.tsx | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx -index 147676a..64a97d3 100644 ---- a/src/components/Navigation.tsx -+++ b/src/components/Navigation.tsx -@@ -261,7 +261,7 @@ const Navigation: FC = () => { -
  • - { -
  • - { -
    - If you think this is an error in our product, please{" "} -     { -- const remoteBase = "https://documentation.ubuntu.com/lxd/en/latest"; -+ const remoteBase = "/documentation"; - const localBase = "/documentation"; - - const { hasLocalDocumentation } = useSupportedFeatures(); --- -2.34.1 - diff --git a/pkgs/incus-ui/ui-canonical-0003-Update-certificate-generation.patch b/pkgs/incus-ui/ui-canonical-0003-Update-certificate-generation.patch deleted file mode 100644 index 0e12b71..0000000 --- a/pkgs/incus-ui/ui-canonical-0003-Update-certificate-generation.patch +++ /dev/null @@ -1,195 +0,0 @@ -From 767dff6c01f0c8195f4044beb3059533a814212a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?St=C3=A9phane=20Graber?= -Date: Wed, 22 Nov 2023 23:03:33 +0000 -Subject: [PATCH 3/8] Update certificate generation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Stéphane Graber ---- - src/pages/login/BrowserImport.tsx | 18 +++++++++--------- - src/pages/login/CertificateAdd.tsx | 4 ++-- - src/pages/login/CertificateGenerate.tsx | 12 ++++++------ - src/util/certificate.tsx | 4 ++-- - 4 files changed, 19 insertions(+), 19 deletions(-) - -diff --git a/src/pages/login/BrowserImport.tsx b/src/pages/login/BrowserImport.tsx -index cc9c87a..d8ff1a4 100644 ---- a/src/pages/login/BrowserImport.tsx -+++ b/src/pages/login/BrowserImport.tsx -@@ -25,7 +25,7 @@ const BrowserImport: FC = ({ sendPfx }) => { - <> -
  • - This opens a certificate management dialog. Click Import... -- then Next and select the lxd-ui.pfx file you -+ then Next and select the incus-ui.pfx file you - just downloaded. Enter your password, or leave the field empty if you - have not set one. Click Next. -
    • -@@ -34,14 +34,14 @@ const BrowserImport: FC = ({ sendPfx }) => { - Next, then click Finish. - -
  • -- Restart the browser and open LXD-UI. Select the LXD-UI certificate. -+ Restart the browser and open Incus-UI. Select the Incus-UI certificate. -
    • - - ); - - const downloadPfx = ( -
  • -- Download lxd-ui.pfx -+ Download incus-ui.pfx - {sendPfx && ( -
    - -@@ -82,12 +82,12 @@ const BrowserImport: FC = ({ sendPfx }) => { - Import. -
    • -
  • -- Select the lxd-ui.pfx file you just downloaded. -+ Select the incus-ui.pfx file you just downloaded. - Enter your password, or leave the field empty if you have not - set one. -
    • -
  • -- Restart the browser and open LXD-UI. Select the LXD-UI -+ Restart the browser and open Incus-UI. Select the Incus-UI - certificate. -
    • - -@@ -108,11 +108,11 @@ const BrowserImport: FC = ({ sendPfx }) => { - -
  • - Click the Import button and select the{" "} -- lxd-ui.pfx file you just downloaded. Enter your -+ incus-ui.pfx file you just downloaded. Enter your - password, or leave the field empty if you have not set one. -
    • -
  • -- Restart the browser and open LXD-UI. Select the LXD-UI -+ Restart the browser and open Incus-UI. Select the Incus-UI - certificate. -
    • - -@@ -179,7 +179,7 @@ const BrowserImport: FC = ({ sendPfx }) => { - keychain. - -
  • -- Drag the lxd-ui.pfx file onto the Keychain Access -+ Drag the incus-ui.pfx file onto the Keychain Access - app. -
    • -
  • -@@ -187,7 +187,7 @@ const BrowserImport: FC = ({ sendPfx }) => { - and password for an administrator user on this computer. -
    • -
  • -- Restart the browser and open LXD-UI. Select the LXD-UI -+ Restart the browser and open Incus-UI. Select the Incus-UI - certificate. -
    • - -diff --git a/src/pages/login/CertificateAdd.tsx b/src/pages/login/CertificateAdd.tsx -index 0e86797..9d227e5 100644 ---- a/src/pages/login/CertificateAdd.tsx -+++ b/src/pages/login/CertificateAdd.tsx -@@ -52,7 +52,7 @@ const CertificateAdd: FC = () => { -

    Generate a token on the command line

    -
    - 
    --                        lxc config trust add --name lxd-ui
-+                        incus config trust add incus-ui
-
    -
    -
    -@@ -78,7 +78,7 @@ const CertificateAdd: FC = () => { - - -
    --

    Enjoy LXD UI.

    -+

    Enjoy Incus UI.

    -
    - - -diff --git a/src/pages/login/CertificateGenerate.tsx b/src/pages/login/CertificateGenerate.tsx -index 2ea99de..39dce9f 100644 ---- a/src/pages/login/CertificateGenerate.tsx -+++ b/src/pages/login/CertificateGenerate.tsx -@@ -82,7 +82,7 @@ const CertificateGenerate: FC = () => { - mainClassName="certificate-generate" - header={ -
    --

    Setup LXD UI

    -+

    Setup Incus UI

    -
    - } - > -@@ -137,12 +137,12 @@ const CertificateGenerate: FC = () => { - -
    -

    -- Download lxd-ui.crt and add it to the LXD -+ Download incus-ui.crt and add it to the Incus - trust store -

    -
    - 
    --                        lxc config trust add Downloads/lxd-ui.crt
-+                        incus config trust add-certificate Downloads/incus-ui.crt
-
    -
    -
    -@@ -152,7 +152,7 @@ const CertificateGenerate: FC = () => { -