Organizaçao e diminuiçao de arquivos desnessesarios

nixos/conf/GM/Pkgs/distrobox.nix

@@ -1,14 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-  
-  ## distro box
-  #virtualisation.podman = {
-  #enable = true;
-  #dockerCompat = true;
-  #};
-
-  users.users.gui.extraGroups = [ "docker" ];
-  users.groups.docker.gid = 131;
-  virtualisation.docker = {
-  enable = true;
-  };
-}

nixos/conf/GM/Pkgs/fontes.nix

@@ -1,17 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-
-  fonts.fontDir.enable = true;
-  fonts.fontconfig.enable = true;
-  fonts.packages = with pkgs; [
-  nerd-fonts.jetbrains-mono
-  nerd-fonts.ubuntu-mono
-  nerd-fonts.ubuntu-sans
-  nerd-fonts.dejavu-sans-mono
-  nerd-fonts.fira-code
-  nerd-fonts.overpass
-  noto-fonts
-  liberation_ttf
-  dejavu_fonts
-  ];
-
-}

nixos/conf/GM/Pkgs/imp_pkgs.nix

@@ -1,11 +1,7 @@
 { config, lib, inputs, pkgs, ... }: {
 
    imports = [
-    ./distrobox.nix
+    ./pkgsconfig.nix
     ./pkgs.nix
-    ./steam.nix
-    ./lact.nix
-    ./obs.nix
-    ./fontes.nix
   ];
 }

nixos/conf/GM/Pkgs/lact.nix

@@ -1,13 +0,0 @@
-{ 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;
-  };
-}

nixos/conf/GM/Pkgs/obs.nix

@@ -1,19 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-
-  programs.obs-studio = {
-    enable = true;
-    # optional Nvidia hardware acceleration
-    package = (
-      pkgs.obs-studio.override {
-        cudaSupport = true;
-      }
-    );
-    plugins = with pkgs.obs-studio-plugins; [
-      wlrobs
-      obs-pipewire-audio-capture
-      obs-gstreamer
-      obs-vkcapture
-    ];
-   #enableVirtualCamera = true;
-  };
-}

nixos/conf/GM/Pkgs/pkgsconfig.nix

@@ -0,0 +1,89 @@
+{ config, lib, inputs, pkgs, ... }: {
+
+  
+  
+  ## configuraçao da steam
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
+    dedicatedServer.openFirewall = true;
+    localNetworkGameTransfers.openFirewall = true;
+  };
+
+  nixpkgs.config.allowUnfreePredicate = pkg: lib.elem (lib.getName pkg) [
+    "steam"
+    "steam-original"
+    "steam-unwrapped"
+    "steam-run"
+  ];
+  programs = {
+    gamescope.enable = true;
+    gamemode.enable = true;
+  };
+
+  ## Configuraçoes do obs
+
+  programs.obs-studio = {
+    enable = true;
+    # optional Nvidia hardware acceleration
+    package = (
+      pkgs.obs-studio.override {
+        cudaSupport = true;
+      }
+    );
+    plugins = with pkgs.obs-studio-plugins; [
+      wlrobs
+      obs-pipewire-audio-capture
+      obs-gstreamer
+      obs-vkcapture
+    ];
+   #enableVirtualCamera = true;
+  };
+
+  ## Configuraçoes do 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;
+  };
+
+  ## Configuraçao de Docker
+
+  #virtualisation.podman = {
+  #enable = true;
+  #dockerCompat = true;
+  #};
+
+  users.users.gui.extraGroups = [ "docker" ];
+  users.groups.docker.gid = 131;
+  virtualisation.docker = {
+  enable = true;
+  };
+
+  ## Fontes
+  fonts.fontDir.enable = true;
+  fonts.fontconfig.enable = true;
+  fonts.packages = with pkgs; [
+  nerd-fonts.jetbrains-mono
+  nerd-fonts.ubuntu-mono
+  nerd-fonts.ubuntu-sans
+  nerd-fonts.dejavu-sans-mono
+  nerd-fonts.fira-code
+  nerd-fonts.overpass
+  noto-fonts
+  liberation_ttf
+  dejavu_fonts
+  ];
+
+  ## OpenRGB
+  services.hardware.openrgb = {
+    enable = true;
+    motherboard = "amd";
+    package = pkgs.openrgb-with-all-plugins; # enable all plugins
+  };
+}   

nixos/conf/GM/Pkgs/steam.nix

@@ -1,20 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true;
-    dedicatedServer.openFirewall = true;
-    localNetworkGameTransfers.openFirewall = true;
-  };
-
-  nixpkgs.config.allowUnfreePredicate = pkg: lib.elem (lib.getName pkg) [
-    "steam"
-    "steam-original"
-    "steam-unwrapped"
-    "steam-run"
-  ];
-  programs = {
-    gamescope.enable = true;
-    gamemode.enable = true;
-  };
-}   

nixos/conf/GM/cfgeral/alias.nix

@@ -1,10 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-
-    programs.fish.shellAliases = {
-    # upd = "sudo nix flake update --flake /etc/nixos && sudo nixos-rebuild switch --flake path:/etc/nixos#Alfa";
-    upd = "nh home switch -a -u && nh os switch -a";
-    updhome = "nh home switch -a -u";
-    updsystem = "nh os switch -a -u";
-    gitupdate = "git add . && git commit && git push origin main";
-    };
-}

nixos/conf/GM/cfgeral/audio.nix

@@ -1,16 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-
-  ## Configuração de áudio com Pipewire (desativa PulseAudio) 
-  services = {
-    pulseaudio.enable = false;
-    pipewire = {
-      enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    #jack.enable = true; # Descomente se usar aplicações JACK
-   };
-  };
-  security.rtkit.enable = true;
-
-}

nixos/conf/GM/cfgeral/fish.nix

@@ -1,15 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-  
-  programs.fish.enable = true;  
-
-  ## auto start fish com bash
-  programs.bash = {
-  interactiveShellInit = 
-  '' if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
-    then
-      shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-      exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
-    fi '';
- };
-
-}

nixos/conf/GM/cfgeral/flakeconfig.nix

@@ -1,11 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-
-  nix = {
-    ## ativar 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 = "";
-  };
-  
-}

nixos/conf/GM/cfgeral/flatpak.nix

@@ -1,14 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-  
-  services.flatpak = {
-    enable = true;
-    packages = [
-      "org.vinegarhq.Sober"
-    ];
-    update.auto = {
-    enable = true;
-    onCalendar = "weekly";
-  };
-  };
-
-}

nixos/conf/GM/cfgeral/idioma.nix

@@ -1,26 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-
-  ## Definir fuso horário
-  time.timeZone = "America/Bahia";
-
-  ## Configurações de idioma e localidade
-  i18n.defaultLocale = "pt_BR.UTF-8";
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "pt_BR.UTF-8";
-    LC_IDENTIFICATION = "pt_BR.UTF-8";
-    LC_MEASUREMENT = "pt_BR.UTF-8";
-    LC_MONETARY = "pt_BR.UTF-8";
-    LC_NAME = "pt_BR.UTF-8";
-    LC_NUMERIC = "pt_BR.UTF-8";
-    LC_PAPER = "pt_BR.UTF-8";
-    LC_TELEPHONE = "pt_BR.UTF-8";
-    LC_TIME = "pt_BR.UTF-8";
-  };
-  ## Configurar layout do teclado no X11 e console
-  services.xserver.xkb = {
-    layout = "br";
-    variant = "";
-  };
-  console.keyMap = "br-abnt2";
-
-}

nixos/conf/GM/cfgeral/impcf.nix

@@ -1,18 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-
-   imports = [
-    ./alias.nix
-    ./audio.nix
-    ./idioma.nix
-    ./nixhelper.nix
-    ./flakeconfig.nix
-    ./flatpak.nix
-    ./nvidia.nix
-    ./variables.nix
-    ./wireless.nix
-    ./zstd.nix
-    ./fish.nix
-    ./udev.nix
-    ./patchgames.nix
-  ];
-}

nixos/conf/GM/cfgeral/udev.nix

@@ -1,16 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-
-  # OpenRGB setup
-  services.hardware.openrgb = {
-    enable = true;
-    motherboard = "amd";
-    package = pkgs.openrgb-with-all-plugins; # enable all plugins
-  };
-  services = {
-  udev.enable = true;
-  udev.extraRules = ''
-  KERNEL=="hidraw*", ATTRS{idVendor}=="1d57", ATTRS{idProduct}=="fa60", MODE="0666", SYMLINK+="xenta-mouse-hidraw"
-  KERNEL=="hidraw*", ATTRS{idVendor}=="1d57", ATTRS{idProduct}=="fa55", MODE="0666", SYMLINK+="xenta-mouse-hidraw"
-  '';
-  };
-}

nixos/conf/GM/cfgeral/variables.nix

@@ -1,7 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-
-  environment.variables = {
-     __GL_SHADER_DISK_CACHE_SIZE = "12000000000";
-    VK_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d";
-  };
-}

nixos/conf/GM/cfgeral/wireless.nix

@@ -1,17 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-
-  ## Configuração da internet
-  networking = {
-    networkmanager.enable = true;
-    interfaces.enp9s0.wakeOnLan.enable = true;
-    
-    firewall.allowedTCPPorts = [ ];
-    firewall.allowedUDPPorts = [
-       
-    ];
-  };
-
-  ## Ativar Bluetooth
-  hardware.bluetooth.enable = true;
-
-}

nixos/conf/GM/cfgeral/zstd.nix

@@ -1,17 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-
-  ## compressao brtfs
-  fileSystems = {
-    "/" = {
-      options = [ "compress=zstd:3" ];
-    };
-  };
-
-  ## zram
-  zramSwap = {
-  enable = true;
-  memoryPercent = 40;
-  algorithm = "zstd";
-  };
-
-}

nixos/conf/GM/configs/cfsystem.nix

@@ -0,0 +1,67 @@
+{ config, lib, inputs, pkgs, ... }: {
+
+  ## Configuração da internet
+  networking = {
+    networkmanager.enable = true;
+    interfaces.enp9s0.wakeOnLan.enable = true;
+    firewall.allowedTCPPorts = [ ];
+    firewall.allowedUDPPorts = [
+    ];
+  };
+  ## Ativar Bluetooth
+  hardware.bluetooth.enable = true;
+
+  ## Configuração de áudio
+  services = {
+    pulseaudio.enable = false;
+    pipewire = {
+      enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    #jack.enable = true; # Descomente se usar aplicações JACK
+   };
+  };
+  security.rtkit.enable = true;
+
+  ## Configuraçao de idioma 
+  ## Definir fuso horário
+  time.timeZone = "America/Bahia";
+  ## Configurações de idioma e localidade
+  i18n.defaultLocale = "pt_BR.UTF-8";
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "pt_BR.UTF-8";
+    LC_IDENTIFICATION = "pt_BR.UTF-8";
+    LC_MEASUREMENT = "pt_BR.UTF-8";
+    LC_MONETARY = "pt_BR.UTF-8";
+    LC_NAME = "pt_BR.UTF-8";
+    LC_NUMERIC = "pt_BR.UTF-8";
+    LC_PAPER = "pt_BR.UTF-8";
+    LC_TELEPHONE = "pt_BR.UTF-8";
+    LC_TIME = "pt_BR.UTF-8";
+  };
+  ## Configurar layout do teclado no X11 e console
+  services.xserver.xkb = {
+    layout = "br";
+    variant = "";
+  };
+  console.keyMap = "br-abnt2";
+
+  ## Alias do fish
+  programs.fish.shellAliases = {
+    # upd = "sudo nix flake update --flake /etc/nixos && sudo nixos-rebuild switch --flake path:/etc/nixos#Alfa";
+    upd = "nh home switch -a -u && nh os switch -a";
+    gitupdate = "git add . && git commit && git push origin main";
+  };
+
+  ## Config do fish
+  programs.fish.enable = true;  
+  programs.bash = {
+  interactiveShellInit = 
+  '' if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+    then
+      shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+      exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+    fi '';
+ };
+}

nixos/conf/GM/configs/imp.nix

@@ -0,0 +1,9 @@
+{ config, lib, inputs, pkgs, ... }: {
+
+   imports = [
+    ./cfsystem.nix
+    ./nixhelper.nix
+    ./nvidia.nix
+    ./patchs.nix
+  ];
+}

nixos/conf/GM/configs/nixhelper.nix

@@ -18,6 +18,9 @@
      enable = true;
      binfmt = true;
     };
+  ## Cache  
+    ccache.enable = true;
+    ccache.cacheDir = "/var/cache/ccache";
 };
 
   ## Configuração do gerenciador nix
@@ -32,14 +35,23 @@
       auto-optimise-store = true;
       extra-sandbox-paths = [ "/var/cache/ccache" ];
 
-      ## cache kernel
+
+    ## 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 = "";
+
+    ## cache kernel
       substituters = [ "https://attic.xuyh0120.win/lantian" ];
       trusted-public-keys = [ "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ];
     };
  };
-   programs = { 
-    ccache.enable = true;
-    ccache.cacheDir = "/var/cache/ccache";
+
+   services = {
+    flatpak = {
+      enable = true;
+    };
   };
 
 }

nixos/conf/GM/configs/nvidia.nix

@@ -1,5 +1,15 @@
 { config, lib, inputs, pkgs, ... }: {
+  
+  ## Driver da nvidia proprietario 
+  services.xserver.videoDrivers = [ "nvidia" ];
+   hardware = {
+    graphics.enable = true;
+    nvidia.open = false; ## Se sua placa for pascal pra cima troque isso para true
+  };
 
+
+  ## Teste sobre o nvk nao recomendo usar
+  
   #services.xserver.videoDrivers = [ "nouveau" ];
   #hardware.graphics = {
   # enable = true;
@@ -13,14 +23,4 @@
   #  MESA_VK_DRIVER_OVERRIDE = "nvk";
   #  VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/nouveau_icd.x86_64.json";
   #};
-  
-  
-  services.xserver.videoDrivers = [ "nvidia" ];
-   hardware = {
-    graphics.enable = true;
-    nvidia.open = false;
-   #nvidia.package = config.boot.kernelPackages.nvidiaPackages.production;
-   #nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_580;
-  };
-  #chaotic.mesa-git.enable = true;
 }

nixos/conf/GM/configs/patchs.nix

@@ -1,5 +1,12 @@
 { config, lib, inputs, pkgs, ... }: {
 
+  ## Variaveis de ambiente contendo o aumento de cache para placas da nvidia
+  environment.variables = {
+     __GL_SHADER_DISK_CACHE_SIZE = "12000000000";
+    VK_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d";
+  };
+
+  ## Configuraçoes de boot para otimzar o kernel e alguns patchs para nvidia
   boot = {
     modprobeConfig.enable = true;
     kernelModules = [ "tcp_bbr" ];
@@ -27,6 +34,7 @@
       ];
     };
 
+  ## Otimizaçao do Udev para placas de Video da Nvidia
   udev = {
 	  enable = true;
 	  extraRules = ''
@@ -78,6 +86,19 @@
    '';
   };
 
+  ## sistema de compressao compressao brtfs
+  fileSystems = {
+    "/" = {
+      options = [ "compress=zstd:3" ];
+    };
+  };
+
+  ## confiuraçao da zram
+  zramSwap = {
+  enable = true;
+  memoryPercent = 40;
+  algorithm = "zstd";
+  };
 
 
 }

nixos/conf/GM/imp.nix

@@ -1,7 +1,7 @@
 { config, lib, inputs, pkgs, ... }: {
 
    imports = [
-    ./cfgeral/impcf.nix
+    ./configs/imp.nix
     ./DE/impde.nix
     ./Pkgs/imp_pkgs.nix
   ];

nixos/conf/HM/Fontes/fontes.nix

@@ -1,14 +0,0 @@
-{config, pkgs, ...}: {
-fonts.fontconfig.enable = true; 
-home.packages = with pkgs; [
-  nerd-fonts.jetbrains-mono
-  nerd-fonts.ubuntu-mono
-  nerd-fonts.ubuntu-sans
-  nerd-fonts.dejavu-sans-mono
-  nerd-fonts.fira-code
-  nerd-fonts.overpass
-  noto-fonts
-  liberation_ttf
-  dejavu_fonts
-];
-}

nixos/conf/HM/configs/cfhome.nix

@@ -0,0 +1,42 @@
+{config, pkgs, ...}: {
+
+  ## starship
+  programs.starship = {
+  enable = true;
+  settings = lib.importTOML "${config.programs.starship.package}/share/starship/presets/nerd-font-symbols.toml";
+  enableFishIntegration = true;
+  };
+
+  ## Configuraçao Git
+  programs.git.settings = {
+    enable = true;
+    user.email = "darkgui@protonmail.com";
+    user.name = "DarkGui";
+   credential.helper = "store";
+  };
+
+  ## Pacotes extras
+  fonts.fontconfig.enable = true; 
+  home.packages = with pkgs; [
+
+    ## Fish
+    fishPlugins.done
+    fishPlugins.fzf-fish
+    fishPlugins.forgit
+    fishPlugins.hydro
+    fzf
+    fishPlugins.grc
+    grc
+
+    ## Fontes
+    nerd-fonts.jetbrains-mono
+    nerd-fonts.ubuntu-mono
+    nerd-fonts.ubuntu-sans
+    nerd-fonts.dejavu-sans-mono
+    nerd-fonts.fira-code
+    nerd-fonts.overpass
+    noto-fonts
+    liberation_ttf
+    dejavu_fonts
+  ];
+}

nixos/conf/HM/git/git.nix

@@ -1,9 +0,0 @@
-{pkgs, config, lib, ...}: {
-
- programs.git.settings = {
-    enable = true;
-    user.email = "darkgui@protonmail.com";
-    user.name = "DarkGui";
-   credential.helper = "store";
-  };
-}

nixos/conf/HM/imp.nix

@@ -1,11 +1,8 @@
 { config, lib, inputs, pkgs, ... }: {
 
    imports = [
-    ./Fontes/fontes.nix
-    ./git/git.nix
+    ./config/cfhome.nix
     ./kitty/kitty.nix
-    ./pkgs/imp_pkgs.nix
-    ./shell/fish.nix
-    ./shell/starship.nix
+    ./pkgs/pkgs.nix
   ];
 }

nixos/conf/HM/pkgs/imp_pkgs.nix

@@ -1,6 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-
-   imports = [
-    ./pkgs.nix
-  ];
-}

nixos/conf/HM/shell/fish.nix

@@ -1,14 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-  
-  ## config fish
-   home.packages = with pkgs; [
-    fishPlugins.done
-    fishPlugins.fzf-fish
-    fishPlugins.forgit
-    fishPlugins.hydro
-    fzf
-    fishPlugins.grc
-    grc
-  ];
-
-}

nixos/conf/HM/shell/starship.nix

@@ -1,9 +0,0 @@
-{ config, lib, inputs, pkgs, ... }: {
-
-  programs.starship = {
-  enable = true;
-  settings = lib.importTOML "${config.programs.starship.package}/share/starship/presets/nerd-font-symbols.toml";
-  enableFishIntegration = true;
-  };
-
-}