pagedmov/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more work on neovim config, added keyboard sound thing for kitty

Browse Source
This commit is contained in:
pagedmov
2026-03-08 03:57:31 -04:00
parent bf22e791d1
commit 4308b8eb16
55 changed files with 411 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/home/environment/hyprland.nix
View File

@@ -23,6 +23,11 @@ let
"border_size 0, match:float 0, match:workspace f[1]"
"rounding 0, match:float 0, match:workspace f[1]"
];
hostWorkspaces = if (host == "phosphorous") then
[
"m[DP-3], layoutopt:orientation:top"
]
else [];
in {
options = {
@@ -82,7 +87,7 @@ in {
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &"
];
workspace = (if (config.movOpts.envConfig.hyprlandConfig.workspaceLayout == "dualmonitor") then [
workspace = hostWorkspaces ++ (if (config.movOpts.envConfig.hyprlandConfig.workspaceLayout == "dualmonitor") then [
"1,persistent=true,monitor:${builtins.elemAt mons 0}"
"2,persistent=true,monitor:${builtins.elemAt mons 0}"
"3,persistent=true,monitor:${builtins.elemAt mons 0}"
@@ -159,7 +164,7 @@ in {
border_size = 3;
"col.active_border" = lib.mkForce "rgba(404042ff)";
"col.inactive_border" = lib.mkForce "rgba(83858a00)";
layout = "dwindle";
layout = "master";
resize_on_border = true;
snap = {
@@ -191,6 +196,8 @@ in {
master = {
new_status = "master";
special_scale_factor = 1;
mfact = 0.65;
new_on_top = true;
};
decoration = {
@@ -237,7 +244,10 @@ in {
"super shift, m, exit,"
"super, m, exec, fuzzel"
"super, r, exec, neovide"
"super, b, togglesplit, # dwindle"
"super, b, layoutmsg, togglesplit, # dwindle"
"super, comma, layoutmsg, rollnext" # comma
"super, period, layoutmsg, rollprev"
"super, n, layoutmsg, swapwithmaster"
"super, f, togglefloating"
"super, g, fullscreen"
"super, h, movefocus, l"

24
modules/home/environment/shed/autocmd.nix Normal file
View File

@@ -0,0 +1,24 @@
{ self, pkgs, ... }:
let
shellsound = "${pkgs.myScripts.playshellsound}/bin/playshellsound";
color-commit = "${pkgs.myScripts.color-commit}/bin/color-commit";
sndpath = "${self}/assets/sound";
in
{
programs.shed = {
autocmds = [
{
hooks = [ "post-cmd" ];
command = "export PROMPT_GIT_LINE=\"$(prompt_git_line)\"";
}
{
hooks = [ "on-history-open" ];
command = ''[ -n "$_NUM_MATCHES" ] && [ "$_NUM_MATCHES" -gt 0 ] && ${shellsound} "${sndpath}/nvim.wav"; fi'';
}
{
hooks = [ "on-completion-start" ];
command = ''[ -n "$_NUM_MATCHES" ] && [ "$_NUM_MATCHES" -gt 1 ] && ${shellsound} "${sndpath}/nvim.wav"; fi'';
}
];
};
}

1
modules/home/environment/shed/default.nix
View File

@@ -9,5 +9,6 @@
./options.nix
./keymaps.nix
./functions.nix
./autocmd.nix
];
}

7
modules/home/environment/shed/extraconfig.nix
View File

@@ -7,8 +7,11 @@ in
{
programs.shed = {
settings.extraPostConfig = /* bash */ ''
export PS1="\!prompt "
export PSR='\e[36;1m$\!shed_ver\e[0m'
export PS1="\@prompt "
export PSR='\e[36;1m$\@shed_ver\e[0m'
export PROMPT_GIT_LINE="$(prompt_git_line)"
if [ "$0" = "-shed" ]; then
${shellsound} $FLAKEPATH/assets/sound/login.wav
fi

150
modules/home/environment/shed/functions.nix
View File

@@ -9,7 +9,59 @@ in
functions = {
prompt_topline = /* bash */ ''
local user_and_host="\e[0m\e[1m$USER\e[1;36m@\e[1;31m$HOST\e[0m"
echo -n "\e[1;34m┏━ $user_and_host\n"
local mode_text="$(prompt_mode)"
echo -n "\e[1;34m┏━ $user_and_host $mode_text\n"
'';
prompt_mode = /* bash */ ''
local mode=""
local normal_fg='\e[0m\e[30m\e[1;43m'
local normal_bg='\e[0m\e[33m'
local insert_fg='\e[0m\e[30m\e[1;46m'
local insert_bg='\e[0m\e[36m'
local command_fg='\e[0m\e[30m\e[1;42m'
local command_bg='\e[0m\e[32m'
local visual_fg='\e[0m\e[30m\e[1;45m'
local visual_bg='\e[0m\e[35m'
local replace_fg='\e[0m\e[30m\e[1;41m'
local replace_bg='\e[0m\e[31m'
local search_fg='\e[0m\e[30m\e[1;47m'
local search_bg='\e[0m\e[39m'
local complete_fg='\e[0m\e[30m\e[1;47m'
local complete_bg='\e[0m\e[39m'
case "$SHED_VI_MODE" in
"NORMAL")
mode="$normal_bg''${normal_fg}NORMAL$normal_bg\e[0m"
;;
"INSERT")
mode="$insert_bg''${insert_fg}INSERT$insert_bg\e[0m"
;;
"COMMAND")
mode="$command_bg''${command_fg}COMMAND$command_bg\e[0m"
;;
"VISUAL")
mode="$visual_bg''${visual_fg}VISUAL$visual_bg\e[0m"
;;
"REPLACE")
mode="$replace_bg''${replace_fg}REPLACE$replace_bg\e[0m"
;;
"VERBATIM")
mode="$replace_bg''${replace_fg}VERBATIM$replace_bg\e[0m"
;;
"COMPLETE")
mode="$complete_bg''${complete_fg}COMPLETE$complete_bg\e[0m"
;;
"SEARCH")
mode="$search_bg''${search_fg}SEARCH$search_bg\e[0m"
;;
*)
mode=""
;;
esac
echo -en "$mode\n"
'';
prompt_stat_line = /* bash */ ''
@@ -17,71 +69,68 @@ in
local last_cmd_status
local last_cmd_runtime
if [ "$last_exit_code" -eq "0" ]; then
last_cmd_status="\e[1;32m\e[0m"
last_cmd_status="\e[1;32m"
else
last_cmd_status="\e[1;31m\e[0m"
last_cmd_status="\e[1;31m"
fi
local last_runtime_raw="$(echo -p "\t")"
if [ -z "$last_runtime_raw" ]; then
return 0
else
last_cmd_runtime="\e[1;38;2;249;226;175m󰔛 $(echo -p "\T")\e[0m"
last_cmd_runtime="\e[1;38;2;249;226;175m󰔛 ''${last_cmd_status}$(echo -p "\T")\e[0m"
fi
echo -n "\e[1;34m┃ $last_cmd_runtime ($last_cmd_status)\n"
echo -n "\e[1;34m┃ $last_cmd_runtime\e[0m\n"
'';
prompt_git_line = /* bash */ ''
git rev-parse --is-inside-work-tree > /dev/null 2>&1 || return
local status="$(git status --porcelain -b 2>/dev/null)" || return
local gitsigns
local status="$(git status --porcelain 2>/dev/null)"
local branch="$(git branch --show-current 2>/dev/null)"
local branch="" gitsigns="" ahead=0 behind=0
local header="''${status%%$'\n'*}"
[ -n "$status" ] && echo "$status" | command grep -q '^ [MADR]' && gitsigns="$gitsigns!"
[ -n "$status" ] && echo "$status" | command grep -q '^??' && gitsigns="$gitsigns?"
[ -n "$status" ] && echo "$status" | command grep -q '^[MADR]' && gitsigns="$gitsigns+"
branch="''${header#\#\# }"
branch="''${branch%%...*}"
case "$header" in
*ahead*) ahead="''${header#*ahead }"; ahead="''${ahead%%[],]*}"; gitsigns="''${gitsigns}↑" ;;
esac
case "$header" in
*behind*) behind="''${header#*behind }"; behind="''${behind%%[],]*}"; gitsigns="''${gitsigns}↓" ;;
esac
local ahead="$(git rev-list --count @{upstream}..HEAD 2>/dev/null)"
local behind="$(git rev-list --count HEAD..@{upstream} 2>/dev/null)"
[ $ahead -gt 0 ] && gitsigns="$gitsigns↑"
[ $behind -gt 0 ] && gitsigns="$gitsigns↓"
case "$status" in
*$'\n'" "[MAR]*) gitsigns="''${gitsigns}!" ;;
esac
case "$status" in
*$'\n'"??"*) gitsigns="''${gitsigns}?" ;;
esac
case "$status" in
*$'\n'" "[D]*) gitsigns="''${gitsigns}" ;;
esac
case "$status" in
*$'\n'[MADR]*) gitsigns="''${gitsigns}+" ;;
esac
local diff="$(git diff --shortstat)"
local add=""
local del=""
local changed=""
i=0
while read -d "," part; do
if [ $i -ge 3 ]; then break; fi
case $i in
0)
changed="$(echo $part | cut -d' ' -f1)"
;;
1)
add="$(echo $part | cut -d' ' -f1)"
;;
2)
del="$(echo $part | cut -d' ' -f1)"
;;
esac
i=$(($i + 1))
done < <(echo "$diff,")
local diff="$(git diff --shortstat 2>/dev/null)"
local diff="$(git diff --shortstat 2>/dev/null)"
local changed="" add="" del=""
if [ -n "$diff" ]; then
changed="''${diff%% file*}"; changed="''${changed##* }"
case "$diff" in
*insertion*) add="''${diff#*, }"; add="''${add%% *}" ;;
esac
case "$diff" in
*deletion*) del="''${diff% deletion*}"; del="''${del##* }" ;;
esac
fi
if [ -n "$gitsigns" ] || [ -n "$branch" ]; then
if [ -n "$gitsigns" ]; then
gitsigns="\e[1;31m[$gitsigns]"
fi
if [ -n "$changed" ] && [ "$changed" -gt 0 ]; then
changed="\e[1;34m~$changed \e[0m"
fi
if [ -n "$add" ] && [ "$add" -gt 0 ]; then
add="\e[1;32m+$add \e[0m"
fi
if [ -n "$del" ] && [ "$del" -gt 0 ]; then
del="\e[1;31m-$del\e[0m"
fi
echo -n "\e[1;34m┃ \e[1;35m $branch$gitsigns\e[0m $changed$add$del\n"
[ -n "$gitsigns" ] && gitsigns="\e[1;31m[$gitsigns]"
[ -n "$changed" ] && [ "$changed" -gt 0 ] && changed="\e[1;34m~$changed \e[0m"
[ -n "$add" ] && [ "$add" -gt 0 ] && add="\e[1;32m+$add \e[0m"
[ -n "$del" ] && [ "$del" -gt 0 ] && del="\e[1;31m-$del\e[0m"
echo -n "\e[1;34m┃ \e[1;35m $branch$gitsigns\e[0m $changed$add$del\n"
fi
'';
@@ -110,12 +159,11 @@ in
prompt = /* bash */ ''
local statline="$(prompt_stat_line)"
local topline="$(prompt_topline)"
local gitline="$(prompt_git_line)"
local jobsline="$(prompt_jobs_line)"
local sshline="$(prompt_ssh_line)"
local pwdline="$(prompt_pwd_line)"
local dollarline="$(prompt_dollar_line)"
local prompt="$topline$statline$gitline$jobsline$sshline$pwdline\n$dollarline"
local prompt="$topline$statline$PROMPT_GIT_LINE$jobsline$sshline$pwdline\n$dollarline"
echo -en "$prompt"
'';

7
modules/home/environment/shed/keymaps.nix
View File

@@ -42,12 +42,6 @@
_surround_2 = /* bash */ ''
local start
local end
if [ -z "$_ANCHOR" ]; then
echo "No anchor" 1>&2
fi
if [ -z "$_CURSOR" ]; then
echo "No cursor"
fi
if [ "$_ANCHOR" -lt "$_CURSOR" ]; then
start=$_ANCHOR
end=$_CURSOR
@@ -62,7 +56,6 @@
left="''${_BUFFER:0:$start}"
mid="''${_BUFFER:$start:$delta}"
right="''${_BUFFER:$end}"
echo "sl = $_sl sr = $_sr start = $start end = $end delta = $delta left = $left mid = $mid right = $right" 1>&2
_BUFFER="$left$_sl$mid$_sr$right"
_CURSOR=$start
'';

1
modules/home/environment/shed/options.nix
View File

@@ -7,6 +7,7 @@
settings = {
autocd = true;
autoHistory = true;
maxHistoryEntries = -1;
};
};
}

1
modules/home/environment/userpkgs.nix
View File

@@ -69,6 +69,7 @@ in {
dust
porsmo
w3m
sox
neovide
claude-code
pythonWithStuff

29
modules/home/environment/userservices.nix
View File

@@ -1,5 +1,9 @@
{ pkgs, self, ... }:
let
pythonWithPkgs = pkgs.python3.withPackages (p: [ p.evdev ]);
keyboardSfxScript = "${self}/assets/scripts/keyboard_sound_thing.py";
in
{
systemd.user = {
timers = {
@@ -13,26 +17,11 @@
};
};
services = {
loginSound = {
Unit= {
Description = "Plays a sound on login";
After = [ "graphical-session.target" ];
WantedBy = [ "graphical-session.target" ];
};
Service = {
ExecStart = "${pkgs.alsa-utils}/bin/aplay -qN ${self}/assets/sound/login.wav";
Type = "simple";
};
};
maintenanceCheck = {
Unit = {
Description = "Check for updates in my maintained packages";
};
Service = {
ExecStart = "${pkgs.nix}/bin/nix-shell -p python3Packages.requests --run '${pkgs.python311}/bin/python ${pkgs.myScripts.check_updates}/bin/checkupdates.py'";
Type = "simple";
kitty-keyboard-sounds = {
description = "Keyboard sound effects for kitty";
wantedBy = [ "hyprland-session.target" ];
serviceConfig = {
ExecStart = "${pythonWithPkgs}/bin/python3 ${keyboardSfxScript}";
};
};
};

2
modules/home/files.nix
View File

@@ -38,7 +38,7 @@ in {
};
config = {
home.file = {
".config/neofetch/config.conf".text = ''
".config/fastfetch/config.conf".text = ''
username=$(whoami)
name_length=''${#username}
total_width=40

91
modules/home/programs/nixvim/keymaps.nix
View File

@@ -52,9 +52,94 @@
mode = [ "n" "t" ];
}
{
action = "<cmd>COQnow<CR>";
key = "!cq";
mode = "n";
action = "<cmd>lua require('treesj').toggle()<CR>";
key = "<space>j";
mode = [ "n" ];
}
{
action = "<C-\\><C-n>";
key = "<C-e>";
mode = [ "t" ];
}
{
action = ''"+y'';
key = "<space>y";
mode = [ "n" "x" ];
}
{
action = ''"+p'';
key = "<space>p";
mode = [ "n" "x" ];
}
{
action.__raw = /*lua*/''function() require('opencode').prompt('test', {submit=true}) end'';
key = "<space>at";
mode = [ "n" "x" ];
}
{
action.__raw = /*lua*/''function() require('opencode').select() end'';
key = "<space>as";
mode = [ "n" "x" ];
}
{
action.__raw = /*lua*/''function() require('opencode').prompt('document', {submit=true}) end'';
key = "<space>ad";
mode = [ "n" "x" ];
}
{
action.__raw = /*lua*/''function() require('opencode').prompt('review', {submit=true}) end'';
key = "<space>ar";
mode = [ "n" "x" ];
}
{
action.__raw = /*lua*/''function() require('opencode').prompt('fix', {submit=true}) end'';
key = "<space>af";
mode = [ "n" "x" ];
}
{
action.__raw = /*lua*/''function() require('opencode').ask("@this ", {submit=true}) end'';
key = "<space>aa";
mode = [ "n" "x" ];
}
{
action.__raw = /*lua*/''function() require('opencode').explain("@this ") end'';
key = "<space>ae";
mode = [ "n" "x" ];
}
{
action.__raw = /*lua*/''function() require('opencode').command("session.half.page.up") end'';
key = "<C-S-u>";
mode = [ "n" "x" ];
}
{
action.__raw = /*lua*/''function() require('opencode').command("session.half.page.down") end'';
key = "<C-S-d>";
mode = [ "n" "x" ];
}
{
action.__raw = /*lua*/''function() require('opencode').command("prompt.clear") end'';
key = "<C-c>";
mode = [ "n" "x" ];
}
{
action.__raw = /*lua*/''function() require('opencode').operator("@this ") end'';
key = "go";
mode = [ "n" "x" ];
}
{
action.__raw = /*lua*/''function() return require('opencode').operator("@this ") .. "_" end'';
key = "goo";
mode = [ "n" ];
}
{
action = "<cmd>lua require('opencode').toggle()<CR>";
key = "<C-.>";
mode = [ "n" "t" ];
}
{
action = "<cmd>lua require('opencode').select()<CR>";
key = "<C-n>";
mode = [ "n" "x" ];
}
];
};

2
modules/home/programs/nixvim/plugins/airline.nix
View File

@@ -1,7 +1,7 @@
{
programs.nixvim = {
plugins.airline = {
enable = true;
enable = false;
settings = {
left_sep = "";
right_sep = "";

0
modules/home/programs/nixvim/plugins/alpha.nix Executable file → Normal file
View File

0
modules/home/programs/nixvim/plugins/barbar.nix Executable file → Normal file
View File

12
modules/home/programs/nixvim/plugins/bufferline.nix Normal file
View File

@@ -0,0 +1,12 @@
{
programs.nixvim = {
plugins.bufferline = {
enable = true;
settings = {
options = {
separator_style = "slant";
};
};
};
};
}

0
modules/home/programs/nixvim/plugins/cmp.nix Executable file → Normal file
View File

18
modules/home/programs/nixvim/plugins/copilot.nix
View File

@@ -1,9 +1,17 @@
{
programs.nixvim.plugins.copilot-lua = {
enable = true;
settings = {
suggestion = {
auto_trigger = false;
programs.nixvim = {
plugins = {
copilot-lua = {
enable = true;
settings = {
suggestion = {
auto_trigger = false;
};
};
};
opencode = {
enable = true;
};
};
};

0
modules/home/programs/nixvim/plugins/coq.nix Executable file → Normal file
View File

7
modules/home/programs/nixvim/plugins/default.nix Executable file → Normal file
View File

@@ -4,7 +4,12 @@
imports = [
./otter.nix
./treesitter.nix
./bufferline.nix
./alpha.nix
./mini.nix
./wtf.nix
./snacks.nix
./noice.nix
./haskell.nix
./vim-matchup.nix
# ./coq.nix
@@ -14,7 +19,7 @@
./lsp.nix
./rustaceanvim.nix
./fidget.nix
# ./lualine.nix
./lualine.nix
./airline.nix
./nvim-lightbulb.nix
./neocord.nix

9
modules/home/programs/nixvim/plugins/extra_plugins.nix Executable file → Normal file
View File

@@ -11,15 +11,6 @@
hash = "sha256-Upx29rIPwW/e7Lkmf0PNOpIACnAXIzlkfa6V1p2nYHM=";
};
})
(pkgs.vimUtils.buildVimPlugin {
name = "vim-sneak";
src = pkgs.fetchFromGitHub {
owner = "justinmk";
repo = "vim-sneak";
rev = "c13d0497139b8796ff9c44ddb9bc0dc9770ad2dd";
hash = "sha256-ndWhnV0fgCcqCGwVyM07GfmUB3CitBZbOWvZtsB1tBk=";
};
})
(pkgs.vimUtils.buildVimPlugin {
name = "vim-slash";
src = pkgs.fetchFromGitHub {

2
modules/home/programs/nixvim/plugins/fidget.nix
View File

@@ -1,6 +1,6 @@
{
programs.nixvim.plugins.fidget = {
enable = true;
enable = false;
settings = {
notification = {
overrideVimNotify = true;

0
modules/home/programs/nixvim/plugins/haskell.nix Executable file → Normal file
View File

6
modules/home/programs/nixvim/plugins/lsp.nix Executable file → Normal file
View File

@@ -84,7 +84,7 @@
installRustc = false;
settings = {
check = {
allTargets = false;
allTargets = true;
command = "clippy";
};
};
@@ -99,9 +99,9 @@
options = {
# uses Xenon config because it has every option exposed to it
nixos.expr = ''
(builtins.getFlake "github:pagedMov/nixos-config").nixosConfigurations.xenon.options'';
(builtins.getFlake "github:pagedMov/nixos-config").nixosConfigurations.phosphorous.options'';
home.expr = ''
(builtins.getFlake "github:pagedMov/nixos-config").homeConfigurations.xenonHome.options'';
(builtins.getFlake "github:pagedMov/nixos-config").homeConfigurations.phospohorousHome.options'';
};
};
};

4
modules/home/programs/nixvim/plugins/lualine.nix Executable file → Normal file
View File

@@ -1,7 +1,7 @@
{
programs.nixvim = {
plugins.lualine = {
enable = false;
enable = true;
settings = {
options = {
icons_enabled = true;
@@ -15,7 +15,7 @@
right = "";
};
always_divide_middle = true;
globalstatus = false;
globalstatus = true;
refresh = {
statusline = 1000;
tabline = 1000;

8
modules/home/programs/nixvim/plugins/mini.nix Normal file
View File

@@ -0,0 +1,8 @@
{
programs.nixvim = {
plugins = {
mini-align = { enable = true; };
mini-clue = { enable = true; };
};
};
}

33
modules/home/programs/nixvim/plugins/noice.nix Normal file
View File

@@ -0,0 +1,33 @@
{
programs.nixvim = {
plugins.noice = {
enable = true;
settings = {
views = {
popupmenu = {
relative = "cursor";
position = {
row = -2;
col = -2;
};
size = {
width = 60;
height = "auto";
};
};
cmdline_popup = {
relative = "cursor";
position = {
row = 0;
col = -2;
};
size = {
width = 60;
height = "auto";
};
};
};
};
};
};
}

0
modules/home/programs/nixvim/plugins/nvim-tree.nix Executable file → Normal file
View File

2
modules/home/programs/nixvim/plugins/plugins.nix Executable file → Normal file
View File

@@ -8,6 +8,8 @@
helpview.enable = true;
floaterm.enable = true;
fugitive.enable = true;
hop.enable = true;
wilder.enable = true;
indent-blankline.enable = true;
lastplace.enable = true;
markdown-preview.enable = true;

1
modules/home/programs/nixvim/plugins/rustaceanvim.nix
View File

@@ -7,6 +7,7 @@
server = {
auto_attach = true;
default_settings = {
cfgOverride.test = true;
checkOnSave.command = "clippy";
};
};

7
modules/home/programs/nixvim/plugins/snacks.nix Normal file
View File

@@ -0,0 +1,7 @@
{
programs.nixvim = {
plugins.snacks = {
enable = true;
};
};
}

0
modules/home/programs/nixvim/plugins/telescope.nix Executable file → Normal file
View File

13
modules/home/programs/nixvim/plugins/treesitter.nix
View File

@@ -2,14 +2,11 @@
programs.nixvim = {
plugins.treesitter = {
enable = true;
folding = {
enable = true;
};
indent = {
enable = true;
};
highlight = {
enable = true;
};
plugins.treesj = {
enable = true;
settings = {
use_default_keymaps = false;
};
};
};

0
modules/home/programs/nixvim/plugins/vim-matchup.nix Executable file → Normal file
View File

10
modules/home/programs/nixvim/plugins/wtf.nix Normal file
View File

@@ -0,0 +1,10 @@
{
programs.nixvim = {
plugins.wtf = {
enable = true;
options = {
context = true;
};
};
};
}