Jafner/Jafner.net
1
0
Fork 0
Code Issues 16 Pull Requests Actions Packages Projects Releases Wiki Activity

Update from joey@joey-laptop: Add fzf-git-sh, pass pkgs-unstable to home-manager to facilitate
Some checks failed
SSH and echo to file / ssh (push) Failing after 3s
Details

Browse Source
This commit is contained in:
Joey Hafner 2024-09-14 15:07:15 -07:00
parent dff2c6f44f
commit c6214990e3
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nix/flake.nix
View File

@ -24,6 +24,8 @@
lib = nixpkgs.lib;
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
pkgs-stable = nixpkgs-stable.legacyPackages.${system};
pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
in {
nixosConfigurations = {
joey-laptop = lib.nixosSystem {
@ -40,6 +42,9 @@
homeConfigurations = {
joey = home-manager.lib.homeManagerConfiguration {
pkgs = pkgs;
extraSpecialArgs = {
pkgs-unstable = pkgs-unstable;
};
modules = [ ./home-manager/home.nix ];
};
};

24
nix/home-manager/home.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ config, pkgs, pkgs-unstable, ... }:
{
home.username = "joey";
@ -7,14 +7,27 @@
home.packages = with pkgs; [
fastfetch
tree
bat
wl-clipboard
fzf
fd
flatpak
fzf-git-sh
tmux
];
home.file = {};
# Programs
## fzf
programs.fzf = {
enable = true;
package = pkgs-unstable.fzf;
defaultCommand = "fd --hidden --strip-cwd-prefix --exclude .git";
fileWidgetCommand = "$FZF_DEFAULT_COMMAND";
changeDirWidgetCommand = "fd --type=d --hidden --strip-cwd-prefix --exclude .git .";
enableZshIntegration = true;
};
## Hyprland
programs.kitty.enable = true;
#wayland.windowManager.hyprland = {
@ -39,6 +52,7 @@
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
shellAliases = {
cat = "bat";
nos = "sudo nixos-rebuild switch --flake .";
hms = "home-manager switch --flake .";
nu = "nos && hms";
@ -63,10 +77,6 @@
bindkey '^[w' kill-region # Delete
bindkey '^I^I' autosuggest-accept # Tab, Tab
bindkey '^[' autosuggest-clear # Esc
eval "$(fzf --zsh)"
export FZF_DEFAULT_COMMAND="fd --hidden --strip-cwd-prefix --exclude .git"
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
export FZF_ALT_C_COMMAND="fd --type=d --hidden --strip-cwd-prefix --exclude .git"
_fzf_compgen_path() {
fd --hidden --exclude .git . "$1"
}