cry/flake
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reorganise /homes

Browse source
This commit is contained in:
do butterflies cry? 2026-03-22 12:26:35 +10:00
parent 719bd1de6b
commit 85071855ec
Signed by: cry
GPG key ID: F68745A836CA0412
32 changed files with 219 additions and 1031 deletions
Download patch file Download diff file Expand all files Collapse all files

118
homes/me/default.nix
View file

@ -1,27 +1,28 @@
{pkgs, ...}: {
imports = [
../modules/fish.nix
../modules/btop.nix
../modules/tmux.nix
../modules/git.nix
../modules/bat.nix
../modules/term/foot.nix
./modules/cli/git.nix
./modules/cli/ssh.nix
../modules/term/foot.nix
../modules/shell/fish.nix
../modules/shell/zsh.nix
../modules/editor/helix.nix
../modules/editor/neovim
../modules/cli/bat.nix
../modules/cli/btop.nix
../modules/cli/hyfetch.nix
../modules/cli/tmux.nix
../modules/apps/firefox.nix
../modules/apps/zen-browser.nix
../modules/apps/thunderbird.nix
../modules/apps/nixcord.nix
../modules/apps/spicetify.nix
# ../modules/wm
../modules/wm/mangowc.nix
# ../modules/wm/hypr/hyprland.nix
# ../modules/wm/hypr/hyprlock.nix
../modules/kanshi.nix
../modules/mako.nix
../modules/wm/hyprland
../modules/wm/mango
../modules/de/mako.nix
];
home = {
@ -33,6 +34,10 @@
trybuild = "nh os test ~/flake";
# shell utilities
ls = "eza --color=auto";
l = "eza -Alh --color=auto --icons=auto";
ll = "eza -lh --color=auto --icons=auto";
li = "eza --color=auto --git-ignore";
rgf = "rg --files | rg";
watch = "viddy";
};
@ -84,98 +89,9 @@
style.name = "gtk2";
};
programs = {
hyfetch = {
enable = true;
settings = {
backend = "neofetch";
args = null;
distro = null;
preset = "transfeminine"; # "nonbinary";
pride_month_disable = false;
custom_ascii_path = null;
mode = "rgb";
light_dark = "dark";
auto_detect_light_dark = true;
lightness = 0.65;
color_align = {
mode = "horizontal";
};
};
};
zsh = {
enable = true;
enableCompletion = true;
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
history = {
size = 10000;
ignoreAllDups = true;
path = "$HOME/.zsh_history";
ignorePatterns = [
"rm *"
];
};
};
# set ssh profiles
# WARNING: this DOES NOT start the ssh-agent
# WARNING: for that you need to use `services.ssh-agent.enable`
ssh = {
enable = true;
forwardAgent = false;
addKeysToAgent = "yes";
matchBlocks = {
butterfly = {
hostname = "dobutterfliescry.net";
user = "cry";
port = 42069;
identityFile = "~/keys/butterfly";
setEnv = {
TERM = "xterm-256color";
};
};
hyrule = {
hostname = "hyrule.dobutterfliescry.net";
user = "cry";
port = 42069;
identityFile = "~/keys/hyrule";
setEnv = {
TERM = "xterm-256color";
};
};
matcha = {
hostname = "192.168.88.250";
user = "emile";
port = 22;
identityFile = "~/keys/matcha";
};
youcue = {
hostname = "moss.labs.eait.uq.edu.au";
user = "s4740056";
port = 22;
identityFile = "~/keys/other/youcue";
setEnv = {
TERM = "xterm-256color";
};
};
};
};
};
services = {
# enable OpenSSH private key agent
# ssh-agent.enable = true;
gnome-keyring.enable = true;
};
# the ssh-agent won't set this for itself...
# systemd.user.sessionVariables.SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/ssh-agent";
home.stateVersion = "24.05"; # don't change this
}

122
homes/me/modules/cli/git.nix Executable file
View file

@ -0,0 +1,122 @@
{
config,
pkgs,
...
}: {
home.packages = with pkgs; [
delta # git diff viewer
];
programs = {
git = {
enable = true;
lfs.enable = true;
signing = {
key = "F68745A836CA0412";
format = "openpgp";
signByDefault = true;
};
settings = {
user.name = "_cry64";
user.email = "them@dobutterfliescry.net";
alias = {
s = "status";
d = "diff";
l = "log";
c = "commit";
p = "push";
};
color.ui = true;
core.editor = "hx";
github.user = "cry128";
# delta diff viewer
core.pager = "delta";
interactive.diffFilter = "delta --color-only";
delta = {
navigate = true;
line-numbers = true;
side-by-side = true;
};
merge.conflictStyle = "zdiff3";
init = {
defaultBranch = "main";
};
url = {
"git@github.com:" = {
insteadOf = [
"gh:"
"github:"
];
};
"https://gitlab.com/" = {
insteadOf = [
"gl:"
"gitlab:"
];
};
"git@codeberg.org:" = {
insteadOf = [
"cb:"
"codeberg:"
];
};
"git@tearforge.net/" = {
insteadOf = [
"cry:"
"forge:"
];
};
};
};
includes = [
{
path = "/home/me/agribit/.gitconfig";
condition = "gitdir:/home/me/agribit/**";
}
# {
# path = "/home/me/luminary/.gitconfig";
# condition = "gitdir:/home/me/luminary/**";
# }
];
};
lazygit = {
enable = true;
enableFishIntegration = true;
enableZshIntegration = true;
shellWrapperName = "lg";
settings = {
gui = {
useHunkModeInStagingView = false;
skipDiscardChangeWarning = false;
skipStashWarning = true;
animateExplosion = true; # FUCK YEAHHHHHHHHHHHHHHHHHHHHHHHHH
theme = {
lightTheme = false;
activeBorderColor = ["green" "bold"];
inactiveBorderColor = ["white"];
selectedLineBgColor = ["default"];
};
};
git.pagers = [
{
pager = "delta --dark --pager=never";
}
];
};
};
};
}

46
homes/me/modules/cli/ssh.nix Normal file
View file

@ -0,0 +1,46 @@
{...}: {
# set ssh profiles
# WARNING: this DOES NOT start the ssh-agent
# WARNING: for that you need to use `services.ssh-agent.enable`
programs.ssh = {
enable = true;
forwardAgent = false;
addKeysToAgent = "yes";
matchBlocks = {
butterfly = {
hostname = "dobutterfliescry.net";
user = "cry";
port = 42069;
identityFile = "~/keys/butterfly";
setEnv = {
TERM = "xterm-256color";
};
};
hyrule = {
hostname = "hyrule.dobutterfliescry.net";
user = "cry";
port = 42069;
identityFile = "~/keys/hyrule";
setEnv = {
TERM = "xterm-256color";
};
};
matcha = {
hostname = "192.168.88.250";
user = "emile";
port = 22;
identityFile = "~/keys/matcha";
};
youcue = {
hostname = "moss.labs.eait.uq.edu.au";
user = "s4740056";
port = 22;
identityFile = "~/keys/other/youcue";
setEnv = {
TERM = "xterm-256color";
};
};
};
};
}