erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:04cb6a0c4cdc5ede6b9edb2cc636a4cc5c50f5d0
Branches Tags
erwin:main
...
compare: erwin:217dfcd3897e40091660dd5bc2b87caef940cc9e
Branches Tags
erwin:main

3 commits
04cb6a0c4c ... 217dfcd389

Author SHA1 Message Date
Erwin Boskma
217dfcd389
incus-ui: Use function with mkDerivation instead of rec
Some checks failed
/ check (push) Failing after 19m32s
Details
2024-02-26 17:01:24 +01:00
Erwin Boskma
43d24fab35
eww: Temporary fix to make it work on wayland 2024-02-26 17:00:59 +01:00
Erwin Boskma
4dd7ec982d
flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/23d308f0059955e3719efc81a34d1fc0369fbb74' (2024-02-22)
  → 'github:nix-community/disko/a13f36255cf4ce99cc4236a34251c2e7106e101d' (2024-02-26)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/841abef01afbd293aa80130bcbd811e4102d5770' (2024-02-23)
  → 'github:nix-community/emacs-overlay/dc68b375c2733198f642804a3cfacab5ede99761' (2024-02-26)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/3cb4ae6689d2aa3f363516234572613b31212b78' (2024-02-22)
  → 'github:NixOS/nixpkgs/5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b' (2024-02-25)
• Updated input 'eww':
    'github:elkowar/eww/d96586c209cad2c1098a4caa42133329bef852e8' (2024-02-20)
  → 'github:elkowar/eww/7bfd47eb8130f02f2a8f695c255df2f5302636b4' (2024-02-24)
• Updated input 'eww/flake-compat':
    'github:edolstra/flake-compat/b4a34015c698c7793d592d66adbab377907a2be8' (2022-04-19)
  → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
• Updated input 'home-manager':
    'github:nix-community/home-manager/0e0e9669547e45ea6cca2de4044c1a384fd0fe55' (2024-02-22)
  → 'github:nix-community/home-manager/4ee704cb13a5a7645436f400b9acc89a67b9c08a' (2024-02-24)
• Updated input 'microvm':
    'github:astro/microvm.nix/5544916016482c91874b0b25fd069a6e041c2715' (2024-02-22)
  → 'github:astro/microvm.nix/4583e2394e1e5723746fb55dbb912385c6c6bda1' (2024-02-26)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/0e74ca98a74bc7270d28838369593635a5db3260' (2024-02-21)
  → 'github:nixos/nixpkgs/73de017ef2d18a04ac4bfd0c02650007ccb31c2a' (2024-02-24)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/67853eda5dfe64922b9deb0ebc246a846fe177c7' (2024-02-23)
  → 'github:oxalica/rust-overlay/cbdf3e5bb205ff2ca165fe661fbd6d885cbd0106' (2024-02-26)
• Updated input 'sops':
    'github:Mic92/sops-nix/f6b80ab6cd25e57f297fe466ad689d8a77057c11' (2024-02-21)
  → 'github:Mic92/sops-nix/2874fbbe4a65bd2484b0ad757d27a16107f6bc17' (2024-02-25)
• Updated input 'sops/nixpkgs-stable':
    'github:NixOS/nixpkgs/69405156cffbdf2be50153f13cbdf9a0bea38e49' (2024-02-17)
  → 'github:NixOS/nixpkgs/89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea' (2024-02-25)
 2024-02-26 16:46:20 +01:00
4 changed files with 100 additions and 96 deletions
Show stats Expand all files Collapse all files

66
flake.lock
View file

@ -124,11 +124,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708564520, "lastModified": 1708910350,
"narHash": "sha256-juduDTYBhGN6jNfQ5RMDpbQF+MkO0pj3k7XGDSTjAbs=", "narHash": "sha256-cTuJVlOm05aQFIgGuYikgkrI61P2vTO2OfXwIRWEzUg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "23d308f0059955e3719efc81a34d1fc0369fbb74", "rev": "a13f36255cf4ce99cc4236a34251c2e7106e101d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -148,11 +148,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1708679224, "lastModified": 1708938386,
"narHash": "sha256-V66NAQSTakocPST2GYv4SKK+ALBg3sgCNq0jIOpNkpc=", "narHash": "sha256-WTSScoG1LhH+PBo3l4+Fcl1oGNuISmRzkYDrASPWefk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "841abef01afbd293aa80130bcbd811e4102d5770", "rev": "dc68b375c2733198f642804a3cfacab5ede99761",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -172,11 +172,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708465329, "lastModified": 1708778800,
"narHash": "sha256-A+fZjpKZe81F7PdpTxMPSLpHfqnlN3jbVZ7P5xwwZ1k=", "narHash": "sha256-CCwOEyCtn/y9IxhY64OTr1iDyPl2XjrF2u93Z2ex56E=",
"owner": "elkowar", "owner": "elkowar",
"repo": "eww", "repo": "eww",
"rev": "d96586c209cad2c1098a4caa42133329bef852e8", "rev": "7bfd47eb8130f02f2a8f695c255df2f5302636b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -204,11 +204,11 @@
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1650374568, "lastModified": 1696426674,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,11 +414,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708591310, "lastModified": 1708806879,
"narHash": "sha256-8mQGVs8JccWTnORgoLOTh9zvf6Np+x2JzhIc+LDcJ9s=", "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0e0e9669547e45ea6cca2de4044c1a384fd0fe55", "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +438,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1708617817, "lastModified": 1708906061,
"narHash": "sha256-7zbgJ3Pzen8V3SS3yemo7hiua2gzP/gmIM8Of1t4c7M=", "narHash": "sha256-8WlGYMCtggvybPdzQschOoC9r3dl0d3lnGmlTZB6pAw=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "5544916016482c91874b0b25fd069a6e041c2715", "rev": "4583e2394e1e5723746fb55dbb912385c6c6bda1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -586,11 +586,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1708566995, "lastModified": 1708831307,
"narHash": "sha256-e/THimsoxxMAHSbwMKov5f5Yg+utTj6XVGEo24Lhx+0=", "narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3cb4ae6689d2aa3f363516234572613b31212b78", "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -618,11 +618,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1708210246, "lastModified": 1708819810,
"narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=", "narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49", "rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -634,11 +634,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1708475490, "lastModified": 1708807242,
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0e74ca98a74bc7270d28838369593635a5db3260", "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -762,11 +762,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708654230, "lastModified": 1708913568,
"narHash": "sha256-f8B3nm0DIsWBmaLHvFvjJnqvFsEEoHxTjE9or5w4nIo=", "narHash": "sha256-76PGANC2ADf0h7fe0w2nWpfdGN+bemFs2rvW2EdU/ZY=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "67853eda5dfe64922b9deb0ebc246a846fe177c7", "rev": "cbdf3e5bb205ff2ca165fe661fbd6d885cbd0106",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -783,11 +783,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1708500294, "lastModified": 1708830076,
"narHash": "sha256-mvJIecY3tDKZh7297mqOtOuAvP7U1rqjfLNfmfkjFpU=", "narHash": "sha256-Cjh2xdjxC6S6nW6Whr2dxSeh8vjodzhTmQdI4zPJ4RA=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f6b80ab6cd25e57f297fe466ad689d8a77057c11", "rev": "2874fbbe4a65bd2484b0ad757d27a16107f6bc17",
"type": "github" "type": "github"
}, },
"original": { "original": {

124
pkgs/incus-ui/default.nix
View file

@ -10,79 +10,81 @@
rsync, rsync,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (
pname = "incus-ui"; finalAttrs: {
version = "0.6"; pname = "incus-ui";
version = "0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "canonical"; owner = "canonical";
repo = "lxd-ui"; repo = "lxd-ui";
rev = version; rev = finalAttrs.version;
# hash = "sha256-52MRf7bk8Un9wqz00+JjDmuJgPKYhgAhIbMbcAuf8W8="; # hash = "sha256-52MRf7bk8Un9wqz00+JjDmuJgPKYhgAhIbMbcAuf8W8=";
hash = "sha256-3Ts6lKyzpMDVATCKD1fFIGTskWzWpQUT9S8cPFnlEOs="; hash = "sha256-3Ts6lKyzpMDVATCKD1fFIGTskWzWpQUT9S8cPFnlEOs=";
}; };
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock"; yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-0pyxwMGGqogEe1w3sail8NUDHtxLQZU9Wg8E6rQNy4o="; hash = "sha256-0pyxwMGGqogEe1w3sail8NUDHtxLQZU9Wg8E6rQNy4o=";
}; };
patches = [ patches = [
./ui-canonical-0001-Branding.patch ./ui-canonical-0001-Branding.patch
./ui-canonical-0002-Update-navigation.patch ./ui-canonical-0002-Update-navigation.patch
./ui-canonical-0003-Update-certificate-generation.patch ./ui-canonical-0003-Update-certificate-generation.patch
./ui-canonical-0004-Remove-external-links.patch ./ui-canonical-0004-Remove-external-links.patch
./ui-canonical-0005-Remove-Canonical-image-servers.patch ./ui-canonical-0005-Remove-Canonical-image-servers.patch
./ui-canonical-0006-Remove-version-check.patch ./ui-canonical-0006-Remove-version-check.patch
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
nodejs nodejs
prefetch-yarn-deps prefetch-yarn-deps
yarn yarn
]; ];
configurePhase = '' configurePhase = ''
runHook preConfigure runHook preConfigure
${gnused}/bin/sed -i "s/LXD/Incus/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts* ${gnused}/bin/sed -i "s/LXD/Incus/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
${gnused}/bin/sed -i "s/devlxd/guestapi/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts* ${gnused}/bin/sed -i "s/devlxd/guestapi/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
${gnused}/bin/sed -i "s/dev\/lxd/dev\/incus/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts* ${gnused}/bin/sed -i "s/dev\/lxd/dev\/incus/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
${gnused}/bin/sed -i "s/lxd_/incus_/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts* ${gnused}/bin/sed -i "s/lxd_/incus_/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
${gnused}/bin/sed -i "s/\"lxd\"/\"incus\"/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts* ${gnused}/bin/sed -i "s/\"lxd\"/\"incus\"/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
yarn config --offline set yarn-offline-mirror "$offlineCache" yarn config --offline set yarn-offline-mirror "$offlineCache"
fixup-yarn-lock yarn.lock fixup-yarn-lock yarn.lock
yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install
patchShebangs node_modules patchShebangs node_modules
cp ${./favicon-32x32.png} public/assets/img/favicon-32x32.png cp ${./favicon-32x32.png} public/assets/img/favicon-32x32.png
runHook postConfigure runHook postConfigure
''; '';
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
yarn --offline build yarn --offline build
runHook postBuild runHook postBuild
''; '';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out mkdir -p $out
${rsync}/bin/rsync -a build/ui/ $out/ ${rsync}/bin/rsync -a build/ui/ $out/
runHook postInstall runHook postInstall
''; '';
meta = with lib; { meta = with lib; {
description = "Easy and accessible container and virtual machine management. A browser interface for LXD"; description = "Easy and accessible container and virtual machine management. A browser interface for LXD";
homepage = "https://github.com/canonical/lxd-ui"; homepage = "https://github.com/canonical/lxd-ui";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }
)

3
users/erwin/home.nix
View file

@ -72,7 +72,8 @@ in
}; };
eww = { eww = {
enable = true; enable = true;
package = pkgs.eww-wayland; # This will fail once https://github.com/NixOS/nixpkgs/pull/289595 is merged
package = pkgs.eww.override { withWayland = true; };
}; };
firefox = { firefox = {
enable = true; enable = true;

3
users/erwin/work.nix
View file

@ -87,7 +87,8 @@ in
}; };
eww = { eww = {
enable = true; enable = true;
package = pkgs.eww-wayland; # This will fail once https://github.com/NixOS/nixpkgs/pull/289595 is merged
package = pkgs.eww.override { withWayland = true; };
}; };
firefox = { firefox = {
enable = true; enable = true;