anthonycicc/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Wiki Activity

switch to nixfmt-rfc-style, run nix fmt

Browse source
This commit is contained in:
Anthony Cicchetti 2025-01-25 11:02:36 -05:00
parent 601817ece5
commit 414550da70
16 changed files with 300 additions and 190 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
flake.nix
View file

@ -3,7 +3,9 @@
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz"; nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz";
devenv = { devenv = {
url = "github:cachix/devenv"; url = "github:cachix/devenv";
inputs = {nixpkgs.follows = "nixpkgs";}; inputs = {
nixpkgs.follows = "nixpkgs";
};
}; };
}; };
@ -12,29 +14,41 @@
extra-substituters = "https://devenv.cachix.org"; extra-substituters = "https://devenv.cachix.org";
}; };
outputs = { outputs =
{
nixpkgs, nixpkgs,
devenv, devenv,
systems, systems,
... ...
} @ inputs: let }@inputs:
let
forEachSystem = nixpkgs.lib.genAttrs (import systems); forEachSystem = nixpkgs.lib.genAttrs (import systems);
in { in
formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.alejandra); {
devShells = formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
forEachSystem devShells = forEachSystem (
(system: let system:
let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
in { in
{
default = devenv.lib.mkShell { default = devenv.lib.mkShell {
inherit inputs pkgs; inherit inputs pkgs;
modules = [ modules = [
{ {
# https://devenv.sh/reference/options/ # https://devenv.sh/reference/options/
packages = [pkgs.hello pkgs.delta pkgs.difftastic pkgs.alejandra pkgs.nodePackages.bash-language-server pkgs.shellcheck pkgs.shfmt]; packages = [
pkgs.hello
pkgs.delta
pkgs.difftastic
pkgs.alejandra
pkgs.nodePackages.bash-language-server
pkgs.shellcheck
pkgs.shfmt
];
pre-commit.hooks = { pre-commit.hooks = {
alejandra.enable = true; nixfmt-rfc-style.enable = true;
black.enable = true; black.enable = true;
deadnix.enable = true; deadnix.enable = true;
stylua.enable = true; stylua.enable = true;
@ -45,6 +59,7 @@
} }
]; ];
}; };
}); }
);
}; };
} }

38
nix/home-manager/flake.nix
View file

@ -16,7 +16,9 @@
inputs = { inputs = {
# Specify the source of Home Manager and Nixpkgs. # Specify the source of Home Manager and Nixpkgs.
nixpkgs = {url = "github:nixos/nixpkgs";}; nixpkgs = {
url = "github:nixos/nixpkgs";
};
flake-utils.url = "github:numtide/flake-utils"; # not directly used, but common source for the several flakes that do use it flake-utils.url = "github:numtide/flake-utils"; # not directly used, but common source for the several flakes that do use it
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
@ -59,7 +61,8 @@
}; };
}; };
outputs = { outputs =
{
self, self,
nixpkgs, nixpkgs,
home-manager, home-manager,
@ -70,15 +73,21 @@
nixneovimplugins, nixneovimplugins,
ghostty, ghostty,
... ...
}: let }:
supportedSystems = ["aarch64-darwin" "x86_64-linux"]; let
supportedSystems = [
"aarch64-darwin"
"x86_64-linux"
];
forAllSystems = nixpkgs.lib.genAttrs supportedSystems; forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
pkgs = forAllSystems ( pkgs = forAllSystems (
system: system:
import nixpkgs { import nixpkgs {
inherit system; inherit system;
config = {allowUnfree = true;}; config = {
allowUnfree = true;
};
overlays = [ overlays = [
ghostty.overlays.default ghostty.overlays.default
# (_final: prev: { # (_final: prev: {
@ -97,8 +106,7 @@
} }
); );
homeManagerConfigs = forAllSystems ( homeManagerConfigs = forAllSystems (system: {
system: {
pkgs = pkgs.${system}; pkgs = pkgs.${system};
modules = [ modules = [
{ {
@ -109,12 +117,16 @@
nix-index-database.hmModules.nix-index nix-index-database.hmModules.nix-index
./home.nix ./home.nix
]; ];
} });
); in
in { {
formatter = forAllSystems (system: pkgs.${system}.alejandra); formatter = forAllSystems (system: pkgs.${system}.nixfmt-rfc-style);
homeConfigurations.aarch64-darwin-acicchetti = home-manager.lib.homeManagerConfiguration homeManagerConfigs."aarch64-darwin"; homeConfigurations.aarch64-darwin-acicchetti =
homeConfigurations.x86_64-linux-acicchetti = home-manager.lib.homeManagerConfiguration homeManagerConfigs."x86_64-linux"; home-manager.lib.homeManagerConfiguration
homeManagerConfigs."aarch64-darwin";
homeConfigurations.x86_64-linux-acicchetti =
home-manager.lib.homeManagerConfiguration
homeManagerConfigs."x86_64-linux";
defaultPackage.aarch64-darwin = self.homeConfigurations.aarch64-darwin-acicchetti.activationPackage; defaultPackage.aarch64-darwin = self.homeConfigurations.aarch64-darwin-acicchetti.activationPackage;
defaultPackage.x86_64-linux = self.homeConfigurations.x86_64-linux-acicchetti.activationPackage; defaultPackage.x86_64-linux = self.homeConfigurations.x86_64-linux-acicchetti.activationPackage;

24
nix/home-manager/home.nix
View file

@ -1,13 +1,12 @@
{pkgs, ...}: let { pkgs, ... }:
let
inherit (pkgs.stdenv.hostPlatform) isDarwin; inherit (pkgs.stdenv.hostPlatform) isDarwin;
in { in
{
home = { home = {
username = "acicchetti"; username = "acicchetti";
homeDirectory = homeDirectory = if isDarwin then "/Users/acicchetti" else "/home/acicchetti";
if isDarwin
then "/Users/acicchetti"
else "/home/acicchetti";
stateVersion = "24.11"; stateVersion = "24.11";
@ -100,7 +99,18 @@ in {
enable = true; enable = true;
settings = { settings = {
misc = { misc = {
disable = ["node" "nix" "home_manager" "gem" "ruby_gems" "cargo" "vim" "pipx" "pip3" "containers"]; disable = [
"node"
"nix"
"home_manager"
"gem"
"ruby_gems"
"cargo"
"vim"
"pipx"
"pip3"
"containers"
];
run_in_tmux = true; run_in_tmux = true;
display_time = true; display_time = true;
skip_notify = true; skip_notify = true;

3
nix/home-manager/modules/environment.nix
View file

@ -1,4 +1,5 @@
{...}: { { ... }:
{
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
PAGE = "page -q 90000 -z 90000"; PAGE = "page -q 90000 -z 90000";

25
nix/home-manager/modules/files.nix
View file

@ -2,19 +2,21 @@
pkgs, pkgs,
config, config,
... ...
}: let }:
let
inherit (pkgs.stdenv.hostPlatform) isLinux; inherit (pkgs.stdenv.hostPlatform) isLinux;
repo_root = "../../.."; repo_root = "../../..";
nv_fonts_basic = ["TX-02-BerkeleyAC" "Maple Mono NF" "Departure Mono" "Fantasque Sans Mono"]; nv_fonts_basic = [
"TX-02-BerkeleyAC"
"Maple Mono NF"
"Departure Mono"
"Fantasque Sans Mono"
];
nv_fonts_normal = nv_fonts_normal =
nv_fonts_basic nv_fonts_basic ++ (if isLinux then [ "Noto Color Emoji" ] else [ "Apple Color Emoji" ]);
++ (
if isLinux
then ["Noto Color Emoji"]
else ["Apple Color Emoji"]
);
nv_fonts_italic = [ "Dank Mono" ] ++ nv_fonts_basic; nv_fonts_italic = [ "Dank Mono" ] ++ nv_fonts_basic;
in { in
{
home.file = { home.file = {
"/.zsh.d/" = { "/.zsh.d/" = {
source = ./${repo_root}/zsh/funcs; source = ./${repo_root}/zsh/funcs;
@ -34,7 +36,10 @@ in {
# Could avoid setting this at all with another `isLinux` but whatever, doesn't truly matter # Could avoid setting this at all with another `isLinux` but whatever, doesn't truly matter
"target.x86_64-unknown-linux-gnu" = { "target.x86_64-unknown-linux-gnu" = {
linker = "clang"; linker = "clang";
rustflags = ["-C" "link-arg=-fuse-ld=${config.home.profileDirectory}/bin/mold"]; rustflags = [
"-C"
"link-arg=-fuse-ld=${config.home.profileDirectory}/bin/mold"
];
}; };
"registries.crates-io" = { "registries.crates-io" = {
protocol = "sparse"; protocol = "sparse";

58
nix/home-manager/modules/packages/default.nix
View file

@ -1,14 +1,33 @@
{pkgs, ...}: let { pkgs, ... }:
let
inherit (pkgs.stdenv.hostPlatform) isLinux; inherit (pkgs.stdenv.hostPlatform) isLinux;
systemSpecificPackages = with pkgs; systemSpecificPackages =
if isLinux with pkgs;
if
isLinux
# ncdu (well, all zig packages) don't work on macOS nix right now # ncdu (well, all zig packages) don't work on macOS nix right now
then [zsh racket mold ncdu ghostty] then
else [keka colima neovide aerospace]; [
cy = { zsh
racket
mold
ncdu
ghostty
xorg.libX11
]
else
[
keka
colima
neovide
aerospace
];
cy =
{
pkgs, pkgs,
fetchFromGitHub, fetchFromGitHub,
}: let }:
let
ver = "1.3.1"; ver = "1.3.1";
in in
pkgs.buildGoModule { pkgs.buildGoModule {
@ -37,7 +56,8 @@
runHook postInstall runHook postInstall
''; '';
}; };
in { in
{
imports = [ imports = [
./git.nix ./git.nix
./mise.nix ./mise.nix
@ -48,7 +68,8 @@ in {
./zsh.nix ./zsh.nix
# ./cy.nix # ./cy.nix
]; ];
home.packages = with pkgs; home.packages =
with pkgs;
[ [
_1password-cli _1password-cli
nerd-fonts._0xproto nerd-fonts._0xproto
@ -57,7 +78,6 @@ in {
cargo-workspaces cargo-workspaces
clipboard-jh clipboard-jh
curl curl
(callPackage cy {})
departure-mono departure-mono
docker-client docker-client
dogedns dogedns
@ -66,7 +86,13 @@ in {
emacs emacs
fantasque-sans-mono fantasque-sans-mono
fd fd
(fenix.latest.withComponents ["cargo" "clippy" "rustfmt" "rust-src" "rustc"]) (fenix.latest.withComponents [
"cargo"
"clippy"
"rustfmt"
"rust-src"
"rustc"
])
ffmpeg_6 ffmpeg_6
gawkInteractive gawkInteractive
gnugrep gnugrep
@ -104,5 +130,13 @@ in {
zenith zenith
zstd zstd
] ]
++ systemSpecificPackages; ++ systemSpecificPackages
++ (
if isLinux then
[ ]
else
[
(callPackage cy { })
]
);
} }

3
nix/home-manager/modules/packages/emacs.nix
View file

@ -1,4 +1,5 @@
{...}: { { ... }:
{
home.file = { home.file = {
".doom.d/init.el".source = ../../../../emacs/emacs.doom/init.el; ".doom.d/init.el".source = ../../../../emacs/emacs.doom/init.el;
".doom.d/config.el".source = ../../../../emacs/emacs.doom/config.el; ".doom.d/config.el".source = ../../../../emacs/emacs.doom/config.el;

3
nix/home-manager/modules/packages/git.nix
View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
programs.git = { programs.git = {
enable = true; enable = true;
# Don't use difftastic on git-diff by default # Don't use difftastic on git-diff by default

3
nix/home-manager/modules/packages/mise.nix
View file

@ -1,4 +1,5 @@
{...}: { { ... }:
{
programs.mise = { programs.mise = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;

48
nix/home-manager/modules/packages/neovim.nix
View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
programs.nixvim = { programs.nixvim = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
@ -41,10 +42,16 @@
}; };
} }
]; ];
lualine_b = ["filename" "branch"]; lualine_b = [
"filename"
"branch"
];
lualine_c = [ "%=" ]; lualine_c = [ "%=" ];
lualine_x = [ ]; lualine_x = [ ];
lualine_y = ["filetype" "progress"]; lualine_y = [
"filetype"
"progress"
];
lualine_z = [ lualine_z = [
{ {
__unkeyed-1 = "location"; __unkeyed-1 = "location";
@ -65,17 +72,21 @@
}; };
lsp = { lsp = {
enable = true; enable = true;
preConfig = '' preConfig = '''';
'';
servers = { servers = {
bashls.enable = true; bashls.enable = true;
gopls.enable = true; gopls.enable = true;
jsonls.enable = true; jsonls.enable = true;
pyright.enable = true; # In preference to attempting to use pylyzer pyright.enable = true; # In preference to attempting to use pylyzer
nil_ls.enable = true; nil_ls.enable = true;
rust_analyzer = let rust_analyzer =
fenix = fenix.latest.withComponents ["cargo" "rustc"]; let
in { fenix = fenix.latest.withComponents [
"cargo"
"rustc"
];
in
{
enable = true; enable = true;
installCargo = false; installCargo = false;
installRustc = false; installRustc = false;
@ -175,7 +186,10 @@
project-nvim = { project-nvim = {
enable = true; enable = true;
enableTelescope = true; enableTelescope = true;
settings.detection_methods = ["lsp" "pattern"]; settings.detection_methods = [
"lsp"
"pattern"
];
}; };
telescope = { telescope = {
enable = true; enable = true;
@ -273,8 +287,7 @@
web-devicons.enable = true; web-devicons.enable = true;
}; };
extraPlugins = extraPlugins =
( (with pkgs.vimPlugins; [
with pkgs.vimPlugins; [
rainbow-delimiters-nvim rainbow-delimiters-nvim
telescope-symbols-nvim telescope-symbols-nvim
overseer-nvim overseer-nvim
@ -284,8 +297,7 @@
vim-dispatch-neovim vim-dispatch-neovim
vim-expand-region vim-expand-region
nvim-ufo nvim-ufo
] ])
)
++ (with pkgs.awesomeNeovimPlugins; [ ++ (with pkgs.awesomeNeovimPlugins; [
linrongbin16-gitlinker-nvim linrongbin16-gitlinker-nvim
officer-nvim officer-nvim
@ -321,12 +333,18 @@
{ {
key = "<c-k>"; key = "<c-k>";
action = "<c-u>"; action = "<c-u>";
mode = ["n" "v"]; mode = [
"n"
"v"
];
} }
{ {
key = "<c-j>"; key = "<c-j>";
action = "<c-d>"; action = "<c-d>";
mode = ["n" "v"]; mode = [
"n"
"v"
];
} }
{ {
key = "<leader>n"; key = "<leader>n";

22
nix/home-manager/modules/packages/ssh.nix
View file

@ -2,22 +2,24 @@
config, config,
pkgs, pkgs,
... ...
}: let }:
let
inherit (pkgs.stdenv.hostPlatform) isDarwin; inherit (pkgs.stdenv.hostPlatform) isDarwin;
_1pass_socket = _1pass_socket =
if isDarwin if isDarwin then
then "${config.home.homeDirectory}/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock" "${config.home.homeDirectory}/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
else "${config.home.homeDirectory}/.1password/agent.sock"; else
in { "${config.home.homeDirectory}/.1password/agent.sock";
in
{
programs.ssh = { programs.ssh = {
enable = true; enable = true;
includes = includes = if isDarwin then [ "${config.home.homeDirectory}/.colima/ssh_config" ] else [ ];
if isDarwin
then ["${config.home.homeDirectory}/.colima/ssh_config"]
else [];
matchBlocks = { matchBlocks = {
"10.*" = { "10.*" = {
setEnv = {"TERM" = "xterm-256color";}; setEnv = {
"TERM" = "xterm-256color";
};
}; };
"acicchetti.dev" = { "acicchetti.dev" = {
extraOptions = { extraOptions = {

3
nix/home-manager/modules/packages/starship.nix
View file

@ -1,4 +1,5 @@
{...}: { { ... }:
{
programs.starship = { programs.starship = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;

3
nix/home-manager/modules/packages/zellij.nix
View file

@ -1,4 +1,5 @@
{...}: { { ... }:
{
programs.zellij = { programs.zellij = {
enable = true; enable = true;
enableZshIntegration = false; # automatically sets up a session - I don't want this, I want manual control of my sessions enableZshIntegration = false; # automatically sets up a session - I don't want this, I want manual control of my sessions

30
nix/home-manager/modules/packages/zsh.nix
View file

@ -1,6 +1,8 @@
{pkgs, ...}: let { pkgs, ... }:
let
inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux; inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux;
in { in
{
programs.zsh = { programs.zsh = {
enable = true; enable = true;
initExtraFirst = '' initExtraFirst = ''
@ -15,17 +17,19 @@ in {
initExtra = builtins.readFile ../../../../zsh/zshrc; initExtra = builtins.readFile ../../../../zsh/zshrc;
antidote = { antidote = {
enable = true; enable = true;
plugins = let plugins =
let
ohmyzsh-lib = "ohmyzsh/oh-my-zsh path:lib"; ohmyzsh-lib = "ohmyzsh/oh-my-zsh path:lib";
ohmyzsh-plugin = "ohmyzsh/oh-my-zsh path:plugins"; ohmyzsh-plugin = "ohmyzsh/oh-my-zsh path:plugins";
extraPlugins = extraPlugins =
if isLinux if isLinux then
then [] [ ]
else if isDarwin else if isDarwin then
then [ [
"${ohmyzsh-plugin}/brew" "${ohmyzsh-plugin}/brew"
] ]
else []; else
[ ];
in in
extraPlugins extraPlugins
++ [ ++ [
@ -82,13 +86,15 @@ in {
AGE = "rage"; AGE = "rage";
AGE_KEYPATH = "op://Jellyfish/age-key"; AGE_KEYPATH = "op://Jellyfish/age-key";
}; };
shellAliases = let shellAliases =
let
platformSpecificAliases = platformSpecificAliases =
if isLinux if isLinux then
then { {
cp = "cp --reflink=auto"; cp = "cp --reflink=auto";
} }
else { else
{
# exa = "eza -l --git"; # exa = "eza -l --git";
# ls = "exa"; # ls = "exa";
nv = "neovide --fork"; nv = "neovide --fork";

3
nix/home-manager/modules/services/default.nix
View file

@ -1,4 +1,5 @@
{...}: { { ... }:
{
imports = [ imports = [
./git-sync.nix ./git-sync.nix
]; ];

3
nix/home-manager/modules/services/git-sync.nix
View file

@ -1,4 +1,5 @@
{config, ...}: { { config, ... }:
{
services.git-sync = { services.git-sync = {
enable = true; enable = true;
repositories = { repositories = {