|
|
b2dfc4cc43
|
emacs: Add python-mode and jinja2-mode
|
2023-06-15 10:06:50 +02:00 |
|
|
|
fe9ac11da0
|
nushell: Update cargoHash for plugin-formats
|
2023-06-13 10:44:43 +02:00 |
|
|
|
eb76a5d566
|
Update flake.lock
• Updated input 'disko':
'github:nix-community/disko/f1178c6e72b7d8ab2b55990397969324822275eb' (2023-06-07)
→ 'github:nix-community/disko/55eea2030a42845102334eb29f054f0c6604a32c' (2023-06-12)
• Updated input 'emacs-overlay':
'github:nix-community/emacs-overlay/bdc9dc52f1ae9772ebdca1f132554fe548392001' (2023-06-08)
→ 'github:nix-community/emacs-overlay/d248cdbbc9799d0cff8550e4fb4267bfac66e992' (2023-06-13)
• Updated input 'emacs-overlay/nixpkgs-stable':
'github:NixOS/nixpkgs/a558f7ac29f50c4b937fb5c102f587678ae1c9fb' (2023-06-06)
→ 'github:NixOS/nixpkgs/d3bb401dcfc5a46ce51cdfb5762e70cc75d082d2' (2023-06-10)
• Updated input 'home-manager':
'github:nix-community/home-manager/cc6745b35fefe48624ebf573382e1e0e4a6fe85e' (2023-06-07)
→ 'github:nix-community/home-manager/d437f0d4e0f72fe76688142e954a4a9b61ac9833' (2023-06-13)
• Updated input 'microvm':
'github:astro/microvm.nix/53155678bf68be0dadbe31e114971846dccba9e7' (2023-06-07)
→ 'github:astro/microvm.nix/551239936a1c86479f6026658c4d1f1a3635d286' (2023-06-11)
• Updated input 'naersk':
'github:nix-community/naersk/88cd22380154a2c36799fe8098888f0f59861a15' (2023-03-23)
→ 'github:nix-community/naersk/8507af04eb40c5520bd35d9ce6f9d2342cea5ad1' (2023-06-12)
• Updated input 'nil':
'github:oxalica/nil/dcd38b96c91a2d07552f824a6480e00dc7b4948a' (2023-05-31)
→ 'github:oxalica/nil/119e56eb4dfcd9fcc1bb808bf68ae3e7a3091409' (2023-06-11)
• Updated input 'nixos-hardware':
'github:NixOS/nixos-hardware/4cc688ee711159b9bcb5a367be44007934e1a49d' (2023-05-24)
→ 'github:NixOS/nixos-hardware/2a807ad6e8dc458db08588b78cc3c0f0ec4ff321' (2023-06-11)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/4729ffac6fd12e26e5a8de002781ffc49b0e94b7' (2023-06-06)
→ 'github:nixos/nixpkgs/75a5ebf473cd60148ba9aec0d219f72e5cf52519' (2023-06-11)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/6881eb2ae5d8a3516e34714e7a90d9d95914c4dc' (2023-06-06)
→ 'github:cachix/pre-commit-hooks.nix/182af51202998af5b64ddecaa7ff9be06425399b' (2023-06-08)
• Updated input 'rust-overlay':
'github:oxalica/rust-overlay/b4b71458b92294e8f1c3a112d972e3cff8a2ab71' (2023-06-08)
→ 'github:oxalica/rust-overlay/e279547de84413ca1a65cec3f0f879709c8c65eb' (2023-06-13)
• Updated input 'sops':
'github:Mic92/sops-nix/a522e12ee35e50fa7d902a164a9796e420e6e75b' (2023-06-04)
→ 'github:Mic92/sops-nix/cb85e297937af1bd1434cf5f85a3f86a21dc8207' (2023-06-11)
• Updated input 'sops/nixpkgs-stable':
'github:NixOS/nixpkgs/eaf03591711b46d21abc7082a8ebee4681f9dbeb' (2023-06-03)
→ 'github:NixOS/nixpkgs/ef24b2fa0c5f290a35064b847bc211f25cb85c88' (2023-06-10)
|
2023-06-13 10:17:48 +02:00 |
|
|
|
517b582f0e
|
Use latest version of nix
|
2023-06-08 16:56:21 +02:00 |
|
|
|
f431173e0c
|
Enable gnome-keyring in home-manager
|
2023-06-08 10:04:21 +02:00 |
|
|
|
46919ae952
|
keycloak: Limit access to management console
|
2023-06-08 10:03:58 +02:00 |
|
|
|
99f1c28019
|
Fix gitea backups
|
2023-06-08 10:03:45 +02:00 |
|
|
|
d96da2f3b6
|
Update flake.lock
• Updated input 'disko':
'github:nix-community/disko/29d632d7e8fa86f937153ecdfd7d768411001d2d' (2023-06-05)
→ 'github:nix-community/disko/f1178c6e72b7d8ab2b55990397969324822275eb' (2023-06-07)
• Updated input 'emacs-overlay':
'github:nix-community/emacs-overlay/fe83f47d0a8240ec1d81928705f6b02dc722fbbd' (2023-06-07)
→ 'github:nix-community/emacs-overlay/bdc9dc52f1ae9772ebdca1f132554fe548392001' (2023-06-08)
• Updated input 'emacs-overlay/nixpkgs-stable':
'github:NixOS/nixpkgs/70f7275b32f49bc67ae3532b758b80cb6c27f98a' (2023-06-05)
→ 'github:NixOS/nixpkgs/a558f7ac29f50c4b937fb5c102f587678ae1c9fb' (2023-06-06)
• Updated input 'home-manager':
'github:nix-community/home-manager/3512a6dafb7836cfceef00dcb29ce6f01c2ce280' (2023-06-07)
→ 'github:nix-community/home-manager/cc6745b35fefe48624ebf573382e1e0e4a6fe85e' (2023-06-07)
• Updated input 'microvm':
'github:astro/microvm.nix/c6416c6b9fed22b71f526720cb120b0218c51b62' (2023-06-06)
→ 'github:astro/microvm.nix/53155678bf68be0dadbe31e114971846dccba9e7' (2023-06-07)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/7409480d5c8584a1a83c422530419efe4afb0d19' (2023-06-05)
→ 'github:nixos/nixpkgs/4729ffac6fd12e26e5a8de002781ffc49b0e94b7' (2023-06-06)
• Updated input 'rust-overlay':
'github:oxalica/rust-overlay/1279a72003f5e4b08c8eca1101d8f57452a539f9' (2023-06-07)
→ 'github:oxalica/rust-overlay/b4b71458b92294e8f1c3a112d972e3cff8a2ab71' (2023-06-08)
|
2023-06-08 10:03:13 +02:00 |
|
|
|
27eb896e0a
|
Enable gnome keyring in home-manager
|
2023-06-08 09:31:17 +02:00 |
|
|
|
32dfd7bc71
|
Enable extra man pages
|
2023-06-08 09:30:42 +02:00 |
|
|
|
2d30d301ae
|
Update flake.lock
• Updated input 'disko':
'github:nix-community/disko/d02e565b95bdc68d8d7179a8eae27a1e4b04e507' (2023-06-04)
→ 'github:nix-community/disko/29d632d7e8fa86f937153ecdfd7d768411001d2d' (2023-06-05)
• Updated input 'emacs-overlay':
'github:nix-community/emacs-overlay/70db17480e76d556cc5363c1ba22cd591c83fa76' (2023-06-04)
→ 'github:nix-community/emacs-overlay/fe83f47d0a8240ec1d81928705f6b02dc722fbbd' (2023-06-07)
• Updated input 'emacs-overlay/nixpkgs-stable':
'github:NixOS/nixpkgs/eaf03591711b46d21abc7082a8ebee4681f9dbeb' (2023-06-03)
→ 'github:NixOS/nixpkgs/70f7275b32f49bc67ae3532b758b80cb6c27f98a' (2023-06-05)
• Updated input 'home-manager':
'github:nix-community/home-manager/57ed23cd29e7b72518e19d2917e2b2880a94162c' (2023-06-04)
→ 'github:nix-community/home-manager/3512a6dafb7836cfceef00dcb29ce6f01c2ce280' (2023-06-07)
• Updated input 'microvm':
'github:astro/microvm.nix/3683f43a37568fbc14bdc1c952acb41b0bb09a01' (2023-05-29)
→ 'github:astro/microvm.nix/c6416c6b9fed22b71f526720cb120b0218c51b62' (2023-06-06)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/dd4982554e18b936790da07c4ea2db7c7600f283' (2023-06-03)
→ 'github:nixos/nixpkgs/7409480d5c8584a1a83c422530419efe4afb0d19' (2023-06-05)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/ca2fdbf3edda2a38140184da6381d49f8206eaf4' (2023-05-29)
→ 'github:cachix/pre-commit-hooks.nix/6881eb2ae5d8a3516e34714e7a90d9d95914c4dc' (2023-06-06)
• Updated input 'pre-commit-hooks/nixpkgs-stable':
'github:NixOS/nixpkgs/9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8' (2023-03-15)
→ 'github:NixOS/nixpkgs/c37ca420157f4abc31e26f436c1145f8951ff373' (2023-06-03)
• Updated input 'rust-overlay':
'github:oxalica/rust-overlay/1ef3c6de6127a1cba94cc5492cdde52e33d06ea4' (2023-06-04)
→ 'github:oxalica/rust-overlay/1279a72003f5e4b08c8eca1101d8f57452a539f9' (2023-06-07)
|
2023-06-07 14:27:48 +02:00 |
|
|
|
a40ec7d1f3
|
valkyrie: Standalone AdGuard Home container
|
2023-06-07 08:34:16 +02:00 |
|
|
|
eba3aafd8b
|
fonts: Update iosevka-aile configuration for v24
|
2023-06-05 11:19:49 +02:00 |
|
|
|
f55ca41ae9
|
emacs: Remove old tree-sitter check
|
2023-06-05 11:19:19 +02:00 |
|
|
|
ce653d8fca
|
base: Add rar/unrar
|
2023-06-05 11:17:55 +02:00 |
|
|
|
a02e3cc201
|
sway: Assign steam to workspace 9
|
2023-06-05 11:17:40 +02:00 |
|
|
|
d9b20e86d9
|
Update emacs package to new emacs-overlay attributes and tree-sitter
|
2023-06-05 11:16:40 +02:00 |
|
|
|
b8a0f7eed0
|
Update flake.lock
• Updated input 'disko':
'github:nix-community/disko/0d270372b21818eba342954220c1a30a7bdaba19' (2023-05-30)
→ 'github:nix-community/disko/d02e565b95bdc68d8d7179a8eae27a1e4b04e507' (2023-06-04)
• Updated input 'emacs-overlay':
'github:nix-community/emacs-overlay/7735f53ef8f28d80ca5339e486e29177ed7c8297' (2023-05-30)
→ 'github:nix-community/emacs-overlay/70db17480e76d556cc5363c1ba22cd591c83fa76' (2023-06-04)
• Added input 'emacs-overlay/nixpkgs-stable':
'github:NixOS/nixpkgs/eaf03591711b46d21abc7082a8ebee4681f9dbeb' (2023-06-03)
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/006c75898cf814ef9497252b022e91c946ba8e17' (2023-05-08)
→ 'github:hercules-ci/flake-parts/71fb97f0d875fd4de4994dfb849f2c75e17eb6c3' (2023-06-01)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/da45bf6ec7bbcc5d1e14d3795c025199f28e0de0?dir=lib' (2023-04-30)
→ 'github:NixOS/nixpkgs/4f53efe34b3a8877ac923b9350c874e3dcd5dc0a?dir=lib' (2023-05-31)
• Updated input 'flake-utils':
'github:numtide/flake-utils/cfacdce06f30d2b68473a46042957675eebb3401' (2023-04-11)
→ 'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
• Updated input 'home-manager':
'github:nix-community/home-manager/9f82227b64245c273d98dd02dedd44fc7576041e' (2023-05-30)
→ 'github:nix-community/home-manager/57ed23cd29e7b72518e19d2917e2b2880a94162c' (2023-06-04)
• Updated input 'nil':
'github:oxalica/nil/0158d58d47abecd7f5f4e67c06365ff77bbedbc7' (2023-05-30)
→ 'github:oxalica/nil/dcd38b96c91a2d07552f824a6480e00dc7b4948a' (2023-05-31)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce' (2023-05-29)
→ 'github:nixos/nixpkgs/dd4982554e18b936790da07c4ea2db7c7600f283' (2023-06-03)
• Updated input 'rust-overlay':
'github:oxalica/rust-overlay/9b3284e2412f76bd68ff46f8cf1c7af44d7ffac0' (2023-05-30)
→ 'github:oxalica/rust-overlay/1ef3c6de6127a1cba94cc5492cdde52e33d06ea4' (2023-06-04)
• Updated input 'sops':
'github:Mic92/sops-nix/876846cde9762ae563f018c17993354875e2538e' (2023-05-30)
→ 'github:Mic92/sops-nix/a522e12ee35e50fa7d902a164a9796e420e6e75b' (2023-06-04)
• Updated input 'sops/nixpkgs-stable':
'github:NixOS/nixpkgs/ba6e4ddeb3e8ad3f3e3bec63dafbc9fe558729bb' (2023-05-27)
→ 'github:NixOS/nixpkgs/eaf03591711b46d21abc7082a8ebee4681f9dbeb' (2023-06-03)
|
2023-06-04 14:22:48 +02:00 |
|
|
|
9b6d18d9c1
|
Switch to maestral as dropbox client
|
2023-06-04 14:21:37 +02:00 |
|
|
|
5010935ae3
|
heimdall: Add WebFinger placeholder
|
2023-06-02 10:25:19 +02:00 |
|
|
|
d6208783c6
|
Clean up flake.nix
|
2023-06-01 23:36:02 +02:00 |
|
|
|
2bf9e68e20
|
Add prettier to devshell
|
2023-06-01 16:59:39 +02:00 |
|
|
|
dcbc1c7757
|
mimir: Update to linux 6.3
|
2023-06-01 16:59:30 +02:00 |
|
|
|
c348b4f5eb
|
heimdall: Add Keycloak
|
2023-06-01 16:59:19 +02:00 |
|
|
|
192e722e75
|
polybar: Update icons
|
2023-06-01 16:58:37 +02:00 |
|
|
|
6a2473628b
|
Re-encrypt secrets
|
2023-06-01 16:06:50 +02:00 |
|
|
|
d2f9e4494c
|
Merge branch 'main' of git.datarift.nl:erwin/nixos-config
|
2023-06-01 16:05:17 +02:00 |
|
|
|
a1bd0b1c50
|
Add work age key
|
2023-06-01 16:04:32 +02:00 |
|
|
|
93a16c9553
|
Update flake.lock
• Updated input 'disko':
'github:nix-community/disko/f0b9f374bb42fdcd57baa7d4448ac5d4788226bd' (2023-05-22)
→ 'github:nix-community/disko/0d270372b21818eba342954220c1a30a7bdaba19' (2023-05-30)
• Updated input 'emacs-overlay':
'github:nix-community/emacs-overlay/6ec9045f8b81b187d0628a8986ca47e163f90285' (2023-05-28)
→ 'github:nix-community/emacs-overlay/7735f53ef8f28d80ca5339e486e29177ed7c8297' (2023-05-30)
• Updated input 'home-manager':
'github:nix-community/home-manager/2d963854ae2499193c0c72fd67435fee34d3e4fd' (2023-05-27)
→ 'github:nix-community/home-manager/9f82227b64245c273d98dd02dedd44fc7576041e' (2023-05-30)
• Updated input 'microvm':
'github:astro/microvm.nix/738db09b400f556bf13925f647a16d5578e377a1' (2023-05-27)
→ 'github:astro/microvm.nix/3683f43a37568fbc14bdc1c952acb41b0bb09a01' (2023-05-29)
• Updated input 'nil':
'github:oxalica/nil/ca462183c525b5a950912f98815b7d290218f1d3' (2023-05-28)
→ 'github:oxalica/nil/0158d58d47abecd7f5f4e67c06365ff77bbedbc7' (2023-05-30)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/e10802309bf9ae351eb27002c85cfdeb1be3b262' (2023-05-27)
→ 'github:nixos/nixpkgs/5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce' (2023-05-29)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/61e567d6497bc9556f391faebe5e410e6623217f' (2023-05-23)
→ 'github:cachix/pre-commit-hooks.nix/ca2fdbf3edda2a38140184da6381d49f8206eaf4' (2023-05-29)
• Updated input 'rust-overlay':
'github:oxalica/rust-overlay/aa1b08de9ca770534ad750dccc70cebd95c15e26' (2023-05-28)
→ 'github:oxalica/rust-overlay/9b3284e2412f76bd68ff46f8cf1c7af44d7ffac0' (2023-05-30)
• Updated input 'sops':
'github:Mic92/sops-nix/3e016341d4dca6ce7c62316f90e66341841a30f9' (2023-05-28)
→ 'github:Mic92/sops-nix/876846cde9762ae563f018c17993354875e2538e' (2023-05-30)
|
2023-05-30 15:40:22 +02:00 |
|
|
|
299a4e4b36
|
Updates
|
2023-05-30 15:36:25 +02:00 |
|
|
|
56e1c03098
|
nushell: Add kink module
|
2023-05-30 15:35:45 +02:00 |
|
|
|
2983121a35
|
thor: Switch to i3
|
2023-05-28 13:22:28 +02:00 |
|
|
|
8ed718fe09
|
Remove temporary config
|
2023-05-28 13:21:31 +02:00 |
|
|
|
12fb3222c6
|
Don't enable fish globally
|
2023-05-28 12:52:03 +02:00 |
|
|
|
fff149d8f9
|
Fix cargo config
|
2023-05-28 12:51:54 +02:00 |
|
|
|
a19d78bd03
|
Remove unnecessary nixpkgs configuration
We're using home-manager.useGlobalPkgs now
|
2023-05-28 12:51:22 +02:00 |
|
|
|
f532da45a1
|
nushell: Use icons when showing filesystem tree
|
2023-05-28 12:49:11 +02:00 |
|
|
|
379b4602ae
|
Update to Linux 6.3
|
2023-05-28 12:48:51 +02:00 |
|
|
|
75e689cc21
|
Update flake.lock
• Updated input 'emacs-overlay':
'github:nix-community/emacs-overlay/30d50ec907edd37cafd215a922e97a0d58af4994' (2023-05-26)
→ 'github:nix-community/emacs-overlay/6ec9045f8b81b187d0628a8986ca47e163f90285' (2023-05-28)
• Updated input 'home-manager':
'github:nix-community/home-manager/d1f04b0f365a34896a37d9015637796537ec88a3' (2023-05-25)
→ 'github:nix-community/home-manager/2d963854ae2499193c0c72fd67435fee34d3e4fd' (2023-05-27)
• Updated input 'microvm':
'github:astro/microvm.nix/583785ae6c046288c8451667f3182ffee9662006' (2023-05-24)
→ 'github:astro/microvm.nix/738db09b400f556bf13925f647a16d5578e377a1' (2023-05-27)
• Updated input 'nil':
'github:oxalica/nil/17ed1578f3a225f2760d4da3adb440eb8677f2d3' (2023-05-19)
→ 'github:oxalica/nil/ca462183c525b5a950912f98815b7d290218f1d3' (2023-05-28)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/f91ee3065de91a3531329a674a45ddcb3467a650' (2023-05-24)
→ 'github:nixos/nixpkgs/e10802309bf9ae351eb27002c85cfdeb1be3b262' (2023-05-27)
• Updated input 'rust-overlay':
'github:oxalica/rust-overlay/b51083ca078b79db94e954e63655ba754956d7ef' (2023-05-26)
→ 'github:oxalica/rust-overlay/aa1b08de9ca770534ad750dccc70cebd95c15e26' (2023-05-28)
• Updated input 'sops':
'github:Mic92/sops-nix/4ccdfb573f323a108a44c13bb7730e42baf962a9' (2023-05-21)
→ 'github:Mic92/sops-nix/3e016341d4dca6ce7c62316f90e66341841a30f9' (2023-05-28)
• Updated input 'sops/nixpkgs-stable':
'github:NixOS/nixpkgs/d0dade110dc7072d67ce27826cfe9ab2ab0cf247' (2023-05-21)
→ 'github:NixOS/nixpkgs/ba6e4ddeb3e8ad3f3e3bec63dafbc9fe558729bb' (2023-05-27)
|
2023-05-28 12:32:53 +02:00 |
|
|
|
e777a9d59f
|
Use prettier in place of prettier-js
prettier-js does not seem to be maintained
|
2023-05-26 08:35:57 +02:00 |
|
|
|
6c5e5c9e1e
|
Update flake.lock
• Updated input 'emacs-overlay':
'github:nix-community/emacs-overlay/2806dea6457fed28013169a05a6dcf9c722d5465' (2023-05-23)
→ 'github:nix-community/emacs-overlay/30d50ec907edd37cafd215a922e97a0d58af4994' (2023-05-26)
• Updated input 'home-manager':
'github:nix-community/home-manager/58eb968c21d309a6c2b020ea8d64e25c38ceebba' (2023-05-23)
→ 'github:nix-community/home-manager/d1f04b0f365a34896a37d9015637796537ec88a3' (2023-05-25)
• Updated input 'microvm':
'github:astro/microvm.nix/59008a1eda995fbd844a756412f7d685086c15a2' (2023-05-17)
→ 'github:astro/microvm.nix/583785ae6c046288c8451667f3182ffee9662006' (2023-05-24)
• Updated input 'nixos-hardware':
'github:NixOS/nixos-hardware/71ce85372a614d418d5e303dd5702a79d1545c04' (2023-05-15)
→ 'github:NixOS/nixos-hardware/4cc688ee711159b9bcb5a367be44007934e1a49d' (2023-05-24)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/7084250df3d7f9735087d3234407f3c1fc2400e3' (2023-05-22)
→ 'github:nixos/nixpkgs/f91ee3065de91a3531329a674a45ddcb3467a650' (2023-05-24)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/df448ffc5d244f52261d05894c5a96af7f3758a1' (2023-05-22)
→ 'github:cachix/pre-commit-hooks.nix/61e567d6497bc9556f391faebe5e410e6623217f' (2023-05-23)
• Updated input 'rust-overlay':
'github:oxalica/rust-overlay/a227d4571dd1f948138a40ea8b0d0c413eefb44b' (2023-05-23)
→ 'github:oxalica/rust-overlay/b51083ca078b79db94e954e63655ba754956d7ef' (2023-05-26)
|
2023-05-26 08:35:18 +02:00 |
|
|
|
92b18ae0d8
|
Add home-manager configuration for regin
|
2023-05-25 08:07:45 +02:00 |
|
|
|
b73a53c427
|
Remove kernel option from base module
|
2023-05-25 08:01:53 +02:00 |
|
|
|
34f04ca705
|
nushell: Change LS_COLORS theme
|
2023-05-25 08:01:24 +02:00 |
|
|
|
5ea0ffb901
|
Remove eitri
|
2023-05-23 17:13:47 +02:00 |
|
|
|
627d902ce8
|
eglot tweaks, add terraform-ls
|
2023-05-23 17:12:50 +02:00 |
|
|
|
60b9355ada
|
Add tailscale to all machines
|
2023-05-23 17:12:31 +02:00 |
|
|
|
fa849e1bd5
|
Use home-manager.useGlobalPkgs
|
2023-05-23 17:10:45 +02:00 |
|
|
|
7491646130
|
emacs: Configure formatter for nil
|
2023-05-23 11:09:55 +02:00 |
|
|
|
52d23eb368
|
Use correct attribute
|
2023-05-23 11:08:42 +02:00 |
|
