noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-03-14 12:17:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

get more working on flame

Browse Source
This commit is contained in:
Noah Masur 2025-03-08 13:30:47 +00:00
parent 98c561f462
commit c36ca39a0d
8 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hosts-by-platform/aarch64-linux/flame/default.nix
View File

@ -17,7 +17,6 @@ rec {
base.enable = true;
server.enable = true;
communications.enable = true;
power-user.enable = true;
};
home-manager.users."noah" = {

3
platforms/home-manager/modules/nmasur/presets/programs/fish.nix
View File

@ -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;
};

4
platforms/home-manager/modules/nmasur/presets/programs/fzf/default.nix
View File

@ -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 = {

2
platforms/home-manager/modules/nmasur/presets/programs/git/default.nix
View File

@ -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";
};
};

15
platforms/home-manager/modules/nmasur/presets/programs/neovim.nix
View File

@ -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 = [

12
platforms/home-manager/modules/nmasur/profiles/common.nix
View File

@ -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;

1
platforms/nixos/modules/nmasur/presets/services/caddy.nix
View File

@ -83,6 +83,7 @@ in
);
in
{
enable = true;
adapter = "''"; # Required to enable JSON
configFile = pkgs.writeText "Caddyfile" (
builtins.toJSON {

4
platforms/nixos/modules/nmasur/presets/services/cloudflare.nix
View File

@ -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 = [
{