Remudularizaçao do codigo

This commit is contained in:
DarkGui
2025-10-19 20:22:15 -03:00
parent 8e7fe043d6
commit 939cff1632
36 changed files with 158 additions and 134 deletions
+33 -35
View File
@@ -5,49 +5,45 @@ Minha Configuraçao no NIX des de 22/07/2025
``` ```
. .
├── conf ├── conf
│   ├── Alias │   ├── GM
│   │   ── alias.nix │   │   ── cfgeral
│   ├── Audio │   │   │   ├── alias.nix
│   │   ── audio.nix │   │   │  ── audio.nix
│   ├── CfStorage │   │   │   ├── fish.nix
│   │   └── CfStorage.nix │   │   │   ├── flakeconfig.nix
│   ├── configidioma │   │   │   ├── flatpak.nix
│   │   └── configidioma.nix │   │   │   ├── idioma.nix
│   ├── DistroBox │   │   │   ├── impcf.nix
│   │   └── distrobox.nix │   │   │   ├── nixhelper.nix
│   ├── environmentvariables │   │   │   ├── nvidia.nix
│   │   ── variables.nix │   │   │  ── variables.nix
│   ├── Fish │   │   │   ├── wireless.nix
│   │   └── fish.nix │   │   │   └── zstd.nix
│   ├── Flakes │   │   ├── DE
│   │   └── flakeconfig.nix │   │   │   ├── cosmic.nix
│   ├── Flatpak │   │   │   ├── gnome.nix
│   │   └── flatpak.nix │   │   │   ├── impde.nix
│   │   │   └── kde.nix
│   │   ├── imp.nix
│   │   └── Pkgs
│   │   ├── distrobox.nix
│   │   ├── imp_pkgs.nix
│   │   ├── lact.nix
│   │   ├── obs.nix
│   │   ├── pkgs.nix
│   │   └── steam.nix
│   └── HM
│   ├── Fontes │   ├── Fontes
│   │   └── fontes.nix │   │   └── fontes.nix
│   ├── git │   ├── git
│   │   └── git.nix │   │   └── git.nix
│   ├── gnome │   ├── imp.nix
│   │   └── gnome.nix
│   ├── Kde
│   │   └── kde.nix
│   ├── kitty │   ├── kitty
│   │   ├── kitty.conf │   │   ├── kitty.conf
│   │   ├── kitty.nix │   │   ├── kitty.nix
│   │   └── theme.conf │   │   └── theme.conf
│   ├── NixHelper │   └── pkgs
│   │   └── nixhelper.nix │   └── pkgs.nix
│   ├── Nvidia
│   │   └── nvidia.nix
│   ├── Obs
│   │   └── obs.nix
│   ├── PatchJogos
│   │   └── patch.nix
│   ├── Pkgs
│   │   ├── pkgshome.nix
│   │   └── pkgs.nix
│   └── wireless
│   └── wireless.nix
├── configuration.nix ├── configuration.nix
├── flake.lock ├── flake.lock
├── flake.nix ├── flake.nix
@@ -55,3 +51,5 @@ Minha Configuraçao no NIX des de 22/07/2025
├── home.nix ├── home.nix
└── imp.nix └── imp.nix
``` ```
@@ -7,11 +7,11 @@
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
]; ];
#programs.kdeconnect = { programs.kdeconnect = {
#enable = true; enable = true;
#package = pkgs.valent; package = pkgs.valent;
#}; };
} }
+8
View File
@@ -0,0 +1,8 @@
{ config, lib, inputs, pkgs, ... }: {
imports = [
./cosmic.nix
#./gnome.nix
#./kde.nix
];
}
+10
View File
@@ -0,0 +1,10 @@
{ config, lib, inputs, pkgs, ... }: {
imports = [
./distrobox.nix
./lact.nix
./obs.nix
./pkgs.nix
./steam.nix
];
}
+13
View File
@@ -0,0 +1,13 @@
{ config, lib, inputs, pkgs, ... }: {
environment.systemPackages = with pkgs; [lact];
systemd.services.lact = {
description = "GPU Control Daemon";
after = ["multi-user.target"];
wantedBy = ["multi-user.target"];
serviceConfig = {
ExecStart = "${pkgs.lact}/bin/lact daemon";
};
enable = true;
};
}
@@ -1,34 +1,20 @@
{ config, lib, inputs, pkgs, ... }: { { config, lib, inputs, pkgs, ... }: {
## Config da steam
programs.steam = { programs.steam = {
enable = true; enable = true;
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true; dedicatedServer.openFirewall = true;
localNetworkGameTransfers.openFirewall = true; localNetworkGameTransfers.openFirewall = true;
}; };
nixpkgs.config.allowUnfreePredicate = pkg: lib.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg: lib.elem (lib.getName pkg) [
"steam" "steam"
"steam-original" "steam-original"
"steam-unwrapped" "steam-unwrapped"
"steam-run" "steam-run"
]; ];
## patch jogos
programs = { programs = {
gamescope.enable = true; gamescope.enable = true;
gamemode.enable = true; gamemode.enable = true;
}; };
## LACT
environment.systemPackages = with pkgs; [lact];
systemd.services.lact = {
description = "GPU Control Daemon";
after = ["multi-user.target"];
wantedBy = ["multi-user.target"];
serviceConfig = {
ExecStart = "${pkgs.lact}/bin/lact daemon";
};
enable = true;
};
} }
@@ -2,7 +2,7 @@
programs.fish.shellAliases = { programs.fish.shellAliases = {
# upd = "sudo nix flake update --flake /etc/nixos && sudo nixos-rebuild switch --flake path:/etc/nixos#Alfa"; # upd = "sudo nix flake update --flake /etc/nixos && sudo nixos-rebuild switch --flake path:/etc/nixos#Alfa";
upd = "nh os switch -a -u && nh home switch -a -u"; upd = "nh home switch -a -u && nh os switch -a -u";
updhome = "nh home switch -a -u"; updhome = "nh home switch -a -u";
updsystem = "nh os switch -a -u"; updsystem = "nh os switch -a -u";
nixcf = "kate /etc/nixos/configuration.nix"; nixcf = "kate /etc/nixos/configuration.nix";
@@ -3,8 +3,7 @@
services.flatpak = { services.flatpak = {
enable = true; enable = true;
packages = [ packages = [
"org.vinegarhq.Sober/x86_64/stable" "org.vinegarhq.Sober"
"com.dec05eba.gpu_screen_recorder/x86_64/stable"
]; ];
update.auto = { update.auto = {
enable = true; enable = true;
+16
View File
@@ -0,0 +1,16 @@
{ config, lib, inputs, pkgs, ... }: {
imports = [
./alias.nix
./fish.nix
./audio.nix
./idioma.nix
./nixhelper.nix
./flakeconfig.nix
./flatpak.nix
./nvidia.nix
./variables.nix
./wireless.nix
./zstd.nix
];
}
+8
View File
@@ -0,0 +1,8 @@
{ config, lib, inputs, pkgs, ... }: {
imports = [
./cfgeral/impcf.nix
./DE/impde.nix
./Pkgs/imp_pkgs.nix
];
}
+9
View File
@@ -0,0 +1,9 @@
{pkgs, config, lib, ...}: {
programs.git.settings = {
enable = true;
user.email = "guihermando13@gmail.com";
user.name = "DarkGui";
credential.helper = "store";
};
}
+9
View File
@@ -0,0 +1,9 @@
{ config, lib, inputs, pkgs, ... }: {
imports = [
./Fontes/fontes.nix
./git/git.nix
./kitty/kitty.nix
./pkgs/pkgs.nix
];
}
@@ -7,9 +7,10 @@
config = lib.mkIf config.mods.kitty.enable { config = lib.mkIf config.mods.kitty.enable {
programs.kitty = { programs.kitty = {
enable = true; enable = true;
extraConfig = "include ${config.mods.flakePath}/conf/kitty/kitty.conf"; extraConfig = "include ${config.mods.flakePath}/conf/HM/kitty/kitty.conf";
settings.clear_all_shortcuts = "yes"; settings.clear_all_shortcuts = "yes";
}; };
}; };
} }
@@ -4,9 +4,8 @@
## aplicativos sociais ## aplicativos sociais
telegram-desktop telegram-desktop
(discord.override {withVencord = true;})
youtube-music youtube-music
(discord.override {withEquicord = true;})
## Jogos ## Jogos
lutris lutris
@@ -33,7 +32,6 @@
kitty kitty
vlc vlc
tree tree
alacarte
python3 python3
unrar unrar
droidcam droidcam
-11
View File
@@ -1,11 +0,0 @@
{pkgs, config, lib, ...}: {
programs.git = {
enable = true;
userName = "DarkGui";
userEmail = "guihermando13@gmail.com";
extraConfig = {
credential.helper = "store";
};
};
}
+18 -18
View File
@@ -122,11 +122,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760809591, "lastModified": 1760887455,
"narHash": "sha256-OxGcFcQdfOK8veZkPdQuqXIotFYiy4sBQB58dMNLeHY=", "narHash": "sha256-/xU8iYZjolWbMUNBQF6af5zgGs73Qw21WMgz1tLs3Yw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "870883ba11ba1c84f756c0c1f9fa74cdb2a16c1e", "rev": "aeabc1ac63e6ebb8ba4714c4abdfe0556f2de765",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -234,11 +234,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1760813300, "lastModified": 1760914368,
"narHash": "sha256-hnUkQfYidSiDSA2m3wm+1sNNg3AeswpYeEZ87KhP1Ts=", "narHash": "sha256-qGHL19N/yhtmnX5uxj7uN6+yGLMaB9sZTwqeA9mU2Iw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c6cc13a8908079574ece1cd0ef23194f7b86cbb", "rev": "ffef919861bf00e40a1a61a479e8f21c27e011b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -249,11 +249,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1760580664, "lastModified": 1760725957,
"narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=", "narHash": "sha256-tdoIhL/NlER290HfSjOkgi4jfmjeqmqrzgnmiMtGepE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389", "rev": "81b927b14b7b3988334d5282ef9cba802e193fe1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -335,11 +335,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760804384, "lastModified": 1760909691,
"narHash": "sha256-E3oVSP3FXC4JkTj9r2Xo7rqdL61dP1lDlmYpI630TC0=", "narHash": "sha256-zAMLBve67hWDKmZzG1KVZRNTzENs2cV9TBE2iHElDGc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "f1f3338af0f776a637ba5e92de04648c1a4c209d", "rev": "7e6ab8df192a781aa95a191b683e463d7cb1e4fb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -406,11 +406,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1760727119, "lastModified": 1760827883,
"narHash": "sha256-DWm+qPwXlsqDESSL4PYlS1NY1CvYUVjGnxM79ZeQ4Qg=", "narHash": "sha256-6Cvg9YE8wqpkdjnw0HwJH+HOWY9inO/slXf48w+84RM=",
"owner": "TibixDev", "owner": "TibixDev",
"repo": "winboat", "repo": "winboat",
"rev": "4e1aad3d3c94bc20f4e072d8bfd8cfb94fe32eaa", "rev": "a1b1105a30b1f5210ce29077e19f21b53083469a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -427,11 +427,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760768820, "lastModified": 1760898315,
"narHash": "sha256-rg4fJ8ocx3rCz//eajnxBmKZV4qulLtEPtBc+mtgrt4=", "narHash": "sha256-d2qbZpREjUQm65lzS70b2TVgTfOpAjQUZa+FS58+WnA=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "fd874a0b5f281bc4e173d81b03726d7fc7983cfd", "rev": "5e52b6a9ec07d22c9555891005b1b39f1bbd83ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
+6 -9
View File
@@ -1,18 +1,10 @@
{pkgs, config, lib, ...}: { {pkgs, config, lib, ...}: {
imports = [ imports = [
./conf/Fontes/fontes.nix ./conf/HM/imp.nix
./conf/Pkgs/pkgshome.nix
./conf/kitty/kitty.nix
./conf/git/git.nix
{options.mods = {flakePath = lib.mkOption {type = lib.types.str; default = lib.mkError "Option 'mods.flakePath' must be explicitly set."; description = "The absolute path of this flake. Must be explicitly set.";};};} {options.mods = {flakePath = lib.mkOption {type = lib.types.str; default = lib.mkError "Option 'mods.flakePath' must be explicitly set."; description = "The absolute path of this flake. Must be explicitly set.";};};}
]; ];
mods = {
kitty.enable = true;
flakePath = "/etc/nixos";
};
home = { home = {
username = "gui"; username = "gui";
homeDirectory = "/home/gui"; homeDirectory = "/home/gui";
@@ -26,6 +18,11 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
mods = {
kitty.enable = true;
flakePath = "/etc/nixos";
};
## config gnome ## config gnome
#dconf = { #dconf = {
# enable = true; # enable = true;
+1 -18
View File
@@ -2,23 +2,6 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./conf/Pkgs/pkgs.nix ./conf/GM/imp.nix
./conf/Alias/alias.nix
./conf/CfStorage/CfStorage.nix
./conf/PatchJogos/patch.nix
./conf/environmentvariables/variables.nix
./conf/Flatpak/flatpak.nix
./conf/Flakes/flakeconfig.nix
./conf/Nvidia/nvidia.nix
./conf/NixHelper/nixhelper.nix
./conf/Audio/audio.nix
./conf/configidioma/configidioma.nix
./conf/wireless/wireless.nix
./conf/Fish/fish.nix
./conf/DistroBox/distrobox.nix
./conf/Obs/obs.nix
#./conf/DE/gnome.nix #gnome
./conf/DE/kde.nix #kde
#./conf/DE/cosmic.nix #cosmic
]; ];
} }