diff --git a/nixos/conf/GM/Pkgs/distrobox.nix b/nixos/conf/GM/Pkgs/distrobox.nix index 91607ea..7df8d6e 100644 --- a/nixos/conf/GM/Pkgs/distrobox.nix +++ b/nixos/conf/GM/Pkgs/distrobox.nix @@ -3,12 +3,12 @@ ## distro box virtualisation.podman = { enable = true; - #dockerCompat = true; + dockerCompat = true; }; users.users.gui.extraGroups = [ "docker" ]; users.groups.docker.gid = 131; - virtualisation.docker = { - enable = true; - }; + #virtualisation.docker = { + #enable = true; + #}; } diff --git a/nixos/conf/GM/Pkgs/obs.nix b/nixos/conf/GM/Pkgs/obs.nix index 8e9c4c9..d373e9d 100644 --- a/nixos/conf/GM/Pkgs/obs.nix +++ b/nixos/conf/GM/Pkgs/obs.nix @@ -10,11 +10,10 @@ ); plugins = with pkgs.obs-studio-plugins; [ wlrobs - obs-backgroundremoval obs-pipewire-audio-capture obs-gstreamer obs-vkcapture ]; + enableVirtualCamera = true; }; - programs.obs-studio.enableVirtualCamera = true; } diff --git a/nixos/conf/GM/Pkgs/pkgs.nix b/nixos/conf/GM/Pkgs/pkgs.nix index 5ccb07f..3d63163 100644 --- a/nixos/conf/GM/Pkgs/pkgs.nix +++ b/nixos/conf/GM/Pkgs/pkgs.nix @@ -6,7 +6,10 @@ environment.systemPackages = with pkgs; [ ## Aplicativos sociais inputs.zen-browser.packages.${system}.default - + inputs.hayase.packages.${pkgs.system}.default + bitwarden-desktop + protonvpn-gui + ## Utilitários do sistema e dev tools nh home-manager @@ -19,6 +22,8 @@ efibootmgr docker-compose podman + distroshelf + distrobox freerdp dmidecode winboat @@ -28,4 +33,7 @@ ## inputs stable #inputs.nixpkgs-stable.legacyPackages.${pkgs.stdenv.hostPlatform.system} ]; + + programs.gpu-screen-recorder.enable = true; + } diff --git a/nixos/conf/GM/Pkgs/steam.nix b/nixos/conf/GM/Pkgs/steam.nix index e1b5ee5..b013e15 100644 --- a/nixos/conf/GM/Pkgs/steam.nix +++ b/nixos/conf/GM/Pkgs/steam.nix @@ -17,4 +17,4 @@ gamescope.enable = true; gamemode.enable = true; }; -} \ No newline at end of file +} \ No newline at end of file diff --git a/nixos/conf/GM/cfgeral/audio.nix b/nixos/conf/GM/cfgeral/audio.nix index 14fbae1..8e5ebc6 100644 --- a/nixos/conf/GM/cfgeral/audio.nix +++ b/nixos/conf/GM/cfgeral/audio.nix @@ -1,14 +1,16 @@ { config, lib, inputs, pkgs, ... }: { - ## Configuração de áudio com Pipewire (desativa PulseAudio) - services.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; + ## 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; } diff --git a/nixos/conf/GM/cfgeral/flakeconfig.nix b/nixos/conf/GM/cfgeral/flakeconfig.nix index ee7a687..8d86ce6 100644 --- a/nixos/conf/GM/cfgeral/flakeconfig.nix +++ b/nixos/conf/GM/cfgeral/flakeconfig.nix @@ -1,11 +1,11 @@ { config, lib, inputs, pkgs, ... }: { - ## Ativar recursos experimentais do Nix, como flakes - nix.settings.experimental-features = ["nix-command" "flakes"]; - + nix = { + ## ativar flakes + settings.experimental-features = ["nix-command" "flakes"]; ## chaotic-nix - nix.nixPath = lib.mapAttrsToList (key: _: "${key}=flake:${key}") config.nix.registry; - nix.registry = lib.mapAttrs (_: value: {flake = value;}) (lib.filterAttrs (_: value: lib.isType "flake" value) inputs); - nix.settings.flake-registry = ""; - + 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 = ""; + }; } diff --git a/nixos/conf/GM/cfgeral/flatpak.nix b/nixos/conf/GM/cfgeral/flatpak.nix index ebd8029..9732b03 100644 --- a/nixos/conf/GM/cfgeral/flatpak.nix +++ b/nixos/conf/GM/cfgeral/flatpak.nix @@ -2,6 +2,14 @@ services.flatpak = { enable = true; + packages = [ + "com.dec05eba.gpu_screen_recorder" + "org.vinegarhq.Sober" + ]; + update.auto = { + enable = true; + onCalendar = "weekly"; + }; }; xdg.portal = { diff --git a/nixos/conf/GM/cfgeral/nixhelper.nix b/nixos/conf/GM/cfgeral/nixhelper.nix index 4200fff..7eeeb3e 100644 --- a/nixos/conf/GM/cfgeral/nixhelper.nix +++ b/nixos/conf/GM/cfgeral/nixhelper.nix @@ -1,19 +1,28 @@ { config, lib, inputs, pkgs, ... }: { - ## nixLD - programs.nix-ld.enable = true; - programs.nix-ld.libraries = with pkgs; []; - - ## nixNH - programs.nh = { - enable = true; - clean.enable = true; - clean.extraArgs = "--keep-since 8d --keep 7"; - flake = "/etc/nixos"; # sets NH_OS_FLAKE variable for you - }; + programs = { + ## nix-ld + nix-ld = { + enable = true; + libraries = with pkgs; [ ]; + }; + ## nh + nh = { + enable = true; + clean.enable = true; + clean.extraArgs = "--keep-since 8d --keep 7"; + flake = "/etc/nixos"; # sets NH_OS_FLAKE variable for you + }; + ## appimage + appimage = { + enable = true; + binfmt = true; + }; +}; ## Configuração do gerenciador nix nix.package = pkgs.lixPackageSets.latest.lix; #nix.package = inputs.nixpkgs-master.legacyPackages.${pkgs.system}.lix; } + diff --git a/nixos/conf/GM/cfgeral/wireless.nix b/nixos/conf/GM/cfgeral/wireless.nix index d14b541..3101ee4 100644 --- a/nixos/conf/GM/cfgeral/wireless.nix +++ b/nixos/conf/GM/cfgeral/wireless.nix @@ -1,13 +1,12 @@ { config, lib, inputs, pkgs, ... }: { ## Configuração da internet - networking.networkmanager.enable = true; - networking.interfaces.enp9s0.wakeOnLan.enable = true; + networking = { + networkmanager.enable = true; + interfaces.enp9s0.wakeOnLan.enable = true; + }; ## Ativar Bluetooth hardware.bluetooth.enable = true; - ## Ativar CUPS para impressão - services.printing.enable = true; - } diff --git a/nixos/conf/HM/pkgs/pkgs.nix b/nixos/conf/HM/pkgs/pkgs.nix index cd096f8..9b3bf5a 100644 --- a/nixos/conf/HM/pkgs/pkgs.nix +++ b/nixos/conf/HM/pkgs/pkgs.nix @@ -23,13 +23,13 @@ ## Utilitários do sistema e dev tools fastfetch + myxer qbittorrent cpu-x git btop-cuda vscodium flatpak - appimage-run wget kitty vlc @@ -40,5 +40,5 @@ winetricks wineWowPackages.staging ]; - + } \ No newline at end of file diff --git a/nixos/configuration.nix b/nixos/configuration.nix index d00b178..3468d16 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -7,13 +7,17 @@ ]; ## Configuração do bootloader - boot.loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; - systemd-boot.configurationLimit = 10; + boot = { + kernelPackages = pkgs.linuxPackages_cachyos; # Kernel Cachy + loader.systemd-boot.enable = true; + loader.efi.canTouchEfiVariables = true; + loader.systemd-boot.configurationLimit = 10; + kernel.sysctl = { + "kernel.split_lock_mitigate" = 0; + "kernel.nmi_watchdog" = 0; + }; }; - boot.kernelPackages = pkgs.linuxPackages_cachyos; # Kernel customizado #boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_cachyos; #boot.kernelPackages = pkgs.linuxPackages_latest; @@ -23,6 +27,7 @@ xserver.enable = false; # Ativar sistema gráfico X11 displayManager.autoLogin.enable = true; displayManager.autoLogin.user = "gui"; + printing.enable = false; }; ## Definição do usuário normal diff --git a/nixos/flake.lock b/nixos/flake.lock index 8836480..185236f 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -7,11 +7,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1761836926, - "narHash": "sha256-HnNzEUuBqmJCUV/N/IbL0wFT1LHmNGWTLkUg7yRIhpY=", + "lastModified": 1762958586, + "narHash": "sha256-1MryKS54NVQld+xDvCN0OBmAC8Jk+HmplqWbuerrhlk=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "e601b479a3d08124ee6ceea391cdc3f395aab54e", + "rev": "0d212e20bebe63b49b588323d37c0cc46bd7000f", "type": "github" }, "original": { @@ -29,11 +29,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1762036128, - "narHash": "sha256-0VgVPYq5upSXc+LSn3ubxJhH+DLdakYW4QXeabo0Ivg=", + "lastModified": 1762966292, + "narHash": "sha256-WJtAHPDOJRd/ecQJBFyuyqBIbDG0ocdQuBGPBRRsgew=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "499783c86e6e9436534d1a23b35da98c7f6af3f4", + "rev": "037d0bb4a6b51609e66fab2221d3bca2d3b5fa3b", "type": "github" }, "original": { @@ -94,6 +94,26 @@ "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" } }, + "hayase": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1762738355, + "narHash": "sha256-Od5HKTCtjK7qwMvSTqvwmtQ0YTWkMajqdtgt94eBJmk=", + "owner": "darkguibrine", + "repo": "hayase-nix", + "rev": "d25c7c029cab0106164568ea0e4caa36cd845bba", + "type": "github" + }, + "original": { + "owner": "darkguibrine", + "repo": "hayase-nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -102,11 +122,11 @@ ] }, "locked": { - "lastModified": 1761878381, - "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=", + "lastModified": 1762787259, + "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa", + "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e", "type": "github" }, "original": { @@ -122,11 +142,11 @@ ] }, "locked": { - "lastModified": 1762087455, - "narHash": "sha256-hpbPma1eUKwLAmiVRoMgIHbHiIKFkcACobJLbDt6ABw=", + "lastModified": 1762964643, + "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", "owner": "nix-community", "repo": "home-manager", - "rev": "43e205606aeb253bfcee15fd8a4a01d8ce8384ca", + "rev": "827f2a23373a774a8805f84ca5344654c31f354b", "type": "github" }, "original": { @@ -143,11 +163,11 @@ ] }, "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "lastModified": 1762351818, + "narHash": "sha256-0ptUDbYwxv1kk/uzEX4+NJjY2e16MaAhtzAOJ6K0TG0=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "b959c67241cae17fc9e4ee7eaf13dfa8512477ea", "type": "github" }, "original": { @@ -165,11 +185,11 @@ ] }, "locked": { - "lastModified": 1761748321, - "narHash": "sha256-hD5mVzmUeyVppjArdy2uVdQe/CQUR9i3WgZB05onE7A=", + "lastModified": 1762856455, + "narHash": "sha256-x7zgteJWIlbVexL2ubOadUXKlHSjh0RAjLO1KfWdgpU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "533db5857c9e00ca352558a928417116ee08a824", + "rev": "29a671ae20223d182eaf54b963a735230497c2f9", "type": "github" }, "original": { @@ -178,6 +198,21 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1754777568, + "narHash": "sha256-0bBqT+3XncgF8F03RFAamw9vdf0VmaDoIJLTGkjfQZs=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "62f636b87ef6050760a8cb325cadb90674d1e23e", + "type": "github" + }, + "original": { + "owner": "gmodena", + "repo": "nix-flatpak", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -219,11 +254,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1762116731, - "narHash": "sha256-RjJanNtBvmtjkBbA8OtCnXvEW6MjV7BCnL5BNckVQHE=", + "lastModified": 1763049953, + "narHash": "sha256-jWHOOcsAbqsJY1Gu+uGuQ+i06Tw1GuX8sWAbteu+b5U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0af24ccb88ca178279669717d42e7959e7d70bbd", + "rev": "4dff818ec364fdb865560dd9c9fccf76223fe566", "type": "github" }, "original": { @@ -234,11 +269,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1761999846, - "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", + "lastModified": 1762756533, + "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", + "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", "type": "github" }, "original": { @@ -266,11 +301,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1761907660, - "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", "type": "github" }, "original": { @@ -282,11 +317,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1761907660, - "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", "type": "github" }, "original": { @@ -304,11 +339,11 @@ ] }, "locked": { - "lastModified": 1762116325, - "narHash": "sha256-MyRBPzCbjKrniwb/hU2a2+z8ojvrBTeRNaHO/SXCqnE=", + "lastModified": 1763048902, + "narHash": "sha256-U2zsuIv9CgoIVWkkardod9KyzEmYafs68LAq9Q+PSmc=", "owner": "nix-community", "repo": "NUR", - "rev": "2ff8c3ddb2281b478d81a127aaaf297e9ebc2f60", + "rev": "d81169a3e6612b0e4c20c5b07717353030bdf779", "type": "github" }, "original": { @@ -321,7 +356,9 @@ "inputs": { "aagl": "aagl", "chaotic": "chaotic", + "hayase": "hayase", "home-manager": "home-manager_2", + "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_4", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable", @@ -355,11 +392,11 @@ ] }, "locked": { - "lastModified": 1761964689, - "narHash": "sha256-Zo3LQQDz+64EQ9zor/WmeNTFLoZkjmhp0UY3G0D3seE=", + "lastModified": 1762915112, + "narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "63d22578600f70d293aede6bc737efef60ebd97f", + "rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02", "type": "github" }, "original": { @@ -376,11 +413,11 @@ ] }, "locked": { - "lastModified": 1762067864, - "narHash": "sha256-Q7o8NTYIbGMmMrgrx9PTmmaj/GM/DWJjM6U+daaiiyk=", + "lastModified": 1763007974, + "narHash": "sha256-XMgjrDIHonLqIjc1eMQkLeemGcNqqYU0Dq+zNmeMYOI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "68b3775543b442b06a76e498fd342b16a8619757", + "rev": "eff1c79c78950ebb4ce70c3d51513e294cf30b52", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index aff076f..f894298 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -6,6 +6,7 @@ nixpkgs-master.url = "github:nixos/nixpkgs"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; aagl.url = "github:ezKEa/aagl-gtk-on-nix"; + nix-flatpak.url = "github:gmodena/nix-flatpak"; home-manager = { url = "github:nix-community/home-manager/"; inputs.nixpkgs.follows = "nixpkgs"; @@ -18,8 +19,12 @@ url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + hayase = { + url = "github:darkguibrine/hayase-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = {self ,nixpkgs ,nixpkgs-stable ,nixpkgs-master ,home-manager ,chaotic ,zen-browser ,nur ,aagl , ...} @ inputs: { + outputs = {self ,nixpkgs ,nixpkgs-stable ,nixpkgs-master ,home-manager ,chaotic ,zen-browser ,nur ,aagl ,hayase ,nix-flatpak , ...} @ inputs: { nixosConfigurations = { "Alfa" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -28,6 +33,7 @@ ./configuration.nix chaotic.nixosModules.default nur.modules.nixos.default + nix-flatpak.nixosModules.nix-flatpak {imports = [ aagl.nixosModules.default ]; nix.settings = aagl.nixConfig; # Set up Cachix programs.anime-game-launcher.enable = true; @@ -42,3 +48,4 @@ }; }; } +