From 6a9932451ca3704e1aeb8630a0f5b678ee262670 Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Mon, 17 Mar 2025 16:10:17 -0600 Subject: [PATCH] auto lint --- home-manager/cobray.nix | 7 +++- home-manager/modules/dunst.nix | 7 +++- home-manager/modules/fish.nix | 8 ++-- home-manager/modules/ghostty.nix | 10 +++-- home-manager/modules/lazygit.nix | 7 +++- home-manager/modules/nvim.nix | 34 ++++++++++------- home-manager/modules/picom.nix | 7 +++- home-manager/modules/polybar.nix | 7 +++- home-manager/modules/rofi.nix | 7 +++- home-manager/modules/starship.nix | 7 +++- home-manager/modules/zellij.nix | 7 +++- hosts/configuration.nix | 9 +++-- hosts/local-packages.nix | 12 +----- modules/audio.nix | 7 +++- modules/bluetooth.nix | 7 +++- modules/boot.nix | 7 +++- modules/default.nix | 8 ++-- modules/docker.nix | 7 +++- modules/env.nix | 7 +++- modules/fonts.nix | 23 +++++------ modules/home-manager.nix | 7 +++- modules/i3-xfce.nix | 50 +++++++++++++----------- modules/man.nix | 42 --------------------- modules/net.nix | 9 +++-- modules/nixos.nix | 9 +++-- modules/nvidia.nix | 9 +++-- modules/steam.nix | 9 ++++- modules/timezone.nix | 7 +++- modules/user.nix | 15 ++++---- pkgs/default.nix | 9 +++-- pkgs/fish-rust/default.nix | 12 ++++-- pkgs/python-pymatting/default.nix | 2 +- pkgs/python-rembg/default.nix | 10 +++-- pkgs/tokyo-night/default.nix | 19 +++++++--- pkgs/vivid-icons/default.nix | 63 +++++++++++++++++-------------- 35 files changed, 262 insertions(+), 205 deletions(-) delete mode 100644 modules/man.nix diff --git a/home-manager/cobray.nix b/home-manager/cobray.nix index 8362032..02189a3 100644 --- a/home-manager/cobray.nix +++ b/home-manager/cobray.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { imports = [ ./modules/dunst.nix ./modules/fish.nix diff --git a/home-manager/modules/dunst.nix b/home-manager/modules/dunst.nix index 16686d6..df6dd53 100644 --- a/home-manager/modules/dunst.nix +++ b/home-manager/modules/dunst.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { home.packages = with pkgs; [ dunst ]; diff --git a/home-manager/modules/fish.nix b/home-manager/modules/fish.nix index e8df928..9673e14 100644 --- a/home-manager/modules/fish.nix +++ b/home-manager/modules/fish.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { home.packages = with pkgs; [ fish-rust starship @@ -10,5 +13,4 @@ fd ripgrep ]; - } diff --git a/home-manager/modules/ghostty.nix b/home-manager/modules/ghostty.nix index 6eff39b..f6bfb42 100644 --- a/home-manager/modules/ghostty.nix +++ b/home-manager/modules/ghostty.nix @@ -1,7 +1,11 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { home.packages = with pkgs; [ - ghostty + ghostty + fastfetch ]; } diff --git a/home-manager/modules/lazygit.nix b/home-manager/modules/lazygit.nix index 0fbbd60..b35c895 100644 --- a/home-manager/modules/lazygit.nix +++ b/home-manager/modules/lazygit.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { home.packages = with pkgs; [ lazygit ]; diff --git a/home-manager/modules/nvim.nix b/home-manager/modules/nvim.nix index ae7675d..5a0004e 100644 --- a/home-manager/modules/nvim.nix +++ b/home-manager/modules/nvim.nix @@ -2,7 +2,7 @@ { home.packages = with pkgs; [ neovim - ripgrep + gnugrep fd fzf nodejs @@ -18,7 +18,7 @@ ]; home.sessionVariables = { - LUA_PATH = "${pkgs.luajit}/share/lua/5.1/?.lua;;"; + LUA_PATH = "${pkgs.luajit}/share/lua/5.1/?.lua;${pkgs.luajit}/share/lua/5.1/?/init.lua;;"; LUA_CPATH = "${pkgs.luajit}/lib/lua/5.1/?.so;;"; }; @@ -26,15 +26,23 @@ "$HOME/.local/share/nvim/mason/bin" ]; - xdg.configFile."nvim" = - if !builtins.pathExists "${config.home.homeDirectory}/.config/nvim" - then { - source = builtins.fetchGit { - url = "https://github.com/alsaiduq-lab/nvim-dotfiles.git"; - ref = "master"; - rev = "71155b4a4b63d9974f1bc3b66303d6f7e5e06871"; - }; - recursive = true; - } - else null; + xdg.configFile."nvim" = let + nvimConfigPath = "${config.home.homeDirectory}/.config/nvim"; + # nvimDotfiles = builtins.fetchGit { + # url = "https://github.com/alsaiduq-lab/nvim-dotfiles.git"; + # ref = "master"; + # rev = "71155b4a4b63d9974f1bc3b66303d6f7e5e06871"; + # }; + in { + source = pkgs.emptyDirectory; + recursive = true; + enable = !builtins.pathExists nvimConfigPath; + onChange = '' + echo "Neovim config at ${nvimConfigPath} was ${ + if builtins.pathExists nvimConfigPath + then "skipped (already exists)" + else "installed" + }" + ''; + }; } diff --git a/home-manager/modules/picom.nix b/home-manager/modules/picom.nix index b522b47..cd0ea0f 100644 --- a/home-manager/modules/picom.nix +++ b/home-manager/modules/picom.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { home.packages = with pkgs; [ picom ]; diff --git a/home-manager/modules/polybar.nix b/home-manager/modules/polybar.nix index f33dd5f..6e49875 100644 --- a/home-manager/modules/polybar.nix +++ b/home-manager/modules/polybar.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { home.packages = with pkgs; [ polybar ]; diff --git a/home-manager/modules/rofi.nix b/home-manager/modules/rofi.nix index 72dc8ae..511832f 100644 --- a/home-manager/modules/rofi.nix +++ b/home-manager/modules/rofi.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { home.packages = with pkgs; [ rofi ]; diff --git a/home-manager/modules/starship.nix b/home-manager/modules/starship.nix index 1a32fbe..1e60569 100644 --- a/home-manager/modules/starship.nix +++ b/home-manager/modules/starship.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { home.packages = with pkgs; [ starship ]; diff --git a/home-manager/modules/zellij.nix b/home-manager/modules/zellij.nix index d7da232..a668691 100644 --- a/home-manager/modules/zellij.nix +++ b/home-manager/modules/zellij.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { home.packages = with pkgs; [ zellij ]; diff --git a/hosts/configuration.nix b/hosts/configuration.nix index b68c0a0..194087a 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -1,10 +1,13 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running 'nixos-help'). - -{ config, pkgs, lib, inputs, ... }: - { + config, + pkgs, + lib, + inputs, + ... +}: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix diff --git a/hosts/local-packages.nix b/hosts/local-packages.nix index 2c3e278..d1ad6bc 100644 --- a/hosts/local-packages.nix +++ b/hosts/local-packages.nix @@ -8,13 +8,9 @@ in { environment.systemPackages = with pkgs; [ # Applications - brave - ghostty + brave # TODO: make a module to save browser stuff vesktop - neovim git - fastfetch - # Development tools nodejs wget curl @@ -34,7 +30,6 @@ in { gawk obs-studio lazygit - # Java ecosystem jdk17 maven gradle @@ -85,7 +80,6 @@ in { deno redis cloudflared - # Rust ecosystem rustup cargo-edit cargo-watch @@ -96,19 +90,15 @@ in { pkg-config libxml2 zlib - # Haskell ecosystem ghc cabal-install stack haskell-language-server - # Database tools postgresql sqlite - # Version control tools git-lfs gitAndTools.gh gitAndTools.diff-so-fancy - # misc ani-cli yt-dlp nmap diff --git a/modules/audio.nix b/modules/audio.nix index b8278a3..2ca23c8 100644 --- a/modules/audio.nix +++ b/modules/audio.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/modules/bluetooth.nix b/modules/bluetooth.nix index 6d2e332..e704bde 100644 --- a/modules/bluetooth.nix +++ b/modules/bluetooth.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { hardware.bluetooth = { enable = true; powerOnBoot = true; diff --git a/modules/boot.nix b/modules/boot.nix index 73e42ab..d313ed0 100644 --- a/modules/boot.nix +++ b/modules/boot.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { # Bootloader boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/modules/default.nix b/modules/default.nix index 7431c84..d3731b8 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { imports = [ ./audio.nix ./bluetooth.nix @@ -16,7 +19,6 @@ ./steam.nix ./timezone.nix ./user.nix - ./man.nix ]; # Enable CUPS to print documents. diff --git a/modules/docker.nix b/modules/docker.nix index 1427194..76407d8 100644 --- a/modules/docker.nix +++ b/modules/docker.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { virtualisation.docker = { enable = true; enableOnBoot = true; diff --git a/modules/env.nix b/modules/env.nix index 3abfc1a..ef6077b 100644 --- a/modules/env.nix +++ b/modules/env.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { environment.shellInit = '' if [ -d $HOME/.cargo/bin ]; then export PATH=$PATH:$HOME/.cargo/bin diff --git a/modules/fonts.nix b/modules/fonts.nix index 792f2d5..2ce9a49 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - -let +{ + config, + pkgs, + lib, + ... +}: let clear-sans = pkgs.stdenv.mkDerivation { name = "clear-sans"; src = pkgs.fetchurl { @@ -13,16 +16,14 @@ let cp $src $out/share/fonts/truetype/ClearSans-Regular.ttf ''; }; -in - -{ +in { fonts = { packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-emoji - (nerdfonts.override { fonts = [ "0xProto" "FiraCode" "JetBrainsMono" "Hack" "Noto" "NerdFontsSymbolsOnly" ]; }) + (nerdfonts.override {fonts = ["0xProto" "FiraCode" "JetBrainsMono" "Hack" "Noto" "NerdFontsSymbolsOnly"];}) ipafont kochi-substitute clear-sans @@ -42,10 +43,10 @@ in fontconfig = { enable = true; defaultFonts = { - monospace = [ "0xProto Nerd Font" "Noto Sans Mono CJK JP" ]; - sansSerif = [ "Clear Sans" "Noto Sans CJK JP" ]; - serif = [ "Noto Serif" "Noto Serif CJK JP" ]; - emoji = [ "Noto Color Emoji" ]; + monospace = ["0xProto Nerd Font" "Noto Sans Mono CJK JP"]; + sansSerif = ["Clear Sans" "Noto Sans CJK JP"]; + serif = ["Noto Serif" "Noto Serif CJK JP"]; + emoji = ["Noto Color Emoji"]; }; }; }; diff --git a/modules/home-manager.nix b/modules/home-manager.nix index 49c119c..1e08aff 100644 --- a/modules/home-manager.nix +++ b/modules/home-manager.nix @@ -1,5 +1,10 @@ -{ config, pkgs, lib, inputs, ... }: { + config, + pkgs, + lib, + inputs, + ... +}: { imports = [ inputs.home-manager.nixosModules.home-manager ]; diff --git a/modules/i3-xfce.nix b/modules/i3-xfce.nix index 2de5807..1fa3ae5 100644 --- a/modules/i3-xfce.nix +++ b/modules/i3-xfce.nix @@ -1,9 +1,11 @@ -{ config, pkgs, lib, ... }: - -let - customPkgs = import ../pkgs { inherit pkgs lib; }; -in { + config, + pkgs, + lib, + ... +}: let + customPkgs = import ../pkgs {inherit pkgs lib;}; +in { services.xserver.enable = true; services.xserver.xkb = { layout = "us"; @@ -118,22 +120,24 @@ in GTK2_RC_FILES = "$HOME/.gtkrc-2.0"; }; - environment.systemPackages = with pkgs; [ - arandr - nitrogen - xclip - lxappearance - libsForQt5.qt5ct - gnome-themes-extra - gsettings-desktop-schemas - adwaita-qt - arc-theme - arc-icon-theme - papirus-icon-theme - numix-icon-theme-circle - candy-icons - ] ++ (with customPkgs; [ - tokyo-night-gtk - vivid-icons - ]); + environment.systemPackages = with pkgs; + [ + arandr + nitrogen + xclip + lxappearance + libsForQt5.qt5ct + gnome-themes-extra + gsettings-desktop-schemas + adwaita-qt + arc-theme + arc-icon-theme + papirus-icon-theme + numix-icon-theme-circle + candy-icons + ] + ++ (with customPkgs; [ + tokyo-night-gtk + vivid-icons + ]); } diff --git a/modules/man.nix b/modules/man.nix deleted file mode 100644 index bc93b5c..0000000 --- a/modules/man.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - documentation = { - enable = true; - dev.enable = true; - doc.enable = true; - info.enable = true; - man = { - enable = true; - generateCaches = true; - }; - nixos.enable = true; - }; - - environment.pathsToLink = [ "/share/man" "/share/doc" ]; - - environment.systemPackages = with pkgs; [ - man-pages - man-pages-posix - stdmanpages - docutils - python311Packages.docutils - python311Packages.docstr-coverage - python310Packages.docutils - python310Packages.docstr-coverage - texlivePackages.documentation - docbook5 - docbook-xsl-ns - docbook-xsl-nons - doctoc - doctave - documentation-highlighter - ]; - - environment.variables = { - MANPATH = [ - "${config.system.path}/share/man" - "${pkgs.man-pages}/share/man" - "${pkgs.man-pages-posix}/share/man" - ]; - }; -} diff --git a/modules/net.nix b/modules/net.nix index 1f58b1e..d75c7c8 100644 --- a/modules/net.nix +++ b/modules/net.nix @@ -1,7 +1,10 @@ -{ config, pkgs, lib, ... }: - { - networking.wireless.enable = false; # Enables wireless support via wpa_supplicant. + config, + pkgs, + lib, + ... +}: { + networking.wireless.enable = false; # Enables wireless support via wpa_supplicant. networking.hostName = "nixos"; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; diff --git a/modules/nixos.nix b/modules/nixos.nix index c3b53ee..b2bc73e 100644 --- a/modules/nixos.nix +++ b/modules/nixos.nix @@ -1,12 +1,15 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { nixpkgs.config.allowUnfree = true; programs.nix-index.enable = true; programs.command-not-found.enable = false; nix.settings = { auto-optimise-store = true; - experimental-features = [ "nix-command" "flakes" ]; + experimental-features = ["nix-command" "flakes"]; substituters = [ "https://cache.nixos.org" ]; diff --git a/modules/nvidia.nix b/modules/nvidia.nix index a28cab2..fdafe7b 100644 --- a/modules/nvidia.nix +++ b/modules/nvidia.nix @@ -1,7 +1,10 @@ -{ config, pkgs, lib, ... }: - { - services.xserver.videoDrivers = [ "nvidia" ]; + config, + pkgs, + lib, + ... +}: { + services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia = { modesetting.enable = true; diff --git a/modules/steam.nix b/modules/steam.nix index be187ed..89d21b5 100644 --- a/modules/steam.nix +++ b/modules/steam.nix @@ -1,6 +1,11 @@ -{ config, pkgs, lib, inputs, system, ... }: - { + config, + pkgs, + lib, + inputs, + system, + ... +}: { programs.steam = { enable = true; remotePlay.openFirewall = true; diff --git a/modules/timezone.nix b/modules/timezone.nix index 23bf6b9..cb9f39e 100644 --- a/modules/timezone.nix +++ b/modules/timezone.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - { + config, + pkgs, + lib, + ... +}: { time.timeZone = "America/Edmonton"; i18n.defaultLocale = "en_CA.UTF-8"; } diff --git a/modules/user.nix b/modules/user.nix index 0638ed9..66928eb 100644 --- a/modules/user.nix +++ b/modules/user.nix @@ -1,15 +1,16 @@ -{ config, pkgs, lib, ... }: - -let - fish-rust = pkgs.callPackage ../pkgs/fish-rust { }; -in - { + config, + pkgs, + lib, + ... +}: let + fish-rust = pkgs.callPackage ../pkgs/fish-rust {}; +in { # Define a user account. Don't forget to set a password with 'passwd'. users.users.cobray = { isNormalUser = true; description = "Mon Aie"; - extraGroups = [ "networkmanager" "wheel" "docker" "video" ]; + extraGroups = ["networkmanager" "wheel" "docker" "video"]; shell = fish-rust; packages = with pkgs; [ # User-specific packages can be defined here diff --git a/pkgs/default.nix b/pkgs/default.nix index 1b4997a..8aadf62 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,11 +1,12 @@ -{ pkgs ? import {}, lib ? pkgs.lib }: -let +{ + pkgs ? import {}, + lib ? pkgs.lib, +}: let python-pymatting = pkgs.callPackage ./python-pymatting { inherit (pkgs) lib fetchPypi; python310Packages = pkgs.python310.pkgs; }; -in -{ +in { fish-rust = pkgs.callPackage ./fish-rust {}; python-pymatting = python-pymatting; python-rembg = pkgs.callPackage ./python-rembg { diff --git a/pkgs/fish-rust/default.nix b/pkgs/fish-rust/default.nix index 0b4ecd2..c70242e 100644 --- a/pkgs/fish-rust/default.nix +++ b/pkgs/fish-rust/default.nix @@ -1,5 +1,11 @@ -{ lib, rustPlatform, fetchgit, ncurses, python3Packages, gettext }: - +{ + lib, + rustPlatform, + fetchgit, + ncurses, + python3Packages, + gettext, +}: rustPlatform.buildRustPackage rec { pname = "fish"; version = "4.1-2025-03-16-rust"; @@ -19,7 +25,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = [ ncurses gettext ]; + buildInputs = [ncurses gettext]; nativeBuildInputs = with python3Packages; [ sphinx sphinx_rtd_theme diff --git a/pkgs/python-pymatting/default.nix b/pkgs/python-pymatting/default.nix index 32f88af..50bc125 100644 --- a/pkgs/python-pymatting/default.nix +++ b/pkgs/python-pymatting/default.nix @@ -7,7 +7,7 @@ python310Packages.buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-LNt8S++s3e9Netwt6ONKJy3mOdYIrlwKCGE9+kJTgQE="; # Updated hash + sha256 = "sha256-LNt8S++s3e9Netwt6ONKJy3mOdYIrlwKCGE9+kJTgQE="; }; propagatedBuildInputs = with python310Packages; [ diff --git a/pkgs/python-rembg/default.nix b/pkgs/python-rembg/default.nix index d2c009b..4ae68c6 100644 --- a/pkgs/python-rembg/default.nix +++ b/pkgs/python-rembg/default.nix @@ -1,5 +1,9 @@ -{ lib, python310Packages, fetchPypi, python-pymatting }: - +{ + lib, + python310Packages, + fetchPypi, + python-pymatting, +}: python310Packages.buildPythonPackage rec { pname = "rembg"; version = "2.0.50"; @@ -40,6 +44,6 @@ python310Packages.buildPythonPackage rec { homepage = "https://github.com/danielgatis/rembg"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ "Cobray" ]; + maintainers = with maintainers; ["Cobray"]; }; } diff --git a/pkgs/tokyo-night/default.nix b/pkgs/tokyo-night/default.nix index 52d5afc..8c23f92 100644 --- a/pkgs/tokyo-night/default.nix +++ b/pkgs/tokyo-night/default.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine, gtk_engines, bash, sassc }: - +{ + lib, + stdenv, + fetchFromGitHub, + gtk-engine-murrine, + gtk_engines, + bash, + sassc, +}: stdenv.mkDerivation { pname = "tokyo-night-gtk"; version = "2025-03-16"; @@ -11,9 +18,9 @@ stdenv.mkDerivation { sha256 = "0c7sp9n2pc70yy9msmbmcyhqbr63v1ssnsxk6vg10zwwc3wl19h0"; }; - nativeBuildInputs = [ bash sassc ]; - buildInputs = [ gtk-engine-murrine gtk_engines ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + nativeBuildInputs = [bash sassc]; + buildInputs = [gtk-engine-murrine gtk_engines]; + propagatedUserEnvPkgs = [gtk-engine-murrine]; patchPhase = '' cd themes @@ -54,6 +61,6 @@ stdenv.mkDerivation { homepage = "https://github.com/Fausto-Korpsvart/Tokyo-Night-GTK-Theme"; license = licenses.gpl3; platforms = platforms.all; - maintainers = [ "Cobray" ]; + maintainers = ["Cobray"]; }; } diff --git a/pkgs/vivid-icons/default.nix b/pkgs/vivid-icons/default.nix index fc530fe..d3b46ab 100644 --- a/pkgs/vivid-icons/default.nix +++ b/pkgs/vivid-icons/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, hicolor-icon-theme }: +{ + lib, + stdenv, + fetchFromGitHub, + hicolor-icon-theme, +}: stdenv.mkDerivation rec { pname = "vivid-icons"; version = "2025-03-16"; @@ -8,40 +13,40 @@ stdenv.mkDerivation rec { rev = "fe8b8f1bdd3784dc838c125bb9e1b2d713f40e67"; sha256 = "1rcphy08r6337gbp98nz00mj780jn9kwm40ngd9pxnlvwp2n8mjj"; }; - buildInputs = [ hicolor-icon-theme ]; + buildInputs = [hicolor-icon-theme]; installPhase = '' - mkdir -p $out/share/icons - cp -r "Vivid Icons Themes/"* $out/share/icons/ - for theme in $out/share/icons/*; do - if [ -d "$theme" ]; then - echo "Processing theme: $theme" - cat > "$theme/index.theme" < "$theme/index.theme" <