feat: Add nix code formatter, and format code
This commit is contained in:
parent
1c61854a11
commit
301bcb8b2e
9 changed files with 122 additions and 101 deletions
|
|
@ -1,6 +1,9 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
# Home Manager needs a bit of information about you and the
|
||||
# paths it should manage.
|
||||
home.username = "kdb424";
|
||||
|
|
@ -25,7 +28,5 @@
|
|||
../modules/common.nix
|
||||
../modules/commonGUI.nix
|
||||
../modules/linuxGUI.nix
|
||||
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
# Home Manager needs a bit of information about you and the
|
||||
# paths it should manage.
|
||||
home.username = "kdb424";
|
||||
|
|
@ -30,6 +32,5 @@
|
|||
../modules/common.nix
|
||||
../modules/mac.nix
|
||||
../modules/commonGUI.nix
|
||||
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
# Home Manager needs a bit of information about you and the
|
||||
# paths it should manage.
|
||||
home.username = "kdb424";
|
||||
|
|
@ -20,6 +22,5 @@
|
|||
programs.home-manager.enable = true;
|
||||
imports = [
|
||||
../modules/common.nix
|
||||
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,102 +1,108 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
# Make sure ZSH is installed
|
||||
zsh # Mac includes x86_64. Nix is always native
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
# Make sure ZSH is installed
|
||||
zsh # Mac includes x86_64. Nix is always native
|
||||
|
||||
# dotfiles
|
||||
yadm
|
||||
# dotfiles
|
||||
yadm
|
||||
|
||||
# builtin replacements
|
||||
htop # modern top
|
||||
bottom # even more top
|
||||
bat # modern cat
|
||||
colordiff # gimme my colours
|
||||
du-dust # modern du
|
||||
eza # modern ls
|
||||
fd # way faster find
|
||||
ripgrep # faster grep
|
||||
thefuck # Can't type? fuck
|
||||
zoxide # cd is just too slow
|
||||
fzf # fuzzy finding
|
||||
sd # sed, but rusty
|
||||
tealdeer # tldr, but rusty
|
||||
# builtin replacements
|
||||
htop # modern top
|
||||
bottom # even more top
|
||||
bat # modern cat
|
||||
colordiff # gimme my colours
|
||||
du-dust # modern du
|
||||
eza # modern ls
|
||||
fd # way faster find
|
||||
ripgrep # faster grep
|
||||
thefuck # Can't type? fuck
|
||||
zoxide # cd is just too slow
|
||||
fzf # fuzzy finding
|
||||
sd # sed, but rusty
|
||||
tealdeer # tldr, but rusty
|
||||
|
||||
# multiplexers
|
||||
tmate # here's what I see
|
||||
# multiplexers
|
||||
tmate # here's what I see
|
||||
|
||||
# misc tools
|
||||
tree # I don't even know what to grep
|
||||
p7zip # gotta extract 'em all
|
||||
yt-dlp # yoink yt
|
||||
mkvtoolnix # the only container that matters
|
||||
hyperfine # benchmark
|
||||
neofetch # Check what system I'm on
|
||||
comma # run things without installing them
|
||||
screen # multiplexer
|
||||
# misc tools
|
||||
tree # I don't even know what to grep
|
||||
p7zip # gotta extract 'em all
|
||||
yt-dlp # yoink yt
|
||||
mkvtoolnix # the only container that matters
|
||||
hyperfine # benchmark
|
||||
neofetch # Check what system I'm on
|
||||
comma # run things without installing them
|
||||
screen # multiplexer
|
||||
|
||||
# vcs
|
||||
git
|
||||
git-lfs
|
||||
# vcs
|
||||
git
|
||||
git-lfs
|
||||
|
||||
# editors
|
||||
#vim
|
||||
# editors
|
||||
#vim
|
||||
|
||||
# tui apps
|
||||
cmus
|
||||
#ncdu_2
|
||||
# tui apps
|
||||
cmus
|
||||
#ncdu_2
|
||||
|
||||
# networking
|
||||
gping # ping with TUI
|
||||
iperf # local speed checks
|
||||
nmap # where in my network is it again...
|
||||
wget # generic "gimme"
|
||||
speedtest-cli # ISP speed check
|
||||
rsync # OUR files
|
||||
# networking
|
||||
gping # ping with TUI
|
||||
iperf # local speed checks
|
||||
nmap # where in my network is it again...
|
||||
wget # generic "gimme"
|
||||
speedtest-cli # ISP speed check
|
||||
rsync # OUR files
|
||||
|
||||
imagemagick # wal dep
|
||||
imagemagick # wal dep
|
||||
|
||||
picocom # microcontrollers
|
||||
picocom # microcontrollers
|
||||
|
||||
# TODO Remove this
|
||||
# languages
|
||||
nim
|
||||
rustup
|
||||
# TODO Remove this
|
||||
# languages
|
||||
nim
|
||||
rustup
|
||||
|
||||
# docs
|
||||
pandoc
|
||||
# docs
|
||||
pandoc
|
||||
|
||||
gnumake
|
||||
gnumake
|
||||
|
||||
# TODO To this
|
||||
# TODO To this
|
||||
|
||||
# Useful utils
|
||||
grex # regex made easy
|
||||
git-cliff # useful commit messages
|
||||
# Useful utils
|
||||
grex # regex made easy
|
||||
git-cliff # useful commit messages
|
||||
|
||||
# nix-only tools
|
||||
comma # Command IS found I said
|
||||
# nix-only tools
|
||||
comma # Command IS found I said
|
||||
|
||||
# nix tools
|
||||
nix-prefetch-github
|
||||
nix-index # needed by comma
|
||||
direnv
|
||||
nix-direnv
|
||||
cachix
|
||||
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
coreutils # provides `dd` with --status=progress
|
||||
wifi-password
|
||||
time # GNU time
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
iputils # provides `ping`, `ifconfig`, ...
|
||||
libuuid # `uuidgen` (already pre-installed on mac)
|
||||
ispell # doom emacs
|
||||
iotop # disk top
|
||||
iftop # network top
|
||||
bandwhich # bandwidth utility
|
||||
];
|
||||
# nix tools
|
||||
nix-prefetch-github
|
||||
nix-index # needed by comma
|
||||
direnv
|
||||
nix-direnv
|
||||
cachix
|
||||
alejandra # nix code formatter
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
coreutils # provides `dd` with --status=progress
|
||||
wifi-password
|
||||
time # GNU time
|
||||
]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
iputils # provides `ping`, `ifconfig`, ...
|
||||
libuuid # `uuidgen` (already pre-installed on mac)
|
||||
ispell # doom emacs
|
||||
iotop # disk top
|
||||
iftop # network top
|
||||
bandwhich # bandwidth utility
|
||||
];
|
||||
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
|
|
@ -105,8 +111,7 @@
|
|||
keyMode = "emacs";
|
||||
sensibleOnTop = true;
|
||||
terminal = "screen-256color";
|
||||
plugins = with pkgs;
|
||||
[
|
||||
plugins = with pkgs; [
|
||||
{
|
||||
plugin = tmuxPlugins.resurrect;
|
||||
extraConfig = "set -g @resurrect-strategy-nvim 'session'";
|
||||
|
|
@ -197,7 +202,7 @@
|
|||
syntax off
|
||||
silent! colorscheme wal
|
||||
";
|
||||
settings = { ignorecase = true; };
|
||||
settings = {ignorecase = true;};
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
fonts.fontconfig.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
# fonts
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
gtk = {
|
||||
enable = true;
|
||||
theme = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs; [
|
||||
curl
|
||||
nodePackages.pnpm # betterdiscord
|
||||
|
|
|
|||
|
|
@ -88,3 +88,6 @@
|
|||
(setq projectile-project-search-path '(("~/src/" . 1)))
|
||||
|
||||
(setq magit-revision-show-gravatars '("^Author: " . "^Commit: "))
|
||||
|
||||
;; better nix code formatter
|
||||
(set-formatter! 'alejandra "alejandra --quiet" :modes '(nix-mode))
|
||||
|
|
|
|||
1
.zshrc
1
.zshrc
|
|
@ -131,6 +131,7 @@ trypath ${HOME}/.scripts
|
|||
trypath ${HOME}/bin
|
||||
trypath ${HOME}/.local/bin
|
||||
trypath ${HOME}/.emacs.d/bin
|
||||
trypath ${HOME}/.config/emacs/bin
|
||||
trypath ${HOME}/src/klipper_estimator/target/release
|
||||
|
||||
# Dev tools to PATH
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue