delete legacy stuff and reformat

This commit is contained in:
Grisha Shipunov 2025-01-11 03:55:19 +01:00
parent 595d4935de
commit 62e2519639
51 changed files with 714 additions and 1056 deletions

View file

@ -8,37 +8,48 @@
./nix-ld.nix
];
environment.systemPackages = with pkgs; [
bat
fd
file
gnupg
glow
htop
irssi
killall
neovim
ripgrep
tealdeer
traceroute
tcpdump
tree
(aspellWithDicts (ps: with ps; [ en en-science en-computers ru nl ]))
exfatprogs
nmap
bind
nnn
lf
man-pages
unzip
usbutils
pciutils
ouch
cryptsetup
sshfs
whois
mtr
] ++ (if config.networking.hostName == "toaster" then [ gitFull ] else [ git ]);
environment.systemPackages =
with pkgs;
[
bat
fd
file
gnupg
glow
htop
irssi
killall
neovim
ripgrep
tealdeer
traceroute
tcpdump
tree
(aspellWithDicts (
ps: with ps; [
en
en-science
en-computers
ru
nl
]
))
exfatprogs
nmap
bind
nnn
lf
man-pages
unzip
usbutils
pciutils
ouch
cryptsetup
sshfs
whois
mtr
]
++ (if config.networking.hostName == "toaster" then [ gitFull ] else [ git ]);
environment.variables =
let
@ -53,7 +64,8 @@
{
PAGER = "less";
LESS = "-X -R -F";
} // editorconf;
}
// editorconf;
environment.shellAliases = {
ls = "ls --color=auto";

View file

@ -1,4 +1,10 @@
{ lib, config, pkgs, ... }: {
{
lib,
config,
pkgs,
...
}:
{
environment = {
systemPackages = [ pkgs.fzf ];
@ -8,11 +14,15 @@
};
};
# integrate fzf into shell, >23.05 only
programs = with lib;
if (toInt (elemAt (splitVersion config.system.nixos.release) 0) >= 23) then {
fzf = {
keybindings = true;
fuzzyCompletion = true;
};
} else { };
programs =
with lib;
if (toInt (elemAt (splitVersion config.system.nixos.release) 0) >= 23) then
{
fzf = {
keybindings = true;
fuzzyCompletion = true;
};
}
else
{ };
}

View file

@ -1,4 +1,5 @@
{ pkgs, inputs, ... }: {
{ pkgs, inputs, ... }:
{
programs.tmux = {
enable = true;
keyMode = "vi";

View file

@ -1,10 +1,10 @@
{ pkgs, lib, ... }:
{
programs.nix-ld ={
enable = true;
libraries = [
pkgs.stdenv.cc.cc
];
programs.nix-ld = {
enable = true;
libraries = [
pkgs.stdenv.cc.cc
];
};
#environment.variables = {
# NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [

View file

@ -1,9 +1,15 @@
{ lib, pkgs, inputs, ... }: {
{
lib,
pkgs,
inputs,
...
}:
{
nix = {
extraOptions = ''
experimental-features = nix-command flakes
narinfo-cache-negative-ttl = 0
experimental-features = nix-command flakes
narinfo-cache-negative-ttl = 0
'';
};
@ -12,8 +18,10 @@
# override default nix shell nixpkgs# behaviour to use current flake lock
nix.registry =
let flakes = lib.filterAttrs (_name: value: value ? outputs) inputs.self.inputs;
in builtins.mapAttrs (_name: v: { flake = v; }) flakes;
let
flakes = lib.filterAttrs (_name: value: value ? outputs) inputs.self.inputs;
in
builtins.mapAttrs (_name: v: { flake = v; }) flakes;
nix.nixPath = lib.mapAttrsToList (name: value: "${name}=${value.outPath}") inputs.self.inputs;