mirror of
https://github.com/nmasur/dotfiles
synced 2025-07-06 19:00:14 +00:00
get more working on flame
This commit is contained in:
@ -40,9 +40,6 @@ in
|
||||
description = "Evaluate a bash-like environment variables file";
|
||||
body = ''set -gx (cat $argv | tr "=" " " | string split ' ')'';
|
||||
};
|
||||
fish_user_key_bindings = {
|
||||
body = builtins.readFile ./functions/fish_user_key_bindings.fish;
|
||||
};
|
||||
ip = {
|
||||
body = lib.getExe pkgs.nmasur.ip-check;
|
||||
};
|
||||
|
@ -51,11 +51,11 @@ in
|
||||
};
|
||||
recent = {
|
||||
description = "Open a recent file in Vim";
|
||||
body = builtins.readFile ./edit/recent.fish;
|
||||
body = builtins.readFile ./fish/recent.fish;
|
||||
};
|
||||
search-and-edit = {
|
||||
description = "Search and open the relevant file in Vim";
|
||||
body = builtins.readFile ./edit/search-and-edit.fish;
|
||||
body = builtins.readFile ./fish/search-and-edit.fish;
|
||||
};
|
||||
};
|
||||
shellAbbrs = {
|
||||
|
@ -16,10 +16,12 @@ in
|
||||
name = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "Name to use for git commits";
|
||||
default = config.nmasur.settings.fullName;
|
||||
};
|
||||
email = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "Email to use for git commits";
|
||||
default = "7386960+nmasur@users.noreply.github.com";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -28,12 +28,13 @@ in
|
||||
|
||||
home.packages = [ cfg.package ];
|
||||
|
||||
nmasur.presets.programs.neovim.package = lib.mkDefault pkgs.nmasur-neovim.override {
|
||||
colors = cfg.colors;
|
||||
github = cfg.github.enable;
|
||||
terraform = cfg.terraform.enable;
|
||||
kubernetes = cfg.kubernetes.enable;
|
||||
};
|
||||
#nmasur.presets.programs.neovim.package = lib.mkDefault pkgs.nmasur-neovim.override {
|
||||
# colors = cfg.colors;
|
||||
# github = cfg.github.enable;
|
||||
# terraform = cfg.terraform.enable;
|
||||
# kubernetes = cfg.kubernetes.enable;
|
||||
#};
|
||||
nmasur.presets.programs.neovim.package = pkgs.nmasur.neovim;
|
||||
|
||||
# Use Neovim as the editor for git commit messages
|
||||
programs.git.extraConfig.core.editor = "${lib.getExe cfg.package}";
|
||||
@ -60,7 +61,7 @@ in
|
||||
|
||||
# Create a desktop option for launching Neovim from a file manager
|
||||
# (Requires launching the terminal and then executing Neovim)
|
||||
xdg.desktopEntries.nvim = lib.mkIf (pkgs.stdenv.isLinux) {
|
||||
xdg.desktopEntries.nvim = lib.mkIf (pkgs.stdenv.isLinux && config.nmasur.presets.services.i3.enable) {
|
||||
name = "Neovim wrapper";
|
||||
exec = "${lib.getExe config.nmasur.presets.services.i3.terminal} nvim %F"; # TODO: change to generic
|
||||
mimeType = [
|
||||
|
@ -28,9 +28,15 @@ in
|
||||
|
||||
nmasur.presets = {
|
||||
programs = {
|
||||
bat.enable = true;
|
||||
ripgrep.enable = true;
|
||||
fd.enable = true;
|
||||
atuin.enable = true;
|
||||
fzf.enable = true;
|
||||
neovim.enable = true;
|
||||
git.enable = true;
|
||||
bat.enable = lib.mkDefault true;
|
||||
fd.enable = lib.mkDefault true;
|
||||
fish.enable = lib.mkDefault true;
|
||||
ripgrep.enable = lib.mkDefault true;
|
||||
starship.enable = lib.mkDefault true;
|
||||
};
|
||||
services = {
|
||||
loadkey.enable = lib.mkDefault true;
|
||||
|
Reference in New Issue
Block a user