Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions home/neovim/settings.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{ ... }:
{
programs.nixvim = {
# Has not effect... the workaround is to set neovim as the general default editour with
# `programs.neovim.defaultEditor = true` in `system/programs/neovim/default.nix`.
#
# see https://github.com/nix-community/home-manager/issues/4969 and in particular
# https://github.com/nix-community/home-manager/issues/4559.
defaultEditor = true;
vimdiffAlias = true;
enableMan = true;
Expand Down
24 changes: 23 additions & 1 deletion home/shell/bash.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{ lib, pkgs, ... }:
{
lib,
pkgs,
config,
...
}:
let
inherit (import ./bt-devices.nix { inherit lib pkgs; }) btDevices bluetoothctl;

Expand All @@ -19,6 +24,23 @@ in

initExtra = ''
${builtins.concatStringsSep "\n" btConnFuncs}

# Add go's bin directory to path
#
# For the record: doing something like this would be more idiomatic...
# ```nix
# home.sessionPath = [
# # Add ~/go/bin to $PATH
# "${config.home.homeDirectory}/go/bin"
# ];
# ```
# ... but unfortunately, this doesn't work for reasons, outlined in
# https://github.com/nix-community/home-manager/issues/4969 and
# https://github.com/nix-community/home-manager/issues/4559, so we're using this workaround
# below \o/
if [[ ":$PATH:" != *":$HOME/go/bin:"* ]]; then
export PATH="$PATH:$HOME/go/bin"
fi
'';
};
}
22 changes: 21 additions & 1 deletion home/shell/fish.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{ lib, pkgs, ... }:
{
lib,
pkgs,
config,
...
}:
let
inherit (import ./bt-devices.nix { inherit lib pkgs; }) btDevices bluetoothctl;

Expand All @@ -23,6 +28,21 @@ in
bind \cd delete-char

${builtins.concatStringsSep "\n" btConnFuncs}

# Add go's bin directory to path
#
# For the record: doing something like this would be more idiomatic...
# ```nix
# home.sessionPath = [
# # Add ~/go/bin to $PATH
# "${config.home.homeDirectory}/go/bin"
# ];
# ```
# ... but unfortunately, this doesn't work for reasons, outlined in
# https://github.com/nix-community/home-manager/issues/4969 and
# https://github.com/nix-community/home-manager/issues/4559, so we're using this workaround
# below \o/
fish_add_path ~/go/bin
'';
};
}
7 changes: 1 addition & 6 deletions home/tools/dev.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ pkgs, ... }:
{
home.packages = [
# Git tools
Expand Down Expand Up @@ -29,9 +29,4 @@
pkgs.nvd
pkgs.nixfmt-tree
];

# Add ~/go/bin to $PATH
home.sessionPath = [
"${config.home.homeDirectory}/go/bin"
];
}
Loading