mirror of
https://github.com/nmasur/dotfiles
synced 2025-03-15 01:07:05 +00:00
get more working on flame
This commit is contained in:
parent
98c561f462
commit
c36ca39a0d
@ -17,7 +17,6 @@ rec {
|
|||||||
base.enable = true;
|
base.enable = true;
|
||||||
server.enable = true;
|
server.enable = true;
|
||||||
communications.enable = true;
|
communications.enable = true;
|
||||||
power-user.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users."noah" = {
|
home-manager.users."noah" = {
|
||||||
|
@ -40,9 +40,6 @@ in
|
|||||||
description = "Evaluate a bash-like environment variables file";
|
description = "Evaluate a bash-like environment variables file";
|
||||||
body = ''set -gx (cat $argv | tr "=" " " | string split ' ')'';
|
body = ''set -gx (cat $argv | tr "=" " " | string split ' ')'';
|
||||||
};
|
};
|
||||||
fish_user_key_bindings = {
|
|
||||||
body = builtins.readFile ./functions/fish_user_key_bindings.fish;
|
|
||||||
};
|
|
||||||
ip = {
|
ip = {
|
||||||
body = lib.getExe pkgs.nmasur.ip-check;
|
body = lib.getExe pkgs.nmasur.ip-check;
|
||||||
};
|
};
|
||||||
|
@ -51,11 +51,11 @@ in
|
|||||||
};
|
};
|
||||||
recent = {
|
recent = {
|
||||||
description = "Open a recent file in Vim";
|
description = "Open a recent file in Vim";
|
||||||
body = builtins.readFile ./edit/recent.fish;
|
body = builtins.readFile ./fish/recent.fish;
|
||||||
};
|
};
|
||||||
search-and-edit = {
|
search-and-edit = {
|
||||||
description = "Search and open the relevant file in Vim";
|
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 = {
|
shellAbbrs = {
|
||||||
|
@ -16,10 +16,12 @@ in
|
|||||||
name = lib.mkOption {
|
name = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
description = "Name to use for git commits";
|
description = "Name to use for git commits";
|
||||||
|
default = config.nmasur.settings.fullName;
|
||||||
};
|
};
|
||||||
email = lib.mkOption {
|
email = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
description = "Email to use for git commits";
|
description = "Email to use for git commits";
|
||||||
|
default = "7386960+nmasur@users.noreply.github.com";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -28,12 +28,13 @@ in
|
|||||||
|
|
||||||
home.packages = [ cfg.package ];
|
home.packages = [ cfg.package ];
|
||||||
|
|
||||||
nmasur.presets.programs.neovim.package = lib.mkDefault pkgs.nmasur-neovim.override {
|
#nmasur.presets.programs.neovim.package = lib.mkDefault pkgs.nmasur-neovim.override {
|
||||||
colors = cfg.colors;
|
# colors = cfg.colors;
|
||||||
github = cfg.github.enable;
|
# github = cfg.github.enable;
|
||||||
terraform = cfg.terraform.enable;
|
# terraform = cfg.terraform.enable;
|
||||||
kubernetes = cfg.kubernetes.enable;
|
# kubernetes = cfg.kubernetes.enable;
|
||||||
};
|
#};
|
||||||
|
nmasur.presets.programs.neovim.package = pkgs.nmasur.neovim;
|
||||||
|
|
||||||
# Use Neovim as the editor for git commit messages
|
# Use Neovim as the editor for git commit messages
|
||||||
programs.git.extraConfig.core.editor = "${lib.getExe cfg.package}";
|
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
|
# Create a desktop option for launching Neovim from a file manager
|
||||||
# (Requires launching the terminal and then executing Neovim)
|
# (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";
|
name = "Neovim wrapper";
|
||||||
exec = "${lib.getExe config.nmasur.presets.services.i3.terminal} nvim %F"; # TODO: change to generic
|
exec = "${lib.getExe config.nmasur.presets.services.i3.terminal} nvim %F"; # TODO: change to generic
|
||||||
mimeType = [
|
mimeType = [
|
||||||
|
@ -28,9 +28,15 @@ in
|
|||||||
|
|
||||||
nmasur.presets = {
|
nmasur.presets = {
|
||||||
programs = {
|
programs = {
|
||||||
bat.enable = true;
|
atuin.enable = true;
|
||||||
ripgrep.enable = true;
|
fzf.enable = true;
|
||||||
fd.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 = {
|
services = {
|
||||||
loadkey.enable = lib.mkDefault true;
|
loadkey.enable = lib.mkDefault true;
|
||||||
|
@ -83,6 +83,7 @@ in
|
|||||||
);
|
);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
enable = true;
|
||||||
adapter = "''"; # Required to enable JSON
|
adapter = "''"; # Required to enable JSON
|
||||||
configFile = pkgs.writeText "Caddyfile" (
|
configFile = pkgs.writeText "Caddyfile" (
|
||||||
builtins.toJSON {
|
builtins.toJSON {
|
||||||
|
@ -67,8 +67,8 @@ in
|
|||||||
|
|
||||||
# Tell Caddy to use Cloudflare DNS for ACME challenge validation
|
# Tell Caddy to use Cloudflare DNS for ACME challenge validation
|
||||||
services.caddy.package = pkgs.caddy.withPlugins {
|
services.caddy.package = pkgs.caddy.withPlugins {
|
||||||
plugins = [ "github.com/caddy-dns/cloudflare@master" ];
|
plugins = [ "github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de" ];
|
||||||
hash = "sha256-C7JOGd4sXsRZL561oP84V2/pTg7szEgF4OFOw35yS1s=";
|
hash = "sha256-3nvVGW+ZHLxQxc1VCc/oTzCLZPBKgw4mhn+O3IoyiSs=";
|
||||||
};
|
};
|
||||||
nmasur.presets.services.caddy.tlsPolicies = [
|
nmasur.presets.services.caddy.tlsPolicies = [
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user