DarkGui/NixConfig
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Guilherme Hermando De Oliveira
2026-05-09 18:44:45 -03:00
parent 8c424e69b8
commit 3df35b841a
5 changed files with 184 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+88 -67
View File
@@ -45,11 +45,11 @@
"quickshell": "quickshell" "quickshell": "quickshell"
}, },
"locked": { "locked": {
"lastModified": 1777817071, "lastModified": 1778306063,
"narHash": "sha256-/W6ia59izAqnuel6ro7K96DPYxN98cvYhz7o9FcNSgI=", "narHash": "sha256-+Y7R7ez8GjQ5oxNeh9Raa2b8t+AQ2jOnWZRTA/h58LE=",
"owner": "AvengeMedia", "owner": "AvengeMedia",
"repo": "DankMaterialShell", "repo": "DankMaterialShell",
"rev": "434490e100cd25b717e26dbd05d488b2e6ddab01", "rev": "cf641b4e0845210dbf05fcfe13c4564897d73cbf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -65,11 +65,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777773446, "lastModified": 1778325528,
"narHash": "sha256-UgLLbyRdv7gDqGvZeNYpvTOj9qOnUG0s8MCbMVnhjfU=", "narHash": "sha256-+y7QsGE8e6AofulVXhMckNrHkNOWfIKrysGwsmk/7pE=",
"owner": "AvengeMedia", "owner": "AvengeMedia",
"repo": "dms-plugin-registry", "repo": "dms-plugin-registry",
"rev": "0ba261d1e2acc88454c849e4f042add1bc92d235", "rev": "5adbbbe54a39c3efdf3ae33ef735813537c5d95c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -142,6 +142,26 @@
"type": "github" "type": "github"
} }
}, },
"hayase": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1778292335,
"narHash": "sha256-Aa8s4mz31xzRQHykNmfzsqUNOCAoEN+txgNsOWosYdI=",
"owner": "darkguibrine",
"repo": "hayase-nix",
"rev": "bb0ca907fa75721bd06a1fd0b99c224e4e72b5b2",
"type": "github"
},
"original": {
"owner": "darkguibrine",
"repo": "hayase-nix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -149,11 +169,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777815398, "lastModified": 1778248595,
"narHash": "sha256-MrIhEoqXc4YsHEUfH4rDU/K09XnWcKntNhCjs7n7zi8=", "narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b5e86c1b19f178a8ee10f7cb747325e02e3d3991", "rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -170,11 +190,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777733408, "lastModified": 1778248595,
"narHash": "sha256-lyKV2GtkMPS1Mp8bKJ8sBr7LPCzL4GnVnQQYa4e7UsQ=", "narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9ce9f7f128c5834bb71a4f5c62232187371379b6", "rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -191,11 +211,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776184304, "lastModified": 1777594677,
"narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", "narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3c7524c68348ef79ce48308e0978611a050089b2", "rev": "899c08a15beae5da51a5cecd6b2b994777a948da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -213,11 +233,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777614199, "lastModified": 1778172518,
"narHash": "sha256-k8fgidVoDNQTZWGLdhe6kLgpsLcydhPzal5YKVwxD2U=", "narHash": "sha256-YE8qTqnGTcnFUAvRi8XTM3pHWebrK6GLy9Os4iOJPko=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "79f3e3cc5c643138b7b3405c42681451be85d838", "rev": "3251531a37b09db4b03f48fbf1bc9348ea9ac045",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -236,11 +256,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1777815637, "lastModified": 1778224717,
"narHash": "sha256-jQnoHmnFgUWYDNosplgd5eFnUTT0MtEj2w9HCA4g1C0=", "narHash": "sha256-lzpzFAinsI1YriR+iVDIDZVkps2oQw1LG2QvFcDVYCk=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "945748d71d3422d4f1dada2cd10222e34ed9d767", "rev": "cb2fdda815a0c2c03f8a7fe7075c433d4ef37110",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -269,11 +289,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1777733745, "lastModified": 1778221858,
"narHash": "sha256-1TlpdT0WYyBGtUS3PH4oXHUmdno2EUh2TfHadK2BmJo=", "narHash": "sha256-+nZlx8MKCs973N9Bm0hNzFHjY+2lmBrBOQeTALeCRhI=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "1f07cffa9f355298a31d7efe1b400ede93a97728", "rev": "0200670d9ee8cfbdb154e3e14d92b5ff61aedd59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -323,11 +343,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1777821564, "lastModified": 1778342540,
"narHash": "sha256-3YL9ibR4WMhzj8OdffFMCm35vjJL6JERJSiPwZmJb8s=", "narHash": "sha256-Mt8tnhpDMFm3oFIF5YGbooNVeESm9tTceMvFp0dscUE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d474d1d274976539f1a01b00afdffd3055e03045", "rev": "883f7315776d6df366bc6074f929047212128961",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -338,11 +358,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1777673416, "lastModified": 1778003029,
"narHash": "sha256-5c2POKPOjU40Kh0MirOdScBLG0bu9TAuPYAtPRNZMBs=", "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "26ef669cffa904b6f6832ab57b77892a37c1a671", "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -354,11 +374,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1777673416, "lastModified": 1778003029,
"narHash": "sha256-5c2POKPOjU40Kh0MirOdScBLG0bu9TAuPYAtPRNZMBs=", "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "26ef669cffa904b6f6832ab57b77892a37c1a671", "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -402,11 +422,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1777578337, "lastModified": 1777954456,
"narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -418,11 +438,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1777641297, "lastModified": 1778124196,
"narHash": "sha256-WNGcmeOZ8Tr9dq6ztCspYbzWFswr2mPebM9LpsfGxPk=", "narHash": "sha256-pYEytCNic/czazbV9r3tbQ6BZzqRBg/41x2dIC5ymOo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c6d65881c5624c9cae5ea6cedef24699b0c0a4c0", "rev": "68a8af93ff4297686cb68880845e61e5e2e41d92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -434,11 +454,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1777641297, "lastModified": 1778124196,
"narHash": "sha256-WNGcmeOZ8Tr9dq6ztCspYbzWFswr2mPebM9LpsfGxPk=", "narHash": "sha256-pYEytCNic/czazbV9r3tbQ6BZzqRBg/41x2dIC5ymOo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c6d65881c5624c9cae5ea6cedef24699b0c0a4c0", "rev": "68a8af93ff4297686cb68880845e61e5e2e41d92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -450,11 +470,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1777578337, "lastModified": 1777954456,
"narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -472,11 +492,11 @@
"noctalia-qs": "noctalia-qs" "noctalia-qs": "noctalia-qs"
}, },
"locked": { "locked": {
"lastModified": 1777772763, "lastModified": 1778104114,
"narHash": "sha256-MIFrNTX+x42UdOiL9lWmwyyymh80/pxtU4afvEizZDk=", "narHash": "sha256-+tbqLv7IW5Aem8kGF6cp4n3MtNBcwqmuGlMt6S1kQjs=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-shell", "repo": "noctalia-shell",
"rev": "f0469d2d6f9b1ca873932dcef6583f9d6a2eee28", "rev": "eb2b53ddaa7564f5c93031cbe65cd5b6ef3c12a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -495,11 +515,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1777380063, "lastModified": 1777773024,
"narHash": "sha256-q5mWOEICcZzr+KnjIwDHV9EXiBxOC9cnBpxZbDAViU8=", "narHash": "sha256-pLU+KB84A0Jei/vTD6pOS4Ovkmq3QDfPQHg1MlKsRqM=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-qs", "repo": "noctalia-qs",
"rev": "8742a7a748c43bf44eb6862a8ebd3591ed71502d", "rev": "d3e26ccd9eecde9139be00caf5dc2d4260fb31ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -517,11 +537,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1777746234, "lastModified": 1778264788,
"narHash": "sha256-7sFNtEl36c8vo50CGn1dH4ewBT9kmRIgTYYT4JLuf6o=", "narHash": "sha256-Ys9jBBS1zevFB/6GjVuQ7IpKmSaEBu/HKSGE2ijQ5q0=",
"owner": "lonerOrz", "owner": "lonerOrz",
"repo": "nyx-loner", "repo": "nyx-loner",
"rev": "a81252dffc4c04ac7e8aa93595e0256dca40af00", "rev": "cd65d7842eed9229cf5590ccde07ef57925bcaa0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -578,11 +598,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777706159, "lastModified": 1778222427,
"narHash": "sha256-TuD8hw9lkRCEb+6v93iB7HDvcmvH8R0qyD6wBmPGfv8=", "narHash": "sha256-6GFiP611nEJvtm+m03sMyfaVIJ9QOCi//hS+PPKyyPA=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "8db8ca1fecfcce8def1f9265fa1742baa0e0c271", "rev": "d1760ed1f31c02a95b37a9bf4084129c829ebe7f",
"revCount": 813, "revCount": 817,
"type": "git", "type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell" "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}, },
@@ -597,6 +617,7 @@
"disko": "disko", "disko": "disko",
"dms": "dms", "dms": "dms",
"dms-plugin-registry": "dms-plugin-registry", "dms-plugin-registry": "dms-plugin-registry",
"hayase": "hayase",
"home-manager": "home-manager", "home-manager": "home-manager",
"niri": "niri", "niri": "niri",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
@@ -639,11 +660,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777691680, "lastModified": 1778210054,
"narHash": "sha256-sdCAzrPAaKu+yo7L2pWddy5PN6U9bO++WEWc1zcr7aQ=", "narHash": "sha256-iYINsX0BVDxTXd0z4FzDpBYHZ9fWUtwjG9cKSXwe9Tg=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "4757db4358c77c1cbe878fa5990e6ea88d82f6b5", "rev": "bc83d66023d19fb301ee98772643b24b6129ef48",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -659,11 +680,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774927919, "lastModified": 1778291268,
"narHash": "sha256-QRUCdfC6/pRhOo1wqd1mhHep6PvJQXBMTw4IskIEAF8=", "narHash": "sha256-95b35l94BfQo6Ui9DIUyqpIA3xW8EY1oLTzEyY9QyXw=",
"owner": "darkguibrine", "owner": "darkguibrine",
"repo": "shiru-nix", "repo": "shiru-nix",
"rev": "2cd2c57f3cc97a33136090cf7a0721fee4ba5e36", "rev": "275240677c27f9c8d51e6d1906eb508d922d4bcf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -765,11 +786,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777564084, "lastModified": 1778343415,
"narHash": "sha256-O9VRkxg+2j+sh+c73wi4VeIBECoqW2PlnCR9Qe1nQKA=", "narHash": "sha256-XsQ/Wln8bMa5JXXeuI+DYm5AJt40hhgh4dJH9x5jjc8=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "d93443c0f6fdb3b179bed68856f322dba4842612", "rev": "26c08c3786f87e2d9ce47d8a36019e2054f3a0e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
flake.nix
+4
View File
@@ -22,6 +22,10 @@
url = "github:darkguibrine/shiru-nix"; url = "github:darkguibrine/shiru-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hayase = {
url = "github:darkguibrine/hayase-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
noctalia = { noctalia = {
url = "github:noctalia-dev/noctalia-shell"; url = "github:noctalia-dev/noctalia-shell";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
hosts/Alfa/conf/GM/Pkgs/pkgs.nix
+49 -33
View File
@@ -11,58 +11,74 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
## Aplicativos sociais ## Navegadores
librewolf
inputs.zen-browser.packages.${pkgs.system}.default
## Streaming / mídia
inputs.shiru.packages.${pkgs.system}.default
inputs.hayase.packages.${pkgs.system}.default
linux-wallpaperengine
## Segurança / rede
bitwarden-desktop bitwarden-desktop
sunshine
tailscale tailscale
zerotierone
cloudflared
sunshine
## inputs ## Remote desktop
inputs.zen-browser.packages.${stdenv.hostPlatform.system}.default freerdp
inputs.shiru.packages.${pkgs.stdenv.hostPlatform.system}.default kdePackages.krdp
## Utilitários do sistema e dev tools ## Containers
docker-compose
distrobox
distroshelf
## Desenvolvimento
gcc
gnumake
gitFull
nh nh
home-manager home-manager
lazygit
## Vulkan / gráficos
vulkan-tools vulkan-tools
vulkan-loader
vulkan-utility-libraries vulkan-utility-libraries
gcc
ethtool ## Wine
wine-staging
winetricks
winboat
## Sistema
efibootmgr efibootmgr
docker-compose ethtool
distroshelf
distrobox
freerdp
dmidecode dmidecode
i2c-tools i2c-tools
gitFull
kdePackages.partitionmanager
usbutils usbutils
openrgb xwayland-satellite
winetricks android-tools
#wineWowPackages.staging
wine ## KDE / utilitários
haguichi kdePackages.partitionmanager
logmein-hamachi
zerotierone
kdePackages.ark kdePackages.ark
loupe loupe
lazygit
gnumake
onlyoffice-desktopeditors onlyoffice-desktopeditors
## Temas Qt
adwaita-qt adwaita-qt
adwaita-qt6 adwaita-qt6
winboat
xwayland-satellite
linux-wallpaperengine
#kdePackages.polkit-qt-1
kdePackages.krdp
cloudflared
## inputs stable ## RGB
#inputs.nixpkgs-stable.legacyPackages.${pkgs.stdenv.hostPlatform.system} openrgb
## Hamachi
haguichi
logmein-hamachi
]; ];
programs.gpu-screen-recorder.enable = true; programs.gpu-screen-recorder.enable = true;
services.logmein-hamachi.enable = true; services.logmein-hamachi.enable = true;
programs.haguichi.enable = true; programs.haguichi.enable = true;
hosts/Alfa/conf/HM/pkgs/pkgs.nix
+34 -42
View File
@@ -8,72 +8,64 @@
{ {
## pacotes home-manager ## pacotes home-manager
home.packages = with pkgs; [ home.packages = with pkgs; [
## Comunicação / social
## aplicativos sociais
telegram-desktop telegram-desktop
pear-desktop pear-desktop
teams-for-linux teams-for-linux
#(discord.override { withVencord = true; })
(discord.override { withEquicord = true; }) (discord.override { withEquicord = true; })
jellyfin-desktop jellyfin-desktop
## Jogos ## Jogos
#lutris
faugus-launcher faugus-launcher
heroic heroic
prismlauncher prismlauncher
steam
adwsteamgtk adwsteamgtk
ryubing ryubing
xclicker xclicker
#mangojuice
goverlay goverlay
mangohud mangohud
protonplus protonplus
hydralauncher hydralauncher
lsfg-vk lsfg-vk
lsfg-vk-ui lsfg-vk-ui
android-tools
## Desenvolvimento
zed-editor zed-editor
vscodium
nil nil
nixd nixd
## Utilitários do sistema e dev tools
fastfetch
flameshot
#handbrake
easyeffects
qbittorrent
cpu-x
git
btop-cuda
vscodium
flatpak
wget
kitty
vlc
tree
python314
unrar
droidcam
motrix
mission-center
nodejs nodejs
lxappearance python3
nwg-look
#rustdesk
anydesk
libargon2
openssl_oqs
icu
kdePackages.qt6ct
libsForQt5.qt5ct
pkgs.gnome-themes-extra
papirus-icon-theme
## Dev
godot godot
]; ## Terminal / CLI
kitty
fastfetch
btop-cuda
tree
wget
git
unrar
## Multimídia
vlc
qbittorrent
easyeffects
flameshot
motrix
## Sistema
cpu-x
mission-center
droidcam
anydesk
## Temas / aparência
lxappearance
nwg-look
kdePackages.qt6ct
libsForQt5.qt5ct
gnome-themes-extra
papirus-icon-theme
];
} }
hosts/darkgui-vps/config/pkgs.nix
+9 -8
View File
@@ -6,23 +6,24 @@
... ...
}: }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
## CLI
curl curl
git
vim
wget wget
screen screen
fish fish
btop btop
fastfetch fastfetch
gitFull
unrar
unzip unzip
unrar
## Zed ## Git
gitFull
## Editor
vim
## Nix
nixd nixd
nil
]; ];
} }