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

accomodating for fern package name change to 'shed'

Browse Source
This commit is contained in:
pagedmov
2026-02-24 18:05:46 -05:00
parent e9cbd0d686
commit a5582a584f
14 changed files with 87 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
flake.lock generated
View File

@@ -20,11 +20,11 @@
]
},
"locked": {
"lastModified": 1770895474,
"narHash": "sha256-JBcrq1Y0uw87VZdYsByVbv+GBuT6ECaCNb9txLX9UuU=",
"lastModified": 1771610171,
"narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "a494d50d32b5567956b558437ceaa58a380712f7",
"rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d",
"type": "github"
},
"original": {
@@ -138,22 +138,22 @@
"type": "github"
}
},
"fern": {
"shed": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1771899927,
"narHash": "sha256-HKBWp3eiDsm9XjmC5ppqjbfI9Wldg2LjBz1zZXIL6l8=",
"lastModified": 1771968179,
"narHash": "sha256-sl3hzJXJ0DlHGobGiiUF2EI0pF/Rky+fGOAk5pZYYwk=",
"owner": "km-clay",
"repo": "fern",
"rev": "62d651eb8df535c0176b254f6dee25d176d0aeff",
"repo": "shed",
"rev": "f1ecec88bd07893eb6400479a6fc7ad82158104b",
"type": "github"
},
"original": {
"owner": "km-clay",
"repo": "fern",
"repo": "shed",
"type": "github"
}
},
@@ -434,11 +434,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1771865886,
"narHash": "sha256-hqoGotv4iNiYmIzQtBQziDANCEQ1L1vtsGODtJGlBgM=",
"lastModified": 1771959711,
"narHash": "sha256-vfvvuUu6X6bF4z6Wagcd5dz+EtPdkPo+9FZLj1JieMI=",
"ref": "refs/heads/main",
"rev": "bc09504ea50901bedf945859bf7bd4c739e1ed38",
"revCount": 6916,
"rev": "c60b3cb2ed0404d9573b2801b51ba7be1da999d9",
"revCount": 6923,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@@ -536,11 +536,11 @@
]
},
"locked": {
"lastModified": 1767983607,
"narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=",
"lastModified": 1771866172,
"narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "d4037379e6057246b408bbcf796cf3e9838af5b2",
"rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
"type": "github"
},
"original": {
@@ -634,11 +634,11 @@
]
},
"locked": {
"lastModified": 1770139857,
"narHash": "sha256-bCqxcXjavgz5KBJ/1CBLqnagMMf9JvU1m9HmYVASKoc=",
"lastModified": 1771271487,
"narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "9038eec033843c289b06b83557a381a2648d8fa5",
"rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
"type": "github"
},
"original": {
@@ -738,11 +738,11 @@
]
},
"locked": {
"lastModified": 1770203293,
"narHash": "sha256-PR/KER+yiHabFC/h1Wjb+9fR2Uy0lWM3Qld7jPVaWkk=",
"lastModified": 1771606233,
"narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
"owner": "hyprwm",
"repo": "hyprwire",
"rev": "37bc90eed02b0c8b5a77a0b00867baf3005cfb98",
"rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
"type": "github"
},
"original": {
@@ -816,11 +816,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1770841267,
"narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=",
"lastModified": 1771848320,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"type": "github"
},
"original": {
@@ -857,8 +857,8 @@
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"rev": "0182a361324364ae3f436a63005877674cf45efb",
"type": "github"
}
},
@@ -949,11 +949,11 @@
]
},
"locked": {
"lastModified": 1770726378,
"narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=",
"lastModified": 1771858127,
"narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae",
"rev": "49bbbfc218bf3856dfa631cead3b052d78248b83",
"type": "github"
},
"original": {
@@ -966,7 +966,7 @@
"inputs": {
"copyparty": "copyparty",
"disko": "disko",
"fern": "fern",
"shed": "shed",
"home-manager": "home-manager",
"hypr-contrib": "hypr-contrib",
"hyprland": "hyprland",

10
flake.nix
View File

@@ -2,13 +2,13 @@
description = "pagedMov's NixOS and Home Manager configuration";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/0182a361324364ae3f436a63005877674cf45efb";
hypr-contrib.url = "github:hyprwm/contrib";
copyparty.url = "github:9001/copyparty";
hyprpicker.url = "github:hyprwm/hyprpicker";
stylix.url = "github:danth/stylix";
disko.url = "github:nix-community/disko";
fern.url = "github:km-clay/fern";
shed.url = "github:km-clay/shed";
nixvim.url = "github:nix-community/nixvim";
@@ -60,14 +60,14 @@
hostDir = "work";
kind = "both";
extraNixosModules = [
inputs.fern.nixosModules.fern
inputs.shed.nixosModules.shed
inputs.copyparty.nixosModules.default
];
extraHomeModules = [
inputs.fern.homeModules.fern
inputs.shed.homeModules.shed
];
extraOverlays = [
inputs.fern.overlays.default
inputs.shed.overlays.default
inputs.copyparty.overlays.default
];
}

4
hosts/desktop/config.nix
View File

@@ -1,7 +1,7 @@
{ inputs, pkgs, username, ... }:
let
fern = inputs.fern.packages.${pkgs.stdenv.hostPlatform.system}.default;
shed = inputs.shed.packages.${pkgs.stdenv.hostPlatform.system}.default;
in
{
imports = [ ./hardware.nix ];
@@ -42,7 +42,7 @@ in
${username} = {
isNormalUser = true;
initialPassword = "1234";
shell = fern;
shell = shed;
extraGroups = [ "input" "wheel" "persist" "libvirtd" ];
};
};

6
hosts/work/config.nix
View File

@@ -1,7 +1,7 @@
{ inputs, pkgs, username, ... }:
let
fern = inputs.fern.packages.${pkgs.stdenv.hostPlatform.system}.default;
shed = inputs.shed.packages.${pkgs.stdenv.hostPlatform.system}.default;
in
{
imports = [
@@ -37,7 +37,7 @@ in
shells = [ pkgs.myPkgs.slash pkgs.zsh pkgs.bash ];
};
programs.fern.enable = true;
programs.shed.enable = true;
users = {
groups.persist = { };
@@ -47,7 +47,7 @@ in
${username} = {
isNormalUser = true;
initialPassword = "1234";
shell = pkgs.fern;
shell = pkgs.shed;
extraGroups = [ "davfs2" "input" "wheel" "persist" "libvirtd" ];
};
};

2
modules/home/environment/default.nix
View File

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

5
modules/home/environment/fern/aliases.nix → modules/home/environment/shed/aliases.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";

0
modules/home/environment/fern/default.nix → modules/home/environment/shed/default.nix
View File

2
modules/home/environment/fern/env.nix → modules/home/environment/shed/env.nix
View File

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

37
modules/home/environment/fern/extraconfig.nix → modules/home/environment/shed/extraconfig.nix
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
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
nvim ./flake.nix
if [ -f "./$filename" ]; then
realpath "./$filename"
fi
)
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
'';

2
modules/home/environment/fern/options.nix → modules/home/environment/shed/options.nix
View File

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

3
modules/home/environment/stylixhome.nix
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;

1
modules/home/programs/kitty.nix
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;

6
modules/home/programs/nixvim/options.nix
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",
}
})

4
modules/sys/software/packages.nix
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