mirror of
https://github.com/kmein/niveum
synced 2026-03-16 10:11:08 +01:00
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
This commit is contained in:
@@ -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;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -16,9 +16,6 @@ in
|
|||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
packageOverrides = pkgs: {
|
|
||||||
dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
|
||||||
};
|
|
||||||
permittedInsecurePackages = [
|
permittedInsecurePackages = [
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -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 <nixpkgs> {} }:
|
|
||||||
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)"
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -38,7 +38,6 @@
|
|||||||
pkgs.pyright
|
pkgs.pyright
|
||||||
pkgs.haskellPackages.haskell-language-server
|
pkgs.haskellPackages.haskell-language-server
|
||||||
pkgs.texlab
|
pkgs.texlab
|
||||||
pkgs.nil
|
|
||||||
pkgs.gopls
|
pkgs.gopls
|
||||||
pkgs.nixfmt-rfc-style
|
pkgs.nixfmt-rfc-style
|
||||||
pkgs.rust-analyzer
|
pkgs.rust-analyzer
|
||||||
|
|||||||
@@ -70,23 +70,16 @@ in
|
|||||||
GPODDER_DOWNLOAD_DIR=${config.users.users.me.home}/mobile/audio/Text/podcasts exec ${pkgs.gpodder}/bin/gpodder "$@"
|
GPODDER_DOWNLOAD_DIR=${config.users.users.me.home}/mobile/audio/Text/podcasts exec ${pkgs.gpodder}/bin/gpodder "$@"
|
||||||
'')
|
'')
|
||||||
# INTERNET
|
# INTERNET
|
||||||
aria2
|
|
||||||
telegram-desktop
|
telegram-desktop
|
||||||
whois
|
|
||||||
dnsutils
|
|
||||||
# FILE MANAGERS
|
# FILE MANAGERS
|
||||||
lf
|
lf
|
||||||
pcmanfm
|
|
||||||
# MEDIA
|
# MEDIA
|
||||||
ffmpeg
|
ffmpeg
|
||||||
simplescreenrecorder
|
simplescreenrecorder
|
||||||
imagemagick
|
imagemagick
|
||||||
exiftool
|
exiftool
|
||||||
nsxiv
|
|
||||||
graphviz
|
graphviz
|
||||||
# SHELL
|
# SHELL
|
||||||
bat # better cat
|
|
||||||
dos2unix
|
|
||||||
genpass # generate passwords
|
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)'/' '')
|
(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
|
gcc
|
||||||
@@ -94,16 +87,10 @@ in
|
|||||||
pup # html toolkit
|
pup # html toolkit
|
||||||
xan # csv toolkit
|
xan # csv toolkit
|
||||||
magic-wormhole-rs # file transfer
|
magic-wormhole-rs # file transfer
|
||||||
man-pages
|
|
||||||
man-pages-posix
|
|
||||||
exfat # to mount windows drives
|
exfat # to mount windows drives
|
||||||
# HARDWARE TOOLS
|
# HARDWARE TOOLS
|
||||||
gnome-disk-utility
|
gnome-disk-utility
|
||||||
arandr # xrandr for noobs
|
arandr # xrandr for noobs
|
||||||
wdisplays
|
|
||||||
libnotify # for notify-send
|
|
||||||
wl-clipboard # clipboard CLI
|
|
||||||
dragon-drop # drag and drop
|
|
||||||
portfolio # personal finance overview
|
portfolio # personal finance overview
|
||||||
audacity
|
audacity
|
||||||
calibre
|
calibre
|
||||||
@@ -254,10 +241,6 @@ in
|
|||||||
# proselint
|
# proselint
|
||||||
asciidoctor
|
asciidoctor
|
||||||
wordnet
|
wordnet
|
||||||
tokei # count lines of code
|
|
||||||
gnumake
|
|
||||||
binutils # for strip, ld, ...
|
|
||||||
# nightly.rust
|
|
||||||
shellcheck
|
shellcheck
|
||||||
|
|
||||||
# photography
|
# photography
|
||||||
|
|||||||
@@ -200,9 +200,9 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
overlays.default = final: prev: {
|
overlays.default = final: prev: {
|
||||||
niveum-terminal = prev.alacritty;
|
niveum-terminal = final.niphas-terminal;
|
||||||
niveum-browser = prev.firefox;
|
niveum-browser = final.niphas-web-browser;
|
||||||
niveum-filemanager = prev.pcmanfm;
|
niveum-filemanager = final.niphas-file-browser;
|
||||||
|
|
||||||
ashell = nixpkgs-unstable.legacyPackages.${prev.system}.ashell;
|
ashell = nixpkgs-unstable.legacyPackages.${prev.system}.ashell;
|
||||||
|
|
||||||
@@ -344,7 +344,6 @@
|
|||||||
unicodmenu = prev.callPackage packages/unicodmenu.nix { };
|
unicodmenu = prev.callPackage packages/unicodmenu.nix { };
|
||||||
vg = prev.callPackage packages/vg.nix { };
|
vg = prev.callPackage packages/vg.nix { };
|
||||||
vim-kmein = prev.callPackage packages/vim-kmein { };
|
vim-kmein = prev.callPackage packages/vim-kmein { };
|
||||||
vimv = prev.callPackage packages/vimv.nix { };
|
|
||||||
klem = prev.callPackage packages/klem.nix { };
|
klem = prev.callPackage packages/klem.nix { };
|
||||||
yt-dlp-master = prev.callPackage packages/yt-dlp-master.nix { };
|
yt-dlp-master = prev.callPackage packages/yt-dlp-master.nix { };
|
||||||
|
|
||||||
@@ -622,7 +621,6 @@
|
|||||||
vim-kmein
|
vim-kmein
|
||||||
vim-typewriter
|
vim-typewriter
|
||||||
vim-email
|
vim-email
|
||||||
vimv
|
|
||||||
weechat-declarative
|
weechat-declarative
|
||||||
wttr
|
wttr
|
||||||
yt-dlp-master
|
yt-dlp-master
|
||||||
|
|||||||
@@ -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;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user