mirror of
https://github.com/nmasur/dotfiles
synced 2026-02-14 22:49:47 +00:00
Compare commits
11 Commits
10eecfa136
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a7dacb7edf | ||
|
|
dfd3b955c0 | ||
|
|
fd7ddf71f3 | ||
|
|
bba66e3e6a | ||
|
|
be6d6b0d35 | ||
|
|
0239a9925c | ||
|
|
49e35403b6 | ||
|
|
430b522c61 | ||
|
|
a64488093c | ||
|
|
54d2376437 | ||
|
|
cd0a5d5de0 |
66
flake.lock
generated
66
flake.lock
generated
@@ -28,11 +28,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768764703,
|
"lastModified": 1770922915,
|
||||||
"narHash": "sha256-5ulSDyOG1U+1sJhkJHYsUOWEsmtLl97O0NTVMvgIVyc=",
|
"narHash": "sha256-6J/JoK9iL7sHvKJcGW2KId2agaKv1OGypsa7kN+ZBD4=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "0fc4e7ac670a0ed874abacf73c4b072a6a58064b",
|
"rev": "6c5a56295d2a24e43bcd8af838def1b9a95746b2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -179,11 +179,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769813945,
|
"lastModified": 1771037579,
|
||||||
"narHash": "sha256-9ABv9Lo9t6MrFjlnRnU8Zw1C6LVj2+R8PipQ/rxGLHk=",
|
"narHash": "sha256-NX5XuhGcsmk0oEII2PEtMRgvh2KaAv3/WWQsOpxAgR4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "475921375def3eb930e1f8883f619ff8609accb6",
|
"rev": "05e6dc0f6ed936f918cb6f0f21f1dad1e4c53150",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -198,9 +198,7 @@
|
|||||||
"cl-nix-lite": "cl-nix-lite",
|
"cl-nix-lite": "cl-nix-lite",
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"nixpkgs": [
|
"nixpkgs": "nixpkgs_3",
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"systems": "systems_2",
|
"systems": "systems_2",
|
||||||
"treefmt-nix": "treefmt-nix_2"
|
"treefmt-nix": "treefmt-nix_2"
|
||||||
},
|
},
|
||||||
@@ -339,6 +337,22 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1732617236,
|
||||||
|
"narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761236834,
|
"lastModified": 1761236834,
|
||||||
"narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=",
|
"narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=",
|
||||||
@@ -354,13 +368,13 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769461804,
|
"lastModified": 1770841267,
|
||||||
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
|
"narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
|
"rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -370,7 +384,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744536153,
|
"lastModified": 1744536153,
|
||||||
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
|
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
|
||||||
@@ -394,11 +408,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769834069,
|
"lastModified": 1771044752,
|
||||||
"narHash": "sha256-GjeN/5TdWev/L/Izem3XScV6i/55Z+n+GfjKa1srBcU=",
|
"narHash": "sha256-9pnZltSDksIepwd1PJIskZKXTGQzdElS/zK/qnlj2uU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "2db81de33100ef4d86ebc80dc4bc30df1fe97c5d",
|
"rev": "40fb292376611e388cb14329c96853966f57763a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -415,7 +429,7 @@
|
|||||||
"mac-app-util": "mac-app-util",
|
"mac-app-util": "mac-app-util",
|
||||||
"nix2vim": "nix2vim",
|
"nix2vim": "nix2vim",
|
||||||
"nixos-generators": "nixos-generators",
|
"nixos-generators": "nixos-generators",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"rust-overlay": "rust-overlay",
|
"rust-overlay": "rust-overlay",
|
||||||
@@ -426,14 +440,14 @@
|
|||||||
},
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_5"
|
"nixpkgs": "nixpkgs_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769828398,
|
"lastModified": 1771038269,
|
||||||
"narHash": "sha256-zmnvRUm15QrlKH0V1BZoiT3U+Q+tr+P5Osi8qgtL9fY=",
|
"narHash": "sha256-TygYZ7JhnJbRoWOk7d5HaA/GhEVCvtRruN7TqaN9s/c=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "a1d32c90c8a4ea43e9586b7e5894c179d5747425",
|
"rev": "d7a86c8a4df49002446737603a3e0d7ef91a9637",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -522,7 +536,7 @@
|
|||||||
},
|
},
|
||||||
"treefmt-nix_2": {
|
"treefmt-nix_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1766000401,
|
"lastModified": 1766000401,
|
||||||
@@ -546,11 +560,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769217863,
|
"lastModified": 1770657009,
|
||||||
"narHash": "sha256-RY9kJDXD6+2Td/59LkZ0PFSereCXHdBX9wIkbYjRKCY=",
|
"narHash": "sha256-v/LA5ZSJ+JQYzMSKB4sySM0wKfsAqddNzzxLLnbsV/E=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NixOS-WSL",
|
"repo": "NixOS-WSL",
|
||||||
"rev": "38a5250e57f583662eac3b944830e4b9e169e965",
|
"rev": "5b50ea1aaa14945d4794c80fcc99c4aa1db84d2d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
# Better App install management in macOS
|
# Better App install management in macOS
|
||||||
mac-app-util = {
|
mac-app-util = {
|
||||||
url = "github:hraban/mac-app-util";
|
url = "github:hraban/mac-app-util";
|
||||||
inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list for their inputs
|
# inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list for their inputs
|
||||||
};
|
};
|
||||||
|
|
||||||
# Manage disk format and partitioning
|
# Manage disk format and partitioning
|
||||||
@@ -132,6 +132,7 @@
|
|||||||
mathesar = "mathesar.${baseName}";
|
mathesar = "mathesar.${baseName}";
|
||||||
metrics = "metrics.${baseName}";
|
metrics = "metrics.${baseName}";
|
||||||
minecraft = "minecraft.${baseName}";
|
minecraft = "minecraft.${baseName}";
|
||||||
|
mumble = "mumble.${baseName}";
|
||||||
n8n = "n8n.${baseName}";
|
n8n = "n8n.${baseName}";
|
||||||
navidrome = "music.${baseName}";
|
navidrome = "music.${baseName}";
|
||||||
notifications = "ntfy.${baseName}";
|
notifications = "ntfy.${baseName}";
|
||||||
|
|||||||
5
overlays/firefox.nix
Normal file
5
overlays/firefox.nix
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
inputs: final: prev: {
|
||||||
|
|
||||||
|
firefox-unwrapped = final.stable.firefox-unwrapped;
|
||||||
|
|
||||||
|
}
|
||||||
41
pkgs/firefox-history-exporter/background.js
Normal file
41
pkgs/firefox-history-exporter/background.js
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
|
||||||
|
function exportHistory() {
|
||||||
|
const now = new Date();
|
||||||
|
const startTime = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0, 0); // Beginning of today
|
||||||
|
|
||||||
|
browser.history.search({
|
||||||
|
text: '',
|
||||||
|
startTime: startTime,
|
||||||
|
endTime: now,
|
||||||
|
maxResults: 10000
|
||||||
|
}).then(historyItems => {
|
||||||
|
const historyData = JSON.stringify(historyItems, null, 2);
|
||||||
|
const blob = new Blob([historyData], {type: 'application/json'});
|
||||||
|
const url = URL.createObjectURL(blob);
|
||||||
|
const date = now.toISOString().slice(0, 10); // YYYY-MM-DD
|
||||||
|
const filename = `firefox-history/history-${date}.json`;
|
||||||
|
|
||||||
|
browser.downloads.download({
|
||||||
|
url: url,
|
||||||
|
filename: filename,
|
||||||
|
conflictAction: 'overwrite',
|
||||||
|
saveAs: false
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
browser.alarms.create('daily-export', {
|
||||||
|
periodInMinutes: 60 // every 1 hour
|
||||||
|
});
|
||||||
|
|
||||||
|
browser.alarms.onAlarm.addListener(alarm => {
|
||||||
|
if (alarm.name === 'daily-export') {
|
||||||
|
exportHistory();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
browser.runtime.onMessage.addListener((message, sender, sendResponse) => {
|
||||||
|
if (message.command === "exportHistory") {
|
||||||
|
exportHistory();
|
||||||
|
}
|
||||||
|
});
|
||||||
25
pkgs/firefox-history-exporter/manifest.json
Normal file
25
pkgs/firefox-history-exporter/manifest.json
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
{
|
||||||
|
"manifest_version": 3,
|
||||||
|
"name": "History Exporter",
|
||||||
|
"version": "1.1",
|
||||||
|
"description": "Automatically exports today's browsing history.",
|
||||||
|
"permissions": [
|
||||||
|
"history",
|
||||||
|
"downloads",
|
||||||
|
"alarms"
|
||||||
|
],
|
||||||
|
"background": {
|
||||||
|
"scripts": ["background.js"]
|
||||||
|
},
|
||||||
|
"action": {
|
||||||
|
"default_popup": "popup.html"
|
||||||
|
},
|
||||||
|
"browser_specific_settings": {
|
||||||
|
"gecko": {
|
||||||
|
"id": "firefox-history-exporter@nmasur.com",
|
||||||
|
"data_collection_permissions": {
|
||||||
|
"required": ["none"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
26
pkgs/firefox-history-exporter/package.nix
Normal file
26
pkgs/firefox-history-exporter/package.nix
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
|
||||||
|
pkgs.stdenv.mkDerivation rec {
|
||||||
|
pname = "firefox-history-exporter";
|
||||||
|
version = "1.1";
|
||||||
|
src = ./.;
|
||||||
|
|
||||||
|
nativeBuildInputs = [ pkgs.zip ];
|
||||||
|
|
||||||
|
dontUnpack = true;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
|
||||||
|
mkdir -p "$dst"
|
||||||
|
zip -j "$dst/firefox-history-exporter@nmasur.com.xpi" \
|
||||||
|
"${src}/manifest.json" \
|
||||||
|
"${src}/background.js" \
|
||||||
|
"${src}/popup.html" \
|
||||||
|
"${src}/popup.js"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with pkgs.lib; {
|
||||||
|
description = "Automatically exports today's browsing history.";
|
||||||
|
license = licenses.mit;
|
||||||
|
};
|
||||||
|
}
|
||||||
25
pkgs/firefox-history-exporter/popup.html
Normal file
25
pkgs/firefox-history-exporter/popup.html
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>History Exporter</title>
|
||||||
|
<style>
|
||||||
|
body {
|
||||||
|
width: 200px;
|
||||||
|
text-align: center;
|
||||||
|
font-family: sans-serif;
|
||||||
|
}
|
||||||
|
button {
|
||||||
|
margin-top: 10px;
|
||||||
|
padding: 10px;
|
||||||
|
font-size: 16px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>History Exporter</h1>
|
||||||
|
<button id="export-button">Export Now</button>
|
||||||
|
<p id="status"></p>
|
||||||
|
<script src="popup.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
9
pkgs/firefox-history-exporter/popup.js
Normal file
9
pkgs/firefox-history-exporter/popup.js
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
document.getElementById('export-button').addEventListener('click', () => {
|
||||||
|
browser.runtime.sendMessage({command: "exportHistory"});
|
||||||
|
|
||||||
|
const statusElement = document.getElementById('status');
|
||||||
|
statusElement.textContent = 'Exporting...';
|
||||||
|
setTimeout(() => {
|
||||||
|
statusElement.textContent = 'Export complete!';
|
||||||
|
}, 2000);
|
||||||
|
});
|
||||||
@@ -46,6 +46,8 @@ in
|
|||||||
ublacklist
|
ublacklist
|
||||||
vimium
|
vimium
|
||||||
wappalyzer # TODO: only for work profile
|
wappalyzer # TODO: only for work profile
|
||||||
|
pkgs.nmasur.firefox-history-exporter
|
||||||
|
# copy-as-markdown
|
||||||
# saml-tracer
|
# saml-tracer
|
||||||
# text-fragment
|
# text-fragment
|
||||||
];
|
];
|
||||||
@@ -61,6 +63,7 @@ in
|
|||||||
"trailhead.firstrun.didSeeAboutWelcome" = true; # Disable welcome splash
|
"trailhead.firstrun.didSeeAboutWelcome" = true; # Disable welcome splash
|
||||||
"dom.forms.autocomplete.formautofill" = false; # Disable autofill
|
"dom.forms.autocomplete.formautofill" = false; # Disable autofill
|
||||||
"extensions.formautofill.creditCards.enabled" = false; # Disable credit cards
|
"extensions.formautofill.creditCards.enabled" = false; # Disable credit cards
|
||||||
|
"extensions.autoDisableScopes" = false; # Enable extensions automatically
|
||||||
"dom.payments.defaults.saveAddress" = false; # Disable address save
|
"dom.payments.defaults.saveAddress" = false; # Disable address save
|
||||||
"general.autoScroll" = true; # Drag middle-mouse to scroll
|
"general.autoScroll" = true; # Drag middle-mouse to scroll
|
||||||
"services.sync.prefs.sync.general.autoScroll" = false; # Prevent disabling autoscroll
|
"services.sync.prefs.sync.general.autoScroll" = false; # Prevent disabling autoscroll
|
||||||
@@ -187,7 +190,7 @@ in
|
|||||||
xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
|
xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
|
||||||
"${config.xsession.windowManager.i3.config.modifier}+Shift+b" = "exec ${
|
"${config.xsession.windowManager.i3.config.modifier}+Shift+b" = "exec ${
|
||||||
# Don't name the script `firefox` or it will affect grep
|
# Don't name the script `firefox` or it will affect grep
|
||||||
builtins.toString (
|
toString (
|
||||||
pkgs.writeShellScript "focus-ff.sh" ''
|
pkgs.writeShellScript "focus-ff.sh" ''
|
||||||
count=$(ps aux | grep -c firefox)
|
count=$(ps aux | grep -c firefox)
|
||||||
if [ "$count" -eq 1 ]; then
|
if [ "$count" -eq 1 ]; then
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ in
|
|||||||
extensions = [
|
extensions = [
|
||||||
pkgs.nmasur.gh-collaborators
|
pkgs.nmasur.gh-collaborators
|
||||||
pkgs.gh-dash
|
pkgs.gh-dash
|
||||||
pkgs.gh-copilot
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -347,7 +347,7 @@ in
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
themes."${config.programs.helix.settings.theme}" = {
|
themes.base16 = {
|
||||||
"attributes" = config.theme.colors.base09;
|
"attributes" = config.theme.colors.base09;
|
||||||
"comment" = {
|
"comment" = {
|
||||||
fg = config.theme.colors.base03;
|
fg = config.theme.colors.base03;
|
||||||
@@ -527,6 +527,197 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
themes.alabaster-style = {
|
||||||
|
"attribute" = config.theme.colors.base05;
|
||||||
|
"comment" = {
|
||||||
|
fg = config.theme.colors.base0A;
|
||||||
|
# modifiers = [ "italic" ];
|
||||||
|
};
|
||||||
|
"constant" = config.theme.colors.base0E;
|
||||||
|
"constant.numeric" = config.theme.colors.base0E;
|
||||||
|
"constant.builtin" = config.theme.colors.base0E;
|
||||||
|
"constant.character" = config.theme.colors.base0E;
|
||||||
|
"constant.character.escape" = config.theme.colors.base0C;
|
||||||
|
"constructor" = config.theme.colors.base0D;
|
||||||
|
"debug" = config.theme.colors.base03;
|
||||||
|
"diagnostic" = {
|
||||||
|
modifiers = [ "underlined" ];
|
||||||
|
};
|
||||||
|
"diff.delta" = config.theme.colors.base09;
|
||||||
|
"diff.minus" = config.theme.colors.base08;
|
||||||
|
"diff.plus" = config.theme.colors.base0B;
|
||||||
|
"error" = config.theme.colors.base08;
|
||||||
|
"function" = config.theme.colors.base0D;
|
||||||
|
"hint" = config.theme.colors.base03;
|
||||||
|
"info" = config.theme.colors.base0D;
|
||||||
|
"keyword" = config.theme.colors.base05;
|
||||||
|
"keyword.control" = config.theme.colors.base05;
|
||||||
|
"keyword.operator" = config.theme.colors.base05;
|
||||||
|
"label" = config.theme.colors.base0E;
|
||||||
|
"namespace" = config.theme.colors.base0E;
|
||||||
|
"operator" = config.theme.colors.base05;
|
||||||
|
"punctuation" = config.theme.colors.base04;
|
||||||
|
"punctuation.bracket" = config.theme.colors.base04;
|
||||||
|
"punctuation.delimiter" = config.theme.colors.base04;
|
||||||
|
"special" = config.theme.colors.base0D;
|
||||||
|
"string" = config.theme.colors.base0B;
|
||||||
|
"string.regexp" = config.theme.colors.base0B;
|
||||||
|
"string.special" = config.theme.colors.base0C;
|
||||||
|
"type" = config.theme.colors.base0A;
|
||||||
|
"variable" = config.theme.colors.base05;
|
||||||
|
"variable.parameter" = config.theme.colors.base05;
|
||||||
|
"variable.builtin" = config.theme.colors.base05;
|
||||||
|
"variable.other.member" = config.theme.colors.base05;
|
||||||
|
"warning" = config.theme.colors.base09;
|
||||||
|
"markup.bold" = {
|
||||||
|
fg = config.theme.colors.base0A;
|
||||||
|
modifiers = [ "bold" ];
|
||||||
|
};
|
||||||
|
"markup.heading" = config.theme.colors.base0D;
|
||||||
|
"markup.italic" = {
|
||||||
|
fg = config.theme.colors.base0E;
|
||||||
|
modifiers = [ "italic" ];
|
||||||
|
};
|
||||||
|
"markup.link.text" = config.theme.colors.base08;
|
||||||
|
"markup.link.url" = {
|
||||||
|
fg = config.theme.colors.base09;
|
||||||
|
modifiers = [ "underlined" ];
|
||||||
|
};
|
||||||
|
"markup.list" = config.theme.colors.base08;
|
||||||
|
"markup.quote" = config.theme.colors.base0C;
|
||||||
|
"markup.raw" = config.theme.colors.base0B;
|
||||||
|
"markup.strikethrough" = {
|
||||||
|
modifiers = [ "crossed_out" ];
|
||||||
|
};
|
||||||
|
"diagnostic.hint" = {
|
||||||
|
underline = {
|
||||||
|
style = "curl";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"diagnostic.info" = {
|
||||||
|
underline = {
|
||||||
|
style = "curl";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"diagnostic.warning" = {
|
||||||
|
underline = {
|
||||||
|
style = "curl";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"diagnostic.error" = {
|
||||||
|
underline = {
|
||||||
|
style = "curl";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"ui.background" = {
|
||||||
|
bg = config.theme.colors.base00;
|
||||||
|
};
|
||||||
|
"ui.bufferline.active" = {
|
||||||
|
fg = config.theme.colors.base00;
|
||||||
|
bg = config.theme.colors.base03;
|
||||||
|
modifiers = [ "bold" ];
|
||||||
|
};
|
||||||
|
"ui.bufferline" = {
|
||||||
|
fg = config.theme.colors.base04;
|
||||||
|
bg = config.theme.colors.base00;
|
||||||
|
};
|
||||||
|
"ui.cursor" = {
|
||||||
|
fg = config.theme.colors.base04;
|
||||||
|
modifiers = [ "reversed" ];
|
||||||
|
};
|
||||||
|
"ui.cursor.insert" = {
|
||||||
|
fg = config.theme.colors.base0A;
|
||||||
|
modifiers = [ "reversed" ];
|
||||||
|
};
|
||||||
|
"ui.cursorline.primary" = {
|
||||||
|
fg = config.theme.colors.base05;
|
||||||
|
bg = config.theme.colors.base01;
|
||||||
|
};
|
||||||
|
"ui.cursor.match" = {
|
||||||
|
fg = config.theme.colors.base03;
|
||||||
|
modifiers = [ "reversed" ];
|
||||||
|
};
|
||||||
|
"ui.cursor.select" = {
|
||||||
|
fg = config.theme.colors.base04;
|
||||||
|
modifiers = [ "reversed" ];
|
||||||
|
};
|
||||||
|
"ui.gutter" = {
|
||||||
|
bg = config.theme.colors.base00;
|
||||||
|
};
|
||||||
|
"ui.help" = {
|
||||||
|
fg = config.theme.colors.base06;
|
||||||
|
bg = config.theme.colors.base01;
|
||||||
|
};
|
||||||
|
"ui.linenr" = {
|
||||||
|
fg = config.theme.colors.base03;
|
||||||
|
bg = config.theme.colors.base00;
|
||||||
|
};
|
||||||
|
"ui.linenr.selected" = {
|
||||||
|
fg = config.theme.colors.base04;
|
||||||
|
bg = config.theme.colors.base01;
|
||||||
|
modifiers = [ "bold" ];
|
||||||
|
};
|
||||||
|
"ui.menu" = {
|
||||||
|
fg = config.theme.colors.base05;
|
||||||
|
bg = config.theme.colors.base01;
|
||||||
|
};
|
||||||
|
"ui.menu.scroll" = {
|
||||||
|
fg = config.theme.colors.base03;
|
||||||
|
bg = config.theme.colors.base01;
|
||||||
|
};
|
||||||
|
"ui.menu.selected" = {
|
||||||
|
fg = config.theme.colors.base01;
|
||||||
|
bg = config.theme.colors.base04;
|
||||||
|
};
|
||||||
|
"ui.popup" = {
|
||||||
|
bg = config.theme.colors.base01;
|
||||||
|
};
|
||||||
|
"ui.selection" = {
|
||||||
|
bg = config.theme.colors.base01;
|
||||||
|
};
|
||||||
|
"ui.selection.primary" = {
|
||||||
|
bg = config.theme.colors.base02;
|
||||||
|
};
|
||||||
|
"ui.statusline" = {
|
||||||
|
fg = config.theme.colors.base04;
|
||||||
|
bg = config.theme.colors.base01;
|
||||||
|
};
|
||||||
|
"ui.statusline.inactive" = {
|
||||||
|
bg = config.theme.colors.base01;
|
||||||
|
fg = config.theme.colors.base03;
|
||||||
|
};
|
||||||
|
"ui.statusline.insert" = {
|
||||||
|
fg = config.theme.colors.base00;
|
||||||
|
bg = config.theme.colors.base0B;
|
||||||
|
};
|
||||||
|
"ui.statusline.normal" = {
|
||||||
|
fg = config.theme.colors.base00;
|
||||||
|
bg = config.theme.colors.base03;
|
||||||
|
};
|
||||||
|
"ui.statusline.select" = {
|
||||||
|
fg = config.theme.colors.base00;
|
||||||
|
bg = config.theme.colors.base0F;
|
||||||
|
};
|
||||||
|
"ui.text" = config.theme.colors.base05;
|
||||||
|
"ui.text.focus" = config.theme.colors.base05;
|
||||||
|
"ui.virtual.indent-guide" = {
|
||||||
|
fg = config.theme.colors.base03;
|
||||||
|
};
|
||||||
|
"ui.virtual.inlay-hint" = {
|
||||||
|
fg = config.theme.colors.base03;
|
||||||
|
};
|
||||||
|
"ui.virtual.ruler" = {
|
||||||
|
bg = config.theme.colors.base01;
|
||||||
|
};
|
||||||
|
"ui.virtual.jump-label" = {
|
||||||
|
fg = config.theme.colors.base0A;
|
||||||
|
modifiers = [ "bold" ];
|
||||||
|
};
|
||||||
|
"ui.window" = {
|
||||||
|
bg = config.theme.colors.base01;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Create a desktop option for launching Helix from a file manager
|
# Create a desktop option for launching Helix from a file manager
|
||||||
|
|||||||
@@ -128,7 +128,7 @@ in
|
|||||||
if pkgs.stdenv.isDarwin then
|
if pkgs.stdenv.isDarwin then
|
||||||
[
|
[
|
||||||
"env"
|
"env"
|
||||||
"PATH=${config.home.homeDirectory}/.nix-profile/bin:/usr/bin:/bin"
|
"PATH=/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin"
|
||||||
(lib.getExe zellij-switch-to-last)
|
(lib.getExe zellij-switch-to-last)
|
||||||
]
|
]
|
||||||
else
|
else
|
||||||
@@ -271,6 +271,16 @@ in
|
|||||||
_args = [ "Left" ];
|
_args = [ "Left" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
"bind \"Alt j\"" = {
|
||||||
|
MoveFocus = {
|
||||||
|
_args = [ "Down" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"bind \"Alt k\"" = {
|
||||||
|
MoveFocus = {
|
||||||
|
_args = [ "Up" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,70 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (config.nmasur.settings) username;
|
||||||
|
cfg = config.nmasur.presets.services.daily-summary;
|
||||||
|
|
||||||
|
# Remove process urls in favor of using extention
|
||||||
|
# process_urls = pkgs.writers.writePython3Bin "process-urls" {
|
||||||
|
# libraries = [
|
||||||
|
# pkgs.python3Packages.requests
|
||||||
|
# pkgs.python3Packages.beautifulsoup4
|
||||||
|
# ];
|
||||||
|
# } (builtins.readFile ./process-urls.py);
|
||||||
|
# prompt = "Based on my browser usage for today from the markdown file located in /Users/${username}/Downloads/Sidebery/todays_urls.md, create or update a daily summary markdown file in the generated notes directory located in /Users/${username}/dev/personal/notes/generated/ with the filename format 'YYYY-MM-DD Daily Summary.md'. The resulting markdown file should use /Users/${username}/dev/personal/notes/templates/generated-summary.md as a format template, and it should summarize where I have spent my time today and highlight any notable links that I have visited. Please create markdown links to other relevant notes in /Users/${username}/dev/personal/notes/. If there is an existing markdown file for today, update it to include the newest information.";
|
||||||
|
prompt = "Based on my browser usage for today from the JSON file located in /Users/${username}/Downloads/firefox-history/history-YYYY-MM-DD.json, create or update a daily summary markdown file in the generated notes directory located in /Users/${username}/dev/personal/notes/generated/ with the filename format 'YYYY-MM-DD Daily Summary.md'. If the JSON file for today doesn't exist, exit. The resulting markdown file should use /Users/${username}/dev/personal/notes/templates/generated-summary.md as a format template, and it should summarize where I have spent my time today and highlight any notable pages that I have visited, using the titles of each URL in the JSON file for markdown links. Please create markdown links to other relevant notes in /Users/${username}/dev/personal/notes/ and explain why they are being referenced. If there is an existing markdown file for today, update it to include the newest information.";
|
||||||
|
in
|
||||||
|
|
||||||
|
{
|
||||||
|
|
||||||
|
options.nmasur.presets.services.daily-summary.enable = lib.mkEnableOption "Daily work summary";
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
launchd.user.agents.daily-summary = {
|
||||||
|
# This replaces program and args entirely
|
||||||
|
# script = ''
|
||||||
|
# ${process_urls}/bin/process-urls /Users/${username}/Downloads/Sidebery/
|
||||||
|
# GEMINI_API_KEY=$(cat /Users/${username}/.config/gemini/.gemini_api_key) ${pkgs.gemini-cli}/bin/gemini --allowed-tools all --yolo --include-directories /Users/${username}/Downloads/Sidebery/ --include-directories /Users/${username}/dev/personal/notes/ "${prompt}"
|
||||||
|
# '';
|
||||||
|
script = ''
|
||||||
|
GEMINI_API_KEY=$(cat /Users/${username}/.config/gemini/.gemini_api_key) ${pkgs.gemini-cli}/bin/gemini --allowed-tools all --yolo --include-directories "/Users/${username}/Downloads/firefox-history/,/Users/${username}/dev/personal/notes/" "${prompt} | tee -a /Users/${username}/dev/personal/gemini-archive/daily-summary-logs/$(date +"%Y-%m-%d").log"
|
||||||
|
'';
|
||||||
|
|
||||||
|
path = [
|
||||||
|
pkgs.bash
|
||||||
|
pkgs.coreutils
|
||||||
|
];
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
Label = "com.example.daily-summary";
|
||||||
|
# Runs the script through /bin/sh automatically
|
||||||
|
# RunAtLoad = true;
|
||||||
|
StartCalendarInterval = [
|
||||||
|
{
|
||||||
|
Hour = 4;
|
||||||
|
Minute = 45;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
Hour = 6;
|
||||||
|
Minute = 0;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
Hour = 9;
|
||||||
|
Minute = 0;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
Hour = 11;
|
||||||
|
Minute = 0;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,115 @@
|
|||||||
|
# Temporarily disabled in favor of using an extension to save history
|
||||||
|
|
||||||
|
|
||||||
|
import requests
|
||||||
|
from bs4 import BeautifulSoup
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
from datetime import datetime
|
||||||
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
|
|
||||||
|
def find_urls(data):
|
||||||
|
urls = []
|
||||||
|
if isinstance(data, dict):
|
||||||
|
for key, value in data.items():
|
||||||
|
if key == 'url' and isinstance(value, str):
|
||||||
|
urls.append(value)
|
||||||
|
else:
|
||||||
|
urls.extend(find_urls(value))
|
||||||
|
elif isinstance(data, list):
|
||||||
|
for item in data:
|
||||||
|
urls.extend(find_urls(item))
|
||||||
|
return urls
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
if len(sys.argv) > 1:
|
||||||
|
base_dir = sys.argv[1]
|
||||||
|
if not os.path.isdir(base_dir):
|
||||||
|
print(f"Error: Directory '{base_dir}' not found.")
|
||||||
|
sys.exit(1)
|
||||||
|
else:
|
||||||
|
base_dir = '.'
|
||||||
|
|
||||||
|
today = datetime.now().strftime('%Y.%m.%d')
|
||||||
|
output_filename = 'todays_urls.md'
|
||||||
|
output_filepath = os.path.join(base_dir, output_filename)
|
||||||
|
url_titles = {}
|
||||||
|
|
||||||
|
print(f"Searching for files in '{base_dir}' "
|
||||||
|
f"starting with 'snapshot-{today}-'")
|
||||||
|
|
||||||
|
with open(output_filepath, 'w') as md_file:
|
||||||
|
md_file.write(f'# URLs from Sidebery Snapshots for '
|
||||||
|
f'{today.replace(".", "-")}\n\n')
|
||||||
|
|
||||||
|
files_processed = 0
|
||||||
|
for filename in sorted(os.listdir(base_dir)):
|
||||||
|
# Debugging print removed
|
||||||
|
if (filename.startswith(f'snapshot-{today}-')
|
||||||
|
and filename.endswith('.json')):
|
||||||
|
files_processed += 1
|
||||||
|
print(f"Processing file: "
|
||||||
|
f"{os.path.join(base_dir, filename)}")
|
||||||
|
|
||||||
|
# Extract and format date and time from filename
|
||||||
|
# Example: snapshot-2026.01.25-13.19.29.json
|
||||||
|
clean_filename = (filename.replace('snapshot-', '')
|
||||||
|
.replace('.json', ''))
|
||||||
|
date_time_parts = clean_filename.split('-', 1)
|
||||||
|
|
||||||
|
formatted_date = date_time_parts[0].replace('.', '-')
|
||||||
|
formatted_time = date_time_parts[1].replace('.', ':')
|
||||||
|
|
||||||
|
datetime_str = f"{formatted_date} {formatted_time}"
|
||||||
|
|
||||||
|
md_file.write(f'## {datetime_str}\n\n')
|
||||||
|
|
||||||
|
with open(os.path.join(base_dir, filename), 'r') as json_file:
|
||||||
|
try:
|
||||||
|
data = json.load(json_file)
|
||||||
|
urls = find_urls(data)
|
||||||
|
print(f" Found {len(urls)} URLs")
|
||||||
|
for url in urls:
|
||||||
|
if url not in url_titles:
|
||||||
|
try:
|
||||||
|
# Get title of URL
|
||||||
|
res = requests.get(
|
||||||
|
url,
|
||||||
|
timeout=10,
|
||||||
|
allow_redirects=True
|
||||||
|
)
|
||||||
|
soup = BeautifulSoup(
|
||||||
|
res.text,
|
||||||
|
'html.parser'
|
||||||
|
)
|
||||||
|
if soup.title and soup.title.string:
|
||||||
|
title = soup.title.string.strip()
|
||||||
|
else:
|
||||||
|
domain = urlparse(url).netloc
|
||||||
|
title = domain if domain else url
|
||||||
|
url_titles[url] = title
|
||||||
|
except requests.exceptions.InvalidSchema:
|
||||||
|
continue
|
||||||
|
except Exception:
|
||||||
|
domain = urlparse(url).netloc
|
||||||
|
title = domain if domain else url
|
||||||
|
url_titles[url] = title
|
||||||
|
if url in url_titles:
|
||||||
|
title = url_titles[url]
|
||||||
|
md_file.write(f'- [{title}]({url})\n')
|
||||||
|
md_file.write('\n')
|
||||||
|
except json.JSONDecodeError:
|
||||||
|
print(f" Error decoding JSON in {filename}")
|
||||||
|
md_file.write('- Error decoding JSON\n\n')
|
||||||
|
|
||||||
|
if files_processed == 0:
|
||||||
|
print("No files found for today.")
|
||||||
|
|
||||||
|
print(f"Processing complete. Output written to {output_filepath}")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
||||||
@@ -22,6 +22,7 @@ in
|
|||||||
homebrew.enable = lib.mkDefault true;
|
homebrew.enable = lib.mkDefault true;
|
||||||
};
|
};
|
||||||
services = {
|
services = {
|
||||||
|
daily-summary.enable = lib.mkDefault true;
|
||||||
dock.enable = lib.mkDefault true;
|
dock.enable = lib.mkDefault true;
|
||||||
finder.enable = lib.mkDefault true;
|
finder.enable = lib.mkDefault true;
|
||||||
hammerspoon.enable = lib.mkDefault true;
|
hammerspoon.enable = lib.mkDefault true;
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ in
|
|||||||
{
|
{
|
||||||
handler = "static_response";
|
handler = "static_response";
|
||||||
status_code = "403";
|
status_code = "403";
|
||||||
|
body = "IP not allowed";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -109,96 +110,95 @@ in
|
|||||||
apps.tls.automation.policies = cfg.tlsPolicies;
|
apps.tls.automation.policies = cfg.tlsPolicies;
|
||||||
|
|
||||||
# Setup logging to journal and files
|
# Setup logging to journal and files
|
||||||
logging.logs =
|
logging.logs = {
|
||||||
{
|
# System logs and catch-all
|
||||||
# System logs and catch-all
|
# Must be called `default` to override Caddy's built-in default logger
|
||||||
# Must be called `default` to override Caddy's built-in default logger
|
default = {
|
||||||
default = {
|
level = "INFO";
|
||||||
level = "INFO";
|
encoder.format = "console";
|
||||||
encoder.format = "console";
|
writer = {
|
||||||
writer = {
|
output = "stderr";
|
||||||
output = "stderr";
|
|
||||||
};
|
|
||||||
exclude = (map (hostname: "http.log.access.${hostname}") (builtins.attrNames hostname_map)) ++ [
|
|
||||||
"http.log.access.${default_logger_name}"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
# This is for the default access logs (anything not captured by hostname)
|
exclude = (map (hostname: "http.log.access.${hostname}") (builtins.attrNames hostname_map)) ++ [
|
||||||
other = {
|
"http.log.access.${default_logger_name}"
|
||||||
level = "INFO";
|
];
|
||||||
encoder.format = "json";
|
};
|
||||||
writer = {
|
# This is for the default access logs (anything not captured by hostname)
|
||||||
output = "file";
|
other = {
|
||||||
filename = "${config.services.caddy.logDir}/other.log";
|
|
||||||
roll = true;
|
|
||||||
inherit roll_size_mb;
|
|
||||||
};
|
|
||||||
include = [ "http.log.access.${default_logger_name}" ];
|
|
||||||
};
|
|
||||||
# This is for using the Caddy API, which will probably never happen
|
|
||||||
admin = {
|
|
||||||
level = "INFO";
|
|
||||||
encoder.format = "json";
|
|
||||||
writer = {
|
|
||||||
output = "file";
|
|
||||||
filename = "${config.services.caddy.logDir}/admin.log";
|
|
||||||
roll = true;
|
|
||||||
inherit roll_size_mb;
|
|
||||||
};
|
|
||||||
include = [ "admin" ];
|
|
||||||
};
|
|
||||||
# This is for TLS cert management tracking
|
|
||||||
tls = {
|
|
||||||
level = "INFO";
|
|
||||||
encoder.format = "json";
|
|
||||||
writer = {
|
|
||||||
output = "file";
|
|
||||||
filename = "${config.services.caddy.logDir}/tls.log";
|
|
||||||
roll = true;
|
|
||||||
inherit roll_size_mb;
|
|
||||||
};
|
|
||||||
include = [ "tls" ];
|
|
||||||
};
|
|
||||||
# This is for debugging
|
|
||||||
debug = {
|
|
||||||
level = "DEBUG";
|
|
||||||
encoder.format = "json";
|
|
||||||
writer = {
|
|
||||||
output = "file";
|
|
||||||
filename = "${config.services.caddy.logDir}/debug.log";
|
|
||||||
roll = true;
|
|
||||||
roll_keep = 1;
|
|
||||||
inherit roll_size_mb;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
# These are the access logs for individual hostnames
|
|
||||||
// (lib.mapAttrs (name: value: {
|
|
||||||
level = "INFO";
|
level = "INFO";
|
||||||
encoder.format = "json";
|
encoder.format = "json";
|
||||||
writer = {
|
writer = {
|
||||||
output = "file";
|
output = "file";
|
||||||
filename = "${config.services.caddy.logDir}/${name}-access.log";
|
filename = "${config.services.caddy.logDir}/other.log";
|
||||||
|
roll = true;
|
||||||
|
inherit roll_size_mb;
|
||||||
|
};
|
||||||
|
include = [ "http.log.access.${default_logger_name}" ];
|
||||||
|
};
|
||||||
|
# This is for using the Caddy API, which will probably never happen
|
||||||
|
admin = {
|
||||||
|
level = "INFO";
|
||||||
|
encoder.format = "json";
|
||||||
|
writer = {
|
||||||
|
output = "file";
|
||||||
|
filename = "${config.services.caddy.logDir}/admin.log";
|
||||||
|
roll = true;
|
||||||
|
inherit roll_size_mb;
|
||||||
|
};
|
||||||
|
include = [ "admin" ];
|
||||||
|
};
|
||||||
|
# This is for TLS cert management tracking
|
||||||
|
tls = {
|
||||||
|
level = "INFO";
|
||||||
|
encoder.format = "json";
|
||||||
|
writer = {
|
||||||
|
output = "file";
|
||||||
|
filename = "${config.services.caddy.logDir}/tls.log";
|
||||||
|
roll = true;
|
||||||
|
inherit roll_size_mb;
|
||||||
|
};
|
||||||
|
include = [ "tls" ];
|
||||||
|
};
|
||||||
|
# This is for debugging
|
||||||
|
debug = {
|
||||||
|
level = "DEBUG";
|
||||||
|
encoder.format = "json";
|
||||||
|
writer = {
|
||||||
|
output = "file";
|
||||||
|
filename = "${config.services.caddy.logDir}/debug.log";
|
||||||
|
roll = true;
|
||||||
|
roll_keep = 1;
|
||||||
|
inherit roll_size_mb;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
# These are the access logs for individual hostnames
|
||||||
|
// (lib.mapAttrs (name: value: {
|
||||||
|
level = "INFO";
|
||||||
|
encoder.format = "json";
|
||||||
|
writer = {
|
||||||
|
output = "file";
|
||||||
|
filename = "${config.services.caddy.logDir}/${name}-access.log";
|
||||||
|
roll = true;
|
||||||
|
inherit roll_size_mb;
|
||||||
|
};
|
||||||
|
include = [ "http.log.access.${name}" ];
|
||||||
|
}) hostname_map)
|
||||||
|
# We also capture just the errors separately for easy debugging
|
||||||
|
// (lib.mapAttrs' (name: value: {
|
||||||
|
name = "${name}-error";
|
||||||
|
value = {
|
||||||
|
level = "ERROR";
|
||||||
|
encoder.format = "json";
|
||||||
|
writer = {
|
||||||
|
output = "file";
|
||||||
|
filename = "${config.services.caddy.logDir}/${name}-error.log";
|
||||||
roll = true;
|
roll = true;
|
||||||
inherit roll_size_mb;
|
inherit roll_size_mb;
|
||||||
};
|
};
|
||||||
include = [ "http.log.access.${name}" ];
|
include = [ "http.log.access.${name}" ];
|
||||||
}) hostname_map)
|
};
|
||||||
# We also capture just the errors separately for easy debugging
|
}) hostname_map);
|
||||||
// (lib.mapAttrs' (name: value: {
|
|
||||||
name = "${name}-error";
|
|
||||||
value = {
|
|
||||||
level = "ERROR";
|
|
||||||
encoder.format = "json";
|
|
||||||
writer = {
|
|
||||||
output = "file";
|
|
||||||
filename = "${config.services.caddy.logDir}/${name}-error.log";
|
|
||||||
roll = true;
|
|
||||||
inherit roll_size_mb;
|
|
||||||
};
|
|
||||||
include = [ "http.log.access.${name}" ];
|
|
||||||
};
|
|
||||||
}) hostname_map);
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -173,5 +173,16 @@ in
|
|||||||
# Enable the home-made service that we created for non-proxied records
|
# Enable the home-made service that we created for non-proxied records
|
||||||
services.cloudflare-dyndns-noproxy.enable = true;
|
services.cloudflare-dyndns-noproxy.enable = true;
|
||||||
|
|
||||||
|
# Create certs when not using proxy
|
||||||
|
secrets.cloudflare-dns-api-prefixed = {
|
||||||
|
source = ./cloudflare-api.age;
|
||||||
|
dest = "${config.secretsDirectory}/cloudflare-dns-api-prefixed";
|
||||||
|
prefix = "CLOUDFLARE_DNS_API_TOKEN=";
|
||||||
|
};
|
||||||
|
security.acme = {
|
||||||
|
acceptTerms = true;
|
||||||
|
defaults.email = "acme@${config.nmasur.presets.programs.msmtp.domain}";
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
41
platforms/nixos/modules/nmasur/presets/services/murmur.nix
Normal file
41
platforms/nixos/modules/nmasur/presets/services/murmur.nix
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
# murmur is a Mumble server for hosting voice chat
|
||||||
|
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
inherit (config.nmasur.settings) hostnames;
|
||||||
|
cfg = config.nmasur.presets.services.murmur;
|
||||||
|
in
|
||||||
|
|
||||||
|
{
|
||||||
|
|
||||||
|
options.nmasur.presets.services.murmur.enable =
|
||||||
|
lib.mkEnableOption "murmur (mumble) voice chat service";
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
|
||||||
|
services.murmur = {
|
||||||
|
enable = true;
|
||||||
|
users = 50; # Max concurrent users
|
||||||
|
bonjour = false; # Auto-connect LAN
|
||||||
|
registerUrl = "https://${hostnames.mumble}";
|
||||||
|
registerName = "Mumble";
|
||||||
|
environmentFile = null;
|
||||||
|
sslKey = "${config.security.acme.certs."${hostnames.mumble}".directory}/key.pem";
|
||||||
|
sslCert = "${config.security.acme.certs."${hostnames.mumble}".directory}/fullchain.pem";
|
||||||
|
openFirewall = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Configure Cloudflare DNS to point to this machine
|
||||||
|
nmasur.presets.services.cloudflare.noProxyDomains = [ hostnames.mumble ];
|
||||||
|
|
||||||
|
security.acme.certs."${hostnames.mumble}" = {
|
||||||
|
dnsProvider = "cloudflare";
|
||||||
|
credentialsFile = config.secrets.cloudflare-dns-api-prefixed.dest;
|
||||||
|
group = config.services.murmur.group;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -32,6 +32,7 @@ in
|
|||||||
mathesar.enable = lib.mkDefault true;
|
mathesar.enable = lib.mkDefault true;
|
||||||
mealie.enable = lib.mkDefault true;
|
mealie.enable = lib.mkDefault true;
|
||||||
minecraft-server.enable = lib.mkDefault false;
|
minecraft-server.enable = lib.mkDefault false;
|
||||||
|
murmur.enable = lib.mkDefault true;
|
||||||
n8n.enable = lib.mkDefault true;
|
n8n.enable = lib.mkDefault true;
|
||||||
nix-autoupgrade.enable = lib.mkDefault true; # On by default for communications
|
nix-autoupgrade.enable = lib.mkDefault true; # On by default for communications
|
||||||
ntfy-sh.enable = lib.mkDefault true;
|
ntfy-sh.enable = lib.mkDefault true;
|
||||||
|
|||||||
Reference in New Issue
Block a user