From 44099f42cebe10519d36817f7f3c992987f4d29d Mon Sep 17 00:00:00 2001 From: elwrcl Date: Thu, 16 Apr 2026 23:05:53 +0300 Subject: [PATCH] feat(home-manager): Consolidate and update packages in home.nix --- home/default.nix | 228 +++++++++++++++++++++--------- nixos/desktop/display/default.nix | 2 +- nixos/system/default.nix | 64 +-------- nixos/system/locale/default.nix | 1 - packages.nix | 184 ++---------------------- 5 files changed, 180 insertions(+), 299 deletions(-) diff --git a/home/default.nix b/home/default.nix index 7a08032..9f1ca9a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,11 +1,12 @@ { pkgs, + inputs, + system, ... }: + { - imports = [ - ./hyprland.nix - ]; + imports = [ ./hyprland.nix ]; home.username = "elars"; home.homeDirectory = "/home/elars"; @@ -19,7 +20,6 @@ x11.enable = true; }; - # Alternatifsiz tek shell. programs.zsh = { enable = true; enableCompletion = true; @@ -38,71 +38,10 @@ window-padding-y = 10; }; }; - xdg.configFile = { - "fastfetch".source = ./dots/fastfetch; - }; - home.packages = with pkgs; [ - eza - bat - fd - fastfetch - vulkan-tools - libva-utils - mesa-demos - intel-gpu-tools - clinfo - trash-cli - rsync - ]; - programs.starship.enable = true; programs.fzf.enable = true; programs.zoxide.enable = true; programs.home-manager.enable = true; - - fonts.fontconfig.enable = true; - services.kdeconnect.enable = true; - - xdg.mimeApps = { - enable = true; - defaultApplications = { - "inode/directory" = [ "org.gnome.Nautilus.desktop" ]; - }; - }; - - dconf.settings = { - "org/gnome/desktop/interface" = { - color-scheme = "prefer-dark"; - gtk-application-prefer-dark-theme = true; - }; - "org/gnome/nautilus/preferences" = { - default-folder-viewer = "icon-view"; - show-hidden-files = true; - }; - "org/gtk/settings/file-chooser" = { - sort-directories-first = true; - }; - }; - - gtk = { - enable = true; - theme = { - name = "Adwaita-dark"; - package = pkgs.gnome-themes-extra; - }; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme; - }; - gtk3.extraConfig = { - gtk-application-prefer-dark-theme = 1; - }; - gtk4.extraConfig = { - gtk-application-prefer-dark-theme = 1; - }; - gtk4.theme = null; - }; - qt = { enable = true; platformTheme.name = "gtk3"; @@ -111,4 +50,163 @@ package = pkgs.adwaita-qt; }; }; + + xdg.configFile = { + "fastfetch".source = ./dots/fastfetch; + "fish/conf.d".source = ./dots/fish/conf.d; + }; + xdg.mimeApps = { + enable = true; + defaultApplications = { + "inode/directory" = [ "org.gnome.Nautilus.desktop" ]; + }; + }; + dconf.settings = { + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + gtk-application-prefer-dark-theme = true; + }; + "org/gnome/nautilus/preferences" = { + default-folder-viewer = "icon-view"; + }; + }; + fonts.fontconfig.enable = true; + services.kdeconnect.enable = true; + + home.packages = with pkgs; [ + # cli + eza + bat + fd + micro + fastfetch + zoxide + trash-cli + rsync + jq + zip + p7zip + rar + dos2unix + unzip + wget + autossh + xdotool + wl-clipboard + direnv + fish + git + cachix + hidapi + btop + luajit + + vulkan-tools + libva-utils + mesa-demos + intel-gpu-tools + clinfo + heroic + bottles + prismlauncher + + waybar + wofi + fuzzel + swaylock + swayidle + feh + eww + easyeffects + swappy + grim + slurp + wf-recorder + + mpv + obs-studio + ffmpeg + yt-dlp + imagemagick + tesseract + cava + pavucontrol + playerctl + pamixer + + # editors + vim + neovim + helix + vscode + zed-editor + + # dev tools + nil + nixpkgs-fmt + gnumake + sqlite + picotool + stripe-cli + openssl + pkg-config + aubio + docker-compose + cargo-tauri + trunk + dioxus-cli + uv + + # langs + odin + ghc + cabal-install + go + rustup + gcc + binutils + zig + lua + glm + + # themes and icons + bibata-cursors + gnome-themes-extra + papirus-icon-theme + adwaita-icon-theme + adwaita-qt6 + gnome-icon-theme + hicolor-icon-theme + pantheon.elementary-icon-theme + tango-icon-theme + arc-icon-theme + + # apps + thunderbird + telegram-desktop + onlyoffice-desktopeditors + nautilus + loupe + spacedrive + qbittorrent + localsend + jellyfin-media-player + calibre + ani-cli + sioyek + qalculate-gtk + libqalculate + blender + wine + antigravity + spotatui + whatsapp-electron + alacritty + kitty + equibop + discord + slack + solaar + + ]; } diff --git a/nixos/desktop/display/default.nix b/nixos/desktop/display/default.nix index ef5a641..a05cee0 100644 --- a/nixos/desktop/display/default.nix +++ b/nixos/desktop/display/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { services.xserver.enable = true; services.displayManager.ly = { diff --git a/nixos/system/default.nix b/nixos/system/default.nix index 2ca5a7f..6dfc429 100644 --- a/nixos/system/default.nix +++ b/nixos/system/default.nix @@ -1,70 +1,10 @@ -{ - pkgs, - inputs, - system, - ... -}: +{ ... }: { imports = [ ./locale ./nix ./power.nix + ./fonts ]; - - fonts = { - packages = with pkgs; [ - noto-fonts - noto-fonts-cjk-sans - noto-fonts-cjk-serif - noto-fonts-color-emoji - ipaexfont - nerd-fonts.jetbrains-mono - nerd-fonts.caskaydia-cove - noto-fonts-cjk-sans - nerd-fonts.symbols-only - inputs.apple-fonts.packages.${system}.sf-pro - inputs.apple-fonts.packages.${system}.sf-mono - nerd-fonts.jetbrains-mono - ]; - - fontconfig = { - enable = true; - antialias = true; - - hinting = { - enable = true; - style = "slight"; - autohint = false; - }; - - subpixel = { - rgba = "rgb"; - lcdfilter = "default"; - }; - - defaultFonts = { - serif = [ - "JetBrainsMono Nerd Font" - "Noto Serif CJK JP" - "Noto Serif" - "IPAexMincho" - ]; - sansSerif = [ - "JetBrainsMono Nerd Font" - "Noto Sans CJK JP" - "Noto Sans" - "IPAexGothic" - ]; - monospace = [ - "JetBrainsMono Nerd Font Mono" - "JetBrainsMono Nerd Font" - "Noto Sans Mono CJK JP" - "Noto Sans CJK JP" - "IPAexGothic" - ]; - emoji = [ "Noto Color Emoji" ]; - }; - }; - }; } diff --git a/nixos/system/locale/default.nix b/nixos/system/locale/default.nix index e920474..405350e 100644 --- a/nixos/system/locale/default.nix +++ b/nixos/system/locale/default.nix @@ -33,4 +33,3 @@ console.keyMap = "trq"; system.stateVersion = "25.05"; } - diff --git a/packages.nix b/packages.nix index 12196c3..2f96b69 100644 --- a/packages.nix +++ b/packages.nix @@ -7,183 +7,27 @@ in with pkgs; { system = [ - # diagnostic - dmidecode - lshw - pciutils - usbutils - hwinfo - efibootmgr - cpuid - smartmontools - gsmartcontrol - lm_sensors - ddcutil - brightnessctl + # android libmtp jmtpfs - btop - fastfetch - wget - curl - unzip - zip - p7zip - rar - dos2unix - jq - parted - libqalculate - qalculate-gtk - direnv - cachix - ollama - antigravity - # network - zapret - autossh - glib-networking - - # gaming - heroic - bottles - prismlauncher - virt-manager - libvirt - qemu - wine - - # dev tools - git - gnumake - pkg-config - binutils - openssl - openssl.dev - sqlite - hidapi - xdotool - cargo-tauri - trunk - dioxus-cli - picotool - stripe-cli - nil - nixpkgs-fmt - - # languages - gcc - rustup - python3 - jdk - go - zig - odin - uv - ghc - cabal-install - lua - luajit - zlib - glibc - glib - libGL - glm - - # desktop environment - waybar - wofi - fuzzel - swaylock - swayidle - eww - bibata-cursors - flatpak - feh - wl-clipboard - grim - slurp - imagemagick - tesseract - wf-recorder - shared-mime-info - - # graphics & display - mesa - adwaita-qt - adwaita-qt6 - gsettings-desktop-schemas - kdePackages.qtmultimedia - qt6Packages.qtbase - qt6Packages.qttools - qt6Packages.qtsvg - qt6Packages.qtdeclarative - qt6Packages.qtwayland - qt6Packages.qtwebsockets - libsoup_3 - gtk3 - webkitgtk_4_1 - - # media - mpv - ffmpeg - yt-dlp - obs-studio - cava - easyeffects - pavucontrol - playerctl - pamixer - alsa-utils - alsa-lib - aubio - spotatui - - # editors - vim - neovim - helix - vscode - zed-editor - - # apps - firefox - chromium - thunderbird - telegram-desktop - discord - equibop - slack - whatsapp-electron - ghostty - alacritty - kitty - nautilus - loupe - onlyoffice-desktopeditors - qbittorrent - localsend - jellyfin-media-player - ani-cli - blender - - # mobile + # ip libimobiledevice ifuse usbmuxd uxplay-fixed - # icons - material-symbols - nixos-icons - papirus-icon-theme - adwaita-icon-theme - gnome-icon-theme - hicolor-icon-theme - pantheon.elementary-icon-theme - tango-icon-theme - arc-icon-theme - gnome-themes-extra + # virt + virt-manager + libvirt + qemu + + # hrd + ddcutil + brightnessctl + lm_sensors + smartmontools + gsmartcontrol + parted ]; }