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

Updated zsh config

Browse Source
This commit is contained in:
pagedmov
2025-07-29 14:33:37 -04:00
parent 44062a87b4
commit 4e44a1618b
6 changed files with 69 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
flake.lock generated
View File

@@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751740947, "lastModified": 1752743471,
"narHash": "sha256-35040CHH7P3JGmhGVfEb2oJHL/A5mI2IXumhkxrBnao=", "narHash": "sha256-4izhj1j7J4mE8LgljCXSIUDculqOsxxhdoC81VhqizM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "dfc1db15a08c4cd234288f66e1199c653495301f", "rev": "e31b575d19e7cf8a8f4398e2f9cffe27a1332506",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -70,11 +70,11 @@
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748408240, "lastModified": 1752979451,
"narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -105,11 +105,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1752718651, "lastModified": 1753140376,
"narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=", "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "d5ad4485e6f2edcc06751df65c5e16572877db88", "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -158,11 +158,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751413152, "lastModified": 1753121425,
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -272,11 +272,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752798675, "lastModified": 1753809622,
"narHash": "sha256-oMJhxLVGVC7v0ReNQ/vFVKMQOPUixg/74MnZZ1Wkv4s=", "narHash": "sha256-66G3qmbOUJJEaxvH97S7I467ILMUV2nTkkRuoN/ZQq4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "dcfd70f80fe6d872c2dc58fe3be384a681e56fea", "rev": "03fdb31290d1a4a8d23f52206283450d304c3841",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -290,11 +290,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1752069516, "lastModified": 1753252360,
"narHash": "sha256-dyzDJvt8IVgHJVmpnw1mueHHSLYnChW1XMkwz9WUBZ8=", "narHash": "sha256-PFAJoEqQWMlo1J+yZb+4HixmhbRVmmNl58e/AkLYDDI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "34d0c01910552b873a07c96921ef70e32bf369a2", "rev": "6839b23345b71db17cd408373de4f5605bf589b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -348,11 +348,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751808145, "lastModified": 1752149140,
"narHash": "sha256-OXgL0XaKMmfX2rRQkt9SkJw+QNfv0jExlySt1D6O72g=", "narHash": "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "b841473a0bd4a1a74a0b64f1ec2ab199035c349f", "rev": "340494a38b5ec453dfc542c6226481f736cc8a9a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -377,11 +377,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1752782660, "lastModified": 1753804949,
"narHash": "sha256-lv5ohWVV8P/T8QBzSBmGVo45oxc4a7snwHF05KRwaK8=", "narHash": "sha256-WWUeMJs7kAIK1ZVqHf2acI6LV2U5X2Vbwql8qnnzif8=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "a05c797e4a7b32f933569aec6cfba180bc693528", "rev": "f51be7f20109cd8eae87db96641aead843a3ef0b",
"revCount": 6286, "revCount": 6321,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@@ -547,11 +547,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751888065, "lastModified": 1752252310,
"narHash": "sha256-F2SV9WGqgtRsXIdUrl3sRe0wXlQD+kRRZcSfbepjPJY=", "narHash": "sha256-06i1pIh6wb+sDeDmWlzuPwIdaFMxLlj1J9I5B9XqSeo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "a8229739cf36d159001cfc203871917b83fdf917", "rev": "bcabcbada90ed2aacb435dc09b91001819a6dc82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -597,11 +597,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751881472, "lastModified": 1751897909,
"narHash": "sha256-meB0SnXbwIe2trD041MLKEv6R7NZ759QwBcVIhlSBfE=", "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "8fb426b3e5452fd9169453fd6c10f8c14ca37120", "rev": "fcca0c61f988a9d092cbb33e906775014c61579d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -697,11 +697,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1751792365, "lastModified": 1752687322,
"narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -729,11 +729,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1752480373, "lastModified": 1753694789,
"narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -769,11 +769,11 @@
"systems": "systems_4" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1752762787, "lastModified": 1753805595,
"narHash": "sha256-WZLSOR2Pei7C4nH/ntKUqOZOAa5rgvc2fVZl4RoEXmw=", "narHash": "sha256-5m0FqObrj/0/nfoaKlgpye4+SZzj1nMPnlxGxlIxKNg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "bc0555c8694d43fb63ae2c7afec08b6987431a04", "rev": "fe0bcc92c8c593d5e2b45ffb0d1253c3aa55eb72",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -817,11 +817,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749730855, "lastModified": 1753450833,
"narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", "narHash": "sha256-Pmpke0JtLRzgdlwDC5a+aiLVZ11JPUO5Bcqkj0nHE/k=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", "rev": "40987cc1a24feba378438d691f87c52819f7bd75",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -874,11 +874,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1752381641, "lastModified": 1753591727,
"narHash": "sha256-R2iDZb94RosuCeuIukacZVVXxzWYr4jn/QI/ax15nW8=", "narHash": "sha256-Ow+qyFckroPS4SQFHcFZ8mKh3HIQ2pQdC6DRjiYF9EE=",
"owner": "gerg-l", "owner": "gerg-l",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "8f9fd947c52aa6adb6bafe72516eccf186708954", "rev": "26c488b60360e15db372483d826cec89ac532980",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -906,11 +906,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1752750082, "lastModified": 1753731630,
"narHash": "sha256-NoVAqy+Wj4tgkvrYB8zWncl8Z6Hb80aX3t/TYGdsfaM=", "narHash": "sha256-8pyTksY2aYtLGmqP8u3xhs4ZfttsfzZXAQZXHKecLDo=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "03699ed214f6e8195bc7199d6ae3aeccf9732b08", "rev": "57d036d92283fddc6ae080459e72e767144a1cda",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
lib/default.nix
View File

@@ -1,10 +1,7 @@
{ inputs, username, nixpkgsConfig ? { allowUnfree = true; } }: { inputs, username, nixpkgsConfig ? { allowUnfree = true; } }:
let rec {
mkHost = import ./mk_host.nix; mkHost = import ./mk_host.nix;
in
{
inherit mkHost;
foldHosts = hosts: inputs.nixpkgs.lib.foldl' foldHosts = hosts: inputs.nixpkgs.lib.foldl'
(acc: host: (acc: host:
let result = mkHost ({ inherit inputs username nixpkgsConfig; } // host); let result = mkHost ({ inherit inputs username nixpkgsConfig; } // host);

5
modules/home/environment/zsh/aliases.nix
View File

@@ -20,7 +20,6 @@
pk = "pkill -9 -f"; pk = "pkill -9 -f";
svcu = "systemctl --user"; svcu = "systemctl --user";
svc = "sudo systemctl"; svc = "sudo systemctl";
viflake = "nvim flake.nix";
iv = "invoke"; iv = "invoke";
cfgfilecount = ''find ".\.nix" $FLAKEPATH | wc -l | toilet -f 3d | lolcat''; cfgfilecount = ''find ".\.nix" $FLAKEPATH | wc -l | toilet -f 3d | lolcat'';
record = "wf-recorder"; record = "wf-recorder";
@@ -33,6 +32,10 @@
rsh = "$HOME/Coding/projects/rust/rsh/target/debug/rsh"; rsh = "$HOME/Coding/projects/rust/rsh/target/debug/rsh";
vide = "neovide"; vide = "neovide";
pk9 = "pkill -9"; pk9 = "pkill -9";
mkexe = "chmod +x";
shortdate = "date '+%m-%d-%y'";
suvi = "sudoedit";
suvide = "EDITOR=neovide; suvi";
}; };
}; };
}; };

1
modules/home/environment/zsh/env.nix
View File

@@ -15,6 +15,7 @@
BROWSER = "firefox"; BROWSER = "firefox";
FLAKEPATH = "$HOME/.sysflake"; FLAKEPATH = "$HOME/.sysflake";
STEAMPATH = "$HOME/.local/share/Steam"; STEAMPATH = "$HOME/.local/share/Steam";
TFPATH = "$STEAMPATH/steamapps/common/Team Fortress 2/";
PATH = "$PATH:$HOME/.userpath/"; PATH = "$PATH:$HOME/.userpath/";
FZF_DEFAULT_COMMAND = "fd"; FZF_DEFAULT_COMMAND = "fd";
FZF_DEFAULT_OPTS = "--height 40% --layout=reverse --border"; FZF_DEFAULT_OPTS = "--height 40% --layout=reverse --border";

14
modules/home/environment/zsh/extraconfig.nix
View File

@@ -34,6 +34,18 @@ in
nsp() { nsp() {
NIX_SHELL=true command nix-shell -p "$@" --run zsh NIX_SHELL=true command nix-shell -p "$@" --run zsh
} }
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
fi
done
nvim ./flake.nix
)
}
nvim() { nvim() {
${shellsound} ${sndpath}/nvim.wav ${shellsound} ${sndpath}/nvim.wav
command nvim "$@" command nvim "$@"
@@ -185,7 +197,7 @@ in
eval "$(starship init zsh)" eval "$(starship init zsh)"
} }
${shellsound} ${sndpath}/sh-source.wav ${shellsound} ${sndpath}/sh-source.wav
[ ! -f $FLAKEPATH/flake.nix ] && echo "WARNING: flake.nix not found at \$FLAKEPATH. Shell aliases for editing config files won't work correctly!" && echo "Edit the FLAKEPATH session variable in zshell.nix to point to the path where you saved the system configuration flake." [ ! -f $FLAKEPATH/flake.nix ] && echo "WARNING: flake.nix not found at \$FLAKEPATH. Shell aliases for editing config files won't work correctly!" && echo "Edit the FLAKEPATH session variable in zsh/env.nix to point to the path where you saved the system configuration flake."
''; '';
}; };
}; };

2
modules/home/programs/kitty.nix
View File

@@ -9,7 +9,7 @@
font = { font = {
package = lib.mkForce pkgs.nerd-fonts.envy-code-r; package = lib.mkForce pkgs.nerd-fonts.envy-code-r;
name = lib.mkForce "EnvyCodeR Nerd Font Mono"; name = lib.mkForce "EnvyCodeR Nerd Font Mono";
size = lib.mkForce 20; size = lib.mkForce 19;
}; };
settings = { settings = {