Compare commits
5 Commits
neovim
...
shell-inhi
Author | SHA1 | Date | |
---|---|---|---|
4feb5b89e8 | |||
29feb9223e | |||
7bc7749f51 | |||
51beed138e | |||
6ff4e13b03 |
23
flake.lock
generated
23
flake.lock
generated
@@ -64,11 +64,11 @@
|
|||||||
"zon2nix": "zon2nix"
|
"zon2nix": "zon2nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751123364,
|
"lastModified": 1754941490,
|
||||||
"narHash": "sha256-Nb3pxs1onnbdhhnoNc+IfHzrW9dM+UbEdjK0AguR2J4=",
|
"narHash": "sha256-2AJf0q4u1zakqjr0y4dCyqzdDSil8P5m2YpZxAAzJJw=",
|
||||||
"owner": "ghostty-org",
|
"owner": "ghostty-org",
|
||||||
"repo": "ghostty",
|
"repo": "ghostty",
|
||||||
"rev": "f6d1c274b9c0e095dc0a1b411dec7410ad779bf5",
|
"rev": "5bf632e9cc0e77a578bad983b0cbdf0451ce87d4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -84,11 +84,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1750792728,
|
"lastModified": 1753592768,
|
||||||
"narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=",
|
"narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "366f00797b1efb70f2882d3da485e3c10fd3d557",
|
"rev": "fc3add429f21450359369af74c2375cb34a2d204",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -129,11 +129,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1750969886,
|
"lastModified": 1754767907,
|
||||||
"narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
|
"narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
|
"rev": "c5f08b62ed75415439d48152c2a784e36909b1bc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -170,7 +170,8 @@
|
|||||||
"zig": {
|
"zig": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": [
|
"flake-compat": [
|
||||||
"ghostty"
|
"ghostty",
|
||||||
|
"flake-compat"
|
||||||
],
|
],
|
||||||
"flake-utils": [
|
"flake-utils": [
|
||||||
"ghostty",
|
"ghostty",
|
||||||
@@ -216,8 +217,8 @@
|
|||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "jcollie",
|
"owner": "jcollie",
|
||||||
"ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
|
|
||||||
"repo": "zon2nix",
|
"repo": "zon2nix",
|
||||||
|
"rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -15,7 +15,7 @@
|
|||||||
extraConfig = {
|
extraConfig = {
|
||||||
init.defaultBranch = "master";
|
init.defaultBranch = "master";
|
||||||
push.autoSetupRemote = true;
|
push.autoSetupRemote = true;
|
||||||
pull.merge = true;
|
pull.rebase = false;
|
||||||
merge.tool = "nvimdiff";
|
merge.tool = "nvimdiff";
|
||||||
mergetool.keepBackup = false;
|
mergetool.keepBackup = false;
|
||||||
};
|
};
|
||||||
|
198
home/shell.nix
198
home/shell.nix
@@ -1,85 +1,125 @@
|
|||||||
{pkgs, ...}: {
|
{
|
||||||
programs.fish = {
|
lib,
|
||||||
enable = true;
|
pkgs,
|
||||||
# initExtra = ''
|
userName,
|
||||||
# export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
|
...
|
||||||
# '';
|
}: {
|
||||||
|
programs = {
|
||||||
shellAliases = {
|
fish = {
|
||||||
# ls aliases
|
enable = true;
|
||||||
ls = "eza --color";
|
shellAliases = {
|
||||||
la = "eza -l -all --color";
|
# ls aliases
|
||||||
ll = "eza -l --color";
|
ls = "eza --color";
|
||||||
lt = "eza -l --color --git";
|
la = "eza -l -all --color";
|
||||||
|
ll = "eza -l --color";
|
||||||
# lazygit alias
|
lt = "eza -l --color --git";
|
||||||
lg = "lazygit";
|
# lazygit alias
|
||||||
|
lg = "lazygit";
|
||||||
# cat, less, more alias
|
# cat, less, more alias
|
||||||
cat = "bat";
|
cat = "bat";
|
||||||
less = "bat";
|
less = "bat";
|
||||||
more = "bat";
|
more = "bat";
|
||||||
|
# top alias
|
||||||
# top alias
|
top = "btm";
|
||||||
top = "btm";
|
|
||||||
};
|
|
||||||
|
|
||||||
functions = {
|
|
||||||
fish_greeting = {
|
|
||||||
body = ''
|
|
||||||
set memes \
|
|
||||||
"Crazy? I was crazy once. They locked me in a room. A rubber room. A rubber room with rats. And rats make me crazy." \
|
|
||||||
"Daddy, chill!" \
|
|
||||||
"What the hell is even that?!" \
|
|
||||||
"Road work ahead? Yeah, I sure hope it does!" \
|
|
||||||
"Look at all those chickens!" \
|
|
||||||
"I smell like beef" \
|
|
||||||
"Say, Coloardo - I'M A GIRAFFE" \
|
|
||||||
"I didn't get no sleep cause of y'all, y'all not gone get any sleep cause of me!" \
|
|
||||||
"This is the dollar store, how good can it be?" \
|
|
||||||
"That was legitness" \
|
|
||||||
"Deez nuts" \
|
|
||||||
"I wanna be a cowboy baby" \
|
|
||||||
"Can I get a waffle? Can I please get a waffle?" \
|
|
||||||
"I'm lesbian. I thought you were American." \
|
|
||||||
"You gotta give 'em that 'hawk tuah' and spit on that thang!" \
|
|
||||||
"We don't do that here..."
|
|
||||||
|
|
||||||
set choose_meme (random)"%"(count $memes)
|
|
||||||
set choose_meme $memes[(math $choose_meme"+1")]
|
|
||||||
|
|
||||||
printf (set_color F90)"%s\n" $choose_meme
|
|
||||||
'';
|
|
||||||
onEvent = "fish_greeting";
|
|
||||||
};
|
};
|
||||||
|
functions =
|
||||||
|
{
|
||||||
|
fish_greeting = {
|
||||||
|
body = ''
|
||||||
|
set memes \
|
||||||
|
"Crazy? I was crazy once. They locked me in a room. A rubber room. A rubber room with rats. And rats make me crazy." \
|
||||||
|
"Daddy, chill!" \
|
||||||
|
"What the hell is even that?!" \
|
||||||
|
"Road work ahead? Yeah, I sure hope it does!" \
|
||||||
|
"Look at all those chickens!" \
|
||||||
|
"I smell like beef" \
|
||||||
|
"Say, Coloardo - I'M A GIRAFFE" \
|
||||||
|
"I didn't get no sleep cause of y'all, y'all not gone get any sleep cause of me!" \
|
||||||
|
"This is the dollar store, how good can it be?" \
|
||||||
|
"That was legitness" \
|
||||||
|
"Deez nuts" \
|
||||||
|
"I wanna be a cowboy baby" \
|
||||||
|
"Can I get a waffle? Can I please get a waffle?" \
|
||||||
|
"I'm lesbian. I thought you were American." \
|
||||||
|
"You gotta give 'em that 'hawk tuah' and spit on that thang!" \
|
||||||
|
"We don't do that here..." \
|
||||||
|
"What are those?! They are my crocs..." \
|
||||||
|
"It's an avocado... Thanks!" \
|
||||||
|
"I am once again asking for your financial support" \
|
||||||
|
"Is that a weed?" \
|
||||||
|
"No, this is Patrick!" \
|
||||||
|
"Come ride, heroes, ride" \
|
||||||
|
"Away with the tide" \
|
||||||
|
"Concede your mind unto the fiend" \
|
||||||
|
"Darkness come, rend the shield of light" \
|
||||||
|
"The sun is setting, darkness taking over - a date with chaos and you're dressed to the nines" \
|
||||||
|
"Now kneel overdweller, your lord commands, there's no salvation for the sons of man" \
|
||||||
|
"Snap click clank whirr whizz wham boom!" \
|
||||||
|
"Rohs an kyn ala na"
|
||||||
|
|
||||||
|
set choose_meme (random)"%"(count $memes)
|
||||||
|
set choose_meme $memes[(math $choose_meme"+1")]
|
||||||
|
printf (set_color F90)"%s\n" $choose_meme
|
||||||
|
'';
|
||||||
|
# onEvent = "fish_greeting";
|
||||||
|
};
|
||||||
|
} // (lib.mkIf pkgs.stdenv.isLinux {
|
||||||
|
block = {
|
||||||
|
body = ''
|
||||||
|
echo "Starting systemd-inhibit..."
|
||||||
|
set inhibit_pid_file /tmp/fish_inhibit_pid_(whoami)
|
||||||
|
bash -c 'systemd-inhibit --no-ask-password --what=idle --who="'${userName}'" --why="manual invocation" sh & echo $! > '"$inhibit_pid_file"' && disown'
|
||||||
|
if test -f $inhibit_pid_file
|
||||||
|
set -g INHIBIT_PID (cat $inhibit_pid_file)
|
||||||
|
echo "Inhibit process started with PID: $INHIBIT_PID"
|
||||||
|
else
|
||||||
|
echo "Failed to start inhibit process"
|
||||||
|
return 1
|
||||||
|
end
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
unblock = {
|
||||||
|
body = ''
|
||||||
|
set inhibit_pid_file /tmp/fish_inhibit_pid_(whoami)
|
||||||
|
if test -f $inhibit_pid_file
|
||||||
|
set INHIBIT_PID (cat $inhibit_pid_file)
|
||||||
|
echo "Killing inhibit process: $INHIBIT_PID"
|
||||||
|
kill -SIGTERM $INHIBIT_PID 2>/dev/null; or kill -SIGKILL $INHIBIT_PID 2>/dev/null
|
||||||
|
rm -f $inhibit_pid_file
|
||||||
|
set -e INHIBIT_PID
|
||||||
|
echo "Inhibit process terminated"
|
||||||
|
else
|
||||||
|
echo "No inhibit process file found"
|
||||||
|
end
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
});
|
||||||
};
|
};
|
||||||
};
|
zsh = {
|
||||||
|
enable = true;
|
||||||
programs.zsh = {
|
initContent = ''
|
||||||
enable = true;
|
if [[ -z "$BASH_EXECUTION_STRING" ]]; then
|
||||||
initContent = ''
|
if [[ -n "$ZSH_VERSION" ]]; then
|
||||||
if [[ -z "$BASH_EXECUTION_STRING" ]]; then
|
LOGIN_OPTION="--login"
|
||||||
if [[ -n "$ZSH_VERSION" ]]; then
|
else
|
||||||
LOGIN_OPTION="--login"
|
LOGIN_OPTION=""
|
||||||
else
|
fi
|
||||||
LOGIN_OPTION=""
|
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
||||||
fi
|
fi
|
||||||
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
'';
|
||||||
fi
|
};
|
||||||
'';
|
bash = {
|
||||||
};
|
enable = true;
|
||||||
|
initExtra = ''
|
||||||
programs.bash = {
|
if [[ -z "$BASH_EXECUTION_STRING" ]]; then
|
||||||
enable = true;
|
if [[ -n "$ZSH_VERSION" ]]; then
|
||||||
initExtra = ''
|
LOGIN_OPTION="--login"
|
||||||
if [[ -z "$BASH_EXECUTION_STRING" ]]; then
|
else
|
||||||
if [[ -n "$ZSH_VERSION" ]]; then
|
LOGIN_OPTION=""
|
||||||
LOGIN_OPTION="--login"
|
fi
|
||||||
else
|
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
||||||
LOGIN_OPTION=""
|
|
||||||
fi
|
fi
|
||||||
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
'';
|
||||||
fi
|
};
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@@ -147,20 +147,5 @@ in {
|
|||||||
programs.waybar = {
|
programs.waybar = {
|
||||||
enable = pkgs.stdenv.isLinux;
|
enable = pkgs.stdenv.isLinux;
|
||||||
systemd.enable = true;
|
systemd.enable = true;
|
||||||
|
|
||||||
package = pkgs.waybar.overrideAttrs (old: {
|
|
||||||
version = "0.11.0";
|
|
||||||
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "Alexays";
|
|
||||||
repo = "Waybar";
|
|
||||||
rev = "d56dd6ee7fdf8c5ba4e90790af62b7f7829d3a47";
|
|
||||||
sha256 = "sha256-3lc0voMU5RS+mEtxKuRayq/uJO09X7byq6Rm5NZohq8=";
|
|
||||||
fetchSubmodules = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = old.buildInputs ++ [ pkgs.fftw pkgs.libcava ];
|
|
||||||
# mesonFlags = (old.mesonFlags or []) ++ [ "-Dcava=disabled" ];
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
19
modules/apps/appimage.nix
Normal file
19
modules/apps/appimage.nix
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
with lib; let
|
||||||
|
cfg = config.appimage;
|
||||||
|
in {
|
||||||
|
options.appimage = {
|
||||||
|
enable = mkEnableOption "AppImage support";
|
||||||
|
};
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
appimageupdate
|
||||||
|
appimage-run
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
@@ -21,11 +21,13 @@ in {
|
|||||||
inherit lib pkgs flatpakPackages;
|
inherit lib pkgs flatpakPackages;
|
||||||
})
|
})
|
||||||
../../apps/gaming.nix
|
../../apps/gaming.nix
|
||||||
|
../../apps/appimage.nix
|
||||||
../../graphics
|
../../graphics
|
||||||
../../pwrMgmt
|
../../pwrMgmt
|
||||||
../../networking/core.nix
|
../../networking/core.nix
|
||||||
../../sound/pipewire.nix
|
../../sound/pipewire.nix
|
||||||
../../sound/shairport.nix
|
../../sound/shairport.nix
|
||||||
|
../../sound/focusrite.nix
|
||||||
../../virtualization/podman.nix
|
../../virtualization/podman.nix
|
||||||
../../virtualization/hardware.nix
|
../../virtualization/hardware.nix
|
||||||
];
|
];
|
||||||
@@ -34,9 +36,13 @@ in {
|
|||||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||||
|
|
||||||
# Custom kernel/boot stuff
|
# Custom kernel/boot stuff
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot = {
|
||||||
boot.loader.systemd-boot.enable = true;
|
kernelPackages = pkgs.linuxPackages_latest;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
loader = {
|
||||||
|
systemd-boot.enable = true;
|
||||||
|
efi.canTouchEfiVariables = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# Enable Bluetooth if present
|
# Enable Bluetooth if present
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
@@ -63,21 +69,6 @@ in {
|
|||||||
wl-clip-persist
|
wl-clip-persist
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enable OpenSSH
|
|
||||||
services.openssh.enable = true;
|
|
||||||
|
|
||||||
# Enable keyring
|
|
||||||
services.gnome.gnome-keyring.enable = true;
|
|
||||||
|
|
||||||
# Enable GnuPG
|
|
||||||
programs.gnupg.agent = {
|
|
||||||
enable = true;
|
|
||||||
enableSSHSupport = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable SUID wrappers (some programs need them)
|
|
||||||
programs.mtr.enable = true;
|
|
||||||
|
|
||||||
# Enable Polkit
|
# Enable Polkit
|
||||||
security.polkit.enable = true;
|
security.polkit.enable = true;
|
||||||
|
|
||||||
@@ -145,14 +136,39 @@ in {
|
|||||||
networkManager.enable = true;
|
networkManager.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable dconf
|
programs = {
|
||||||
programs.dconf.enable = true;
|
# Enable GnuPG
|
||||||
|
gnupg.agent = {
|
||||||
|
enable = true;
|
||||||
|
enableSSHSupport = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Enable SUID wrappers (some programs need them)
|
||||||
|
mtr.enable = true;
|
||||||
|
|
||||||
|
# Enable dconf
|
||||||
|
dconf.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
# Add username to groups "wheel" and "video" - more may be added here later
|
# Add username to groups "wheel" and "video" - more may be added here later
|
||||||
users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network"];
|
users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network"];
|
||||||
|
|
||||||
# Flatpak packages (see ../../apps/flatpak.nix)
|
services = {
|
||||||
services.flatpak.packages = flatpakPackages;
|
# Enable OpenSSH
|
||||||
|
openssh.enable = true;
|
||||||
|
|
||||||
|
# Enable keyring
|
||||||
|
gnome.gnome-keyring.enable = true;
|
||||||
|
|
||||||
|
# Flatpak packages (see ../../apps/flatpak.nix)
|
||||||
|
flatpak.packages = flatpakPackages;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Focusrite Scarlett audio interface support (see ../../sound/focusrite.nix)
|
||||||
|
sound.hardware.focusrite.enable = true;
|
||||||
|
|
||||||
|
# AppImage support
|
||||||
|
appimage.enable = true;
|
||||||
|
|
||||||
# XDG stuff
|
# XDG stuff
|
||||||
xdg = {
|
xdg = {
|
||||||
@@ -160,12 +176,12 @@ in {
|
|||||||
enable = true;
|
enable = true;
|
||||||
config = {
|
config = {
|
||||||
sway = {
|
sway = {
|
||||||
default = [ "wlr" "gtk" ];
|
default = ["wlr" "gtk"];
|
||||||
"org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
|
"org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
|
||||||
};
|
};
|
||||||
common = {
|
common = {
|
||||||
default = [ "gtk" ];
|
default = ["gtk"];
|
||||||
"org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
|
"org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
extraPortals = with pkgs; [
|
extraPortals = with pkgs; [
|
||||||
|
33
modules/sound/focusrite.nix
Normal file
33
modules/sound/focusrite.nix
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
# Must be paired with the pipewire Nix module, this does nothing but install packages
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
with lib; let
|
||||||
|
cfg = config.sound.hardware.focusrite;
|
||||||
|
in {
|
||||||
|
options.sound.hardware.focusrite = {
|
||||||
|
enable = mkEnableOption "Focusrite audio interface support";
|
||||||
|
guiSupport = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Enable GUI support for Focusrite Scarlett audio interface (installs alsa-scarlett-gui)";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
config = mkIf cfg.enable (mkMerge [
|
||||||
|
{
|
||||||
|
environment.systemPackages = with pkgs;
|
||||||
|
[
|
||||||
|
scarlett2
|
||||||
|
alsa-scarlett-gui
|
||||||
|
]
|
||||||
|
++ (
|
||||||
|
if cfg.guiSupport
|
||||||
|
then [pkgs.alsa-scarlett-gui]
|
||||||
|
else []
|
||||||
|
);
|
||||||
|
}
|
||||||
|
]);
|
||||||
|
}
|
Reference in New Issue
Block a user