From 939cff16326cfbc030bdd2a8706022cc7d971076 Mon Sep 17 00:00:00 2001 From: DarkGui Date: Sun, 19 Oct 2025 20:22:15 -0300 Subject: [PATCH] =?UTF-8?q?Remudulariza=C3=A7ao=20do=20codigo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 84 +++++++++---------- nixos/conf/{ => GM}/DE/cosmic.nix | 10 +-- nixos/conf/{ => GM}/DE/gnome.nix | 0 nixos/conf/GM/DE/impde.nix | 8 ++ nixos/conf/{ => GM}/DE/kde.nix | 0 .../conf/{DistroBox => GM/Pkgs}/distrobox.nix | 0 nixos/conf/GM/Pkgs/imp_pkgs.nix | 10 +++ nixos/conf/GM/Pkgs/lact.nix | 13 +++ nixos/conf/{Obs => GM/Pkgs}/obs.nix | 0 nixos/conf/{ => GM}/Pkgs/pkgs.nix | 2 +- .../patch.nix => GM/Pkgs/steam.nix} | 18 +--- nixos/conf/{Alias => GM/cfgeral}/alias.nix | 2 +- nixos/conf/{Audio => GM/cfgeral}/audio.nix | 0 nixos/conf/{Fish => GM/cfgeral}/fish.nix | 0 .../{Flakes => GM/cfgeral}/flakeconfig.nix | 0 .../conf/{Flatpak => GM/cfgeral}/flatpak.nix | 3 +- .../cfgeral/idioma.nix} | 0 nixos/conf/GM/cfgeral/impcf.nix | 16 ++++ .../{NixHelper => GM/cfgeral}/nixhelper.nix | 0 nixos/conf/{Nvidia => GM/cfgeral}/nvidia.nix | 0 .../cfgeral}/variables.nix | 0 .../{wireless => GM/cfgeral}/wireless.nix | 0 .../CfStorage.nix => GM/cfgeral/zstd.nix} | 0 nixos/conf/GM/imp.nix | 8 ++ nixos/conf/{ => HM}/Fontes/fontes.nix | 0 nixos/conf/HM/git/git.nix | 9 ++ nixos/conf/HM/imp.nix | 9 ++ nixos/conf/{ => HM}/kitty/kitty.conf | 0 nixos/conf/{ => HM}/kitty/kitty.nix | 3 +- nixos/conf/{ => HM}/kitty/theme.conf | 0 .../{Pkgs/pkgshome.nix => HM/pkgs/pkgs.nix} | 4 +- nixos/conf/git/git.nix | 11 --- nixos/flake.lock | 36 ++++---- nixos/flake.nix | 12 +-- nixos/home.nix | 15 ++-- nixos/imp.nix | 19 +---- 36 files changed, 158 insertions(+), 134 deletions(-) rename nixos/conf/{ => GM}/DE/cosmic.nix (77%) rename nixos/conf/{ => GM}/DE/gnome.nix (100%) create mode 100644 nixos/conf/GM/DE/impde.nix rename nixos/conf/{ => GM}/DE/kde.nix (100%) rename nixos/conf/{DistroBox => GM/Pkgs}/distrobox.nix (100%) create mode 100644 nixos/conf/GM/Pkgs/imp_pkgs.nix create mode 100644 nixos/conf/GM/Pkgs/lact.nix rename nixos/conf/{Obs => GM/Pkgs}/obs.nix (100%) rename nixos/conf/{ => GM}/Pkgs/pkgs.nix (99%) rename nixos/conf/{PatchJogos/patch.nix => GM/Pkgs/steam.nix} (55%) rename nixos/conf/{Alias => GM/cfgeral}/alias.nix (89%) rename nixos/conf/{Audio => GM/cfgeral}/audio.nix (100%) rename nixos/conf/{Fish => GM/cfgeral}/fish.nix (100%) rename nixos/conf/{Flakes => GM/cfgeral}/flakeconfig.nix (100%) rename nixos/conf/{Flatpak => GM/cfgeral}/flatpak.nix (78%) rename nixos/conf/{configidioma/configidioma.nix => GM/cfgeral/idioma.nix} (100%) create mode 100644 nixos/conf/GM/cfgeral/impcf.nix rename nixos/conf/{NixHelper => GM/cfgeral}/nixhelper.nix (100%) rename nixos/conf/{Nvidia => GM/cfgeral}/nvidia.nix (100%) rename nixos/conf/{environmentvariables => GM/cfgeral}/variables.nix (100%) rename nixos/conf/{wireless => GM/cfgeral}/wireless.nix (100%) rename nixos/conf/{CfStorage/CfStorage.nix => GM/cfgeral/zstd.nix} (100%) create mode 100644 nixos/conf/GM/imp.nix rename nixos/conf/{ => HM}/Fontes/fontes.nix (100%) create mode 100644 nixos/conf/HM/git/git.nix create mode 100644 nixos/conf/HM/imp.nix rename nixos/conf/{ => HM}/kitty/kitty.conf (100%) rename nixos/conf/{ => HM}/kitty/kitty.nix (75%) rename nixos/conf/{ => HM}/kitty/theme.conf (100%) rename nixos/conf/{Pkgs/pkgshome.nix => HM/pkgs/pkgs.nix} (90%) delete mode 100644 nixos/conf/git/git.nix diff --git a/README.md b/README.md index 3e8f77b..844d9d6 100644 --- a/README.md +++ b/README.md @@ -5,49 +5,45 @@ Minha Configuraçao no NIX des de 22/07/2025 ``` . ├── conf -│   ├── Alias -│   │   └── alias.nix -│   ├── Audio -│   │   └── audio.nix -│   ├── CfStorage -│   │   └── CfStorage.nix -│   ├── configidioma -│   │   └── configidioma.nix -│   ├── DistroBox -│   │   └── distrobox.nix -│   ├── environmentvariables -│   │   └── variables.nix -│   ├── Fish -│   │   └── fish.nix -│   ├── Flakes -│   │   └── flakeconfig.nix -│   ├── Flatpak -│   │   └── flatpak.nix -│   ├── Fontes -│   │   └── fontes.nix -│   ├── git -│   │   └── git.nix -│   ├── gnome -│   │   └── gnome.nix -│   ├── Kde -│   │   └── kde.nix -│   ├── kitty -│   │   ├── kitty.conf -│   │   ├── kitty.nix -│   │   └── theme.conf -│   ├── NixHelper -│   │   └── nixhelper.nix -│   ├── Nvidia -│   │   └── nvidia.nix -│   ├── Obs -│   │   └── obs.nix -│   ├── PatchJogos -│   │   └── patch.nix -│   ├── Pkgs -│   │   ├── pkgshome.nix -│   │   └── pkgs.nix -│   └── wireless -│   └── wireless.nix +│   ├── GM +│   │   ├── cfgeral +│   │   │   ├── alias.nix +│   │   │   ├── audio.nix +│   │   │   ├── fish.nix +│   │   │   ├── flakeconfig.nix +│   │   │   ├── flatpak.nix +│   │   │   ├── idioma.nix +│   │   │   ├── impcf.nix +│   │   │   ├── nixhelper.nix +│   │   │   ├── nvidia.nix +│   │   │   ├── variables.nix +│   │   │   ├── wireless.nix +│   │   │   └── zstd.nix +│   │   ├── DE +│   │   │   ├── cosmic.nix +│   │   │   ├── gnome.nix +│   │   │   ├── impde.nix +│   │   │   └── kde.nix +│   │   ├── imp.nix +│   │   └── Pkgs +│   │   ├── distrobox.nix +│   │   ├── imp_pkgs.nix +│   │   ├── lact.nix +│   │   ├── obs.nix +│   │   ├── pkgs.nix +│   │   └── steam.nix +│   └── HM +│   ├── Fontes +│   │   └── fontes.nix +│   ├── git +│   │   └── git.nix +│   ├── imp.nix +│   ├── kitty +│   │   ├── kitty.conf +│   │   ├── kitty.nix +│   │   └── theme.conf +│   └── pkgs +│   └── pkgs.nix ├── configuration.nix ├── flake.lock ├── flake.nix @@ -55,3 +51,5 @@ Minha Configuraçao no NIX des de 22/07/2025 ├── home.nix └── imp.nix ``` + + diff --git a/nixos/conf/DE/cosmic.nix b/nixos/conf/GM/DE/cosmic.nix similarity index 77% rename from nixos/conf/DE/cosmic.nix rename to nixos/conf/GM/DE/cosmic.nix index b09c741..755dbbc 100644 --- a/nixos/conf/DE/cosmic.nix +++ b/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; +}; + } \ No newline at end of file diff --git a/nixos/conf/DE/gnome.nix b/nixos/conf/GM/DE/gnome.nix similarity index 100% rename from nixos/conf/DE/gnome.nix rename to nixos/conf/GM/DE/gnome.nix diff --git a/nixos/conf/GM/DE/impde.nix b/nixos/conf/GM/DE/impde.nix new file mode 100644 index 0000000..852d846 --- /dev/null +++ b/nixos/conf/GM/DE/impde.nix @@ -0,0 +1,8 @@ +{ config, lib, inputs, pkgs, ... }: { + + imports = [ + ./cosmic.nix + #./gnome.nix + #./kde.nix + ]; +} diff --git a/nixos/conf/DE/kde.nix b/nixos/conf/GM/DE/kde.nix similarity index 100% rename from nixos/conf/DE/kde.nix rename to nixos/conf/GM/DE/kde.nix diff --git a/nixos/conf/DistroBox/distrobox.nix b/nixos/conf/GM/Pkgs/distrobox.nix similarity index 100% rename from nixos/conf/DistroBox/distrobox.nix rename to nixos/conf/GM/Pkgs/distrobox.nix diff --git a/nixos/conf/GM/Pkgs/imp_pkgs.nix b/nixos/conf/GM/Pkgs/imp_pkgs.nix new file mode 100644 index 0000000..52735aa --- /dev/null +++ b/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 + ]; +} diff --git a/nixos/conf/GM/Pkgs/lact.nix b/nixos/conf/GM/Pkgs/lact.nix new file mode 100644 index 0000000..4335350 --- /dev/null +++ b/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; + }; +} \ No newline at end of file diff --git a/nixos/conf/Obs/obs.nix b/nixos/conf/GM/Pkgs/obs.nix similarity index 100% rename from nixos/conf/Obs/obs.nix rename to nixos/conf/GM/Pkgs/obs.nix diff --git a/nixos/conf/Pkgs/pkgs.nix b/nixos/conf/GM/Pkgs/pkgs.nix similarity index 99% rename from nixos/conf/Pkgs/pkgs.nix rename to nixos/conf/GM/Pkgs/pkgs.nix index 1ddc040..edbce21 100644 --- a/nixos/conf/Pkgs/pkgs.nix +++ b/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 diff --git a/nixos/conf/PatchJogos/patch.nix b/nixos/conf/GM/Pkgs/steam.nix similarity index 55% rename from nixos/conf/PatchJogos/patch.nix rename to nixos/conf/GM/Pkgs/steam.nix index f984394..3658581 100644 --- a/nixos/conf/PatchJogos/patch.nix +++ b/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; - }; -} +} \ No newline at end of file diff --git a/nixos/conf/Alias/alias.nix b/nixos/conf/GM/cfgeral/alias.nix similarity index 89% rename from nixos/conf/Alias/alias.nix rename to nixos/conf/GM/cfgeral/alias.nix index bfe2736..002423a 100644 --- a/nixos/conf/Alias/alias.nix +++ b/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"; diff --git a/nixos/conf/Audio/audio.nix b/nixos/conf/GM/cfgeral/audio.nix similarity index 100% rename from nixos/conf/Audio/audio.nix rename to nixos/conf/GM/cfgeral/audio.nix diff --git a/nixos/conf/Fish/fish.nix b/nixos/conf/GM/cfgeral/fish.nix similarity index 100% rename from nixos/conf/Fish/fish.nix rename to nixos/conf/GM/cfgeral/fish.nix diff --git a/nixos/conf/Flakes/flakeconfig.nix b/nixos/conf/GM/cfgeral/flakeconfig.nix similarity index 100% rename from nixos/conf/Flakes/flakeconfig.nix rename to nixos/conf/GM/cfgeral/flakeconfig.nix diff --git a/nixos/conf/Flatpak/flatpak.nix b/nixos/conf/GM/cfgeral/flatpak.nix similarity index 78% rename from nixos/conf/Flatpak/flatpak.nix rename to nixos/conf/GM/cfgeral/flatpak.nix index 95f0f2f..f18ef17 100644 --- a/nixos/conf/Flatpak/flatpak.nix +++ b/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; diff --git a/nixos/conf/configidioma/configidioma.nix b/nixos/conf/GM/cfgeral/idioma.nix similarity index 100% rename from nixos/conf/configidioma/configidioma.nix rename to nixos/conf/GM/cfgeral/idioma.nix diff --git a/nixos/conf/GM/cfgeral/impcf.nix b/nixos/conf/GM/cfgeral/impcf.nix new file mode 100644 index 0000000..4a11609 --- /dev/null +++ b/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 + ]; +} diff --git a/nixos/conf/NixHelper/nixhelper.nix b/nixos/conf/GM/cfgeral/nixhelper.nix similarity index 100% rename from nixos/conf/NixHelper/nixhelper.nix rename to nixos/conf/GM/cfgeral/nixhelper.nix diff --git a/nixos/conf/Nvidia/nvidia.nix b/nixos/conf/GM/cfgeral/nvidia.nix similarity index 100% rename from nixos/conf/Nvidia/nvidia.nix rename to nixos/conf/GM/cfgeral/nvidia.nix diff --git a/nixos/conf/environmentvariables/variables.nix b/nixos/conf/GM/cfgeral/variables.nix similarity index 100% rename from nixos/conf/environmentvariables/variables.nix rename to nixos/conf/GM/cfgeral/variables.nix diff --git a/nixos/conf/wireless/wireless.nix b/nixos/conf/GM/cfgeral/wireless.nix similarity index 100% rename from nixos/conf/wireless/wireless.nix rename to nixos/conf/GM/cfgeral/wireless.nix diff --git a/nixos/conf/CfStorage/CfStorage.nix b/nixos/conf/GM/cfgeral/zstd.nix similarity index 100% rename from nixos/conf/CfStorage/CfStorage.nix rename to nixos/conf/GM/cfgeral/zstd.nix diff --git a/nixos/conf/GM/imp.nix b/nixos/conf/GM/imp.nix new file mode 100644 index 0000000..2204ea4 --- /dev/null +++ b/nixos/conf/GM/imp.nix @@ -0,0 +1,8 @@ +{ config, lib, inputs, pkgs, ... }: { + + imports = [ + ./cfgeral/impcf.nix + ./DE/impde.nix + ./Pkgs/imp_pkgs.nix + ]; +} diff --git a/nixos/conf/Fontes/fontes.nix b/nixos/conf/HM/Fontes/fontes.nix similarity index 100% rename from nixos/conf/Fontes/fontes.nix rename to nixos/conf/HM/Fontes/fontes.nix diff --git a/nixos/conf/HM/git/git.nix b/nixos/conf/HM/git/git.nix new file mode 100644 index 0000000..dcb9977 --- /dev/null +++ b/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"; + }; +} \ No newline at end of file diff --git a/nixos/conf/HM/imp.nix b/nixos/conf/HM/imp.nix new file mode 100644 index 0000000..481794e --- /dev/null +++ b/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 + ]; +} diff --git a/nixos/conf/kitty/kitty.conf b/nixos/conf/HM/kitty/kitty.conf similarity index 100% rename from nixos/conf/kitty/kitty.conf rename to nixos/conf/HM/kitty/kitty.conf diff --git a/nixos/conf/kitty/kitty.nix b/nixos/conf/HM/kitty/kitty.nix similarity index 75% rename from nixos/conf/kitty/kitty.nix rename to nixos/conf/HM/kitty/kitty.nix index a901edf..9735ccf 100644 --- a/nixos/conf/kitty/kitty.nix +++ b/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"; }; }; + } diff --git a/nixos/conf/kitty/theme.conf b/nixos/conf/HM/kitty/theme.conf similarity index 100% rename from nixos/conf/kitty/theme.conf rename to nixos/conf/HM/kitty/theme.conf diff --git a/nixos/conf/Pkgs/pkgshome.nix b/nixos/conf/HM/pkgs/pkgs.nix similarity index 90% rename from nixos/conf/Pkgs/pkgshome.nix rename to nixos/conf/HM/pkgs/pkgs.nix index 07d92be..74e90c7 100644 --- a/nixos/conf/Pkgs/pkgshome.nix +++ b/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 diff --git a/nixos/conf/git/git.nix b/nixos/conf/git/git.nix deleted file mode 100644 index add8179..0000000 --- a/nixos/conf/git/git.nix +++ /dev/null @@ -1,11 +0,0 @@ -{pkgs, config, lib, ...}: { - - programs.git = { - enable = true; - userName = "DarkGui"; - userEmail = "guihermando13@gmail.com"; - extraConfig = { - credential.helper = "store"; - }; - }; -} \ No newline at end of file diff --git a/nixos/flake.lock b/nixos/flake.lock index 7772275..646a31e 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -122,11 +122,11 @@ ] }, "locked": { - "lastModified": 1760809591, - "narHash": "sha256-OxGcFcQdfOK8veZkPdQuqXIotFYiy4sBQB58dMNLeHY=", + "lastModified": 1760887455, + "narHash": "sha256-/xU8iYZjolWbMUNBQF6af5zgGs73Qw21WMgz1tLs3Yw=", "owner": "nix-community", "repo": "home-manager", - "rev": "870883ba11ba1c84f756c0c1f9fa74cdb2a16c1e", + "rev": "aeabc1ac63e6ebb8ba4714c4abdfe0556f2de765", "type": "github" }, "original": { @@ -234,11 +234,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1760813300, - "narHash": "sha256-hnUkQfYidSiDSA2m3wm+1sNNg3AeswpYeEZ87KhP1Ts=", + "lastModified": 1760914368, + "narHash": "sha256-qGHL19N/yhtmnX5uxj7uN6+yGLMaB9sZTwqeA9mU2Iw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2c6cc13a8908079574ece1cd0ef23194f7b86cbb", + "rev": "ffef919861bf00e40a1a61a479e8f21c27e011b3", "type": "github" }, "original": { @@ -249,11 +249,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1760580664, - "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=", + "lastModified": 1760725957, + "narHash": "sha256-tdoIhL/NlER290HfSjOkgi4jfmjeqmqrzgnmiMtGepE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389", + "rev": "81b927b14b7b3988334d5282ef9cba802e193fe1", "type": "github" }, "original": { @@ -335,11 +335,11 @@ ] }, "locked": { - "lastModified": 1760804384, - "narHash": "sha256-E3oVSP3FXC4JkTj9r2Xo7rqdL61dP1lDlmYpI630TC0=", + "lastModified": 1760909691, + "narHash": "sha256-zAMLBve67hWDKmZzG1KVZRNTzENs2cV9TBE2iHElDGc=", "owner": "nix-community", "repo": "NUR", - "rev": "f1f3338af0f776a637ba5e92de04648c1a4c209d", + "rev": "7e6ab8df192a781aa95a191b683e463d7cb1e4fb", "type": "github" }, "original": { @@ -406,11 +406,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1760727119, - "narHash": "sha256-DWm+qPwXlsqDESSL4PYlS1NY1CvYUVjGnxM79ZeQ4Qg=", + "lastModified": 1760827883, + "narHash": "sha256-6Cvg9YE8wqpkdjnw0HwJH+HOWY9inO/slXf48w+84RM=", "owner": "TibixDev", "repo": "winboat", - "rev": "4e1aad3d3c94bc20f4e072d8bfd8cfb94fe32eaa", + "rev": "a1b1105a30b1f5210ce29077e19f21b53083469a", "type": "github" }, "original": { @@ -427,11 +427,11 @@ ] }, "locked": { - "lastModified": 1760768820, - "narHash": "sha256-rg4fJ8ocx3rCz//eajnxBmKZV4qulLtEPtBc+mtgrt4=", + "lastModified": 1760898315, + "narHash": "sha256-d2qbZpREjUQm65lzS70b2TVgTfOpAjQUZa+FS58+WnA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "fd874a0b5f281bc4e173d81b03726d7fc7983cfd", + "rev": "5e52b6a9ec07d22c9555891005b1b39f1bbd83ed", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index ff5d4b3..5e3a11c 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -8,9 +8,9 @@ aagl.url = "github:ezKEa/aagl-gtk-on-nix"; winboat.url = "github:TibixDev/winboat"; nix-flatpak.url = "github:gmodena/nix-flatpak"; # unstable branch. Use github:gmodena/nix-flatpak/?ref= to pin releases. - home-manager = { - url = "github:nix-community/home-manager/"; - inputs.nixpkgs.follows = "nixpkgs"; + home-manager = { + url = "github:nix-community/home-manager/"; + inputs.nixpkgs.follows = "nixpkgs"; }; nur = { url = "github:nix-community/NUR"; @@ -40,8 +40,8 @@ }; }; homeConfigurations."gui@Alfa" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; - modules = [ ./home.nix ]; - }; + pkgs = nixpkgs.legacyPackages.x86_64-linux; + modules = [ ./home.nix ]; + }; }; } diff --git a/nixos/home.nix b/nixos/home.nix index da82822..c3b1888 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -1,18 +1,10 @@ {pkgs, config, lib, ...}: { imports = [ - ./conf/Fontes/fontes.nix - ./conf/Pkgs/pkgshome.nix - ./conf/kitty/kitty.nix - ./conf/git/git.nix + ./conf/HM/imp.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.";};};} ]; - mods = { - kitty.enable = true; - flakePath = "/etc/nixos"; - }; - home = { username = "gui"; homeDirectory = "/home/gui"; @@ -26,6 +18,11 @@ nixpkgs.config.allowUnfree = true; + mods = { + kitty.enable = true; + flakePath = "/etc/nixos"; + }; + ## config gnome #dconf = { # enable = true; diff --git a/nixos/imp.nix b/nixos/imp.nix index a7f8c2c..c26642a 100644 --- a/nixos/imp.nix +++ b/nixos/imp.nix @@ -2,23 +2,6 @@ imports = [ ./hardware-configuration.nix - ./conf/Pkgs/pkgs.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 + ./conf/GM/imp.nix ]; }