reajustes no codigo

This commit is contained in:
2026-05-10 16:37:42 -03:00
parent 1d1e886b62
commit 0211c5e3e5
8 changed files with 213 additions and 221 deletions
Generated
+135 -128
View File
@@ -38,46 +38,6 @@
"type": "github"
}
},
"dms": {
"inputs": {
"flake-compat": "flake-compat_2",
"nixpkgs": "nixpkgs_3",
"quickshell": "quickshell"
},
"locked": {
"lastModified": 1778306063,
"narHash": "sha256-+Y7R7ez8GjQ5oxNeh9Raa2b8t+AQ2jOnWZRTA/h58LE=",
"owner": "AvengeMedia",
"repo": "DankMaterialShell",
"rev": "cf641b4e0845210dbf05fcfe13c4564897d73cbf",
"type": "github"
},
"original": {
"owner": "AvengeMedia",
"repo": "DankMaterialShell",
"type": "github"
}
},
"dms-plugin-registry": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1778325528,
"narHash": "sha256-+y7QsGE8e6AofulVXhMckNrHkNOWfIKrysGwsmk/7pE=",
"owner": "AvengeMedia",
"repo": "dms-plugin-registry",
"rev": "5adbbbe54a39c3efdf3ae33ef735813537c5d95c",
"type": "github"
},
"original": {
"owner": "AvengeMedia",
"repo": "dms-plugin-registry",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
@@ -94,19 +54,21 @@
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "NixOS",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"lastModified": 1777988971,
"narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "flake-compat",
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
@@ -144,9 +106,7 @@
},
"hayase": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1778292335,
@@ -169,11 +129,11 @@
]
},
"locked": {
"lastModified": 1778248595,
"narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=",
"lastModified": 1778365864,
"narHash": "sha256-ImoT/wqmgMImf2dAC+E0MverAdA4QXsedOeES9B7Ezw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d",
"rev": "2f419037039a152448c5f4ae9494154753d1b399",
"type": "github"
},
"original": {
@@ -190,11 +150,11 @@
]
},
"locked": {
"lastModified": 1778248595,
"narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=",
"lastModified": 1778365864,
"narHash": "sha256-ImoT/wqmgMImf2dAC+E0MverAdA4QXsedOeES9B7Ezw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d",
"rev": "2f419037039a152448c5f4ae9494154753d1b399",
"type": "github"
},
"original": {
@@ -233,11 +193,11 @@
]
},
"locked": {
"lastModified": 1778172518,
"narHash": "sha256-YE8qTqnGTcnFUAvRi8XTM3pHWebrK6GLy9Os4iOJPko=",
"lastModified": 1778408709,
"narHash": "sha256-DKIuvXXnv4+2wN+AY1qGfQ4uv/2dsOluMCCDEJCJ00g=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "3251531a37b09db4b03f48fbf1bc9348ea9ac045",
"rev": "6d7bfd32efacd9a06c36df65f47c875395547977",
"type": "github"
},
"original": {
@@ -256,11 +216,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1778224717,
"narHash": "sha256-lzpzFAinsI1YriR+iVDIDZVkps2oQw1LG2QvFcDVYCk=",
"lastModified": 1778392415,
"narHash": "sha256-UbEC8dOIWwCG4mww7SGhYMgM1yi8ewgKLi8O3uhX33M=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "cb2fdda815a0c2c03f8a7fe7075c433d4ef37110",
"rev": "670859bacca122ec1158c882b4cf2828930b3669",
"type": "github"
},
"original": {
@@ -289,11 +249,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1778221858,
"narHash": "sha256-+nZlx8MKCs973N9Bm0hNzFHjY+2lmBrBOQeTALeCRhI=",
"lastModified": 1778389445,
"narHash": "sha256-9NyDMVf8ydUZGTzcPcLMQf0o1B3bte/00UGbuXHNWh8=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "0200670d9ee8cfbdb154e3e14d92b5ff61aedd59",
"rev": "38191826cb1e5fb9051a7e141fefe4941a2b4bed",
"type": "github"
},
"original": {
@@ -341,13 +301,28 @@
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1777168982,
"narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1778342540,
"narHash": "sha256-Mt8tnhpDMFm3oFIF5YGbooNVeESm9tTceMvFp0dscUE=",
"lastModified": 1778435793,
"narHash": "sha256-Qi4UlkqLvorzUfGSda06fNBX9qHs1MoPy+96jvOvX1Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "883f7315776d6df366bc6074f929047212128961",
"rev": "539206eac557c86e4b6134dc65d2bb63482b7940",
"type": "github"
},
"original": {
@@ -388,6 +363,38 @@
"type": "github"
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1772198003,
"narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1777268161,
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1773628058,
@@ -406,11 +413,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1776169885,
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
"lastModified": 1760878510,
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github"
},
"original": {
@@ -438,11 +445,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1778124196,
"narHash": "sha256-pYEytCNic/czazbV9r3tbQ6BZzqRBg/41x2dIC5ymOo=",
"lastModified": 1778274207,
"narHash": "sha256-I4puXmX1iovcCHZlRmztO3vW0mAbbRvq4F8wgIMQ1MM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "68a8af93ff4297686cb68880845e61e5e2e41d92",
"rev": "b3da656039dc7a6240f27b2ef8cc6a3ef3bccae7",
"type": "github"
},
"original": {
@@ -454,11 +461,27 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1778124196,
"narHash": "sha256-pYEytCNic/czazbV9r3tbQ6BZzqRBg/41x2dIC5ymOo=",
"lastModified": 1777954456,
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1778274207,
"narHash": "sha256-I4puXmX1iovcCHZlRmztO3vW0mAbbRvq4F8wgIMQ1MM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "68a8af93ff4297686cb68880845e61e5e2e41d92",
"rev": "b3da656039dc7a6240f27b2ef8cc6a3ef3bccae7",
"type": "github"
},
"original": {
@@ -468,7 +491,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_8": {
"locked": {
"lastModified": 1777954456,
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
@@ -484,11 +507,24 @@
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1768127708,
"narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"noctalia": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"nixpkgs": "nixpkgs_6",
"noctalia-qs": "noctalia-qs"
},
"locked": {
@@ -533,15 +569,15 @@
"flake-schemas": "flake-schemas",
"home-manager": "home-manager_2",
"jovian": "jovian",
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_7",
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1778264788,
"narHash": "sha256-Ys9jBBS1zevFB/6GjVuQ7IpKmSaEBu/HKSGE2ijQ5q0=",
"lastModified": 1778432182,
"narHash": "sha256-GKMj2ahDJOwJbrQr1vVQ3/Eb+Prri+nPwOfX+TY3zbU=",
"owner": "lonerOrz",
"repo": "nyx-loner",
"rev": "cd65d7842eed9229cf5590ccde07ef57925bcaa0",
"rev": "ac354d5e8b3eea3cc68bcf4ff0e09b67fd665ddb",
"type": "github"
},
"original": {
@@ -553,7 +589,7 @@
"preload-ng": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_7"
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1768356181,
@@ -571,31 +607,7 @@
},
"quickshell": {
"inputs": {
"nixpkgs": [
"dms",
"nixpkgs"
]
},
"locked": {
"lastModified": 1776854048,
"narHash": "sha256-lLbV66V3RMNp1l8/UelmR4YzoJ5ONtgvEtiUMJATH/o=",
"ref": "refs/heads/master",
"rev": "783c953987dc56ff0601abe6845ed96f1d00495a",
"revCount": 806,
"type": "git",
"url": "https://git.outfoxxed.me/quickshell/quickshell"
},
"original": {
"rev": "783c953987dc56ff0601abe6845ed96f1d00495a",
"type": "git",
"url": "https://git.outfoxxed.me/quickshell/quickshell"
}
},
"quickshell_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1778222427,
@@ -615,8 +627,7 @@
"inputs": {
"aagl": "aagl",
"disko": "disko",
"dms": "dms",
"dms-plugin-registry": "dms-plugin-registry",
"flake-parts": "flake-parts",
"hayase": "hayase",
"home-manager": "home-manager",
"niri": "niri",
@@ -626,7 +637,7 @@
"noctalia": "noctalia",
"nyx-loner": "nyx-loner",
"preload-ng": "preload-ng",
"quickshell": "quickshell_2",
"quickshell": "quickshell",
"shiru": "shiru",
"zen-browser": "zen-browser"
}
@@ -660,11 +671,11 @@
]
},
"locked": {
"lastModified": 1778210054,
"narHash": "sha256-iYINsX0BVDxTXd0z4FzDpBYHZ9fWUtwjG9cKSXwe9Tg=",
"lastModified": 1778383025,
"narHash": "sha256-UK7s2LJS1YwIMFL7PSaNJvLXT9pyRgm7X+HNPgMXiEE=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "bc83d66023d19fb301ee98772643b24b6129ef48",
"rev": "4568a557ca325ff81fb354382d4a9968daa1001a",
"type": "github"
},
"original": {
@@ -675,9 +686,7 @@
},
"shiru": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1778291268,
@@ -781,16 +790,14 @@
"zen-browser": {
"inputs": {
"home-manager": "home-manager_3",
"nixpkgs": [
"nixpkgs"
]
"nixpkgs": "nixpkgs_11"
},
"locked": {
"lastModified": 1778343415,
"narHash": "sha256-XsQ/Wln8bMa5JXXeuI+DYm5AJt40hhgh4dJH9x5jjc8=",
"lastModified": 1778394798,
"narHash": "sha256-/jR8bModWv0ji305ecMgAB+2eaXLZiYdH+9Z4JIRkuA=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "26c08c3786f87e2d9ce47d8a36019e2054f3a0e0",
"rev": "45bc54456044b96492923739bfae633e1a4352e1",
"type": "github"
},
"original": {
+34 -63
View File
@@ -1,87 +1,43 @@
{
description = "A very basic flake";
inputs = {
#nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixpkgs-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
nixpkgs-master.url = "github:nixos/nixpkgs";
flake-parts.url = "github:hercules-ci/flake-parts";
preload-ng.url = "github:miguel-b-p/preload-ng";
aagl.url = "github:ezKEa/aagl-gtk-on-nix";
disko.url = "github:nix-community/disko";
#nix-cachyos.url = "github:xddxdd/nix-cachyos-kernel";
nyx-loner.url = "github:lonerOrz/nyx-loner";
home-manager = {
url = "github:nix-community/home-manager/";
inputs.nixpkgs.follows = "nixpkgs";
};
zen-browser = {
url = "github:0xc000022070/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
shiru = {
url = "github:darkguibrine/shiru-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
hayase = {
url = "github:darkguibrine/hayase-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
noctalia = {
url = "github:noctalia-dev/noctalia-shell";
inputs.nixpkgs.follows = "nixpkgs";
};
dms.url = "github:AvengeMedia/DankMaterialShell";
home-manager.url = "github:nix-community/home-manager/";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
zen-browser.url = "github:0xc000022070/zen-browser-flake";
shiru.url = "github:darkguibrine/shiru-nix";
hayase.url = "github:darkguibrine/hayase-nix";
noctalia.url = "github:noctalia-dev/noctalia-shell";
niri.url = "github:sodiboo/niri-flake";
dms-plugin-registry = {
url = "github:AvengeMedia/dms-plugin-registry";
inputs.nixpkgs.follows = "nixpkgs";
};
quickshell = {
url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
inputs.nixpkgs.follows = "nixpkgs";
};
quickshell.url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
};
outputs =
{
self,
inputs@{
flake-parts,
nixpkgs,
nixpkgs-stable,
nixpkgs-master,
home-manager,
zen-browser,
shiru,
preload-ng,
aagl,
noctalia,
niri,
disko,
nyx-loner,
...
}@inputs:
{
## Pc
}:
flake-parts.lib.mkFlake { inherit inputs; } {
flake = {
nixosConfigurations = {
# PC
"Alfa" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
./hosts/Alfa/configuration.nix
./mods/nixos/nixos.nix
preload-ng.nixosModules.default
{ services.preload-ng.enable = true; }
nyx-loner.nixosModules.default
{
imports = [ aagl.nixosModules.default ];
nix.settings = aagl.nixConfig;
programs.anime-game-launcher.enable = true;
programs.sleepy-launcher.enable = true;
}
];
};
};
## VPS
nixosConfigurations = {
# VPS
"darkgui-vps" = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
specialArgs = { inherit inputs; };
@@ -90,14 +46,29 @@
];
};
};
## home manager
homeConfigurations."gui@Alfa" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
# Home Manager
homeConfigurations = {
"gui@Alfa" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
system = "x86_64-linux";
config.allowUnfree = true;
};
extraSpecialArgs = { inherit inputs; };
modules = [
./hosts/Alfa/home.nix
./mods/home/home.nix
];
};
};
systems = [
"x86_64-linux"
"aarch64-linux"
];
perSystem =
{ config, pkgs, ... }:
{
};
};
};
}
+1 -1
View File
@@ -6,7 +6,6 @@
...
}:
{
nixpkgs.overlays = [ inputs.niri.overlays.niri ];
programs.niri = {
enable = true;
@@ -17,6 +16,7 @@
./thunar.nix
#./dms.nix
./noctalia.nix
inputs.niri.nixosModules.niri
];
services.dbus.enable = true;
+5 -1
View File
@@ -12,7 +12,6 @@
environment.systemPackages = with pkgs; [
## Navegadores
librewolf
inputs.zen-browser.packages.${pkgs.system}.default
## Streaming / mídia
@@ -83,6 +82,11 @@
services.logmein-hamachi.enable = true;
programs.haguichi.enable = true;
imports = [ inputs.aagl.nixosModules.default ];
nix.settings = inputs.aagl.nixConfig;
programs.sleepy-launcher.enable = true;
programs.anime-game-launcher.enable = true;
nixpkgs.config.permittedInsecurePackages = [
"electron-38.8.4"
];
+17 -9
View File
@@ -37,24 +37,32 @@
max-jobs = "auto";
auto-optimise-store = true;
extra-sandbox-paths = [ "/var/cache/ccache" ];
## Ativaçao flakes
flake-registry = "";
experimental-features = [
"nix-command"
"flakes"
];
## cache
substituters = [
"https://cache.garnix.io"
"https://niri.cachix.org/" # niri
];
trusted-public-keys = [
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" # niri
];
};
## Lix
package = pkgs.lixPackageSets.latest.lix;
## ativaçao do flakes
settings.experimental-features = [
"nix-command"
"flakes"
];
nixPath = lib.mapAttrsToList (key: _: "${key}=flake:${key}") config.nix.registry;
registry = lib.mapAttrs (_: value: { flake = value; }) (
lib.filterAttrs (_: value: lib.isType "flake" value) inputs
);
settings.flake-registry = "";
settings.substituters = [ "https://cache.garnix.io" ];
settings.trusted-public-keys = [ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ];
};
# chaotic
+1
View File
@@ -6,6 +6,7 @@
...
}:
{
imports = [ inputs.preload-ng.nixosModules.default ];
## Variaveis de ambiente contendo o aumento de cache para placas da nvidia
environment.variables = {
+1 -1
View File
@@ -22,7 +22,7 @@
adwsteamgtk
ryubing
xclicker
goverlay
#goverlay
mangohud
protonplus
hydralauncher
+1
View File
@@ -10,6 +10,7 @@
# Importa a configuração de hardware detectada
./hardware-configuration.nix
./conf/GM/imp.nix
inputs.nyx-loner.nixosModules.default
];
## Configuraçãao do bootloader