mirror of
https://github.com/nmasur/dotfiles
synced 2025-10-12 00:13:17 +00:00
Compare commits
7 Commits
8b3ab57b34
...
caddy-clou
Author | SHA1 | Date | |
---|---|---|---|
|
68d8e60b7e | ||
|
774773c748 | ||
|
c85d292d1a | ||
|
78cc3559f6 | ||
|
a35e758c2f | ||
|
72f30cbab1 | ||
|
17b30de163 |
46
flake.nix
46
flake.nix
@@ -247,30 +247,30 @@
|
|||||||
default = lib.pkgsBySystem.${system}.nmasur.dotfiles-devshell;
|
default = lib.pkgsBySystem.${system}.nmasur.dotfiles-devshell;
|
||||||
});
|
});
|
||||||
|
|
||||||
checks = lib.forAllSystems (
|
# checks = lib.forAllSystems (
|
||||||
system:
|
# system:
|
||||||
let
|
# let
|
||||||
pkgs = import nixpkgs {
|
# pkgs = import nixpkgs {
|
||||||
inherit system;
|
# inherit system;
|
||||||
overlays = lib.overlays;
|
# overlays = lib.overlays;
|
||||||
};
|
# };
|
||||||
in
|
# in
|
||||||
{
|
# {
|
||||||
neovim =
|
# neovim =
|
||||||
pkgs.runCommand "neovim-check-health" { buildInputs = [ inputs.self.packages.${system}.neovim ]; }
|
# pkgs.runCommand "neovim-check-health" { buildInputs = [ inputs.self.packages.${system}.neovim ]; }
|
||||||
''
|
# ''
|
||||||
mkdir -p $out
|
# mkdir -p $out
|
||||||
export HOME=$TMPDIR
|
# export HOME=$TMPDIR
|
||||||
nvim -c "checkhealth" -c "write $out/health.log" -c "quitall"
|
# nvim -c "checkhealth" -c "write $out/health.log" -c "quitall"
|
||||||
|
|
||||||
# Check for errors inside the health log
|
# # Check for errors inside the health log
|
||||||
if $(grep "ERROR" $out/health.log); then
|
# if $(grep "ERROR" $out/health.log); then
|
||||||
cat $out/health.log
|
# cat $out/health.log
|
||||||
exit 1
|
# exit 1
|
||||||
fi
|
# fi
|
||||||
'';
|
# '';
|
||||||
}
|
# }
|
||||||
);
|
# );
|
||||||
|
|
||||||
formatter = lib.forAllSystems (
|
formatter = lib.forAllSystems (
|
||||||
system:
|
system:
|
||||||
|
15
pkgs/caddy/package.nix
Normal file
15
pkgs/caddy/package.nix
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
# Caddy with Cloudflare DNS
|
||||||
|
|
||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
# Maintain a static version so that the plugin hash doesn't keep breaking
|
||||||
|
(pkgs.caddy.override {
|
||||||
|
version = "2.10.2";
|
||||||
|
}).withPlugins
|
||||||
|
{
|
||||||
|
plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
|
||||||
|
hash = "sha256-AcWko5513hO8I0lvbCLqVbM1eWegAhoM0J0qXoWL/vI=";
|
||||||
|
}
|
@@ -21,7 +21,7 @@ in
|
|||||||
programs.ghostty = {
|
programs.ghostty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
package = if pkgs.stdenv.isDarwin then pkgs.nur.repos.DimitarNestorov.ghostty else pkgs.ghostty;
|
package = if pkgs.stdenv.isDarwin then null else pkgs.ghostty;
|
||||||
|
|
||||||
enableFishIntegration = true;
|
enableFishIntegration = true;
|
||||||
enableBashIntegration = true;
|
enableBashIntegration = true;
|
||||||
@@ -37,8 +37,8 @@ in
|
|||||||
fullscreen = if pkgs.stdenv.isDarwin then true else false;
|
fullscreen = if pkgs.stdenv.isDarwin then true else false;
|
||||||
keybind = [
|
keybind = [
|
||||||
"super+t=unbind" # Pass super-t to underlying tool (e.g. zellij tabs)
|
"super+t=unbind" # Pass super-t to underlying tool (e.g. zellij tabs)
|
||||||
"super+shift+]=unbind"
|
"super+shift+bracket_right=unbind"
|
||||||
"super+shift+[=unbind"
|
"super+shift+bracket_left=unbind"
|
||||||
"ctrl+tab=unbind"
|
"ctrl+tab=unbind"
|
||||||
"ctrl+shift+tab=unbind"
|
"ctrl+shift+tab=unbind"
|
||||||
"ctrl+tab=text:\\x1b[9;5u"
|
"ctrl+tab=text:\\x1b[9;5u"
|
||||||
|
@@ -46,6 +46,10 @@ in
|
|||||||
command = "${pkgs.nixd}/bin/nixd";
|
command = "${pkgs.nixd}/bin/nixd";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
language-server.ty = {
|
||||||
|
command = "${pkgs.ty}/bin/ty";
|
||||||
|
};
|
||||||
|
|
||||||
language-server.fish-lsp = {
|
language-server.fish-lsp = {
|
||||||
command = "${pkgs.fish-lsp}/bin/fish-lsp";
|
command = "${pkgs.fish-lsp}/bin/fish-lsp";
|
||||||
};
|
};
|
||||||
@@ -59,7 +63,8 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
language-server.terraform-ls = {
|
language-server.terraform-ls = {
|
||||||
command = "${lib.getExe pkgs.terraform-ls} serve";
|
command = "${lib.getExe pkgs.terraform-ls}";
|
||||||
|
args = [ "serve" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
language-server.bash-language-server = {
|
language-server.bash-language-server = {
|
||||||
|
@@ -57,7 +57,7 @@ function obj:init()
|
|||||||
self.launcher:bind("ctrl", "space", function() end)
|
self.launcher:bind("ctrl", "space", function() end)
|
||||||
self.launcher:bind("", "return", function()
|
self.launcher:bind("", "return", function()
|
||||||
-- self:switch("@wezterm@")
|
-- self:switch("@wezterm@")
|
||||||
self:switch("@ghostty@")
|
self:switch("/Applications/Ghostty.app")
|
||||||
end)
|
end)
|
||||||
self.launcher:bind("", "C", function()
|
self.launcher:bind("", "C", function()
|
||||||
self:switch("Calendar.app")
|
self:switch("Calendar.app")
|
||||||
|
@@ -23,7 +23,6 @@ in
|
|||||||
{
|
{
|
||||||
discord = "${pkgs.discord}/Applications/Discord.app";
|
discord = "${pkgs.discord}/Applications/Discord.app";
|
||||||
firefox = "${pkgs.firefox-unwrapped}/Applications/Firefox.app";
|
firefox = "${pkgs.firefox-unwrapped}/Applications/Firefox.app";
|
||||||
ghostty = "${config.programs.ghostty.package}/Applications/Ghostty.app";
|
|
||||||
obsidian = "${pkgs.obsidian}/Applications/Obsidian.app";
|
obsidian = "${pkgs.obsidian}/Applications/Obsidian.app";
|
||||||
slack = "${pkgs.slack}/Applications/Slack.app";
|
slack = "${pkgs.slack}/Applications/Slack.app";
|
||||||
wezterm = "${pkgs.wezterm}/Applications/WezTerm.app";
|
wezterm = "${pkgs.wezterm}/Applications/WezTerm.app";
|
||||||
|
@@ -29,6 +29,8 @@ in
|
|||||||
pkgs.charm # Manage account and filesystem
|
pkgs.charm # Manage account and filesystem
|
||||||
pkgs.pop # Send emails from a TUI
|
pkgs.pop # Send emails from a TUI
|
||||||
|
|
||||||
|
pkgs.chawan # Browser TUI
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.gh-dash.enable = lib.mkDefault true;
|
programs.gh-dash.enable = lib.mkDefault true;
|
||||||
|
@@ -6,7 +6,6 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (config.nmasur.settings) username;
|
|
||||||
cfg = config.nmasur.presets.services.dock;
|
cfg = config.nmasur.presets.services.dock;
|
||||||
in
|
in
|
||||||
|
|
||||||
@@ -50,7 +49,7 @@ in
|
|||||||
"/System/Applications/Messages.app"
|
"/System/Applications/Messages.app"
|
||||||
"/System/Applications/Mail.app"
|
"/System/Applications/Mail.app"
|
||||||
"/Applications/zoom.us.app"
|
"/Applications/zoom.us.app"
|
||||||
"${config.home-manager.users.${username}.programs.ghostty.package}/Applications/Ghostty.app"
|
"/Applications/Ghostty.app"
|
||||||
"${pkgs.discord}/Applications/Discord.app"
|
"${pkgs.discord}/Applications/Discord.app"
|
||||||
"${pkgs.obsidian}/Applications/Obsidian.app"
|
"${pkgs.obsidian}/Applications/Obsidian.app"
|
||||||
];
|
];
|
||||||
|
@@ -39,6 +39,7 @@ in
|
|||||||
"scroll-reverser" # Different scroll style for mouse vs. trackpad
|
"scroll-reverser" # Different scroll style for mouse vs. trackpad
|
||||||
"notunes" # Don't launch Apple Music with the play button
|
"notunes" # Don't launch Apple Music with the play button
|
||||||
"topnotch" # Darkens the menu bar to complete black
|
"topnotch" # Darkens the menu bar to complete black
|
||||||
|
"ghostty" # Terminal application (not buildable on Nix on macOS)
|
||||||
];
|
];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@@ -66,10 +66,7 @@ in
|
|||||||
nmasur.presets.services.caddy.cidrAllowlist = cloudflareIpRanges;
|
nmasur.presets.services.caddy.cidrAllowlist = cloudflareIpRanges;
|
||||||
|
|
||||||
# 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.nmasur.caddy;
|
||||||
plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
|
|
||||||
hash = "sha256-AcWko5513hO8I0lvbCLqVbM1eWegAhoM0J0qXoWL/vI=";
|
|
||||||
};
|
|
||||||
nmasur.presets.services.caddy.tlsPolicies = [
|
nmasur.presets.services.caddy.tlsPolicies = [
|
||||||
{
|
{
|
||||||
issuers = [
|
issuers = [
|
||||||
|
@@ -10,8 +10,8 @@ in
|
|||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
|
|
||||||
# Use power button to sleep instead of poweroff
|
# Use power button to sleep instead of poweroff
|
||||||
services.logind.powerKey = "suspend";
|
services.logind.settings.Login.HandlePowerKey = "suspend";
|
||||||
services.logind.powerKeyLongPress = "poweroff";
|
services.logind.settings.Login.HandlePowerKeyLongPress = "poweroff";
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user