diff --git a/nixos/conf/GM/DE/impde.nix b/nixos/conf/GM/DE/impde.nix index 852d846..e19f58e 100644 --- a/nixos/conf/GM/DE/impde.nix +++ b/nixos/conf/GM/DE/impde.nix @@ -1,8 +1,8 @@ { config, lib, inputs, pkgs, ... }: { imports = [ - ./cosmic.nix + #./cosmic.nix #./gnome.nix - #./kde.nix + ./kde.nix ]; } diff --git a/nixos/conf/GM/Pkgs/pkgs.nix b/nixos/conf/GM/Pkgs/pkgs.nix index b21adda..39aa51e 100644 --- a/nixos/conf/GM/Pkgs/pkgs.nix +++ b/nixos/conf/GM/Pkgs/pkgs.nix @@ -8,6 +8,7 @@ inputs.zen-browser.packages.${system}.default inputs.hayase.packages.${pkgs.system}.default bitwarden-desktop + inputs.chaotic.legacyPackages.${pkgs.stdenv.hostPlatform.system}.proton-cachyos_x86_64_v3 ## Utilitários do sistema e dev tools nh @@ -25,7 +26,7 @@ distrobox freerdp dmidecode - winboat + #winboat gitFull kdePackages.partitionmanager diff --git a/nixos/conf/GM/cfgeral/flatpak.nix b/nixos/conf/GM/cfgeral/flatpak.nix index 9732b03..9269603 100644 --- a/nixos/conf/GM/cfgeral/flatpak.nix +++ b/nixos/conf/GM/cfgeral/flatpak.nix @@ -3,7 +3,6 @@ services.flatpak = { enable = true; packages = [ - "com.dec05eba.gpu_screen_recorder" "org.vinegarhq.Sober" ]; update.auto = { diff --git a/nixos/conf/GM/cfgeral/impcf.nix b/nixos/conf/GM/cfgeral/impcf.nix index 7929eeb..b4b1c77 100644 --- a/nixos/conf/GM/cfgeral/impcf.nix +++ b/nixos/conf/GM/cfgeral/impcf.nix @@ -12,5 +12,6 @@ ./wireless.nix ./zstd.nix ./fish.nix + ./kernel.nix ]; } diff --git a/nixos/conf/GM/cfgeral/kernel.nix b/nixos/conf/GM/cfgeral/kernel.nix new file mode 100644 index 0000000..5f56238 --- /dev/null +++ b/nixos/conf/GM/cfgeral/kernel.nix @@ -0,0 +1,8 @@ +{ config, lib, inputs, pkgs, ... }: { + + boot.kernelPackages = pkgs.linuxPackages_cachyos.cachyOverride { + mArch = "GENERIC_V3"; + #useO3 = true; + #withLTO = "full"; + }; +} \ No newline at end of file diff --git a/nixos/conf/GM/cfgeral/nixhelper.nix b/nixos/conf/GM/cfgeral/nixhelper.nix index 7eeeb3e..183b322 100644 --- a/nixos/conf/GM/cfgeral/nixhelper.nix +++ b/nixos/conf/GM/cfgeral/nixhelper.nix @@ -24,5 +24,19 @@ nix.package = pkgs.lixPackageSets.latest.lix; #nix.package = inputs.nixpkgs-master.legacyPackages.${pkgs.system}.lix; -} + ## compilaçao + nix = { + settings = { + cores = 0; + max-jobs = "auto"; + auto-optimise-store = true; + }; + }; + programs = { + ccache.enable = true; + ccache.cacheDir = "/var/cache/ccache"; + }; + nix.settings.extra-sandbox-paths = [ "/var/cache/ccache" ]; + +} diff --git a/nixos/conf/HM/pkgs/pkgs.nix b/nixos/conf/HM/pkgs/pkgs.nix index 9b3bf5a..868782a 100644 --- a/nixos/conf/HM/pkgs/pkgs.nix +++ b/nixos/conf/HM/pkgs/pkgs.nix @@ -5,10 +5,13 @@ ## aplicativos sociais telegram-desktop youtube-music + element-desktop (discord.override {withEquicord = true;}) + #inputs.chaotic.legacyPackages.${pkgs.stdenv.hostPlatform.system}.proton-cachyos_x86_64_v3 ## Jogos lutris + faugus-launcher heroic prismlauncher steam diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 3468d16..1c62821 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -8,7 +8,6 @@ ## Configuração do bootloader boot = { - kernelPackages = pkgs.linuxPackages_cachyos; # Kernel Cachy loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; loader.systemd-boot.configurationLimit = 10; diff --git a/nixos/flake.lock b/nixos/flake.lock index 028afd3..32545bb 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -29,11 +29,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1763246168, - "narHash": "sha256-gUDJZGSOg5syHtQvLImOKL6Eaw4e1ybz4o5pid66kQg=", + "lastModified": 1763413916, + "narHash": "sha256-KOr7YS7n+j9knjA03DUDtk6pRsx0LlFUYGBXjT6Kj3w=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "6476fbdd52621b4a532309d982d468dc08204151", + "rev": "7cdf1116617e30f1e30163c7337907f65bb5309d", "type": "github" }, "original": { @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1763313531, - "narHash": "sha256-yvdCYUL85zEDp2NzPUBmaNBXP6KnWEOhAk3j7PTfsKw=", + "lastModified": 1763416652, + "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3670a78eee49deebe4825fc8ecc46b172d1a8391", + "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1763323935, - "narHash": "sha256-hevT9XXDyFIEg12D7kHs/oz2vkUWQUYHjup8Q/Q2JiY=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "af552ca3a8bc898cd4416b1a7837931b34080935", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -301,11 +301,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1763283776, + "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", "type": "github" }, "original": { @@ -317,11 +317,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1763283776, + "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", "type": "github" }, "original": { @@ -339,11 +339,11 @@ ] }, "locked": { - "lastModified": 1763323750, - "narHash": "sha256-tTaUU2D6BW46yJxs0OrAz03gYtIw7pBRplSSsGW1rfs=", + "lastModified": 1763422451, + "narHash": "sha256-0hrrVl62bolcTlxgdMbvDqI3t7F/DOrfzPcs/biqE8Q=", "owner": "nix-community", "repo": "NUR", - "rev": "e920a0f7bd310fb33c1abba4fb1133fcca6d0489", + "rev": "748780ee1b02608ab1c37e8b83c673937c6ec785", "type": "github" }, "original": { @@ -413,11 +413,11 @@ ] }, "locked": { - "lastModified": 1763317021, - "narHash": "sha256-UOP9AyuBvQCEzGe6u8FxuhnJU2ShUPU4G7z7zraFNoo=", + "lastModified": 1763353619, + "narHash": "sha256-y30wSzjr7QiO4OVB/Tt7dnLRLIuK2EpaftpKeMMLGu0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "db2be18049b9159a33ee7083566040fca4254c03", + "rev": "7463345c68cfdd9e92e2d40e390b1a802b0f2add", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index f894298..29060cb 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -44,7 +44,8 @@ }; homeConfigurations."gui@Alfa" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; - modules = [ ./home.nix ]; + modules = [ ./home.nix + ]; }; }; }