rouven.seifert/nixos-config
1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2024-11-15 05:13:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

nixpkgs update, use global fzf

Browse source
This commit is contained in:
Rouven Seifert 2023-05-20 10:37:41 +02:00
parent 3df08b721e
commit a3e8fba7c0
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
6 changed files with 20 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
flake.lock
View file

@ -179,11 +179,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1684385584, "lastModified": 1684481515,
"narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=", "narHash": "sha256-sDMEZ4HLP6sVNiBcgla3KWihdDjh67DP5ZWkGKWFgY0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a", "rev": "5b1bc788f578cd83d54b48bb057d6f6703ae7725",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -199,11 +199,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684047328, "lastModified": 1684491027,
"narHash": "sha256-Kwdg+vDiZpfjtkoJH/AQdu2HFJmfdWp+7AJegBIibrs=", "narHash": "sha256-tB44RuuhVCq7TOF02D1l9sxexSmX2c9DDl/UUzi+XQY=",
"owner": "therealr5", "owner": "therealr5",
"repo": "purge", "repo": "purge",
"rev": "fb7472f69dad2b5cd1c58c6b505a2db72048d3a5", "rev": "63a0c5b4d9f4f167b5b8a5456ed195fd3340d3ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -252,11 +252,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684047341, "lastModified": 1684491085,
"narHash": "sha256-p012shouUVUI1cXEtgmOr6o6ki7qu+NICIwu+PvstIU=", "narHash": "sha256-ce65P0CAKbZ9Xcx3aBHtByynrT0LHlusgyTzdxxuwr4=",
"owner": "therealr5", "owner": "therealr5",
"repo": "trucksimulatorbot-images", "repo": "trucksimulatorbot-images",
"rev": "ec556101ee5f314550d4e4ce843cda5152d16006", "rev": "734dbc070778c5671fc23dfc70196e449089e904",
"type": "github" "type": "github"
}, },
"original": { "original": {

15
hosts/iso/zsh.nix
View file

@ -1,10 +1,11 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
programs.command-not-found.enable = false; programs.command-not-found.enable = false;
environment.systemPackages = with pkgs; [
fzf
];
users.defaultUserShell = pkgs.zsh; users.defaultUserShell = pkgs.zsh;
programs.fzf = {
fuzzyCompletion = true;
keybindings = true;
};
programs.zsh = { programs.zsh = {
enable = true; enable = true;
autosuggestions = { autosuggestions = {
@ -20,14 +21,6 @@
'' ''
source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh
zsh-newuser-install () {} zsh-newuser-install () {}
'';
# Hacky way to bind Ctrl+R to fzf. Otherwise it will be overridden
promptInit =
''
source ${pkgs.fzf}/share/fzf/completion.zsh
source ${pkgs.fzf}/share/fzf/key-bindings.zsh
''; '';
}; };
} }

10
shared/zsh.nix
View file

@ -2,12 +2,16 @@
{ {
programs.command-not-found.enable = false; programs.command-not-found.enable = false;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
fzf # fzf
bat bat
exa exa
trash-cli trash-cli
]; ];
users.defaultUserShell = pkgs.zsh; users.defaultUserShell = pkgs.zsh;
programs.fzf = {
fuzzyCompletion = true;
keybindings = true;
};
programs.zsh = { programs.zsh = {
enable = true; enable = true;
shellAliases = { shellAliases = {
@ -62,12 +66,8 @@
} }
''; '';
# Hacky way to bind Ctrl+R to fzf. Otherwise it will be overridden
promptInit = promptInit =
'' ''
source ${pkgs.fzf}/share/fzf/completion.zsh
source ${pkgs.fzf}/share/fzf/key-bindings.zsh
if [[ "$(hostname)" == "thinkpad" ]] if [[ "$(hostname)" == "thinkpad" ]]
then then
cat ${../images/cat.sixel} cat ${../images/cat.sixel}

1
users/rouven/modules/default.nix
View file

@ -3,7 +3,6 @@
imports = [ imports = [
./accounts ./accounts
./foot ./foot
./fzf
./git ./git
./gpg ./gpg
./helix ./helix

7
users/rouven/modules/fzf/default.nix
View file

@ -1,7 +0,0 @@
{ ... }:
{
programs.fzf = {
enable = true;
tmux.enableShellIntegration = true;
};
}

3
users/rouven/modules/packages.nix
View file

@ -4,7 +4,8 @@
# essentials # essentials
wpa_supplicant_gui # manage wifi wpa_supplicant_gui # manage wifi
pcmanfm # rock solid file manager # pcmanfm # rock solid file manager
xfce.thunar
xdg-utils # used for xdg-open xdg-utils # used for xdg-open
snapper-gui snapper-gui
kleopatra kleopatra