gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: gerg-l:23400b0ab35cc0c6a030d66f4287375142c250a9
Branches Tags
gerg-l:master
..
compare: gerg-l:362b9dda0f95b35729aeb3a804697993244800d6
Branches Tags
gerg-l:master

No commits in common. "23400b0ab35cc0c6a030d66f4287375142c250a9" and "362b9dda0f95b35729aeb3a804697993244800d6" have entirely different histories.
23400b0ab3 ... 362b9dda0f

5 changed files with 36 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

24
flake.lock generated
View file

@ -387,11 +387,11 @@
}, },
"mnw": { "mnw": {
"locked": { "locked": {
"lastModified": 1748203683, "lastModified": 1747615842,
"narHash": "sha256-zd5GFPg/lVbIILs0ze0bLUsFS72TD/N0Vq5IEGmSG7Y=", "narHash": "sha256-pAh9ndf+GdoCfsWaNATFDjgiax9fOYdWzguYV1H/W0E=",
"owner": "gerg-l", "owner": "gerg-l",
"repo": "mnw", "repo": "mnw",
"rev": "0cb0df3a6f26cbb42f3e096ec65bc7263aab9757", "rev": "b62120999410eb4a4e27359a3e1c0a22fcc0baff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -411,11 +411,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1748176456, "lastModified": 1748070814,
"narHash": "sha256-9KctKybf6ypTTeqepgWPwCLU2V2tVrLXL8OtHzfKEhY=", "narHash": "sha256-UENoloiY25w0GmPsni8aswhks13qD1sT7XPQgmBd4tU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "f788fa289c6e2769339eb519ce7e3732f24a8096", "rev": "1654f815b79267a32c0eb9feb5962089d855d287",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -427,11 +427,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748117132, "lastModified": 1748041342,
"narHash": "sha256-RscRZfMlnsCYzLbgskVPc0AOqtcdyg77htxaVT0xFpc=", "narHash": "sha256-gYkZbws7QEZ6o5Kh8IPotFAk1thbzzm3C8+vs/M32E4=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "06043af27d9c9258eeebf16e4691dcb92f9b857d", "rev": "9784bc134624ff6dcf2e59e3c3998e206d2adad7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -631,11 +631,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1748217776, "lastModified": 1748138789,
"narHash": "sha256-H5yi/nBlTL8TZ3GKvjJhJReEMc3z1xLBocVvewaJ5SY=", "narHash": "sha256-FWrmnGlRlQy1MYkGzhzQ2eaW+unNU0Te+ns14ajtQ5E=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "nvim-flake", "repo": "nvim-flake",
"rev": "19ee0aebca7d0d675539efde545dc49cee7e3d20", "rev": "3071f5d63c727a218e459ad10f2cc01404425636",
"type": "github" "type": "github"
}, },
"original": { "original": {

24
nixosConfigurations/gerg-desktop/main.nix
View file

@ -41,6 +41,7 @@
vesktop vesktop
gh gh
nixfmt-rfc-style nixfmt-rfc-style
zellij
tidal-hifi tidal-hifi
hyperfine hyperfine
@ -130,6 +131,29 @@
silent = true; silent = true;
}; };
zoxide.enable = true;
zsh = {
shellAliases.cd = "z";
interactiveShellInit =
let
monitorScript = pkgs.replaceVarsWith {
src = ./monitor.ps;
replacements = builtins.mapAttrs (_: lib.getExe) {
inherit (pkgs) perl xdotool;
};
isExecutable = true;
};
in
''
if [[ -z "$ZELLIJ" ]]; then
MONITOR="$(${monitorScript} || true)"
zellij attach -c "''${MONITOR:+"$MONITOR@"}$USER"
exit
fi
'';
};
nix-index = { nix-index = {
enable = true; enable = true;
package = nix-index-database.packages.nix-index-with-db; package = nix-index-database.packages.nix-index-with-db;

0
nixosModules/zellij/monitor.ps → nixosConfigurations/gerg-desktop/monitor.ps
View file

2
nixosModules/shell.nix
View file

@ -32,12 +32,10 @@
lx = "eza -lbhHigUmuSa@ --time-style=long-iso --git --color-scale"; lx = "eza -lbhHigUmuSa@ --time-style=long-iso --git --color-scale";
lS = "eza -1"; lS = "eza -1";
lt = "eza --tree --level=2"; lt = "eza --tree --level=2";
cd = "z";
}; };
interactiveShellInit = "fetch-rs"; interactiveShellInit = "fetch-rs";
}; };
programs.zoxide.enable = true;
programs.starship = { programs.starship = {
enable = true; enable = true;
settings = { settings = {

38
nixosModules/zellij/default.nix
View file

@ -1,38 +0,0 @@
{
lib,
pkgs,
config,
}:
{
options.local.zellij = lib.mkEnableOption "zellij" // {
default = true;
};
config = lib.mkIf config.local.zellij {
local.packages = {
inherit (pkgs) zellij;
};
programs.zsh.interactiveShellInit =
let
monitorScript = pkgs.replaceVarsWith {
src = ./monitor.ps;
replacements = builtins.mapAttrs (_: lib.getExe) {
inherit (pkgs) perl xdotool;
};
isExecutable = true;
};
in
''
if [[ -z "$ZELLIJ" ]]; then
if [[ -n "$SSH_TTY" ]]; then
zellij attach -c "SSH@$USER"
else
MONITOR="$(${monitorScript} || true)"
zellij attach -c "''${MONITOR:+"$MONITOR@"}$USER"
fi
fi
'';
};
}