From c36ca39a0d5f57c880e6dc4fb45f866352e26546 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Sat, 8 Mar 2025 13:30:47 +0000 Subject: [PATCH] get more working on flame --- hosts-by-platform/aarch64-linux/flame/default.nix | 1 - .../modules/nmasur/presets/programs/fish.nix | 3 --- .../nmasur/presets/programs/fzf/default.nix | 4 ++-- .../nmasur/presets/programs/git/default.nix | 2 ++ .../modules/nmasur/presets/programs/neovim.nix | 15 ++++++++------- .../modules/nmasur/profiles/common.nix | 12 +++++++++--- .../modules/nmasur/presets/services/caddy.nix | 1 + .../nmasur/presets/services/cloudflare.nix | 4 ++-- 8 files changed, 24 insertions(+), 18 deletions(-) diff --git a/hosts-by-platform/aarch64-linux/flame/default.nix b/hosts-by-platform/aarch64-linux/flame/default.nix index ae84238..d0039de 100644 --- a/hosts-by-platform/aarch64-linux/flame/default.nix +++ b/hosts-by-platform/aarch64-linux/flame/default.nix @@ -17,7 +17,6 @@ rec { base.enable = true; server.enable = true; communications.enable = true; - power-user.enable = true; }; home-manager.users."noah" = { diff --git a/platforms/home-manager/modules/nmasur/presets/programs/fish.nix b/platforms/home-manager/modules/nmasur/presets/programs/fish.nix index f8c9184..04aea85 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/fish.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/fish.nix @@ -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; }; diff --git a/platforms/home-manager/modules/nmasur/presets/programs/fzf/default.nix b/platforms/home-manager/modules/nmasur/presets/programs/fzf/default.nix index c3bdaf6..473fc3a 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/fzf/default.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/fzf/default.nix @@ -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 = { diff --git a/platforms/home-manager/modules/nmasur/presets/programs/git/default.nix b/platforms/home-manager/modules/nmasur/presets/programs/git/default.nix index 2997eff..73574ff 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/git/default.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/git/default.nix @@ -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"; }; }; diff --git a/platforms/home-manager/modules/nmasur/presets/programs/neovim.nix b/platforms/home-manager/modules/nmasur/presets/programs/neovim.nix index 8070760..aaf129d 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/neovim.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/neovim.nix @@ -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 = [ diff --git a/platforms/home-manager/modules/nmasur/profiles/common.nix b/platforms/home-manager/modules/nmasur/profiles/common.nix index 174556b..5dc4938 100644 --- a/platforms/home-manager/modules/nmasur/profiles/common.nix +++ b/platforms/home-manager/modules/nmasur/profiles/common.nix @@ -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; diff --git a/platforms/nixos/modules/nmasur/presets/services/caddy.nix b/platforms/nixos/modules/nmasur/presets/services/caddy.nix index 880ba08..c954024 100644 --- a/platforms/nixos/modules/nmasur/presets/services/caddy.nix +++ b/platforms/nixos/modules/nmasur/presets/services/caddy.nix @@ -83,6 +83,7 @@ in ); in { + enable = true; adapter = "''"; # Required to enable JSON configFile = pkgs.writeText "Caddyfile" ( builtins.toJSON { diff --git a/platforms/nixos/modules/nmasur/presets/services/cloudflare.nix b/platforms/nixos/modules/nmasur/presets/services/cloudflare.nix index b042bb9..f6ca463 100644 --- a/platforms/nixos/modules/nmasur/presets/services/cloudflare.nix +++ b/platforms/nixos/modules/nmasur/presets/services/cloudflare.nix @@ -67,8 +67,8 @@ in # Tell Caddy to use Cloudflare DNS for ACME challenge validation services.caddy.package = pkgs.caddy.withPlugins { - plugins = [ "github.com/caddy-dns/cloudflare@master" ]; - hash = "sha256-C7JOGd4sXsRZL561oP84V2/pTg7szEgF4OFOw35yS1s="; + plugins = [ "github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de" ]; + hash = "sha256-3nvVGW+ZHLxQxc1VCc/oTzCLZPBKgw4mhn+O3IoyiSs="; }; nmasur.presets.services.caddy.tlsPolicies = [ {