diff --git a/conf/Audio/audio.nix b/conf/Audio/audio.nix index 39ebb2e..14fbae1 100644 --- a/conf/Audio/audio.nix +++ b/conf/Audio/audio.nix @@ -8,7 +8,7 @@ alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; - # jack.enable = true; # Descomente se usar aplicações JACK + #jack.enable = true; # Descomente se usar aplicações JACK }; } diff --git a/conf/DistroBox/distrobox.nix b/conf/DistroBox/distrobox.nix index fb98c90..91607ea 100644 --- a/conf/DistroBox/distrobox.nix +++ b/conf/DistroBox/distrobox.nix @@ -3,6 +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; }; } diff --git a/conf/NixHelper/nixhelper.nix b/conf/NixHelper/nixhelper.nix index 8eba0b0..62c3edd 100644 --- a/conf/NixHelper/nixhelper.nix +++ b/conf/NixHelper/nixhelper.nix @@ -13,6 +13,7 @@ }; ## Configuração do gerenciador nix - nix.package = pkgs.lixPackageSets.latest.lix; + #nix.package = pkgs.lixPackageSets.latest.lix; + nix.package = inputs.nixpkgs-master.legacyPackages.${pkgs.system}.lix; } diff --git a/conf/Nvidia/nvidia.nix b/conf/Nvidia/nvidia.nix index bc2a924..b510a00 100644 --- a/conf/Nvidia/nvidia.nix +++ b/conf/Nvidia/nvidia.nix @@ -4,7 +4,7 @@ hardware.graphics.enable = true; services.xserver.videoDrivers = [ "nvidia" ]; hardware.nvidia.open = false; - hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta; - #hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.production; + #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 727c4b8..8a165ac 100644 --- a/conf/Pkgs/pkgs.nix +++ b/conf/Pkgs/pkgs.nix @@ -21,13 +21,20 @@ preload ethtool kdePackages.partitionmanager + kdePackages.filelight + kdePackages.dolphin + kdePackages.ark + xdg-desktop-portal-gnome winetricks wineWowPackages.staging kdePackages.qtmultimedia efibootmgr distrobox + docker-compose podman distroshelf + freerdp + kdePackages.krfb ## repositorio 25.05 inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.vulkan-tools diff --git a/conf/gnome/gnome.nix b/conf/gnome/gnome.nix new file mode 100644 index 0000000..e6988c5 --- /dev/null +++ b/conf/gnome/gnome.nix @@ -0,0 +1,44 @@ +{ config, lib, inputs, pkgs, ... }: { + + services.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; + + # Para desabilitar a instalação do conjunto de aplicativos do GNOME + # e ficar apenas com o shell do GNOME. + services.gnome.core-apps.enable = false; + services.gnome.core-developer-tools.enable = false; + services.gnome.games.enable = false; + environment.gnome.excludePackages = with pkgs; [ gnome-tour gnome-user-docs ]; + + + environment.systemPackages = with pkgs; [ + gnomeExtensions.blur-my-shell + gnomeExtensions.dash-to-dock + gnomeExtensions.just-perfection + gnomeExtensions.arc-menu + gnomeExtensions.appindicator + gnomeExtensions.valent + xdg-desktop-portal-gnome + valent + gnome-tweaks + gnome-shell + gnome-extension-manager + refine + alacarte + nautilus + ]; + services.udev.packages = [ pkgs.gnome-settings-daemon ]; + + qt = { + enable = true; + platformTheme = "gnome"; + style = "adwaita-dark"; + }; + + programs.kdeconnect = { + enable = true; + package = pkgs.valent; +}; + +} + diff --git a/conf/kitty/kitty.conf b/conf/kitty/kitty.conf new file mode 100644 index 0000000..5736065 --- /dev/null +++ b/conf/kitty/kitty.conf @@ -0,0 +1,69 @@ +include ./theme.conf + +wayland_enable_ime no + +font_size 7.5 +underline_exclusion 0 + +cursor_shape beam +cursor_blink_interval 0.3 +cursor_trail 3 +cursor_trail_decay 0.1 0.4 + +scrollback_lines 5000 +scrollback_pager_history_size 100 + +show_hyperlink_targets yes + +repaint_delay 15 + +tab_bar_edge top +tab_bar_style powerline +tab_powerline_style slanted +tab_bar_align left +tab_bar_min_tabs 1 +active_tab_font_style normal + +enabled_layouts fat:bias=60,stack +window_margin_width 2.5 +window_border_width 1 +draw_minimal_borders no + +background_opacity 0.9 + +allow_remote_control yes + +map alt+f5 load_config_file +map alt+minus resize_window narrower +map alt+underline resize_window shorter +map ctrl+alt+minus change_font_size all -0.5 +map alt+equal resize_window wider +map alt+plus resize_window taller +map ctrl+alt+equal change_font_size all +0.5 +map alt+q close_window_with_confirmation ignore-shell +map alt+shift+q close_tab +map alt+r set_window_title +map alt+shift+r set_tab_title +map alt+u scroll_line_up +map alt+shift+u scroll_to_prompt -1 +map alt+p previous_tab +map alt+shift+p detach_window tab-left +map alt+d scroll_line_down +map alt+shift+d scroll_to_prompt 1 +map alt+h neighboring_window left +map alt+shift+h move_window left +map alt+j neighboring_window bottom +map alt+shift+j move_window bottom +map alt+k neighboring_window top +map alt+shift+k move_window top +map alt+l neighboring_window right +map alt+shift+l move_window right +map alt+z toggle_layout stack +map ctrl+c copy_or_interrupt +map ctrl+v paste_from_clipboard +map alt+n next_tab +map alt+shift+n detach_window tab-right +map alt+t new_window +map alt+shift+t new_tab + +# TODO: detach window to tab-left, and if tab-left doesn't exist create it diff --git a/conf/kitty/kitty.nix b/conf/kitty/kitty.nix new file mode 100644 index 0000000..a901edf --- /dev/null +++ b/conf/kitty/kitty.nix @@ -0,0 +1,15 @@ +{ config, lib, inputs, pkgs, ... }: { + + options.mods.kitty = { + enable = lib.mkEnableOption "Enable Kitty."; + }; + + config = lib.mkIf config.mods.kitty.enable { + programs.kitty = { + enable = true; + extraConfig = "include ${config.mods.flakePath}/conf/kitty/kitty.conf"; + settings.clear_all_shortcuts = "yes"; + }; + }; +} + diff --git a/conf/kitty/theme.conf b/conf/kitty/theme.conf new file mode 100644 index 0000000..d8c94a8 --- /dev/null +++ b/conf/kitty/theme.conf @@ -0,0 +1,37 @@ +cursor #f4dbe2 +cursor_text_color background + +url_color #eec6e9 +url_style dotted + +active_border_color #f4dbe2 +inactive_border_color #121622 +bell_border_color #efd286 + +active_tab_foreground #f4dbe2 +active_tab_background #121622 +inactive_tab_foreground #aeb8d4 +inactive_tab_background #060810 + +foreground #ced4e6 +background #060810 +transparent_background_colors #121622 #1c2232 #272d41 #313950 #46516f +selection_foreground none +selection_background #46516f +color0 #121622 +color1 #ea8f80 +color2 #6ac27f +color3 #c7a84d +color4 #92a8eb +color5 #db8ad4 +color6 #52bcce +color7 #aeb8d4 +color8 #7683a8 +color9 #f5b3a7 +color10 #7ae092 +color11 #e5c25f +color12 #b3c4f5 +color13 #eaafe4 +color14 #6bd8ea +color15 #ced4e6 + diff --git a/configuration.nix b/configuration.nix index 235323e..7a44ad0 100644 --- a/configuration.nix +++ b/configuration.nix @@ -10,7 +10,10 @@ boot.loader.efi.canTouchEfiVariables = true; boot.loader.systemd-boot.configurationLimit = 10; - boot.kernelPackages = pkgs.linuxPackages_cachyos; # Kernel customizado + #boot.kernelPackages = pkgs.linuxPackages_cachyos; # Kernel customizado + boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_cachyos-gcc; + #boot.kernelPackages = pkgs.linuxPackages_latest; + networking.hostName = "Alfa"; # Defina o nome da sua máquina @@ -20,7 +23,7 @@ users.users.gui = { isNormalUser = true; description = "Gui"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ "networkmanager" "wheel"]; packages = with pkgs; [ kdePackages.kate kdePackages.kcalc diff --git a/flake.lock b/flake.lock index 7858bc1..616f7f4 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1755444192, - "narHash": "sha256-9eVUtk3ces32aJpHnsrO49UJNvMKNMxlV7NeNSAADLo=", + "lastModified": 1758033778, + "narHash": "sha256-oQH2wLOWLFHXT3NE+gcsFOX+Pq40bKjlOH1xw0wcmT8=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "958ba486ee73019e3820b9ebd97a38660f736f40", + "rev": "b3efa297b9c6a9e55a44f3b6905d55f80738704f", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1755313937, - "narHash": "sha256-pQb7bNcolxYGRiylUCrTddiF+qW2wsUiM9+eRIDUrVU=", + "lastModified": 1757920978, + "narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a749f4790a14f7168be67cdf6e548ef1c944e10", + "rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8", "type": "github" }, "original": { @@ -80,6 +80,26 @@ } }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1758288820, + "narHash": "sha256-ubyO7Ly6NSFN5GgNTEuoIavBFMZOMcRchSTIXiDVtAI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "e38751933802481b37fee1f9251cbb86e63df381", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "zen-browser", @@ -109,11 +129,11 @@ ] }, "locked": { - "lastModified": 1755151620, - "narHash": "sha256-fVMalQZ+tRXR8oue2SdWu4CdlsS2NII+++rI40XQ8rU=", + "lastModified": 1757230583, + "narHash": "sha256-4uqu7sFPOaVTCogsxaGMgbzZ2vK40GVGMfUmrvK3/LY=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "16e12d22754d97064867006acae6e16da7a142a6", + "rev": "fc3960e6c32c9d4f95fff2ef84444284d24d3bea", "type": "github" }, "original": { @@ -147,11 +167,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", - "owner": "NixOS", + "lastModified": 1758029758, + "narHash": "sha256-fKqsvznISxVSBo6aaiGGXMRiBG4IIuV3sSySxx80pcQ=", + "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "4eb5897225c3d7e78a0b9d1542197ee7c8d270a5", "type": "github" }, "original": { @@ -163,11 +183,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1755465171, - "narHash": "sha256-vGNQOI+26Lxjf0YNfXRScZ++1TqvFNZpDP47GWFv8Po=", + "lastModified": 1758294315, + "narHash": "sha256-H+C4c+jKCZpSJHODHFaY6b2ciB3Hv00V5QKA7yUVtis=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4f28529650e163574f78bd309150fccba09b15d", + "rev": "90ade7da38aa49c2e2693a04a44662a0e61530e9", "type": "github" }, "original": { @@ -178,11 +198,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1755274400, - "narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=", + "lastModified": 1758216857, + "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899", + "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743", "type": "github" }, "original": { @@ -194,11 +214,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1758198701, + "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", "type": "github" }, "original": { @@ -216,11 +236,11 @@ ] }, "locked": { - "lastModified": 1755463657, - "narHash": "sha256-zlwwq8sVyIs/i3unqtQEqRXFVIxaFzxtjGEAnNQjUsc=", + "lastModified": 1758273929, + "narHash": "sha256-8ZhQaoeWOcCpe14PLgJ7ZEhWFFISA2qcVuXTGlNZGgU=", "owner": "nix-community", "repo": "NUR", - "rev": "b12cf912ef3f7d899cb78f3865c6f22befaca3ad", + "rev": "2d644af21cc32d53594b9d17fa167c4eec6431cd", "type": "github" }, "original": { @@ -232,6 +252,7 @@ "root": { "inputs": { "chaotic": "chaotic", + "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_2", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable", @@ -247,11 +268,11 @@ ] }, "locked": { - "lastModified": 1755311859, - "narHash": "sha256-NspGtm0ZpihxlFD628pvh5ZEhL/Q6/Z9XBpe3n6ZtEw=", + "lastModified": 1757930296, + "narHash": "sha256-Z9u5VszKs8rfEvg2AsFucWEjl7wMtAln9l1b78cfBh4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "07619500e5937cc4669f24fec355d18a8fec0165", + "rev": "09442765a05c2ca617c20ed68d9613da92a2d96b", "type": "github" }, "original": { @@ -262,17 +283,17 @@ }, "zen-browser": { "inputs": { - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1755456856, - "narHash": "sha256-AbZX34NDKg8eMqYNXZlGwRUe48xkGtdqsr0hJTkGyCo=", + "lastModified": 1758255782, + "narHash": "sha256-uBjTUcpb+P1nMoj0jDfIavNPJ3zkGmatvvxU2TTHSXQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "09489bfb2511da9eeeb57bc10e37910809a1ddb7", + "rev": "ef8fb5704a9aa2845d95ef36b5250a57fb6d5bd6", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 392be26..625bf05 100644 --- a/home.nix +++ b/home.nix @@ -3,6 +3,7 @@ imports = [ ./conf/Fontes/fontes.nix ./conf/Pkgs/pkgshome.nix + ./conf/kitty/kitty.nix ]; home.username = "gui"; @@ -12,6 +13,13 @@ programs.fish.enable = true; nixpkgs.config.allowUnfree = true; + ## config gnome + #dconf = { + # enable = true; + # settings."org/gnome/desktop/interface".color-scheme = "prefer-dark"; + #}; + + # The state version is required and should stay at the version you # originally installed. home.stateVersion = "25.11"; diff --git a/imp.nix b/imp.nix index 5c7f594..56aaca4 100644 --- a/imp.nix +++ b/imp.nix @@ -6,7 +6,6 @@ ./conf/Alias/alias.nix ./conf/CfStorage/CfStorage.nix ./conf/PatchJogos/patch.nix - ./conf/Kde/kde.nix ./conf/environmentvariables/variables.nix ./conf/Flatpak/flatpak.nix ./conf/Flakes/flakeconfig.nix @@ -18,5 +17,7 @@ ./conf/Fish/fish.nix ./conf/DistroBox/distrobox.nix ./conf/Obs/obs.nix + #./conf/gnome/gnome.nix #gnome + ./conf/Kde/kde.nix #kde ]; }