From 3bebe25adb39ff6e096f52ef1df7fa059bbc912e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 17 Feb 2026 20:53:52 +0100 Subject: [PATCH] remove duplicates already provided by niphas - Delete configs/bash.nix (identical to niphas, was dead code) - Delete configs/direnv.nix (dead code, niphas provides direnv) - Delete packages/vimv.nix (identical to niphas) - Remove vimv from overlay and packages output - Alias niveum-terminal/browser/filemanager to niphas equivalents - Remove 17 duplicate packages from configs/packages.nix - Remove nil from configs/editor.nix (niphas provides it) - Remove dead dmenu packageOverride from configs/default.nix --- configs/bash.nix | 10 ---------- configs/default.nix | 3 --- configs/direnv.nix | 42 ------------------------------------------ configs/editor.nix | 1 - configs/packages.nix | 17 ----------------- flake.nix | 8 +++----- packages/vimv.nix | 27 --------------------------- 7 files changed, 3 insertions(+), 105 deletions(-) delete mode 100644 configs/bash.nix delete mode 100644 configs/direnv.nix delete mode 100644 packages/vimv.nix diff --git a/configs/bash.nix b/configs/bash.nix deleted file mode 100644 index d542722..0000000 --- a/configs/bash.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, ... }: -{ - programs.bash = { - promptInit = ''PS1="$(${pkgs.ncurses}/bin/tput bold)\w \$([[ \$? == 0 ]] && echo \"\[\033[1;32m\]\" || echo \"\[\033[1;31m\]\")\$$(${pkgs.ncurses}/bin/tput sgr0) "''; - interactiveShellInit = '' - set -o vi - ''; - completion.enable = true; - }; -} diff --git a/configs/default.nix b/configs/default.nix index 533a06a..0d3ad83 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -16,9 +16,6 @@ in nixpkgs = { config = { allowUnfree = true; - packageOverrides = pkgs: { - dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"''; - }; permittedInsecurePackages = [ ]; }; diff --git a/configs/direnv.nix b/configs/direnv.nix deleted file mode 100644 index 1506ba3..0000000 --- a/configs/direnv.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ pkgs, ... }: -let - nixify = pkgs.writers.writeDashBin "nixify" '' - set -efuC - - if [ ! -e ./.envrc ]; then - echo use_nix > .envrc - direnv allow - fi - if [ ! -e shell.nix ]; then - cat > shell.nix <<'EOF' - { pkgs ? import {} }: - pkgs.mkShell { - packages = []; - } - EOF - ''${EDITOR:-vim} shell.nix - fi - ''; -in -{ - environment.systemPackages = [ - pkgs.direnv - nixify - ]; - - home-manager.users.me.programs.direnv = { - enable = true; - stdlib = builtins.readFile "${ - pkgs.fetchFromGitHub { - owner = "Mic92"; - repo = "dotfiles"; - rev = "a0a9b7e358fa70a85cd468f8ca1fbb02ae0a91df"; - sha256 = "1y9h5s1lf59sczsm0ksq2x1yhl98ba9lwk5yil3q53rg7n4574pg"; - } - }/home/.direnvrc"; - }; - - programs.zsh.interactiveShellInit = '' - eval "$(${pkgs.direnv}/bin/direnv hook zsh)" - ''; -} diff --git a/configs/editor.nix b/configs/editor.nix index 7e6058a..28e0c45 100644 --- a/configs/editor.nix +++ b/configs/editor.nix @@ -38,7 +38,6 @@ pkgs.pyright pkgs.haskellPackages.haskell-language-server pkgs.texlab - pkgs.nil pkgs.gopls pkgs.nixfmt-rfc-style pkgs.rust-analyzer diff --git a/configs/packages.nix b/configs/packages.nix index 54a9b20..51ee95e 100644 --- a/configs/packages.nix +++ b/configs/packages.nix @@ -70,23 +70,16 @@ in GPODDER_DOWNLOAD_DIR=${config.users.users.me.home}/mobile/audio/Text/podcasts exec ${pkgs.gpodder}/bin/gpodder "$@" '') # INTERNET - aria2 telegram-desktop - whois - dnsutils # FILE MANAGERS lf - pcmanfm # MEDIA ffmpeg simplescreenrecorder imagemagick exiftool - nsxiv graphviz # SHELL - bat # better cat - dos2unix genpass # generate passwords (pkgs.writers.writeDashBin "genpassphrase" ''${pkgs.genpass}/bin/genpass "$@" --passphrase | ${pkgs.gnused}/bin/sed 's/ /-/g;s/\(^\|-\)\([a-z]\)/\1\U\2/g;s/$/-'$(${pkgs.coreutils}/bin/date +%Y)'/' '') gcc @@ -94,16 +87,10 @@ in pup # html toolkit xan # csv toolkit magic-wormhole-rs # file transfer - man-pages - man-pages-posix exfat # to mount windows drives # HARDWARE TOOLS gnome-disk-utility arandr # xrandr for noobs - wdisplays - libnotify # for notify-send - wl-clipboard # clipboard CLI - dragon-drop # drag and drop portfolio # personal finance overview audacity calibre @@ -254,10 +241,6 @@ in # proselint asciidoctor wordnet - tokei # count lines of code - gnumake - binutils # for strip, ld, ... - # nightly.rust shellcheck # photography diff --git a/flake.nix b/flake.nix index c1ed5f1..e381f36 100644 --- a/flake.nix +++ b/flake.nix @@ -200,9 +200,9 @@ }; overlays.default = final: prev: { - niveum-terminal = prev.alacritty; - niveum-browser = prev.firefox; - niveum-filemanager = prev.pcmanfm; + niveum-terminal = final.niphas-terminal; + niveum-browser = final.niphas-web-browser; + niveum-filemanager = final.niphas-file-browser; ashell = nixpkgs-unstable.legacyPackages.${prev.system}.ashell; @@ -344,7 +344,6 @@ unicodmenu = prev.callPackage packages/unicodmenu.nix { }; vg = prev.callPackage packages/vg.nix { }; vim-kmein = prev.callPackage packages/vim-kmein { }; - vimv = prev.callPackage packages/vimv.nix { }; klem = prev.callPackage packages/klem.nix { }; yt-dlp-master = prev.callPackage packages/yt-dlp-master.nix { }; @@ -622,7 +621,6 @@ vim-kmein vim-typewriter vim-email - vimv weechat-declarative wttr yt-dlp-master diff --git a/packages/vimv.nix b/packages/vimv.nix deleted file mode 100644 index 1502ad0..0000000 --- a/packages/vimv.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - stdenv, - bash, - fetchFromGitHub, -}: -stdenv.mkDerivation { - name = "vimv"; - src = fetchFromGitHub { - owner = "thameera"; - repo = "vimv"; - rev = "4152496c1946f68a13c648fb7e583ef23dac4eb8"; - sha256 = "1fsrfx2gs6bqx7wk7pgcji2i2x4alqpsi66aif4kqvnpqfhcfzjd"; - }; - phases = [ "installPhase" ]; - installPhase = '' - mkdir -p $out/bin - sed 's:#!/bin/bash:#!${bash}/bin/bash:' $src/vimv > $out/bin/vimv - chmod 755 $out/bin/vimv - ''; - meta = with lib; { - homepage = "https://github.com/thameera/vimv"; - description = "Batch-rename files using Vim"; - license = licenses.mit; - platforms = platforms.all; - }; -}