diff --git a/conf/Alias/alias.nix b/conf/Alias/alias.nix index d0d86f5..bfe2736 100644 --- a/conf/Alias/alias.nix +++ b/conf/Alias/alias.nix @@ -1,8 +1,10 @@ { config, lib, inputs, pkgs, ... }: { - programs.bash.shellAliases = { + 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"; + upd = "nh os switch -a -u && nh home switch -a -u"; + updhome = "nh home switch -a -u"; + updsystem = "nh os switch -a -u"; nixcf = "kate /etc/nixos/configuration.nix"; nixfk = "kate /etc/nixos/flake.nix"; nixpkg = "kate /etc/nixos/conf/Pkgs/pkgs.nix"; diff --git a/conf/Fish/fish.nix b/conf/Fish/fish.nix index 6b9595b..8764412 100644 --- a/conf/Fish/fish.nix +++ b/conf/Fish/fish.nix @@ -1,24 +1,25 @@ { config, lib, inputs, pkgs, ... }: { ## config fish - #environment.systemPackages = with pkgs; [ - #fishPlugins.done - #fishPlugins.fzf-fish - #fishPlugins.forgit - #fishPlugins.hydro - #fzf - #fishPlugins.grc - #grc - #]; + environment.systemPackages = with pkgs; [ + fishPlugins.done + fishPlugins.fzf-fish + fishPlugins.forgit + fishPlugins.hydro + fzf + fishPlugins.grc + grc + ]; - # programs.fish.enable = true; + 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/Fontes/fontes.nix b/conf/Fontes/fontes.nix new file mode 100644 index 0000000..2d2daa8 --- /dev/null +++ b/conf/Fontes/fontes.nix @@ -0,0 +1,11 @@ +{config, pkgs, ...}: { +fonts.fontconfig.enable = true; +home.packages = with pkgs; [ + nerd-fonts.jetbrains-mono + nerd-fonts.ubuntu-mono + nerd-fonts.ubuntu-sans + nerd-fonts.dejavu-sans-mono + nerd-fonts.fira-code + nerd-fonts.overpass +]; +} \ No newline at end of file diff --git a/conf/Nvidia/nvidia.nix b/conf/Nvidia/nvidia.nix index f96999c..bc2a924 100644 --- a/conf/Nvidia/nvidia.nix +++ b/conf/Nvidia/nvidia.nix @@ -5,5 +5,6 @@ services.xserver.videoDrivers = [ "nvidia" ]; hardware.nvidia.open = false; hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta; + #hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.production; } diff --git a/conf/Pkgs/pkgs.nix b/conf/Pkgs/pkgs.nix index 18d2958..727c4b8 100644 --- a/conf/Pkgs/pkgs.nix +++ b/conf/Pkgs/pkgs.nix @@ -5,52 +5,33 @@ environment.systemPackages = with pkgs; [ ## Aplicativos sociais - zapzap inputs.zen-browser.packages.${system}.default - (discord.override {withVencord = true;}) - ## Jogos - lutris - heroic - prismlauncher - steam - xclicker - mangojuice - mangohud - protonplus + ## jogos lsfg-vk lsfg-vk-ui ## Utilitários do sistema e dev tools nh - vscode - cpu-x - flatpak + home-manager vulkan-tools-lunarg vulkan-loader vulkan-utility-libraries - preload - fastfetch - git - btop - ethtool - appimage-run - wget gcc + preload + ethtool kdePackages.partitionmanager winetricks wineWowPackages.staging kdePackages.qtmultimedia - zenity - python3 efibootmgr distrobox podman distroshelf - lact ## repositorio 25.05 inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.vulkan-tools ]; + } diff --git a/conf/Pkgs/pkgshome.nix b/conf/Pkgs/pkgshome.nix new file mode 100644 index 0000000..99ce04c --- /dev/null +++ b/conf/Pkgs/pkgshome.nix @@ -0,0 +1,33 @@ +{ config, lib, inputs, pkgs, ... }: { + ## pacotes home-manager + home.packages = with pkgs; [ + + ## aplicativos sociais + (discord.override {withVencord = true;}) + telegram-desktop + + ## Jogos + lutris + heroic + prismlauncher + steam + ryubing + xclicker + mangojuice + mangohud + protonplus + + ## Utilitários do sistema e dev tools + fastfetch + cpu-x + git + btop-cuda + vscode + flatpak + appimage-run + wget + lact + kitty + + ]; +} \ No newline at end of file diff --git a/flake.nix b/flake.nix index 5696435..145e215 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,10 @@ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-master.url = "github:nixos/nixpkgs"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + home-manager = { + url = "github:nix-community/home-manager/"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nur = { url = "github:nix-community/NUR"; inputs.nixpkgs.follows = "nixpkgs"; @@ -13,8 +17,9 @@ url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + }; - outputs = { self, nixpkgs, nixpkgs-stable,nixpkgs-master ,chaotic, zen-browser, nur, ...} @ inputs: { + outputs = { self,nixpkgs,nixpkgs-stable,nixpkgs-master,home-manager,chaotic, zen-browser,nur, ...} @ inputs: { nixosConfigurations = { "Alfa" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -24,8 +29,11 @@ chaotic.nixosModules.default nur.modules.nixos.default ]; - }; }; - }; -} - + }; + homeConfigurations."gui@Alfa" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; + modules = [ ./home.nix ]; + }; + }; + } diff --git a/home.nix b/home.nix new file mode 100644 index 0000000..392be26 --- /dev/null +++ b/home.nix @@ -0,0 +1,18 @@ +{pkgs, config, ...}: { + + imports = [ + ./conf/Fontes/fontes.nix + ./conf/Pkgs/pkgshome.nix +]; + + home.username = "gui"; + home.homeDirectory = "/home/gui"; + + programs.home-manager.enable = true; + programs.fish.enable = true; + nixpkgs.config.allowUnfree = true; + + # The state version is required and should stay at the version you + # originally installed. + home.stateVersion = "25.11"; +} \ No newline at end of file