From 272bfb68d5131bf13ba36877aaccd0f39e88ce4e Mon Sep 17 00:00:00 2001 From: Guilherme Hermando <112888817+DarkGuibrine@users.noreply.github.com> Date: Sun, 17 Aug 2025 18:45:41 -0300 Subject: [PATCH] Update de rotina --- conf/Alias/alias.nix | 2 +- conf/CfStorage/CfStorage.nix | 19 ++++++++ conf/DistroBox/distrobox.nix | 8 ++++ conf/Fish/fish.nix | 36 +++++++-------- conf/Pkgs/pkgs.nix | 14 +++++- conf/environmentvariables/variables.nix | 3 +- flake.lock | 60 ++++++++++++------------- imp.nix | 3 +- 8 files changed, 90 insertions(+), 55 deletions(-) create mode 100644 conf/CfStorage/CfStorage.nix create mode 100644 conf/DistroBox/distrobox.nix diff --git a/conf/Alias/alias.nix b/conf/Alias/alias.nix index af91373..d0d86f5 100644 --- a/conf/Alias/alias.nix +++ b/conf/Alias/alias.nix @@ -1,6 +1,6 @@ { config, lib, inputs, pkgs, ... }: { - programs.fish.shellAliases = { + programs.bash.shellAliases = { # upd = "sudo nix flake update --flake /etc/nixos && sudo nixos-rebuild switch --flake path:/etc/nixos#Alfa"; upd = "nh os switch -a -u"; nixcf = "kate /etc/nixos/configuration.nix"; diff --git a/conf/CfStorage/CfStorage.nix b/conf/CfStorage/CfStorage.nix new file mode 100644 index 0000000..587e80c --- /dev/null +++ b/conf/CfStorage/CfStorage.nix @@ -0,0 +1,19 @@ +{ config, lib, inputs, pkgs, ... }: { + + ## compressao brtfs + fileSystems = { + "/" = { + options = [ "compress=zstd:3" ]; + }; + }; + + ## zram + zramSwap = { + enable = true; + memoryPercent = 70; + algorithm = "zstd"; + }; + + ## preload + services.preload.enable = true; +} diff --git a/conf/DistroBox/distrobox.nix b/conf/DistroBox/distrobox.nix new file mode 100644 index 0000000..fb98c90 --- /dev/null +++ b/conf/DistroBox/distrobox.nix @@ -0,0 +1,8 @@ +{ config, lib, inputs, pkgs, ... }: { + + ## distro box + virtualisation.podman = { + enable = true; + dockerCompat = true; + }; +} diff --git a/conf/Fish/fish.nix b/conf/Fish/fish.nix index 21fa22a..6b9595b 100644 --- a/conf/Fish/fish.nix +++ b/conf/Fish/fish.nix @@ -1,26 +1,24 @@ { config, lib, inputs, pkgs, ... }: { ## config fish - environment.systemPackages = with pkgs; [ - fishPlugins.done - fishPlugins.fzf-fish - fishPlugins.forgit - fishPlugins.hydro - fzf - fishPlugins.grc - grc - ]; - - programs.fish.enable = true; + #environment.systemPackages = with pkgs; [ + #fishPlugins.done + #fishPlugins.fzf-fish + #fishPlugins.forgit + #fishPlugins.hydro + #fzf + #fishPlugins.grc + #grc + #]; + # 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 ''; -}; + #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 ''; } diff --git a/conf/Pkgs/pkgs.nix b/conf/Pkgs/pkgs.nix index 78cdfa5..16030be 100644 --- a/conf/Pkgs/pkgs.nix +++ b/conf/Pkgs/pkgs.nix @@ -17,8 +17,10 @@ xclicker mangojuice mangohud - inputs.nixpkgs-master.legacyPackages.${pkgs.system}.lsfg-vk - inputs.nixpkgs-master.legacyPackages.${pkgs.system}.lsfg-vk-ui + hydralauncher + protonplus + lsfg-vk + lsfg-vk-ui ## Utilitários do sistema e dev tools nh @@ -28,6 +30,7 @@ vulkan-tools-lunarg vulkan-loader vulkan-utility-libraries + preload fastfetch git btop @@ -38,6 +41,13 @@ kdePackages.partitionmanager winetricks wineWowPackages.staging + kdePackages.qtmultimedia + zenity + python3 + efibootmgr + distrobox + podman + distroshelf ## repositorio 25.05 inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.vulkan-tools diff --git a/conf/environmentvariables/variables.nix b/conf/environmentvariables/variables.nix index 6df3a50..865b37d 100644 --- a/conf/environmentvariables/variables.nix +++ b/conf/environmentvariables/variables.nix @@ -1,8 +1,7 @@ { config, lib, inputs, pkgs, ... }: { environment.variables = { - __GL_SHADER_DISK_CACHE_SIZE = "12000000000"; - GITHUB_TOKEN = ""; # Recomendado manter tokens em segredo + __GL_SHADER_DISK_CACHE_SIZE = "12000000000"; VK_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d"; }; } diff --git a/flake.lock b/flake.lock index bf5dfb3..7858bc1 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1754388539, - "narHash": "sha256-Yu9jClB3mjgONUDzHuKr1AnkfX60gyvgMeX/LNP/ZOI=", + "lastModified": 1755444192, + "narHash": "sha256-9eVUtk3ces32aJpHnsrO49UJNvMKNMxlV7NeNSAADLo=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a3c21f1b39682e698695456666d4e77345ee712e", + "rev": "958ba486ee73019e3820b9ebd97a38660f736f40", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1754365350, - "narHash": "sha256-NLWIkn1qM0wxtZu/2NXRaujWJ4Y1PSZlc7h0y6pOzOQ=", + "lastModified": 1755313937, + "narHash": "sha256-pQb7bNcolxYGRiylUCrTddiF+qW2wsUiM9+eRIDUrVU=", "owner": "nix-community", "repo": "home-manager", - "rev": "c5d7e957397ecb7d48b99c928611c6e780db1b56", + "rev": "2a749f4790a14f7168be67cdf6e548ef1c944e10", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1754110197, - "narHash": "sha256-N7GWK2084EsNdwzwg6FCIgMrSau1WwzxGSNdPHx5Tak=", + "lastModified": 1755151620, + "narHash": "sha256-fVMalQZ+tRXR8oue2SdWu4CdlsS2NII+++rI40XQ8rU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "04ce5c103eb621220d69102bc0ee27c3abd89204", + "rev": "16e12d22754d97064867006acae6e16da7a142a6", "type": "github" }, "original": { @@ -147,11 +147,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -163,11 +163,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1754444864, - "narHash": "sha256-gft1q7YIOhoCsFj1D3nWtY4m3nmMV0cTEfHEBsikFDQ=", + "lastModified": 1755465171, + "narHash": "sha256-vGNQOI+26Lxjf0YNfXRScZ++1TqvFNZpDP47GWFv8Po=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f7212540bdbcee96fe83171405f6aafa93857081", + "rev": "e4f28529650e163574f78bd309150fccba09b15d", "type": "github" }, "original": { @@ -178,11 +178,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1754292888, - "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", + "lastModified": 1755274400, + "narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", + "rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1754433317, - "narHash": "sha256-6k/ZzS+PvzbkpSzfT7lf+RDZGEjjIhNn+66x3JyovnM=", + "lastModified": 1755463657, + "narHash": "sha256-zlwwq8sVyIs/i3unqtQEqRXFVIxaFzxtjGEAnNQjUsc=", "owner": "nix-community", "repo": "NUR", - "rev": "4fcbb42f9696a850b55481ded21c8dab51ed3af5", + "rev": "b12cf912ef3f7d899cb78f3865c6f22befaca3ad", "type": "github" }, "original": { @@ -247,11 +247,11 @@ ] }, "locked": { - "lastModified": 1754362243, - "narHash": "sha256-QHNTUdI6oIYuuazGuKGhVk5RCOM1nIzDUc/AGgL7Szw=", + "lastModified": 1755311859, + "narHash": "sha256-NspGtm0ZpihxlFD628pvh5ZEhL/Q6/Z9XBpe3n6ZtEw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3ec3244ffb877f1b7f5d2dbff19241982ab25ff2", + "rev": "07619500e5937cc4669f24fec355d18a8fec0165", "type": "github" }, "original": { @@ -268,11 +268,11 @@ ] }, "locked": { - "lastModified": 1754365690, - "narHash": "sha256-je5DVA23UU2RzJB1A7VTNSohPk/FE8HwDJaSK65/UJg=", + "lastModified": 1755456856, + "narHash": "sha256-AbZX34NDKg8eMqYNXZlGwRUe48xkGtdqsr0hJTkGyCo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ec4909d02fb8c2d3c00ca71ceafb65753b4e3ea6", + "rev": "09489bfb2511da9eeeb57bc10e37910809a1ddb7", "type": "github" }, "original": { diff --git a/imp.nix b/imp.nix index a8a6016..38e9b8e 100644 --- a/imp.nix +++ b/imp.nix @@ -4,7 +4,7 @@ ./hardware-configuration.nix ./conf/Pkgs/pkgs.nix ./conf/Alias/alias.nix - ./conf/Compressao/compressao.nix + ./conf/CfStorage/CfStorage.nix ./conf/PatchJogos/patch.nix ./conf/Kde/kde.nix ./conf/environmentvariables/variables.nix @@ -16,5 +16,6 @@ ./conf/configidioma/configidioma.nix ./conf/wireless/wireless.nix ./conf/Fish/fish.nix + ./conf/DistroBox/distrobox.nix ]; }