accomodating for fern package name change to 'shed'

This commit is contained in:
2026-02-24 18:05:46 -05:00
parent e9cbd0d686
commit a5582a584f
14 changed files with 87 additions and 63 deletions

View File

@@ -7,7 +7,7 @@
./starship.nix
./userpkgs.nix
./zsh
./fern
./shed
./swaync.nix
./hyprland.nix
./waybar.nix

View File

@@ -1,13 +1,13 @@
{ lib, config, pkgs, self, ... }:
{
programs.fern = {
programs.shed = {
aliases = {
mv = "mv -v";
cp = "cp -vr";
gt = "gtrash";
gtp = "${pkgs.myScripts.playshellsound}/bin/playshellsound ${self}/assets/sound/rm.wav && gtrash put";
diff = "diff --color=auto";
sr = "source ~/.fernrc";
sr = "source ~/.shedrc";
psg = "ps aux | grep -v grep | grep -i -e VSZ -e";
mkdir = "mkdir -p";
pk = "pkill -9 -f";
@@ -22,6 +22,7 @@
suvi = "sudoedit";
suvide = "EDITOR=neovide; suvi";
rustdev = "nix develop github:km-clay/devshells#rust";
y = "yazi";
ga = "playshellsound ${self}/assets/sound/gitadd.wav; git add";
gcomm = "gitcommit_sfx";

View File

@@ -1,6 +1,6 @@
{ lib, config, ... }:
{
programs.fern = {
programs.shed = {
environmentVars = {
SOUNDS_ENABLED = "true";
EDITOR = "nvim";

View File

@@ -5,12 +5,13 @@ let
sndpath = "${self}/assets/sound";
in
{
programs.fern = {
programs.shed = {
settings.extraPreConfig = ''
prompt_topline() {
local last_exit_code="$?"
local last_cmd_status
local last_cmd_runtime
if [ "$?" -eq "0" ]; then
if [ "$last_exit_code" -eq "0" ]; then
last_cmd_status="\e[1;32m\e[0m"
else
last_cmd_status="\e[1;31m\e[0m"
@@ -89,16 +90,32 @@ in
}
viflake() {
(
while ! [ -f ./flake.nix ]; do
builtin cd ..
if [ "$PWD" = "/" ]; then
echo "No flake.nix found in this directory or any parent directories."
return 1
filename="$(upfind flake.nix)"
if [ -n "$filename" ]; then
nvim "$filename"
else
echo "No flake.nix found in this directory or any parent directories."
return 1
fi
}
upfind() {
until [ "$#" -eq 0 ]; do
filename="$1"
(
until [ -f "./$filename" ]; do
builtin cd ..
if [ "$PWD" = "/" ]; then
echo "upsearch: failed to find file '$filename' in this directory or any parent directories." 1>&2
break
fi
done
if [ -f "./$filename" ]; then
realpath "./$filename"
fi
done
nvim ./flake.nix
)
)
shift 1
done
}
nvim() {
@@ -170,6 +187,10 @@ in
${shellsound} ${sndpath}/cd.wav
}
hyprsock() {
socat -U - UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock
}
vipe() {
local tmp=$(mktemp)
$EDITOR "$tmp" >/dev/tty </dev/tty
@@ -177,7 +198,7 @@ in
rm "$tmp"
}
if [ "$0" = "-fern" ]; then
if [ "$0" = "-shed" ]; then
${shellsound} $FLAKEPATH/assets/sound/login.wav
fi
'';

View File

@@ -1,7 +1,7 @@
{ lib, config, ... }:
{
programs.fern = {
programs.shed = {
enable = true;
settings = {

View File

@@ -1,7 +1,7 @@
{ lib, self, config, host, pkgs, ... }:
let
scheme = "ayu-dark";
scheme = "seti";
wallpaper = "${self}/assets/wallpapers/dark-waves.jpg";
server = (host == "xenon");
in {
@@ -16,7 +16,6 @@ in {
image = wallpaper;
polarity = "dark";
autoEnable = true;
opacity.terminal = 1.0;
targets = {
waybar.enable = false;
spicetify.enable = false;

View File

@@ -14,6 +14,7 @@
settings = {
confirm_os_window_close = 0;
background_opacity = lib.mkForce 0.5;
window_padding_width = 4;
scrollback_lines = 10000;
enable_audio_bell = true;

View File

@@ -5,7 +5,7 @@ in {
programs.nixvim = {
colorschemes.base16 = {
enable = true;
colorscheme = "chalk";
colorscheme = "seti";
#colorscheme = {
# base00 = "#${scheme.base00}";
# base01 = "#${scheme.base01}";
@@ -37,13 +37,15 @@ in {
if vim.g.neovide then
vim.g.neovide_refresh_rate = 144
vim.g.neovide_cursor_animate_in_insert_mode = true
vim.g.neovide_opacity = 0.5;
vim.g.neovide_normal_opacity = 1.0;
end
vim.g.vimwiki_list = {{path = '~/vimwiki/', syntax = 'markdown', ext = '.md'}}
vim.filetype.add({
filename = {
[".fernrc"] = "sh",
[".shedrc"] = "sh",
}
})

View File

@@ -5,14 +5,14 @@
};
config =
let
fern = inputs.fern.packages.${pkgs.stdenv.hostPlatform.system}.default;
shed = inputs.shed.packages.${pkgs.stdenv.hostPlatform.system}.default;
in
lib.mkIf config.movOpts.softwareCfg.sysPkgs.enable {
environment.systemPackages = with pkgs; [
dotnetCorePackages.sdk_8_0_4xx
alsa-lib
xwayland
fern
shed
wayland
alsa-utils
bc