Compare commits
8 commits
a4ef312575
...
2c9f3cc24d
| Author | SHA1 | Date | |
|---|---|---|---|
2c9f3cc24d
|
|||
|
28f24e94c3
|
|||
|
db9e19eff0
|
|||
|
12efb214e0
|
|||
|
792648c64e
|
|||
|
fd23604902
|
|||
|
513fc5f771
|
|||
|
c7cd658c51
|
16 changed files with 247 additions and 158 deletions
66
flake.lock
66
flake.lock
|
|
@ -124,11 +124,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708029101,
|
||||
"narHash": "sha256-FPlAle/nl4sJRfd8eILe5M20aRJh/z2KY8ji2yBBwaI=",
|
||||
"lastModified": 1708305517,
|
||||
"narHash": "sha256-WYnEspeTTksC21obnnxWOGOAQbnBD0GES0S0XOLsJjs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "810eccbad22cc50323b27161033399eb87658932",
|
||||
"rev": "1ae1f57dad13595600dd57b6a55fcbaef6673804",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -148,11 +148,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708074333,
|
||||
"narHash": "sha256-m3N1qSO3UxHiKHvkAmYid0eVZ/6CH+Z/lxy7Mw40xMw=",
|
||||
"lastModified": 1708506424,
|
||||
"narHash": "sha256-4fqy9oG7vmaCkRQPeQly7N4LwXAfOizm+EVqs7mHurk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "1572bc00e95555e6c4743957103d69c9ec08a336",
|
||||
"rev": "39a63475945fea0d8b4e4aeb351f392c1c3beeab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -172,11 +172,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1703102678,
|
||||
"narHash": "sha256-MR91Ytt9Jf63dshn7LX64LWAVygbZgQYkcTIKhfVNXI=",
|
||||
"lastModified": 1708465329,
|
||||
"narHash": "sha256-A+fZjpKZe81F7PdpTxMPSLpHfqnlN3jbVZ7P5xwwZ1k=",
|
||||
"owner": "elkowar",
|
||||
"repo": "eww",
|
||||
"rev": "65d622c81f2e753f462d23121fa1939b0a84a3e0",
|
||||
"rev": "d96586c209cad2c1098a4caa42133329bef852e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -414,11 +414,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708031129,
|
||||
"narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=",
|
||||
"lastModified": 1708451036,
|
||||
"narHash": "sha256-tgZ38NummEdnXvxj4D0StHBzXgceAw8CptytHljH790=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8",
|
||||
"rev": "517601b37c6d495274454f63c5a483c8e3ca6be1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -438,11 +438,11 @@
|
|||
"spectrum": "spectrum"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708030119,
|
||||
"narHash": "sha256-szAJdvg27Mj54npMHnDH+0NYQFJOuuW70h+uvKALy0M=",
|
||||
"lastModified": 1708421045,
|
||||
"narHash": "sha256-xoN9rB7Uyoj+fIjMvHN1l3dGyQff7hV4KIVCYDocn4U=",
|
||||
"owner": "astro",
|
||||
"repo": "microvm.nix",
|
||||
"rev": "995b1c5d7fa2a9e64047acbf1e897579178d768c",
|
||||
"rev": "c3f2eb54f96f56ec93fcccc7f14808f10a61e6ca",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -521,11 +521,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1707842204,
|
||||
"narHash": "sha256-M+HAq1qWQBi/gywaMZwX0odU+Qb/XeqVeANGKRBDOwU=",
|
||||
"lastModified": 1708091350,
|
||||
"narHash": "sha256-o28BJYi68qqvHipT7V2jkWxDiMS1LF9nxUsou+eFUPQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "f1b2f71c86a5b1941d20608db0b1e88a07d31303",
|
||||
"rev": "106d3fec43bcea19cb2e061ca02531d54b542ce3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -586,11 +586,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1707978831,
|
||||
"narHash": "sha256-UblFdWQ2MMZNzD9C/w8+7RjAJ2QIbebbzHUniQ/a44o=",
|
||||
"lastModified": 1708294118,
|
||||
"narHash": "sha256-evZzmLW7qoHXf76VCepvun1esZDxHfVRFUJtumD7L2M=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c68a9fc85c2cb3a313be6ff40511635544dde8da",
|
||||
"rev": "e0da498ad77ac8909a980f07eff060862417ccf7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -618,11 +618,11 @@
|
|||
},
|
||||
"nixpkgs-stable_4": {
|
||||
"locked": {
|
||||
"lastModified": 1707603439,
|
||||
"narHash": "sha256-LodBVZ3+ehJP2azM5oj+JrhfNAAzmTJ/OwAIOn0RfZ0=",
|
||||
"lastModified": 1708210246,
|
||||
"narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d8cd80616c8800feec0cab64331d7c3d5a1a6d98",
|
||||
"rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -634,11 +634,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1707956935,
|
||||
"narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=",
|
||||
"lastModified": 1708475490,
|
||||
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c",
|
||||
"rev": "0e74ca98a74bc7270d28838369593635a5db3260",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -762,11 +762,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708049456,
|
||||
"narHash": "sha256-8qGWZTQPPBhcF5dsl1KSWF+H7RX8C3BZGvqYWKBtLjQ=",
|
||||
"lastModified": 1708481452,
|
||||
"narHash": "sha256-s07K6pwJtnB7Z/3wbkf4iaYXj+H5CuDD94I8hohm3Ig=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "4ee92bf124fbc4e157cbce1bc2a35499866989fc",
|
||||
"rev": "3d6647bf9d1f8e537b0d026c51ea25c0cdd92055",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -783,11 +783,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707842202,
|
||||
"narHash": "sha256-3dTBbCzHJBinwhsisGJHW1HLBsLbj91+a5ZDXt7ttW0=",
|
||||
"lastModified": 1708500294,
|
||||
"narHash": "sha256-mvJIecY3tDKZh7297mqOtOuAvP7U1rqjfLNfmfkjFpU=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "48afd3264ec52bee85231a7122612e2c5202fa74",
|
||||
"rev": "f6b80ab6cd25e57f297fe466ad689d8a77057c11",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -16,13 +16,8 @@ let
|
|||
"gfx.webrender.all" = true;
|
||||
"image.avif.enabled" = true;
|
||||
"image.webp.enabled" = true;
|
||||
"media.encoder.webm.enabled" = true;
|
||||
"media.ffmpeg.encoder.enabled" = true;
|
||||
"media.ffmpeg.vaapi.enabled" = true;
|
||||
"media.rdd-ffmpeg.enabled" = true;
|
||||
"media.webrtc.platformencoder" = true;
|
||||
"media.webrtc.platformencoder.sw_only" = false;
|
||||
"media.webrtc.software_encoder.fallback" = true;
|
||||
"privacy.webrtc.allowSilencingNotifications" = true;
|
||||
"privacy.webrtc.legacyGlobalIndicator" = false;
|
||||
"security.tls.enable_0rtt_data" = false;
|
||||
|
|
|
|||
|
|
@ -56,7 +56,15 @@ in
|
|||
atool
|
||||
ffmpegthumbnailer
|
||||
html2text
|
||||
imv
|
||||
(imv.override {
|
||||
withBackends = [
|
||||
"libtiff"
|
||||
"libjpeg"
|
||||
"libpng"
|
||||
"librsvg"
|
||||
"libheif"
|
||||
];
|
||||
})
|
||||
mediainfo
|
||||
p7zip
|
||||
pbzip2
|
||||
|
|
|
|||
|
|
@ -1,15 +1,3 @@
|
|||
let carapace_completer = {|spans|
|
||||
let expanded_alias = (scope aliases | where name == $spans.0 | get -i 0 | get -i expansion)
|
||||
|
||||
let spans = (if $expanded_alias != null {
|
||||
spans | skip 1 | prepend ($expanded_alias | split row " " | take 1)
|
||||
} else {
|
||||
$spans
|
||||
})
|
||||
|
||||
carapace $spans.0 nushell ...$spans | from json
|
||||
}
|
||||
|
||||
# The default config record. This is where much of your global configuration is setup.
|
||||
$env.config = {
|
||||
explore: {
|
||||
|
|
@ -34,7 +22,6 @@ $env.config = {
|
|||
algorithm: "fuzzy" # prefix or fuzzy
|
||||
external: {
|
||||
enable: true # set to false to prevent nushell looking into $env.PATH to find more suggestions, `false` recommended for WSL users as this look up my be very slow
|
||||
completer: $carapace_completer # check 'carapace_completer' above as an example
|
||||
}
|
||||
}
|
||||
filesize: {
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@
|
|||
with lib;
|
||||
let
|
||||
cfg = config.eboskma.programs.nushell;
|
||||
|
||||
zoxideOptions = concatStringsSep " " config.programs.zoxide.options;
|
||||
in
|
||||
{
|
||||
options.eboskma.programs.nushell = {
|
||||
|
|
@ -16,7 +14,8 @@ in
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.nushell = {
|
||||
programs = {
|
||||
nushell = {
|
||||
enable = true;
|
||||
package = pkgs.nushellFull;
|
||||
configFile.source = ./config.nu;
|
||||
|
|
@ -26,14 +25,6 @@ in
|
|||
$env.command_not_found_db = ${config.programs.command-not-found.dbPath}
|
||||
$env.NIX_SYSTEM = "${pkgs.system}"
|
||||
|
||||
let zoxide_cache = "${config.xdg.cacheHome}/zoxide"
|
||||
if not ($zoxide_cache | path exists) {
|
||||
mkdir $zoxide_cache
|
||||
}
|
||||
${config.programs.zoxide.package}/bin/zoxide init nushell ${zoxideOptions} | save --force ${config.xdg.cacheHome}/zoxide/init.nu
|
||||
# Temporary fix until zoxide releases new version
|
||||
sed -i 's/def-env/def --env/g' ${config.xdg.cacheHome}/zoxide/init.nu
|
||||
|
||||
$env.NU_LIB_DIRS = ($env.NU_LIB_DIRS | append ${pkgs.nu_scripts}/share/nu_scripts)
|
||||
'';
|
||||
extraConfig = ''
|
||||
|
|
@ -52,20 +43,20 @@ in
|
|||
use themes/nu-themes/dracula.nu
|
||||
|
||||
$env.config = ($env.config | merge { color_config: (dracula)})
|
||||
|
||||
source ${config.xdg.cacheHome}/zoxide/init.nu
|
||||
'';
|
||||
};
|
||||
|
||||
# Temporary until zoxide releases new version
|
||||
programs.zoxide.enableNushellIntegration = false;
|
||||
carapace = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
xdg.configFile."nushell/scripts" = {
|
||||
source = ./scripts;
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
carapace
|
||||
# carapace
|
||||
nu_scripts
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ with lib;
|
|||
virtualisation.oci-containers.containers = {
|
||||
frigate = {
|
||||
autoStart = true;
|
||||
image = "ghcr.io/blakeblackshear/frigate:0.13.0";
|
||||
image = "ghcr.io/blakeblackshear/frigate:0.13.2";
|
||||
ports = [
|
||||
"1984:1984" # go2rtc
|
||||
"5000:5000" # Frigate
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ in
|
|||
|
||||
dump = {
|
||||
enable = true;
|
||||
interval = "*-*-* 2,6,10,14,18,22:00:00";
|
||||
interval = "*-*-* 2,14:00:00";
|
||||
type = "tar.zst";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -12,18 +12,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "incus-ui";
|
||||
version = "0.5";
|
||||
version = "0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "lxd-ui";
|
||||
rev = version;
|
||||
hash = "sha256-52MRf7bk8Un9wqz00+JjDmuJgPKYhgAhIbMbcAuf8W8=";
|
||||
# hash = "sha256-52MRf7bk8Un9wqz00+JjDmuJgPKYhgAhIbMbcAuf8W8=";
|
||||
hash = "sha256-3Ts6lKyzpMDVATCKD1fFIGTskWzWpQUT9S8cPFnlEOs=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-WWnNjwzhN57PzTPmLWWzPoj66VFUnuzW1hTjKlVV8II=";
|
||||
hash = "sha256-0pyxwMGGqogEe1w3sail8NUDHtxLQZU9Wg8E6rQNy4o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
|
|||
./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 = [
|
||||
|
|
|
|||
|
|
@ -1,16 +1,22 @@
|
|||
From b2c17ef237b6c7540d4947f3d4544dc08dbd33ad Mon Sep 17 00:00:00 2001
|
||||
From: Erwin Boskma <erwin@datarift.nl>
|
||||
Date: Sat, 23 Dec 2023 20:02:24 +0100
|
||||
Subject: [PATCH] Branding
|
||||
From 530478927deddecbcc49efd01cad10ed49f0ca26 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
|
||||
Date: Wed, 22 Nov 2023 22:59:56 +0000
|
||||
Subject: [PATCH 1/6] Branding
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
|
||||
---
|
||||
index.html | 2 +-
|
||||
public/assets/img/incus-logo.svg | 129 ++++++++++++++++++++++++++++++
|
||||
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_navigation.scss | 8 +-
|
||||
src/sass/styles.scss | 4 -
|
||||
src/util/title.tsx | 2 +-
|
||||
6 files changed, 138 insertions(+), 43 deletions(-)
|
||||
9 files changed, 138 insertions(+), 48 deletions(-)
|
||||
create mode 100644 public/assets/img/incus-logo.svg
|
||||
delete mode 100644 public/assets/img/lxd-logo.svg
|
||||
|
||||
|
|
@ -222,8 +228,20 @@ index bcaf07e..92a0a5a 100644
|
|||
</NavLink>
|
||||
);
|
||||
};
|
||||
diff --git a/src/pages/login/Login.tsx b/src/pages/login/Login.tsx
|
||||
index 608f7a0..130198e 100644
|
||||
--- a/src/pages/login/Login.tsx
|
||||
+++ b/src/pages/login/Login.tsx
|
||||
@@ -24,7 +24,6 @@ const Login: FC = () => {
|
||||
<CustomLayout>
|
||||
<Row className="empty-state">
|
||||
<Col size={6} className="col-start-large-4">
|
||||
- <Icon name="containers" className="empty-state-icon lxd-icon" />
|
||||
<h1 className="p-heading--4 u-sv-2">Login</h1>
|
||||
{hasOidc && (
|
||||
<>
|
||||
diff --git a/src/sass/_pattern_navigation.scss b/src/sass/_pattern_navigation.scss
|
||||
index a224ef4..d68f363 100644
|
||||
index 92236ef..1373ab0 100644
|
||||
--- a/src/sass/_pattern_navigation.scss
|
||||
+++ b/src/sass/_pattern_navigation.scss
|
||||
@@ -5,20 +5,20 @@
|
||||
|
|
@ -259,18 +277,33 @@ index a224ef4..d68f363 100644
|
|||
}
|
||||
}
|
||||
}
|
||||
diff --git a/src/sass/styles.scss b/src/sass/styles.scss
|
||||
index 43f63ae..7aa17ac 100644
|
||||
--- a/src/sass/styles.scss
|
||||
+++ b/src/sass/styles.scss
|
||||
@@ -146,10 +146,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 715fd43..a40b0b7 100644
|
||||
index 8a80a11..6b69387 100644
|
||||
--- a/src/util/title.tsx
|
||||
+++ b/src/util/title.tsx
|
||||
@@ -6,6 +6,6 @@ export const setTitle = () => {
|
||||
|
||||
useEffect(() => {
|
||||
const host = settings?.config["user.ui_title"] ?? location.hostname;
|
||||
const host = settings?.config?.["user.ui_title"] ?? location.hostname;
|
||||
- document.title = `${host} | LXD UI`;
|
||||
+ document.title = `${host} | Incus UI`;
|
||||
}, [settings?.config]);
|
||||
};
|
||||
--
|
||||
2.42.0
|
||||
2.34.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
From 837f1824fb44a3f9d47370ebb098e09f84e7fd9d Mon Sep 17 00:00:00 2001
|
||||
From 9f44a025b61024f47c8eabcf9a0f25af0d2585da Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
|
||||
Date: Wed, 22 Nov 2023 23:02:27 +0000
|
||||
Subject: [PATCH 2/5] Update navigation
|
||||
Subject: [PATCH 2/6] Update navigation
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
|
||||
---
|
||||
src/components/Navigation.tsx | 5 ++---
|
||||
src/components/Navigation.tsx | 4 ++--
|
||||
src/components/NoMatch.tsx | 2 +-
|
||||
src/context/useDocs.tsx | 2 +-
|
||||
3 files changed, 4 insertions(+), 5 deletions(-)
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx
|
||||
index 0e0c704..93d2db2 100644
|
||||
index d2321da..f79deeb 100644
|
||||
--- a/src/components/Navigation.tsx
|
||||
+++ b/src/components/Navigation.tsx
|
||||
@@ -287,7 +287,7 @@ const Navigation: FC = () => {
|
||||
@@ -286,7 +286,7 @@ const Navigation: FC = () => {
|
||||
<li className="p-side-navigation__item">
|
||||
<a
|
||||
className="p-side-navigation__link"
|
||||
|
|
@ -26,7 +26,7 @@ index 0e0c704..93d2db2 100644
|
|||
target="_blank"
|
||||
rel="noreferrer"
|
||||
title="Discussion"
|
||||
@@ -302,7 +302,7 @@ const Navigation: FC = () => {
|
||||
@@ -301,7 +301,7 @@ const Navigation: FC = () => {
|
||||
<li className="p-side-navigation__item">
|
||||
<a
|
||||
className="p-side-navigation__link"
|
||||
|
|
@ -35,14 +35,6 @@ index 0e0c704..93d2db2 100644
|
|||
target="_blank"
|
||||
rel="noreferrer"
|
||||
title="Report a bug"
|
||||
@@ -314,7 +314,6 @@ const Navigation: FC = () => {
|
||||
Report a bug
|
||||
</a>
|
||||
</li>
|
||||
- <Version />
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
diff --git a/src/components/NoMatch.tsx b/src/components/NoMatch.tsx
|
||||
index 8d5270c..bd9e515 100644
|
||||
--- a/src/components/NoMatch.tsx
|
||||
|
|
@ -70,5 +62,5 @@ index 454d98c..90a0de9 100644
|
|||
|
||||
const { data: settings } = useSettings();
|
||||
--
|
||||
2.39.2
|
||||
2.34.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From fc477ad289e1be83d2e4350e07563c01c8750468 Mon Sep 17 00:00:00 2001
|
||||
From fc42d29bfc591a2f3a31cb7355ac5a6fb2f64614 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
|
||||
Date: Wed, 22 Nov 2023 23:03:33 +0000
|
||||
Subject: [PATCH 3/5] Update certificate generation
|
||||
Subject: [PATCH 3/6] Update certificate generation
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
|
@ -92,7 +92,7 @@ index f3cbcae..5d11d80 100644
|
|||
</li>
|
||||
</ul>
|
||||
diff --git a/src/pages/login/CertificateAdd.tsx b/src/pages/login/CertificateAdd.tsx
|
||||
index e539588..bc09982 100644
|
||||
index e539588..05ed677 100644
|
||||
--- a/src/pages/login/CertificateAdd.tsx
|
||||
+++ b/src/pages/login/CertificateAdd.tsx
|
||||
@@ -52,7 +52,7 @@ const CertificateAdd: FC = () => {
|
||||
|
|
@ -100,7 +100,7 @@ index e539588..bc09982 100644
|
|||
<div className="p-code-snippet">
|
||||
<pre className="p-code-snippet__block--icon">
|
||||
- <code>lxc config trust add --name lxd-ui</code>
|
||||
+ <code>incus config trust add --name incus-ui</code>
|
||||
+ <code>incus config trust add incus-ui</code>
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -191,5 +191,5 @@ index b409147..a802f5d 100644
|
|||
const der = forge.asn1.toDer(asn1).getBytes();
|
||||
const pfx = forge.util.encode64(der);
|
||||
--
|
||||
2.39.2
|
||||
2.34.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 1ada954bbf0220653ad3edec673b83fc32f2c56d Mon Sep 17 00:00:00 2001
|
||||
From 7d9a5b8d9bbf2408dc8334e34db9f487a691c0b3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
|
||||
Date: Wed, 22 Nov 2023 23:12:29 +0000
|
||||
Subject: [PATCH 4/5] Remove external links
|
||||
Subject: [PATCH 4/6] Remove external links
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
|
@ -12,13 +12,13 @@ Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
|
|||
1 file changed, 11 deletions(-)
|
||||
|
||||
diff --git a/src/pages/storage/UploadCustomImageHint.tsx b/src/pages/storage/UploadCustomImageHint.tsx
|
||||
index b66934e..fbb616d 100644
|
||||
index 128c658..22c9a1f 100644
|
||||
--- a/src/pages/storage/UploadCustomImageHint.tsx
|
||||
+++ b/src/pages/storage/UploadCustomImageHint.tsx
|
||||
@@ -9,17 +9,6 @@ const UploadCustomImageHint: FC = () => {
|
||||
<h5 className="p-notification__title">
|
||||
<h3 className="p-notification__title">
|
||||
Some image formats need to be modified in order to work with LXD.
|
||||
</h5>
|
||||
</h3>
|
||||
- <p>
|
||||
- <a
|
||||
- className="p-notification__action"
|
||||
|
|
@ -34,5 +34,5 @@ index b66934e..fbb616d 100644
|
|||
</div>
|
||||
</>
|
||||
--
|
||||
2.39.2
|
||||
2.34.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,40 @@
|
|||
From b429729297ed2bf93af12b5f429f5c0122e61a02 Mon Sep 17 00:00:00 2001
|
||||
From 98fcec984025deeb3a93cdd1618e3d47abb0d0cd Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
|
||||
Date: Wed, 22 Nov 2023 23:16:13 +0000
|
||||
Subject: [PATCH 5/5] Remove Canonical image servers
|
||||
Subject: [PATCH 5/6] Remove Canonical image servers
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
|
||||
---
|
||||
src/pages/images/ImageSelector.tsx | 14 --------------
|
||||
1 file changed, 14 deletions(-)
|
||||
src/pages/images/ImageSelector.tsx | 34 +++++++++---------------------
|
||||
1 file changed, 10 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/src/pages/images/ImageSelector.tsx b/src/pages/images/ImageSelector.tsx
|
||||
index 3af5f69..868a7fe 100644
|
||||
index f026ec3..91333be 100644
|
||||
--- a/src/pages/images/ImageSelector.tsx
|
||||
+++ b/src/pages/images/ImageSelector.tsx
|
||||
@@ -81,25 +81,13 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
|
||||
},
|
||||
);
|
||||
@@ -33,13 +33,9 @@ interface Props {
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
-const canonicalJson =
|
||||
- "https://cloud-images.ubuntu.com/releases/streams/v1/com.ubuntu.cloud:released:download.json";
|
||||
-const canonicalServer = "https://cloud-images.ubuntu.com/releases";
|
||||
-
|
||||
-const minimalJson =
|
||||
- "https://cloud-images.ubuntu.com/minimal/releases/streams/v1/com.ubuntu.cloud:released:download.json";
|
||||
-const minimalServer = "https://cloud-images.ubuntu.com/minimal/releases/";
|
||||
+const linuxContainersJson =
|
||||
+ "https://images.linuxcontainers.org/streams/v1/images.json";
|
||||
+const linuxContainersServer = "https://images.linuxcontainers.org";
|
||||
|
||||
const ANY = "any";
|
||||
const CONTAINER = "container";
|
||||
@@ -72,14 +68,9 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
|
||||
|
||||
const { data: settings, isLoading: isSettingsLoading } = useSettings();
|
||||
|
||||
- const { data: canonicalImages = [], isLoading: isCiLoading } = useQuery({
|
||||
- queryKey: [queryKeys.images, canonicalServer],
|
||||
|
|
@ -27,29 +44,46 @@ index 3af5f69..868a7fe 100644
|
|||
- const { data: minimalImages = [], isLoading: isMinimalLoading } = useQuery({
|
||||
- queryKey: [queryKeys.images, minimalServer],
|
||||
- queryFn: () => loadImages(minimalJson, minimalServer),
|
||||
- });
|
||||
-
|
||||
+ const { data: linuxContainerImages = [], isLoading: isLciLoading } = useQuery({
|
||||
+ queryKey: [queryKeys.images, linuxContainersServer],
|
||||
+ queryFn: () => loadImages(linuxContainersJson, linuxContainersServer),
|
||||
});
|
||||
|
||||
const { data: localImages = [], isLoading: isLocalImageLoading } = useQuery({
|
||||
queryKey: [queryKeys.images, project],
|
||||
@@ -87,8 +78,7 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
|
||||
queryFn: () => fetchImageList(project ?? ""),
|
||||
});
|
||||
|
||||
const isLoading =
|
||||
- isCiLoading ||
|
||||
isLciLoading ||
|
||||
- isMinimalLoading ||
|
||||
isLocalImageLoading ||
|
||||
isSettingsLoading;
|
||||
- const isLoading =
|
||||
- isCiLoading || isMinimalLoading || isLocalImageLoading || isSettingsLoading;
|
||||
+ const isLoading = isLciLoading || isLocalImageLoading || isSettingsLoading;
|
||||
const archSupported = getArchitectureAliases(
|
||||
@@ -110,8 +98,6 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
|
||||
settings?.environment?.architectures ?? [],
|
||||
);
|
||||
@@ -97,8 +87,7 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
|
||||
: localImages
|
||||
.filter((image) => !image.cached)
|
||||
.map(localLxdToRemoteImage)
|
||||
- .concat([...minimalImages].reverse().sort(byLtsFirst))
|
||||
- .concat([...canonicalImages].reverse().sort(byLtsFirst))
|
||||
.concat(linuxContainerImages)
|
||||
+ .concat(linuxContainerImages)
|
||||
.filter((image) => archSupported.includes(image.arch));
|
||||
|
||||
--
|
||||
2.39.2
|
||||
const archAll = [...new Set(images.map((item) => item.arch))]
|
||||
@@ -199,11 +188,8 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
|
||||
if (item.created_at) {
|
||||
return "Local";
|
||||
}
|
||||
- if (item.server === canonicalServer) {
|
||||
- return "Ubuntu";
|
||||
- }
|
||||
- if (item.server === minimalServer) {
|
||||
- return "Ubuntu Minimal";
|
||||
+ if (item.server === linuxContainersServer) {
|
||||
+ return "Linux Containers";
|
||||
}
|
||||
};
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
|
|||
31
pkgs/incus-ui/ui-canonical-0006-Remove-version-check.patch
Normal file
31
pkgs/incus-ui/ui-canonical-0006-Remove-version-check.patch
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
From 02a3fdbde4c5bb60ca12f99f2141f0754f665b1e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
|
||||
Date: Fri, 16 Feb 2024 17:32:51 +0000
|
||||
Subject: [PATCH 6/6] Remove version check
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
|
||||
---
|
||||
src/components/Version.tsx | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/components/Version.tsx b/src/components/Version.tsx
|
||||
index acb4c59..9c1d968 100644
|
||||
--- a/src/components/Version.tsx
|
||||
+++ b/src/components/Version.tsx
|
||||
@@ -14,9 +14,7 @@ const Version: FC = () => {
|
||||
const serverMajor = serverVersion.includes(".")
|
||||
? serverVersion.split(".")[0]
|
||||
: undefined;
|
||||
- const isOutdated = serverMajor
|
||||
- ? parseInt(serverMajor) < RECENT_MAJOR_SERVER_VERSION
|
||||
- : false;
|
||||
+ const isOutdated = false;
|
||||
|
||||
return (
|
||||
<>
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -201,7 +201,15 @@ in
|
|||
helvum
|
||||
horizon-eda
|
||||
imagemagick
|
||||
imv
|
||||
(imv.override {
|
||||
withBackends = [
|
||||
"libtiff"
|
||||
"libjpeg"
|
||||
"libpng"
|
||||
"librsvg"
|
||||
"libheif"
|
||||
];
|
||||
})
|
||||
iotop
|
||||
(jetbrains.clion.override { jdk = pkgs.jetbrains.jdk; })
|
||||
kicad
|
||||
|
|
|
|||
|
|
@ -255,7 +255,15 @@ in
|
|||
gnome.nautilus
|
||||
icemon
|
||||
imagemagick
|
||||
imv
|
||||
(imv.override {
|
||||
withBackends = [
|
||||
"libtiff"
|
||||
"libjpeg"
|
||||
"libpng"
|
||||
"librsvg"
|
||||
"libheif"
|
||||
];
|
||||
})
|
||||
incus
|
||||
iotop
|
||||
(jetbrains.clion.override { jdk = pkgs.jetbrains.jdk; })
|
||||
|
|
|
|||
Loading…
Reference in a new issue