Remudularizaçao do codigo

nixos/conf/GM/DE/cosmic.nix

@@ -7,11 +7,11 @@
   };
   
   environment.systemPackages = with pkgs; [
-
   ];
-  #programs.kdeconnect = {
-  #enable = true;
-  #package = pkgs.valent;
-#};
+  programs.kdeconnect = {
+  enable = true;
+  package = pkgs.valent;
+};
+
 }
   

nixos/conf/GM/DE/impde.nix

@@ -0,0 +1,8 @@
+{ config, lib, inputs, pkgs, ... }: {
+
+   imports = [
+    ./cosmic.nix
+    #./gnome.nix
+    #./kde.nix
+  ];
+}

nixos/conf/GM/Pkgs/imp_pkgs.nix

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

nixos/conf/GM/Pkgs/lact.nix

@@ -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;
+  };
+}

nixos/conf/GM/Pkgs/pkgs.nix

@@ -6,7 +6,7 @@
     environment.systemPackages = with pkgs; [
     ## Aplicativos sociais
     inputs.zen-browser.packages.${system}.default
-    
+
     ## jogos
     lsfg-vk
     lsfg-vk-ui

nixos/conf/GM/Pkgs/steam.nix

@@ -1,34 +1,20 @@
 { config, lib, inputs, pkgs, ... }: {
 
-    ## Config 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"
   ];
-
-  ## patch jogos
   programs = {
     gamescope.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;
-  };
-}
+}

nixos/conf/GM/cfgeral/alias.nix

@@ -2,7 +2,7 @@
 
     programs.fish.shellAliases = {
     # 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";
     updsystem = "nh os switch -a -u";
     nixcf = "kate /etc/nixos/configuration.nix";

nixos/conf/GM/cfgeral/flatpak.nix

@@ -3,8 +3,7 @@
   services.flatpak = {
     enable = true;
     packages = [
-      "org.vinegarhq.Sober/x86_64/stable"
-      "com.dec05eba.gpu_screen_recorder/x86_64/stable"
+      "org.vinegarhq.Sober"
     ];
       update.auto = {
     enable = true;

nixos/conf/GM/cfgeral/impcf.nix

@@ -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
+  ];
+}

nixos/conf/GM/imp.nix

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

nixos/conf/HM/git/git.nix

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

nixos/conf/HM/imp.nix

@@ -0,0 +1,9 @@
+{ config, lib, inputs, pkgs, ... }: {
+
+   imports = [
+    ./Fontes/fontes.nix
+    ./git/git.nix
+    ./kitty/kitty.nix
+    ./pkgs/pkgs.nix
+  ];
+}

nixos/conf/HM/kitty/kitty.nix

@@ -7,9 +7,10 @@
   config = lib.mkIf config.mods.kitty.enable {
     programs.kitty = {
       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";
     };
   };
+   
 }
 

nixos/conf/HM/pkgs/pkgs.nix

@@ -4,9 +4,8 @@
     
     ## aplicativos sociais
     telegram-desktop
-    (discord.override {withVencord = true;})
     youtube-music
-
+    (discord.override {withEquicord = true;})
 
     ## Jogos
     lutris
@@ -33,7 +32,6 @@
     kitty
     vlc
     tree
-    alacarte
     python3
     unrar
     droidcam

nixos/conf/git/git.nix

@@ -1,11 +0,0 @@
-{pkgs, config, lib, ...}: {
-
- programs.git = {
-    enable = true;
-    userName = "DarkGui";
-    userEmail = "guihermando13@gmail.com";
-    extraConfig = {
-      credential.helper = "store"; 
-    };
-  };
-}