@@ -1,8 +1,8 @@
|
||||
{pkgs}:
|
||||
pkgs.writeShellScriptBin "open-project" ''
|
||||
TARGET=$(fd -t d --exact-depth 1 . $HOME/Projects |
|
||||
sed "s~$HOME/Projects/~~" |
|
||||
fzf --prompt "project > ")
|
||||
TARGET=$(fd -t d --exact-depth 1 . $HOME/Projects |
|
||||
sed "s~$HOME/Projects/~~" |
|
||||
fzf --prompt "project > ")
|
||||
|
||||
zellij run -i -- /${pkgs.fish}/bin/fish -c "cd $HOME/Projects/$TARGET; fish"
|
||||
zellij run -i -- /${pkgs.fish}/bin/fish -c "cd $HOME/Projects/$TARGET; fish"
|
||||
''
|
||||
|
||||
@@ -1,30 +1,30 @@
|
||||
{pkgs, ...}: {
|
||||
programs.fish.enable = true;
|
||||
programs.fish.enable = true;
|
||||
|
||||
nixpkgs = {
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
};
|
||||
nixpkgs = {
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
};
|
||||
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
settings = {
|
||||
trusted-users = [
|
||||
"@admin"
|
||||
];
|
||||
substituters = [
|
||||
"https://nix-community.cachix.org"
|
||||
"https://cache.nixos.org"
|
||||
];
|
||||
trusted-public-keys = ["cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="];
|
||||
};
|
||||
gc = {
|
||||
automatic = true;
|
||||
options = "--delete-older-than 30d";
|
||||
};
|
||||
extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
'';
|
||||
};
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
settings = {
|
||||
trusted-users = [
|
||||
"@admin"
|
||||
];
|
||||
substituters = [
|
||||
"https://nix-community.cachix.org"
|
||||
"https://cache.nixos.org"
|
||||
];
|
||||
trusted-public-keys = ["cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="];
|
||||
};
|
||||
gc = {
|
||||
automatic = true;
|
||||
options = "--delete-older-than 30d";
|
||||
};
|
||||
extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
{pkgs}: let
|
||||
wallpaper = pkgs.fetchurl {
|
||||
url = "https://misc-assets.raycast.com/wallpapers/bright-rain.png";
|
||||
sha256 = "sha256-wQT4I2X3gS6QFsEb7MdRsn4oX7FNkflukXPGMFbJZ10=";
|
||||
};
|
||||
wallpaper =
|
||||
pkgs.fetchurl {
|
||||
url = "https://misc-assets.raycast.com/wallpapers/bright-rain.png";
|
||||
sha256 = "sha256-wQT4I2X3gS6QFsEb7MdRsn4oX7FNkflukXPGMFbJZ10=";
|
||||
};
|
||||
in
|
||||
pkgs.writeShellScriptBin "set-wallpaper-script" ''
|
||||
set -e
|
||||
/usr/bin/osascript -e "tell application \"Finder\" to set desktop picture to POSIX file \"${wallpaper}\""
|
||||
''
|
||||
pkgs.writeShellScriptBin "set-wallpaper-script" ''
|
||||
set -e
|
||||
/usr/bin/osascript -e "tell application \"Finder\" to set desktop picture to POSIX file \"${wallpaper}\""
|
||||
''
|
||||
|
||||
@@ -1,80 +1,80 @@
|
||||
{
|
||||
config,
|
||||
constants,
|
||||
nixvim,
|
||||
pkgs,
|
||||
user,
|
||||
sops-nix,
|
||||
...
|
||||
config,
|
||||
constants,
|
||||
nixvim,
|
||||
pkgs,
|
||||
user,
|
||||
sops-nix,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../core.nix
|
||||
../syncthing.nix
|
||||
../tailscale.nix
|
||||
./dock
|
||||
./homebrew.nix
|
||||
./syncthing.nix
|
||||
./system.nix
|
||||
sops-nix.darwinModules.sops
|
||||
];
|
||||
imports = [
|
||||
../core.nix
|
||||
../syncthing.nix
|
||||
../tailscale.nix
|
||||
./dock
|
||||
./homebrew.nix
|
||||
./syncthing.nix
|
||||
./system.nix
|
||||
sops-nix.darwinModules.sops
|
||||
];
|
||||
|
||||
system = {
|
||||
primaryUser = user;
|
||||
stateVersion = constants.stateVersions.darwin;
|
||||
};
|
||||
system = {
|
||||
primaryUser = user;
|
||||
stateVersion = constants.stateVersions.darwin;
|
||||
};
|
||||
|
||||
nix = {
|
||||
settings.trusted-users = ["@admin" "${user}"];
|
||||
gc.interval = {
|
||||
Weekday = 0;
|
||||
Hour = 2;
|
||||
Minute = 0;
|
||||
};
|
||||
};
|
||||
nix = {
|
||||
settings.trusted-users = ["@admin" "${user}"];
|
||||
gc.interval = {
|
||||
Weekday = 0;
|
||||
Hour = 2;
|
||||
Minute = 0;
|
||||
};
|
||||
};
|
||||
|
||||
users.users.${user} = {
|
||||
name = "${user}";
|
||||
home = "/Users/${user}";
|
||||
isHidden = false;
|
||||
shell = pkgs.fish;
|
||||
};
|
||||
users.users.${user} = {
|
||||
name = "${user}";
|
||||
home = "/Users/${user}";
|
||||
isHidden = false;
|
||||
shell = pkgs.fish;
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
users.${user} = {
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
_module.args = {inherit user constants;};
|
||||
imports = [
|
||||
nixvim.homeModules.nixvim
|
||||
../home/default.nix
|
||||
./home/default.nix
|
||||
];
|
||||
fonts.fontconfig.enable = true;
|
||||
};
|
||||
};
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
users.${user} = {
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
_module.args = {inherit user constants;};
|
||||
imports = [
|
||||
nixvim.homeModules.nixvim
|
||||
../home/default.nix
|
||||
./home/default.nix
|
||||
];
|
||||
fonts.fontconfig.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
local = {
|
||||
dock = {
|
||||
enable = true;
|
||||
username = user;
|
||||
entries = [
|
||||
{path = "/Applications/Helium.app/";}
|
||||
{path = "/${pkgs.ghostty-bin}/Applications/Ghostty.app/";}
|
||||
{path = "/System/Applications/Calendar.app/";}
|
||||
{path = "/System/Applications/Mail.app/";}
|
||||
{path = "/System/Applications/Notes.app/";}
|
||||
{path = "/System/Applications/Music.app/";}
|
||||
{path = "/System/Applications/System Settings.app/";}
|
||||
{
|
||||
path = "${config.users.users.${user}.home}/Downloads";
|
||||
section = "others";
|
||||
options = "--sort name --view grid --display stack";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
local = {
|
||||
dock = {
|
||||
enable = true;
|
||||
username = user;
|
||||
entries = [
|
||||
{path = "/Applications/Helium.app/";}
|
||||
{path = "/${pkgs.ghostty-bin}/Applications/Ghostty.app/";}
|
||||
{path = "/System/Applications/Calendar.app/";}
|
||||
{path = "/System/Applications/Mail.app/";}
|
||||
{path = "/System/Applications/Notes.app/";}
|
||||
{path = "/System/Applications/Music.app/";}
|
||||
{path = "/System/Applications/System Settings.app/";}
|
||||
{
|
||||
path = "${config.users.users.${user}.home}/Downloads";
|
||||
section = "others";
|
||||
options = "--sort name --view grid --display stack";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,104 +1,110 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.dock;
|
||||
inherit (pkgs) stdenv dockutil;
|
||||
cfg = config.local.dock;
|
||||
inherit (pkgs) stdenv dockutil;
|
||||
in {
|
||||
options = {
|
||||
local.dock = {
|
||||
enable = mkOption {
|
||||
description = "Enable dock";
|
||||
default = stdenv.isDarwin;
|
||||
example = false;
|
||||
};
|
||||
options = {
|
||||
local.dock = {
|
||||
enable =
|
||||
mkOption {
|
||||
description = "Enable dock";
|
||||
default = stdenv.isDarwin;
|
||||
example = false;
|
||||
};
|
||||
|
||||
entries = mkOption {
|
||||
description = "Entries on the Dock";
|
||||
type = with types;
|
||||
listOf (submodule {
|
||||
options = {
|
||||
path = lib.mkOption {type = str;};
|
||||
section = lib.mkOption {
|
||||
type = str;
|
||||
default = "apps";
|
||||
};
|
||||
options = lib.mkOption {
|
||||
type = str;
|
||||
default = "";
|
||||
};
|
||||
};
|
||||
});
|
||||
readOnly = true;
|
||||
};
|
||||
entries =
|
||||
mkOption {
|
||||
description = "Entries on the Dock";
|
||||
type = with types;
|
||||
listOf (submodule {
|
||||
options = {
|
||||
path = lib.mkOption {type = str;};
|
||||
section =
|
||||
lib.mkOption {
|
||||
type = str;
|
||||
default = "apps";
|
||||
};
|
||||
options =
|
||||
lib.mkOption {
|
||||
type = str;
|
||||
default = "";
|
||||
};
|
||||
};
|
||||
});
|
||||
readOnly = true;
|
||||
};
|
||||
|
||||
username = mkOption {
|
||||
description = "Username to apply the dock settings to";
|
||||
type = types.str;
|
||||
};
|
||||
};
|
||||
};
|
||||
username =
|
||||
mkOption {
|
||||
description = "Username to apply the dock settings to";
|
||||
type = types.str;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable (
|
||||
let
|
||||
normalize = path:
|
||||
if hasSuffix ".app" path
|
||||
then path + "/"
|
||||
else path;
|
||||
entryURI = path:
|
||||
"file://"
|
||||
+ (
|
||||
builtins.replaceStrings
|
||||
[
|
||||
" "
|
||||
"!"
|
||||
"\""
|
||||
"#"
|
||||
"$"
|
||||
"%"
|
||||
"&"
|
||||
"'"
|
||||
"("
|
||||
")"
|
||||
]
|
||||
[
|
||||
"%20"
|
||||
"%21"
|
||||
"%22"
|
||||
"%23"
|
||||
"%24"
|
||||
"%25"
|
||||
"%26"
|
||||
"%27"
|
||||
"%28"
|
||||
"%29"
|
||||
]
|
||||
(normalize path)
|
||||
);
|
||||
wantURIs = concatMapStrings (entry: "${entryURI entry.path}\n") cfg.entries;
|
||||
createEntries =
|
||||
concatMapStrings (
|
||||
entry: "${dockutil}/bin/dockutil --no-restart --add '${entry.path}' --section ${entry.section} ${entry.options}\n"
|
||||
)
|
||||
cfg.entries;
|
||||
in {
|
||||
system.activationScripts.postActivation.text = ''
|
||||
echo >&2 "Setting up the Dock for ${cfg.username}..."
|
||||
su ${cfg.username} -s /bin/sh <<'USERBLOCK'
|
||||
haveURIs="$(${dockutil}/bin/dockutil --list | ${pkgs.coreutils}/bin/cut -f2)"
|
||||
if ! diff -wu <(echo -n "$haveURIs") <(echo -n '${wantURIs}') >&2 ; then
|
||||
echo >&2 "Resetting Dock."
|
||||
${dockutil}/bin/dockutil --no-restart --remove all
|
||||
${createEntries}
|
||||
killall Dock
|
||||
else
|
||||
echo >&2 "Dock setup complete."
|
||||
fi
|
||||
USERBLOCK
|
||||
'';
|
||||
}
|
||||
);
|
||||
config =
|
||||
mkIf cfg.enable (
|
||||
let
|
||||
normalize = path:
|
||||
if hasSuffix ".app" path
|
||||
then path + "/"
|
||||
else path;
|
||||
entryURI = path:
|
||||
"file://"
|
||||
+ (
|
||||
builtins.replaceStrings
|
||||
[
|
||||
" "
|
||||
"!"
|
||||
"\""
|
||||
"#"
|
||||
"$"
|
||||
"%"
|
||||
"&"
|
||||
"'"
|
||||
"("
|
||||
")"
|
||||
]
|
||||
[
|
||||
"%20"
|
||||
"%21"
|
||||
"%22"
|
||||
"%23"
|
||||
"%24"
|
||||
"%25"
|
||||
"%26"
|
||||
"%27"
|
||||
"%28"
|
||||
"%29"
|
||||
]
|
||||
(normalize path)
|
||||
);
|
||||
wantURIs = concatMapStrings (entry: "${entryURI entry.path}\n") cfg.entries;
|
||||
createEntries =
|
||||
concatMapStrings (
|
||||
entry: "${dockutil}/bin/dockutil --no-restart --add '${entry.path}' --section ${entry.section} ${entry.options}\n"
|
||||
)
|
||||
cfg.entries;
|
||||
in {
|
||||
system.activationScripts.postActivation.text = ''
|
||||
echo >&2 "Setting up the Dock for ${cfg.username}..."
|
||||
su ${cfg.username} -s /bin/sh <<'USERBLOCK'
|
||||
haveURIs="$(${dockutil}/bin/dockutil --list | ${pkgs.coreutils}/bin/cut -f2)"
|
||||
if ! diff -wu <(echo -n "$haveURIs") <(echo -n '${wantURIs}') >&2 ; then
|
||||
echo >&2 "Resetting Dock."
|
||||
${dockutil}/bin/dockutil --no-restart --remove all
|
||||
${createEntries}
|
||||
killall Dock
|
||||
else
|
||||
echo >&2 "Dock setup complete."
|
||||
fi
|
||||
USERBLOCK
|
||||
'';
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,21 +1,22 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
setWallpaperScript = import ../bin/wallpaper.nix {inherit pkgs;};
|
||||
setWallpaperScript = import ../bin/wallpaper.nix {inherit pkgs;};
|
||||
in {
|
||||
imports = [
|
||||
./ghostty.nix
|
||||
];
|
||||
imports = [
|
||||
./ghostty.nix
|
||||
];
|
||||
|
||||
home = {
|
||||
packages = pkgs.callPackage ../packages.nix {};
|
||||
activation = {
|
||||
"setWallpaper" = lib.hm.dag.entryAfter ["revealHomeLibraryDirectory"] ''
|
||||
echo "[+] Setting wallpaper"
|
||||
${setWallpaperScript}/bin/set-wallpaper-script
|
||||
'';
|
||||
};
|
||||
};
|
||||
home = {
|
||||
packages = pkgs.callPackage ../packages.nix {};
|
||||
activation = {
|
||||
"setWallpaper" =
|
||||
lib.hm.dag.entryAfter ["revealHomeLibraryDirectory"] ''
|
||||
echo "[+] Setting wallpaper"
|
||||
${setWallpaperScript}/bin/set-wallpaper-script
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{pkgs, ...}: {
|
||||
programs.ghostty = {
|
||||
enable = true;
|
||||
package = pkgs.ghostty-bin;
|
||||
settings = {
|
||||
command = "${pkgs.fish}/bin/fish";
|
||||
theme = "Catppuccin Latte";
|
||||
window-padding-x = 12;
|
||||
window-padding-y = 3;
|
||||
window-padding-balance = true;
|
||||
font-family = "TX-02 SemiCondensed";
|
||||
font-size = 16.5;
|
||||
cursor-style = "block";
|
||||
mouse-hide-while-typing = true;
|
||||
mouse-scroll-multiplier = 1.25;
|
||||
shell-integration = "detect";
|
||||
shell-integration-features = "no-cursor";
|
||||
clipboard-read = "allow";
|
||||
clipboard-write = "allow";
|
||||
};
|
||||
};
|
||||
programs.ghostty = {
|
||||
enable = true;
|
||||
package = pkgs.ghostty-bin;
|
||||
settings = {
|
||||
command = "${pkgs.fish}/bin/fish";
|
||||
theme = "Catppuccin Latte";
|
||||
window-padding-x = 12;
|
||||
window-padding-y = 3;
|
||||
window-padding-balance = true;
|
||||
font-family = "TX-02 SemiCondensed";
|
||||
font-size = 16.5;
|
||||
cursor-style = "block";
|
||||
mouse-hide-while-typing = true;
|
||||
mouse-scroll-multiplier = 1.25;
|
||||
shell-integration = "detect";
|
||||
shell-integration-features = "no-cursor";
|
||||
clipboard-read = "allow";
|
||||
clipboard-write = "allow";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
homebrew = {
|
||||
enable = true;
|
||||
casks = [
|
||||
"helium-browser"
|
||||
"pearcleaner"
|
||||
"tidal"
|
||||
];
|
||||
};
|
||||
homebrew = {
|
||||
enable = true;
|
||||
casks = [
|
||||
"helium-browser"
|
||||
"pearcleaner"
|
||||
"tidal"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{pkgs}:
|
||||
with pkgs; [
|
||||
_1password-gui
|
||||
dockutil
|
||||
mas
|
||||
raycast
|
||||
tailscale
|
||||
whatsapp-for-mac
|
||||
xcodes
|
||||
_1password-gui
|
||||
dockutil
|
||||
mas
|
||||
raycast
|
||||
tailscale
|
||||
whatsapp-for-mac
|
||||
xcodes
|
||||
]
|
||||
|
||||
@@ -1,396 +1,437 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.services.syncthing;
|
||||
settingsFormat = pkgs.formats.json {};
|
||||
cleanedConfig = converge (filterAttrsRecursive (_: v: v != null && v != {})) cfg.settings;
|
||||
cfg = config.services.syncthing;
|
||||
settingsFormat = pkgs.formats.json {};
|
||||
cleanedConfig = converge (filterAttrsRecursive (_: v: v != null && v != {})) cfg.settings;
|
||||
|
||||
isUnixGui = (builtins.substring 0 1 cfg.guiAddress) == "/";
|
||||
isUnixGui = (builtins.substring 0 1 cfg.guiAddress) == "/";
|
||||
|
||||
curlAddressArgs = path:
|
||||
if isUnixGui
|
||||
then "--unix-socket ${cfg.guiAddress} http://.${path}"
|
||||
else "${cfg.guiAddress}${path}";
|
||||
curlAddressArgs = path:
|
||||
if isUnixGui
|
||||
then "--unix-socket ${cfg.guiAddress} http://.${path}"
|
||||
else "${cfg.guiAddress}${path}";
|
||||
|
||||
devices = mapAttrsToList (_: device: device // {deviceID = device.id;}) cfg.settings.devices;
|
||||
anyAutoAccept = builtins.any (dev: dev.autoAcceptFolders) devices;
|
||||
devices = mapAttrsToList (_: device: device // {deviceID = device.id;}) cfg.settings.devices;
|
||||
anyAutoAccept = builtins.any (dev: dev.autoAcceptFolders) devices;
|
||||
|
||||
folders = mapAttrsToList (_: folder:
|
||||
folder
|
||||
// {
|
||||
devices = let
|
||||
folderDevices = folder.devices;
|
||||
in
|
||||
map (
|
||||
device:
|
||||
if builtins.isString device
|
||||
then {deviceId = cfg.settings.devices.${device}.id;}
|
||||
else if builtins.isAttrs device
|
||||
then {deviceId = cfg.settings.devices.${device.name}.id;} // device
|
||||
else throw "Invalid type for devices in folder; expected list or attrset."
|
||||
)
|
||||
folderDevices;
|
||||
}) (filterAttrs (_: folder: folder.enable) cfg.settings.folders);
|
||||
folders =
|
||||
mapAttrsToList (_: folder:
|
||||
folder
|
||||
// {
|
||||
devices = let
|
||||
folderDevices = folder.devices;
|
||||
in
|
||||
map (
|
||||
device:
|
||||
if builtins.isString device
|
||||
then {deviceId = cfg.settings.devices.${device}.id;}
|
||||
else if builtins.isAttrs device
|
||||
then {deviceId = cfg.settings.devices.${device.name}.id;} // device
|
||||
else throw "Invalid type for devices in folder; expected list or attrset."
|
||||
)
|
||||
folderDevices;
|
||||
}) (filterAttrs (_: folder: folder.enable) cfg.settings.folders);
|
||||
|
||||
jq = "${pkgs.jq}/bin/jq";
|
||||
updateConfig = pkgs.writers.writeBash "merge-syncthing-config" (
|
||||
''
|
||||
set -efu
|
||||
umask 0077
|
||||
jq = "${pkgs.jq}/bin/jq";
|
||||
updateConfig =
|
||||
pkgs.writers.writeBash "merge-syncthing-config" (
|
||||
''
|
||||
set -efu
|
||||
umask 0077
|
||||
|
||||
curl() {
|
||||
while
|
||||
! ${pkgs.libxml2}/bin/xmllint \
|
||||
--xpath 'string(configuration/gui/apikey)' \
|
||||
${cfg.configDir}/config.xml \
|
||||
>"$TMPDIR/api_key"
|
||||
do sleep 1; done
|
||||
(printf "X-API-Key: "; cat "$TMPDIR/api_key") >"$TMPDIR/headers"
|
||||
${pkgs.curl}/bin/curl -sSLk -H "@$TMPDIR/headers" \
|
||||
--retry 1000 --retry-delay 1 --retry-all-errors \
|
||||
"$@"
|
||||
}
|
||||
''
|
||||
+ (lib.pipe {
|
||||
devs = {
|
||||
new_conf_IDs = map (v: v.id) devices;
|
||||
GET_IdAttrName = "deviceID";
|
||||
override = cfg.overrideDevices;
|
||||
conf = devices;
|
||||
baseAddress = curlAddressArgs "/rest/config/devices";
|
||||
};
|
||||
dirs = {
|
||||
new_conf_IDs = map (v: v.id) folders;
|
||||
GET_IdAttrName = "id";
|
||||
override = cfg.overrideFolders;
|
||||
conf = folders;
|
||||
baseAddress = curlAddressArgs "/rest/config/folders";
|
||||
};
|
||||
} [
|
||||
(mapAttrs (
|
||||
conf_type: s:
|
||||
lib.pipe s.conf [
|
||||
(map (
|
||||
new_cfg: let
|
||||
jsonPreSecretsFile = pkgs.writeTextFile {
|
||||
name = "${conf_type}-${new_cfg.id}-conf-pre-secrets.json";
|
||||
text = builtins.toJSON new_cfg;
|
||||
};
|
||||
injectSecretsJqCmd =
|
||||
{
|
||||
"devs" = "${jq} .";
|
||||
"dirs" = let
|
||||
folder = new_cfg;
|
||||
devicesWithSecrets = lib.pipe folder.devices [
|
||||
(lib.filter (device: (builtins.isAttrs device) && device ? encryptionPasswordFile))
|
||||
(map (device: {
|
||||
deviceId = device.deviceId;
|
||||
variableName = "secret_${builtins.hashString "sha256" device.encryptionPasswordFile}";
|
||||
secretPath = device.encryptionPasswordFile;
|
||||
}))
|
||||
];
|
||||
jqUpdates =
|
||||
map (device: ''
|
||||
.devices[] |= (
|
||||
if .deviceId == "${device.deviceId}" then
|
||||
del(.encryptionPasswordFile) |
|
||||
.encryptionPassword = ''$${device.variableName}
|
||||
else
|
||||
.
|
||||
end
|
||||
)
|
||||
'')
|
||||
devicesWithSecrets;
|
||||
jqRawFiles = map (device: "--rawfile ${device.variableName} ${lib.escapeShellArg device.secretPath}") devicesWithSecrets;
|
||||
in "${jq} ${lib.concatStringsSep " " jqRawFiles} ${lib.escapeShellArg (lib.concatStringsSep "|" (["."] ++ jqUpdates))}";
|
||||
}.${
|
||||
conf_type
|
||||
};
|
||||
in ''
|
||||
${injectSecretsJqCmd} ${jsonPreSecretsFile} | curl --json @- -X POST ${s.baseAddress}
|
||||
''
|
||||
))
|
||||
(lib.concatStringsSep "\n")
|
||||
]
|
||||
+ lib.optionalString s.override ''
|
||||
stale_${conf_type}_ids="$(curl -X GET ${s.baseAddress} | ${jq} \
|
||||
--argjson new_ids ${lib.escapeShellArg (builtins.toJSON s.new_conf_IDs)} \
|
||||
--raw-output \
|
||||
'[.[].${s.GET_IdAttrName}] - $new_ids | .[]'
|
||||
)"
|
||||
for id in ''${stale_${conf_type}_ids}; do
|
||||
>&2 echo "Deleting stale device: $id"
|
||||
curl -X DELETE ${s.baseAddress}/$id
|
||||
done
|
||||
''
|
||||
))
|
||||
builtins.attrValues
|
||||
(lib.concatStringsSep "\n")
|
||||
])
|
||||
+ (lib.pipe cleanedConfig [
|
||||
builtins.attrNames
|
||||
(lib.subtractLists ["folders" "devices"])
|
||||
(map (subOption: ''
|
||||
curl -X PUT -d ${lib.escapeShellArg (builtins.toJSON cleanedConfig.${subOption})} ${curlAddressArgs "/rest/config/${subOption}"}
|
||||
''))
|
||||
(lib.concatStringsSep "\n")
|
||||
])
|
||||
+ ''
|
||||
if curl ${curlAddressArgs "/rest/config/restart-required"} |
|
||||
${jq} -e .requiresRestart > /dev/null; then
|
||||
curl -X POST ${curlAddressArgs "/rest/system/restart"}
|
||||
fi
|
||||
''
|
||||
);
|
||||
curl() {
|
||||
while
|
||||
! ${pkgs.libxml2}/bin/xmllint \
|
||||
--xpath 'string(configuration/gui/apikey)' \
|
||||
${cfg.configDir}/config.xml \
|
||||
>"$TMPDIR/api_key"
|
||||
do sleep 1; done
|
||||
(printf "X-API-Key: "; cat "$TMPDIR/api_key") >"$TMPDIR/headers"
|
||||
${pkgs.curl}/bin/curl -sSLk -H "@$TMPDIR/headers" \
|
||||
--retry 1000 --retry-delay 1 --retry-all-errors \
|
||||
"$@"
|
||||
}
|
||||
''
|
||||
+ (lib.pipe {
|
||||
devs = {
|
||||
new_conf_IDs = map (v: v.id) devices;
|
||||
GET_IdAttrName = "deviceID";
|
||||
override = cfg.overrideDevices;
|
||||
conf = devices;
|
||||
baseAddress = curlAddressArgs "/rest/config/devices";
|
||||
};
|
||||
dirs = {
|
||||
new_conf_IDs = map (v: v.id) folders;
|
||||
GET_IdAttrName = "id";
|
||||
override = cfg.overrideFolders;
|
||||
conf = folders;
|
||||
baseAddress = curlAddressArgs "/rest/config/folders";
|
||||
};
|
||||
} [
|
||||
(mapAttrs (
|
||||
conf_type: s:
|
||||
lib.pipe s.conf [
|
||||
(map (
|
||||
new_cfg: let
|
||||
jsonPreSecretsFile =
|
||||
pkgs.writeTextFile {
|
||||
name = "${conf_type}-${new_cfg.id}-conf-pre-secrets.json";
|
||||
text = builtins.toJSON new_cfg;
|
||||
};
|
||||
injectSecretsJqCmd =
|
||||
{
|
||||
"devs" = "${jq} .";
|
||||
"dirs" = let
|
||||
folder = new_cfg;
|
||||
devicesWithSecrets =
|
||||
lib.pipe folder.devices [
|
||||
(lib.filter (device: (builtins.isAttrs device) && device ? encryptionPasswordFile))
|
||||
(map (device: {
|
||||
deviceId = device.deviceId;
|
||||
variableName = "secret_${builtins.hashString "sha256" device.encryptionPasswordFile}";
|
||||
secretPath = device.encryptionPasswordFile;
|
||||
}))
|
||||
];
|
||||
jqUpdates =
|
||||
map (device: ''
|
||||
.devices[] |= (
|
||||
if .deviceId == "${device.deviceId}" then
|
||||
del(.encryptionPasswordFile) |
|
||||
.encryptionPassword = ''$${device.variableName}
|
||||
else
|
||||
.
|
||||
end
|
||||
)
|
||||
'')
|
||||
devicesWithSecrets;
|
||||
jqRawFiles = map (device: "--rawfile ${device.variableName} ${lib.escapeShellArg device.secretPath}") devicesWithSecrets;
|
||||
in "${jq} ${lib.concatStringsSep " " jqRawFiles} ${lib.escapeShellArg (lib.concatStringsSep "|" (["."] ++ jqUpdates))}";
|
||||
}.${
|
||||
conf_type
|
||||
};
|
||||
in ''
|
||||
${injectSecretsJqCmd} ${jsonPreSecretsFile} | curl --json @- -X POST ${s.baseAddress}
|
||||
''
|
||||
))
|
||||
(lib.concatStringsSep "\n")
|
||||
]
|
||||
+ lib.optionalString s.override ''
|
||||
stale_${conf_type}_ids="$(curl -X GET ${s.baseAddress} | ${jq} \
|
||||
--argjson new_ids ${lib.escapeShellArg (builtins.toJSON s.new_conf_IDs)} \
|
||||
--raw-output \
|
||||
'[.[].${s.GET_IdAttrName}] - $new_ids | .[]'
|
||||
)"
|
||||
for id in ''${stale_${conf_type}_ids}; do
|
||||
>&2 echo "Deleting stale device: $id"
|
||||
curl -X DELETE ${s.baseAddress}/$id
|
||||
done
|
||||
''
|
||||
))
|
||||
builtins.attrValues
|
||||
(lib.concatStringsSep "\n")
|
||||
])
|
||||
+ (lib.pipe cleanedConfig [
|
||||
builtins.attrNames
|
||||
(lib.subtractLists ["folders" "devices"])
|
||||
(map (subOption: ''
|
||||
curl -X PUT -d ${lib.escapeShellArg (builtins.toJSON cleanedConfig.${subOption})} ${curlAddressArgs "/rest/config/${subOption}"}
|
||||
''))
|
||||
(lib.concatStringsSep "\n")
|
||||
])
|
||||
+ ''
|
||||
if curl ${curlAddressArgs "/rest/config/restart-required"} |
|
||||
${jq} -e .requiresRestart > /dev/null; then
|
||||
curl -X POST ${curlAddressArgs "/rest/system/restart"}
|
||||
fi
|
||||
''
|
||||
);
|
||||
in {
|
||||
options = {
|
||||
services.syncthing = {
|
||||
enable = mkEnableOption "Syncthing, a self-hosted open-source alternative to Dropbox and Bittorrent Sync";
|
||||
options = {
|
||||
services.syncthing = {
|
||||
enable = mkEnableOption "Syncthing, a self-hosted open-source alternative to Dropbox and Bittorrent Sync";
|
||||
|
||||
cert = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = "Path to the cert.pem file, which will be copied into Syncthing's configDir.";
|
||||
};
|
||||
cert =
|
||||
mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = "Path to the cert.pem file, which will be copied into Syncthing's configDir.";
|
||||
};
|
||||
|
||||
key = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = "Path to the key.pem file, which will be copied into Syncthing's configDir.";
|
||||
};
|
||||
key =
|
||||
mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = "Path to the key.pem file, which will be copied into Syncthing's configDir.";
|
||||
};
|
||||
|
||||
overrideDevices = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to delete the devices which are not configured via the devices option.";
|
||||
};
|
||||
overrideDevices =
|
||||
mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to delete the devices which are not configured via the devices option.";
|
||||
};
|
||||
|
||||
overrideFolders = mkOption {
|
||||
type = types.bool;
|
||||
default = !anyAutoAccept;
|
||||
description = "Whether to delete the folders which are not configured via the folders option.";
|
||||
};
|
||||
overrideFolders =
|
||||
mkOption {
|
||||
type = types.bool;
|
||||
default = !anyAutoAccept;
|
||||
description = "Whether to delete the folders which are not configured via the folders option.";
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
options = mkOption {
|
||||
default = {};
|
||||
description = "The options element contains all other global configuration options";
|
||||
type = types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
localAnnounceEnabled = mkOption {
|
||||
type = types.nullOr types.bool;
|
||||
default = null;
|
||||
description = "Whether to send announcements to the local LAN.";
|
||||
};
|
||||
globalAnnounceEnabled = mkOption {
|
||||
type = types.nullOr types.bool;
|
||||
default = null;
|
||||
description = "Whether to send announcements to the global discovery servers.";
|
||||
};
|
||||
relaysEnabled = mkOption {
|
||||
type = types.nullOr types.bool;
|
||||
default = null;
|
||||
description = "When true, relays will be connected to and potentially used for device to device connections.";
|
||||
};
|
||||
urAccepted = mkOption {
|
||||
type = types.nullOr types.int;
|
||||
default = null;
|
||||
description = "Whether the user has accepted to submit anonymous usage data.";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
settings =
|
||||
mkOption {
|
||||
type =
|
||||
types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
options =
|
||||
mkOption {
|
||||
default = {};
|
||||
description = "The options element contains all other global configuration options";
|
||||
type =
|
||||
types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
localAnnounceEnabled =
|
||||
mkOption {
|
||||
type = types.nullOr types.bool;
|
||||
default = null;
|
||||
description = "Whether to send announcements to the local LAN.";
|
||||
};
|
||||
globalAnnounceEnabled =
|
||||
mkOption {
|
||||
type = types.nullOr types.bool;
|
||||
default = null;
|
||||
description = "Whether to send announcements to the global discovery servers.";
|
||||
};
|
||||
relaysEnabled =
|
||||
mkOption {
|
||||
type = types.nullOr types.bool;
|
||||
default = null;
|
||||
description = "When true, relays will be connected to and potentially used for device to device connections.";
|
||||
};
|
||||
urAccepted =
|
||||
mkOption {
|
||||
type = types.nullOr types.int;
|
||||
default = null;
|
||||
description = "Whether the user has accepted to submit anonymous usage data.";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
devices = mkOption {
|
||||
default = {};
|
||||
description = "Peers/devices which Syncthing should communicate with.";
|
||||
type = types.attrsOf (types.submodule ({name, ...}: {
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
name = mkOption {
|
||||
type = types.str;
|
||||
default = name;
|
||||
description = "The name of the device.";
|
||||
};
|
||||
id = mkOption {
|
||||
type = types.str;
|
||||
description = "The device ID.";
|
||||
};
|
||||
autoAcceptFolders = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Automatically create or share folders that this device advertises at the default path.";
|
||||
};
|
||||
};
|
||||
}));
|
||||
};
|
||||
devices =
|
||||
mkOption {
|
||||
default = {};
|
||||
description = "Peers/devices which Syncthing should communicate with.";
|
||||
type =
|
||||
types.attrsOf (types.submodule ({name, ...}: {
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
name =
|
||||
mkOption {
|
||||
type = types.str;
|
||||
default = name;
|
||||
description = "The name of the device.";
|
||||
};
|
||||
id =
|
||||
mkOption {
|
||||
type = types.str;
|
||||
description = "The device ID.";
|
||||
};
|
||||
autoAcceptFolders =
|
||||
mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Automatically create or share folders that this device advertises at the default path.";
|
||||
};
|
||||
};
|
||||
}));
|
||||
};
|
||||
|
||||
folders = mkOption {
|
||||
default = {};
|
||||
description = "Folders which should be shared by Syncthing.";
|
||||
type = types.attrsOf (types.submodule ({name, ...}: {
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to share this folder.";
|
||||
};
|
||||
path = mkOption {
|
||||
type = types.str;
|
||||
default = name;
|
||||
description = "The path to the folder which should be shared.";
|
||||
};
|
||||
id = mkOption {
|
||||
type = types.str;
|
||||
default = name;
|
||||
description = "The ID of the folder. Must be the same on all devices.";
|
||||
};
|
||||
label = mkOption {
|
||||
type = types.str;
|
||||
default = name;
|
||||
description = "The label of the folder.";
|
||||
};
|
||||
type = mkOption {
|
||||
type = types.enum ["sendreceive" "sendonly" "receiveonly" "receiveencrypted"];
|
||||
default = "sendreceive";
|
||||
description = "Controls how the folder is handled by Syncthing.";
|
||||
};
|
||||
devices = mkOption {
|
||||
type = types.listOf (types.oneOf [
|
||||
types.str
|
||||
(types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
name = mkOption {
|
||||
type = types.str;
|
||||
description = "The name of a device defined in the devices option.";
|
||||
};
|
||||
encryptionPasswordFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = "Path to encryption password file.";
|
||||
};
|
||||
};
|
||||
})
|
||||
]);
|
||||
default = [];
|
||||
description = "The devices this folder should be shared with.";
|
||||
};
|
||||
};
|
||||
}));
|
||||
};
|
||||
};
|
||||
};
|
||||
default = {};
|
||||
description = "Extra configuration options for Syncthing.";
|
||||
};
|
||||
folders =
|
||||
mkOption {
|
||||
default = {};
|
||||
description = "Folders which should be shared by Syncthing.";
|
||||
type =
|
||||
types.attrsOf (types.submodule ({name, ...}: {
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
enable =
|
||||
mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to share this folder.";
|
||||
};
|
||||
path =
|
||||
mkOption {
|
||||
type = types.str;
|
||||
default = name;
|
||||
description = "The path to the folder which should be shared.";
|
||||
};
|
||||
id =
|
||||
mkOption {
|
||||
type = types.str;
|
||||
default = name;
|
||||
description = "The ID of the folder. Must be the same on all devices.";
|
||||
};
|
||||
label =
|
||||
mkOption {
|
||||
type = types.str;
|
||||
default = name;
|
||||
description = "The label of the folder.";
|
||||
};
|
||||
type =
|
||||
mkOption {
|
||||
type = types.enum ["sendreceive" "sendonly" "receiveonly" "receiveencrypted"];
|
||||
default = "sendreceive";
|
||||
description = "Controls how the folder is handled by Syncthing.";
|
||||
};
|
||||
devices =
|
||||
mkOption {
|
||||
type =
|
||||
types.listOf (types.oneOf [
|
||||
types.str
|
||||
(types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
name =
|
||||
mkOption {
|
||||
type = types.str;
|
||||
description = "The name of a device defined in the devices option.";
|
||||
};
|
||||
encryptionPasswordFile =
|
||||
mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = "Path to encryption password file.";
|
||||
};
|
||||
};
|
||||
})
|
||||
]);
|
||||
default = [];
|
||||
description = "The devices this folder should be shared with.";
|
||||
};
|
||||
};
|
||||
}));
|
||||
};
|
||||
};
|
||||
};
|
||||
default = {};
|
||||
description = "Extra configuration options for Syncthing.";
|
||||
};
|
||||
|
||||
guiAddress = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1:8384";
|
||||
description = "The address to serve the web interface at.";
|
||||
};
|
||||
guiAddress =
|
||||
mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1:8384";
|
||||
description = "The address to serve the web interface at.";
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "syncthing";
|
||||
description = "The user to run Syncthing as.";
|
||||
};
|
||||
user =
|
||||
mkOption {
|
||||
type = types.str;
|
||||
default = "syncthing";
|
||||
description = "The user to run Syncthing as.";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "syncthing";
|
||||
description = "The group to run Syncthing under.";
|
||||
};
|
||||
group =
|
||||
mkOption {
|
||||
type = types.str;
|
||||
default = "syncthing";
|
||||
description = "The group to run Syncthing under.";
|
||||
};
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.path;
|
||||
default = "/var/lib/syncthing";
|
||||
description = "The path where synchronised directories will exist.";
|
||||
};
|
||||
dataDir =
|
||||
mkOption {
|
||||
type = types.path;
|
||||
default = "/var/lib/syncthing";
|
||||
description = "The path where synchronised directories will exist.";
|
||||
};
|
||||
|
||||
configDir = mkOption {
|
||||
type = types.path;
|
||||
default = cfg.dataDir + "/.config/syncthing";
|
||||
description = "The path where the settings and keys will exist.";
|
||||
};
|
||||
configDir =
|
||||
mkOption {
|
||||
type = types.path;
|
||||
default = cfg.dataDir + "/.config/syncthing";
|
||||
description = "The path where the settings and keys will exist.";
|
||||
};
|
||||
|
||||
openDefaultPorts = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to open the default ports in the firewall (not applicable on Darwin).";
|
||||
};
|
||||
openDefaultPorts =
|
||||
mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to open the default ports in the firewall (not applicable on Darwin).";
|
||||
};
|
||||
|
||||
package = mkPackageOption pkgs "syncthing" {};
|
||||
};
|
||||
};
|
||||
package = mkPackageOption pkgs "syncthing" {};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = !(cfg.overrideFolders && anyAutoAccept);
|
||||
message = "services.syncthing.overrideFolders will delete auto-accepted folders from the configuration, creating path conflicts.";
|
||||
}
|
||||
];
|
||||
config =
|
||||
mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = !(cfg.overrideFolders && anyAutoAccept);
|
||||
message = "services.syncthing.overrideFolders will delete auto-accepted folders from the configuration, creating path conflicts.";
|
||||
}
|
||||
];
|
||||
|
||||
environment.systemPackages = [cfg.package];
|
||||
environment.systemPackages = [cfg.package];
|
||||
|
||||
launchd.user.agents.syncthing = {
|
||||
serviceConfig = {
|
||||
ProgramArguments = [
|
||||
"${cfg.package}/bin/syncthing"
|
||||
"--no-browser"
|
||||
"--gui-address=${
|
||||
if isUnixGui
|
||||
then "unix://"
|
||||
else ""
|
||||
}${cfg.guiAddress}"
|
||||
"--config=${cfg.configDir}"
|
||||
"--data=${cfg.configDir}"
|
||||
];
|
||||
EnvironmentVariables = {
|
||||
STNORESTART = "yes";
|
||||
STNOUPGRADE = "yes";
|
||||
};
|
||||
KeepAlive = true;
|
||||
RunAtLoad = true;
|
||||
ProcessType = "Background";
|
||||
StandardOutPath = "${cfg.configDir}/syncthing.log";
|
||||
StandardErrorPath = "${cfg.configDir}/syncthing.log";
|
||||
};
|
||||
};
|
||||
launchd.user.agents.syncthing = {
|
||||
serviceConfig = {
|
||||
ProgramArguments = [
|
||||
"${cfg.package}/bin/syncthing"
|
||||
"--no-browser"
|
||||
"--gui-address=${
|
||||
if isUnixGui
|
||||
then "unix://"
|
||||
else ""
|
||||
}${cfg.guiAddress}"
|
||||
"--config=${cfg.configDir}"
|
||||
"--data=${cfg.configDir}"
|
||||
];
|
||||
EnvironmentVariables = {
|
||||
STNORESTART = "yes";
|
||||
STNOUPGRADE = "yes";
|
||||
};
|
||||
KeepAlive = true;
|
||||
RunAtLoad = true;
|
||||
ProcessType = "Background";
|
||||
StandardOutPath = "${cfg.configDir}/syncthing.log";
|
||||
StandardErrorPath = "${cfg.configDir}/syncthing.log";
|
||||
};
|
||||
};
|
||||
|
||||
launchd.user.agents.syncthing-init = mkIf (cleanedConfig != {}) {
|
||||
serviceConfig = {
|
||||
ProgramArguments = ["${updateConfig}"];
|
||||
RunAtLoad = true;
|
||||
KeepAlive = false;
|
||||
ProcessType = "Background";
|
||||
StandardOutPath = "${cfg.configDir}/syncthing-init.log";
|
||||
StandardErrorPath = "${cfg.configDir}/syncthing-init.log";
|
||||
};
|
||||
};
|
||||
launchd.user.agents.syncthing-init =
|
||||
mkIf (cleanedConfig != {}) {
|
||||
serviceConfig = {
|
||||
ProgramArguments = ["${updateConfig}"];
|
||||
RunAtLoad = true;
|
||||
KeepAlive = false;
|
||||
ProcessType = "Background";
|
||||
StandardOutPath = "${cfg.configDir}/syncthing-init.log";
|
||||
StandardErrorPath = "${cfg.configDir}/syncthing-init.log";
|
||||
};
|
||||
};
|
||||
|
||||
system.activationScripts.syncthing = mkIf (cfg.cert != null || cfg.key != null) ''
|
||||
echo "Setting up Syncthing certificates..."
|
||||
mkdir -p ${cfg.configDir}
|
||||
${optionalString (cfg.cert != null) ''
|
||||
cp ${toString cfg.cert} ${cfg.configDir}/cert.pem
|
||||
chmod 644 ${cfg.configDir}/cert.pem
|
||||
''}
|
||||
${optionalString (cfg.key != null) ''
|
||||
cp ${toString cfg.key} ${cfg.configDir}/key.pem
|
||||
chmod 600 ${cfg.configDir}/key.pem
|
||||
''}
|
||||
'';
|
||||
};
|
||||
system.activationScripts.syncthing =
|
||||
mkIf (cfg.cert != null || cfg.key != null) ''
|
||||
echo "Setting up Syncthing certificates..."
|
||||
mkdir -p ${cfg.configDir}
|
||||
${optionalString (cfg.cert != null) ''
|
||||
cp ${toString cfg.cert} ${cfg.configDir}/cert.pem
|
||||
chmod 644 ${cfg.configDir}/cert.pem
|
||||
''}
|
||||
${optionalString (cfg.key != null) ''
|
||||
cp ${toString cfg.key} ${cfg.configDir}/key.pem
|
||||
chmod 600 ${cfg.configDir}/key.pem
|
||||
''}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,31 +1,31 @@
|
||||
{
|
||||
system.defaults = {
|
||||
NSGlobalDomain = {
|
||||
AppleInterfaceStyle = "Dark";
|
||||
AppleShowAllExtensions = true;
|
||||
ApplePressAndHoldEnabled = false;
|
||||
KeyRepeat = 2;
|
||||
InitialKeyRepeat = 15;
|
||||
"com.apple.mouse.tapBehavior" = 1;
|
||||
"com.apple.sound.beep.volume" = 0.0;
|
||||
"com.apple.sound.beep.feedback" = 0;
|
||||
};
|
||||
system.defaults = {
|
||||
NSGlobalDomain = {
|
||||
AppleInterfaceStyle = "Dark";
|
||||
AppleShowAllExtensions = true;
|
||||
ApplePressAndHoldEnabled = false;
|
||||
KeyRepeat = 2;
|
||||
InitialKeyRepeat = 15;
|
||||
"com.apple.mouse.tapBehavior" = 1;
|
||||
"com.apple.sound.beep.volume" = 0.0;
|
||||
"com.apple.sound.beep.feedback" = 0;
|
||||
};
|
||||
|
||||
dock = {
|
||||
autohide = true;
|
||||
show-recents = false;
|
||||
launchanim = true;
|
||||
orientation = "bottom";
|
||||
tilesize = 60;
|
||||
};
|
||||
dock = {
|
||||
autohide = true;
|
||||
show-recents = false;
|
||||
launchanim = true;
|
||||
orientation = "bottom";
|
||||
tilesize = 60;
|
||||
};
|
||||
|
||||
finder = {
|
||||
_FXShowPosixPathInTitle = false;
|
||||
};
|
||||
finder = {
|
||||
_FXShowPosixPathInTitle = false;
|
||||
};
|
||||
|
||||
trackpad = {
|
||||
Clicking = true;
|
||||
TrackpadThreeFingerDrag = true;
|
||||
};
|
||||
};
|
||||
trackpad = {
|
||||
Clicking = true;
|
||||
TrackpadThreeFingerDrag = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{
|
||||
programs.atuin = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
flags = [
|
||||
"--disable-up-arrow"
|
||||
];
|
||||
settings = {
|
||||
style = "compact";
|
||||
inline_height = 0;
|
||||
show_help = false;
|
||||
show_tabs = false;
|
||||
};
|
||||
};
|
||||
programs.atuin = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
flags = [
|
||||
"--disable-up-arrow"
|
||||
];
|
||||
settings = {
|
||||
style = "compact";
|
||||
inline_height = 0;
|
||||
show_help = false;
|
||||
show_tabs = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
};
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,20 +1,21 @@
|
||||
{pkgs, ...}: {
|
||||
programs.bat = {
|
||||
enable = true;
|
||||
config = {
|
||||
theme = "Catppuccin Latte";
|
||||
pager = "ov";
|
||||
};
|
||||
themes = {
|
||||
"Catppuccin Latte" = {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "bat";
|
||||
rev = "6810349b28055dce54076712fc05fc68da4b8ec0";
|
||||
sha256 = "lJapSgRVENTrbmpVyn+UQabC9fpV1G1e+CdlJ090uvg=";
|
||||
};
|
||||
file = "themes/Catppuccin Latte.tmTheme";
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.bat = {
|
||||
enable = true;
|
||||
config = {
|
||||
theme = "Catppuccin Latte";
|
||||
pager = "ov";
|
||||
};
|
||||
themes = {
|
||||
"Catppuccin Latte" = {
|
||||
src =
|
||||
pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "bat";
|
||||
rev = "6810349b28055dce54076712fc05fc68da4b8ec0";
|
||||
sha256 = "lJapSgRVENTrbmpVyn+UQabC9fpV1G1e+CdlJ090uvg=";
|
||||
};
|
||||
file = "themes/Catppuccin Latte.tmTheme";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,33 +1,33 @@
|
||||
{
|
||||
pkgs,
|
||||
constants,
|
||||
...
|
||||
pkgs,
|
||||
constants,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./atuin.nix
|
||||
./bash.nix
|
||||
./bat.nix
|
||||
./direnv.nix
|
||||
./eza.nix
|
||||
./fish.nix
|
||||
./fzf.nix
|
||||
./git.nix
|
||||
./lazygit.nix
|
||||
./mise.nix
|
||||
./neovim
|
||||
./opencode.nix
|
||||
./ripgrep.nix
|
||||
./ssh.nix
|
||||
./starship.nix
|
||||
./zellij.nix
|
||||
./zoxide.nix
|
||||
./zsh.nix
|
||||
];
|
||||
imports = [
|
||||
./atuin.nix
|
||||
./bash.nix
|
||||
./bat.nix
|
||||
./direnv.nix
|
||||
./eza.nix
|
||||
./fish.nix
|
||||
./fzf.nix
|
||||
./git.nix
|
||||
./lazygit.nix
|
||||
./mise.nix
|
||||
./neovim
|
||||
./opencode.nix
|
||||
./ripgrep.nix
|
||||
./ssh.nix
|
||||
./starship.nix
|
||||
./zellij.nix
|
||||
./zoxide.nix
|
||||
./zsh.nix
|
||||
];
|
||||
|
||||
programs.home-manager.enable = true;
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
home = {
|
||||
packages = pkgs.callPackage ../packages.nix {};
|
||||
stateVersion = constants.stateVersions.homeManager;
|
||||
};
|
||||
home = {
|
||||
packages = pkgs.callPackage ../packages.nix {};
|
||||
stateVersion = constants.stateVersions.homeManager;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
programs.eza = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
programs.eza = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,54 +1,54 @@
|
||||
{
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
functions = {
|
||||
open_project = ''
|
||||
set -l base "$HOME/Projects"
|
||||
set -l choice (fd -t d -d 1 -a . "$base/Personal" "$base/Work" \
|
||||
| string replace -r -- "^$base/" "" \
|
||||
| fzf --prompt "project > ")
|
||||
test -n "$choice"; and cd "$base/$choice"
|
||||
'';
|
||||
};
|
||||
interactiveShellInit = ''
|
||||
set fish_greeting
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
functions = {
|
||||
open_project = ''
|
||||
set -l base "$HOME/Projects"
|
||||
set -l choice (fd -t d -d 1 -a . "$base/Personal" "$base/Work" \
|
||||
| string replace -r -- "^$base/" "" \
|
||||
| fzf --prompt "project > ")
|
||||
test -n "$choice"; and cd "$base/$choice"
|
||||
'';
|
||||
};
|
||||
interactiveShellInit = ''
|
||||
set fish_greeting
|
||||
|
||||
set fish_color_normal 4c4f69
|
||||
set fish_color_command 1e66f5
|
||||
set fish_color_param dd7878
|
||||
set fish_color_keyword d20f39
|
||||
set fish_color_quote 40a02b
|
||||
set fish_color_redirection ea76cb
|
||||
set fish_color_end fe640b
|
||||
set fish_color_comment 8c8fa1
|
||||
set fish_color_error d20f39
|
||||
set fish_color_gray 9ca0b0
|
||||
set fish_color_selection --background=ccd0da
|
||||
set fish_color_search_match --background=ccd0da
|
||||
set fish_color_option 40a02b
|
||||
set fish_color_operator ea76cb
|
||||
set fish_color_escape e64553
|
||||
set fish_color_autosuggestion 9ca0b0
|
||||
set fish_color_cancel d20f39
|
||||
set fish_color_cwd df8e1d
|
||||
set fish_color_user 179299
|
||||
set fish_color_host 1e66f5
|
||||
set fish_color_host_remote 40a02b
|
||||
set fish_color_status d20f39
|
||||
set fish_pager_color_progress 9ca0b0
|
||||
set fish_pager_color_prefix ea76cb
|
||||
set fish_pager_color_completion 4c4f69
|
||||
set fish_pager_color_description 9ca0b0
|
||||
set fish_color_normal 4c4f69
|
||||
set fish_color_command 1e66f5
|
||||
set fish_color_param dd7878
|
||||
set fish_color_keyword d20f39
|
||||
set fish_color_quote 40a02b
|
||||
set fish_color_redirection ea76cb
|
||||
set fish_color_end fe640b
|
||||
set fish_color_comment 8c8fa1
|
||||
set fish_color_error d20f39
|
||||
set fish_color_gray 9ca0b0
|
||||
set fish_color_selection --background=ccd0da
|
||||
set fish_color_search_match --background=ccd0da
|
||||
set fish_color_option 40a02b
|
||||
set fish_color_operator ea76cb
|
||||
set fish_color_escape e64553
|
||||
set fish_color_autosuggestion 9ca0b0
|
||||
set fish_color_cancel d20f39
|
||||
set fish_color_cwd df8e1d
|
||||
set fish_color_user 179299
|
||||
set fish_color_host 1e66f5
|
||||
set fish_color_host_remote 40a02b
|
||||
set fish_color_status d20f39
|
||||
set fish_pager_color_progress 9ca0b0
|
||||
set fish_pager_color_prefix ea76cb
|
||||
set fish_pager_color_completion 4c4f69
|
||||
set fish_pager_color_description 9ca0b0
|
||||
|
||||
set -gx LS_COLORS "$(vivid generate catppuccin-latte)"
|
||||
set -gx LS_COLORS "$(vivid generate catppuccin-latte)"
|
||||
|
||||
set -gx COLORTERM truecolor
|
||||
set -gx COLORFGBG "15;0"
|
||||
set -gx TERM_BACKGROUND light
|
||||
set -gx COLORTERM truecolor
|
||||
set -gx COLORFGBG "15;0"
|
||||
set -gx TERM_BACKGROUND light
|
||||
|
||||
for mode in default insert
|
||||
bind --mode $mode \cp open_project
|
||||
end
|
||||
'';
|
||||
};
|
||||
for mode in default insert
|
||||
bind --mode $mode \cp open_project
|
||||
end
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
{
|
||||
programs.fzf = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
programs.fzf = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
|
||||
home.sessionVariables = {
|
||||
FZF_DEFAULT_OPTS = ''
|
||||
--bind=alt-k:up,alt-j:down
|
||||
--expect=tab,enter
|
||||
--layout=reverse
|
||||
--delimiter='\t'
|
||||
--with-nth=1
|
||||
--preview-window='border-rounded' --prompt=' ' --marker=' ' --pointer=' '
|
||||
--separator='─' --scrollbar='┃' --layout='reverse'
|
||||
home.sessionVariables = {
|
||||
FZF_DEFAULT_OPTS = ''
|
||||
--bind=alt-k:up,alt-j:down
|
||||
--expect=tab,enter
|
||||
--layout=reverse
|
||||
--delimiter='\t'
|
||||
--with-nth=1
|
||||
--preview-window='border-rounded' --prompt=' ' --marker=' ' --pointer=' '
|
||||
--separator='─' --scrollbar='┃' --layout='reverse'
|
||||
|
||||
--color=bg+:#CCD0DA,bg:#EFF1F5,spinner:#DC8A78,hl:#D20F39
|
||||
--color=fg:#4C4F69,header:#D20F39,info:#8839EF,pointer:#DC8A78
|
||||
--color=marker:#7287FD,fg+:#4C4F69,prompt:#8839EF,hl+:#D20F39
|
||||
--color=selected-bg:#BCC0CC
|
||||
--color=border:#9CA0B0,label:#4C4F69
|
||||
'';
|
||||
};
|
||||
--color=bg+:#CCD0DA,bg:#EFF1F5,spinner:#DC8A78,hl:#D20F39
|
||||
--color=fg:#4C4F69,header:#D20F39,info:#8839EF,pointer:#DC8A78
|
||||
--color=marker:#7287FD,fg+:#4C4F69,prompt:#8839EF,hl+:#D20F39
|
||||
--color=selected-bg:#BCC0CC
|
||||
--color=border:#9CA0B0,label:#4C4F69
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,211 +1,211 @@
|
||||
{...}: let
|
||||
name = "Christoph Schmatzler";
|
||||
name = "Christoph Schmatzler";
|
||||
in {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
ignores = ["*.swp"];
|
||||
settings = {
|
||||
user.name = name;
|
||||
init.defaultBranch = "main";
|
||||
core = {
|
||||
editor = "vim";
|
||||
autocrlf = "input";
|
||||
pager = "delta";
|
||||
};
|
||||
pull.rebase = true;
|
||||
rebase.autoStash = true;
|
||||
interactive.diffFilter = "delta --color-only";
|
||||
delta = {
|
||||
navigate = true;
|
||||
line-numbers = true;
|
||||
syntax-theme = "GitHub";
|
||||
side-by-side = true;
|
||||
pager = "less -FRX";
|
||||
};
|
||||
pager = {
|
||||
diff = "delta";
|
||||
log = "delta";
|
||||
show = "delta";
|
||||
};
|
||||
};
|
||||
lfs = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
programs.git = {
|
||||
enable = true;
|
||||
ignores = ["*.swp"];
|
||||
settings = {
|
||||
user.name = name;
|
||||
init.defaultBranch = "main";
|
||||
core = {
|
||||
editor = "vim";
|
||||
autocrlf = "input";
|
||||
pager = "delta";
|
||||
};
|
||||
pull.rebase = true;
|
||||
rebase.autoStash = true;
|
||||
interactive.diffFilter = "delta --color-only";
|
||||
delta = {
|
||||
navigate = true;
|
||||
line-numbers = true;
|
||||
syntax-theme = "GitHub";
|
||||
side-by-side = true;
|
||||
pager = "less -FRX";
|
||||
};
|
||||
pager = {
|
||||
diff = "delta";
|
||||
log = "delta";
|
||||
show = "delta";
|
||||
};
|
||||
};
|
||||
lfs = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
home.shellAliases = {
|
||||
g = "git";
|
||||
ga = "git add";
|
||||
gaa = "git add --all";
|
||||
gapa = "git add --patch";
|
||||
gau = "git add --update";
|
||||
gav = "git add --verbose";
|
||||
gap = "git apply";
|
||||
gapt = "git apply --3way";
|
||||
gb = "git branch";
|
||||
gba = "git branch --all";
|
||||
gbd = "git branch --delete";
|
||||
gbD = "git branch --delete --force";
|
||||
gbl = "git blame -w";
|
||||
gbnm = "git branch --no-merged";
|
||||
gbr = "git branch --remote";
|
||||
gbs = "git bisect";
|
||||
gbsb = "git bisect bad";
|
||||
gbsg = "git bisect good";
|
||||
gbsn = "git bisect new";
|
||||
gbso = "git bisect old";
|
||||
gbsr = "git bisect reset";
|
||||
gbss = "git bisect start";
|
||||
gc = "git commit --verbose";
|
||||
gca = "git commit --verbose --all";
|
||||
gcam = "git commit --all --message";
|
||||
gcas = "git commit --all --signoff";
|
||||
gcasm = "git commit --all --signoff --message";
|
||||
gcb = "git checkout -b";
|
||||
gcB = "git checkout -B";
|
||||
gcf = "git config --list";
|
||||
gclean = "git clean --interactive -d";
|
||||
gcl = "git clone --recurse-submodules";
|
||||
gclf = "git clone --recursive --shallow-submodules --filter=blob:none --also-filter-submodules";
|
||||
gcm = "git checkout main";
|
||||
gcmsg = "git commit --message";
|
||||
gcn = "git commit --verbose --no-edit";
|
||||
gco = "git checkout";
|
||||
gcor = "git checkout --recurse-submodules";
|
||||
gcount = "git shortlog --summary --numbered";
|
||||
gcp = "git cherry-pick";
|
||||
gcpa = "git cherry-pick --abort";
|
||||
gcpc = "git cherry-pick --continue";
|
||||
gcs = "git commit --gpg-sign";
|
||||
gcss = "git commit --gpg-sign --signoff";
|
||||
gcssm = "git commit --gpg-sign --signoff --message";
|
||||
gcsm = "git commit --signoff --message";
|
||||
gd = "git diff";
|
||||
gdca = "git diff --cached";
|
||||
gdcw = "git diff --cached --word-diff";
|
||||
gds = "git diff --staged";
|
||||
gdw = "git diff --word-diff";
|
||||
gdt = "git diff-tree --no-commit-id --name-only -r";
|
||||
gdup = "git diff @{upstream}";
|
||||
gf = "git fetch";
|
||||
gfa = "git fetch --all --tags --prune";
|
||||
gfo = "git fetch origin";
|
||||
gfg = "git ls-files | grep";
|
||||
gg = "git gui citool";
|
||||
gga = "git gui citool --amend";
|
||||
ggpull = "git pull origin \"$(git branch --show-current)\"";
|
||||
ggpush = "git push origin \"$(git branch --show-current)\"";
|
||||
ggsup = "git branch --set-upstream-to=origin/$(git branch --show-current)";
|
||||
ghh = "git help";
|
||||
gignore = "git update-index --assume-unchanged";
|
||||
gignored = "git ls-files -v | grep \"^[[:lower:]]\"";
|
||||
gl = "git pull";
|
||||
glg = "git log --stat";
|
||||
glgp = "git log --stat --patch";
|
||||
glgg = "git log --graph";
|
||||
glgga = "git log --graph --decorate --all";
|
||||
glgm = "git log --graph --max-count=10";
|
||||
glo = "git log --oneline --decorate";
|
||||
glog = "git log --oneline --decorate --graph";
|
||||
gloga = "git log --oneline --decorate --graph --all";
|
||||
glol = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset\"";
|
||||
glola = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset\" --all";
|
||||
glols = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset\" --stat";
|
||||
glod = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset\"";
|
||||
glods = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset\" --date=short";
|
||||
gluc = "git pull upstream $(git branch --show-current)";
|
||||
glum = "git pull upstream main";
|
||||
gm = "git merge";
|
||||
gma = "git merge --abort";
|
||||
gmc = "git merge --continue";
|
||||
gms = "git merge --squash";
|
||||
gmff = "git merge --ff-only";
|
||||
gmtl = "git mergetool --no-prompt";
|
||||
gmtlvim = "git mergetool --no-prompt --tool=vimdiff";
|
||||
gmum = "git merge upstream/main";
|
||||
gmom = "git merge origin/main";
|
||||
gp = "git push";
|
||||
gpd = "git push --dry-run";
|
||||
gpf = "git push --force-with-lease";
|
||||
gpod = "git push origin --delete";
|
||||
gpoat = "git push origin --all && git push origin --tags";
|
||||
gpr = "git pull --rebase";
|
||||
gpra = "git pull --rebase --autostash";
|
||||
gprav = "git pull --rebase --autostash -v";
|
||||
gprom = "git pull --rebase origin main";
|
||||
gpromi = "git pull --rebase=interactive origin main";
|
||||
gprv = "git pull --rebase -v";
|
||||
gprum = "git pull --rebase upstream main";
|
||||
gprumi = "git pull --rebase=interactive upstream main";
|
||||
gpsup = "git push --set-upstream origin $(git branch --show-current)";
|
||||
gpsupf = "git push --set-upstream origin $(git branch --show-current) --force-with-lease";
|
||||
gpv = "git push --verbose";
|
||||
gpu = "git push upstream";
|
||||
gr = "git remote";
|
||||
gra = "git remote add";
|
||||
grb = "git rebase";
|
||||
grba = "git rebase --abort";
|
||||
grbc = "git rebase --continue";
|
||||
grbd = "git rebase develop";
|
||||
grbi = "git rebase --interactive";
|
||||
grbm = "git rebase main";
|
||||
grbo = "git rebase --onto";
|
||||
grbom = "git rebase origin/main";
|
||||
grbs = "git rebase --skip";
|
||||
grbum = "git rebase upstream/main";
|
||||
grev = "git revert";
|
||||
greva = "git revert --abort";
|
||||
grevc = "git revert --continue";
|
||||
grf = "git reflog";
|
||||
grh = "git reset";
|
||||
grhh = "git reset --hard";
|
||||
grhk = "git reset --keep";
|
||||
grhs = "git reset --soft";
|
||||
grm = "git rm";
|
||||
grmc = "git rm --cached";
|
||||
grmv = "git remote rename";
|
||||
groh = "git reset origin/$(git branch --show-current) --hard";
|
||||
grrm = "git remote remove";
|
||||
grs = "git restore";
|
||||
grset = "git remote set-url";
|
||||
grss = "git restore --source";
|
||||
grst = "git restore --staged";
|
||||
grt = "cd \"$(git rev-parse --show-toplevel || echo .)\"";
|
||||
gru = "git reset --";
|
||||
grup = "git remote update";
|
||||
grv = "git remote --verbose";
|
||||
gsb = "git status --short --branch";
|
||||
gsh = "git show";
|
||||
gsi = "git submodule init";
|
||||
gsps = "git show --pretty=short --show-signature";
|
||||
gss = "git status --short";
|
||||
gst = "git status";
|
||||
gsta = "git stash push";
|
||||
gstaa = "git stash apply";
|
||||
gstall = "git stash --all";
|
||||
gstc = "git stash clear";
|
||||
gstd = "git stash drop";
|
||||
gstl = "git stash list";
|
||||
gstp = "git stash pop";
|
||||
gsts = "git stash show --patch";
|
||||
gstu = "git stash push --include-untracked";
|
||||
gsu = "git submodule update";
|
||||
gsw = "git switch";
|
||||
gswc = "git switch --create";
|
||||
gswd = "git switch develop";
|
||||
gswm = "git switch main";
|
||||
gta = "git tag --annotate";
|
||||
gts = "git tag --sign";
|
||||
gtv = "git tag | sort -V";
|
||||
gunignore = "git update-index --no-assume-unchanged";
|
||||
gunwip = "git rev-list --max-count=1 --format=\"%s\" HEAD | grep -q \"\\--wip--\" && git reset HEAD~1";
|
||||
gwch = "git whatchanged -p --abbrev-commit --pretty=medium";
|
||||
gwipe = "git reset --hard && git clean --force -df";
|
||||
gwt = "git worktree";
|
||||
gwta = "git worktree add";
|
||||
gwtls = "git worktree list";
|
||||
gwtmv = "git worktree move";
|
||||
gwtrm = "git worktree remove";
|
||||
gwip = "git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign --message \"--wip-- [skip ci]\"";
|
||||
};
|
||||
home.shellAliases = {
|
||||
g = "git";
|
||||
ga = "git add";
|
||||
gaa = "git add --all";
|
||||
gapa = "git add --patch";
|
||||
gau = "git add --update";
|
||||
gav = "git add --verbose";
|
||||
gap = "git apply";
|
||||
gapt = "git apply --3way";
|
||||
gb = "git branch";
|
||||
gba = "git branch --all";
|
||||
gbd = "git branch --delete";
|
||||
gbD = "git branch --delete --force";
|
||||
gbl = "git blame -w";
|
||||
gbnm = "git branch --no-merged";
|
||||
gbr = "git branch --remote";
|
||||
gbs = "git bisect";
|
||||
gbsb = "git bisect bad";
|
||||
gbsg = "git bisect good";
|
||||
gbsn = "git bisect new";
|
||||
gbso = "git bisect old";
|
||||
gbsr = "git bisect reset";
|
||||
gbss = "git bisect start";
|
||||
gc = "git commit --verbose";
|
||||
gca = "git commit --verbose --all";
|
||||
gcam = "git commit --all --message";
|
||||
gcas = "git commit --all --signoff";
|
||||
gcasm = "git commit --all --signoff --message";
|
||||
gcb = "git checkout -b";
|
||||
gcB = "git checkout -B";
|
||||
gcf = "git config --list";
|
||||
gclean = "git clean --interactive -d";
|
||||
gcl = "git clone --recurse-submodules";
|
||||
gclf = "git clone --recursive --shallow-submodules --filter=blob:none --also-filter-submodules";
|
||||
gcm = "git checkout main";
|
||||
gcmsg = "git commit --message";
|
||||
gcn = "git commit --verbose --no-edit";
|
||||
gco = "git checkout";
|
||||
gcor = "git checkout --recurse-submodules";
|
||||
gcount = "git shortlog --summary --numbered";
|
||||
gcp = "git cherry-pick";
|
||||
gcpa = "git cherry-pick --abort";
|
||||
gcpc = "git cherry-pick --continue";
|
||||
gcs = "git commit --gpg-sign";
|
||||
gcss = "git commit --gpg-sign --signoff";
|
||||
gcssm = "git commit --gpg-sign --signoff --message";
|
||||
gcsm = "git commit --signoff --message";
|
||||
gd = "git diff";
|
||||
gdca = "git diff --cached";
|
||||
gdcw = "git diff --cached --word-diff";
|
||||
gds = "git diff --staged";
|
||||
gdw = "git diff --word-diff";
|
||||
gdt = "git diff-tree --no-commit-id --name-only -r";
|
||||
gdup = "git diff @{upstream}";
|
||||
gf = "git fetch";
|
||||
gfa = "git fetch --all --tags --prune";
|
||||
gfo = "git fetch origin";
|
||||
gfg = "git ls-files | grep";
|
||||
gg = "git gui citool";
|
||||
gga = "git gui citool --amend";
|
||||
ggpull = "git pull origin \"$(git branch --show-current)\"";
|
||||
ggpush = "git push origin \"$(git branch --show-current)\"";
|
||||
ggsup = "git branch --set-upstream-to=origin/$(git branch --show-current)";
|
||||
ghh = "git help";
|
||||
gignore = "git update-index --assume-unchanged";
|
||||
gignored = "git ls-files -v | grep \"^[[:lower:]]\"";
|
||||
gl = "git pull";
|
||||
glg = "git log --stat";
|
||||
glgp = "git log --stat --patch";
|
||||
glgg = "git log --graph";
|
||||
glgga = "git log --graph --decorate --all";
|
||||
glgm = "git log --graph --max-count=10";
|
||||
glo = "git log --oneline --decorate";
|
||||
glog = "git log --oneline --decorate --graph";
|
||||
gloga = "git log --oneline --decorate --graph --all";
|
||||
glol = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset\"";
|
||||
glola = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset\" --all";
|
||||
glols = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset\" --stat";
|
||||
glod = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset\"";
|
||||
glods = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset\" --date=short";
|
||||
gluc = "git pull upstream $(git branch --show-current)";
|
||||
glum = "git pull upstream main";
|
||||
gm = "git merge";
|
||||
gma = "git merge --abort";
|
||||
gmc = "git merge --continue";
|
||||
gms = "git merge --squash";
|
||||
gmff = "git merge --ff-only";
|
||||
gmtl = "git mergetool --no-prompt";
|
||||
gmtlvim = "git mergetool --no-prompt --tool=vimdiff";
|
||||
gmum = "git merge upstream/main";
|
||||
gmom = "git merge origin/main";
|
||||
gp = "git push";
|
||||
gpd = "git push --dry-run";
|
||||
gpf = "git push --force-with-lease";
|
||||
gpod = "git push origin --delete";
|
||||
gpoat = "git push origin --all && git push origin --tags";
|
||||
gpr = "git pull --rebase";
|
||||
gpra = "git pull --rebase --autostash";
|
||||
gprav = "git pull --rebase --autostash -v";
|
||||
gprom = "git pull --rebase origin main";
|
||||
gpromi = "git pull --rebase=interactive origin main";
|
||||
gprv = "git pull --rebase -v";
|
||||
gprum = "git pull --rebase upstream main";
|
||||
gprumi = "git pull --rebase=interactive upstream main";
|
||||
gpsup = "git push --set-upstream origin $(git branch --show-current)";
|
||||
gpsupf = "git push --set-upstream origin $(git branch --show-current) --force-with-lease";
|
||||
gpv = "git push --verbose";
|
||||
gpu = "git push upstream";
|
||||
gr = "git remote";
|
||||
gra = "git remote add";
|
||||
grb = "git rebase";
|
||||
grba = "git rebase --abort";
|
||||
grbc = "git rebase --continue";
|
||||
grbd = "git rebase develop";
|
||||
grbi = "git rebase --interactive";
|
||||
grbm = "git rebase main";
|
||||
grbo = "git rebase --onto";
|
||||
grbom = "git rebase origin/main";
|
||||
grbs = "git rebase --skip";
|
||||
grbum = "git rebase upstream/main";
|
||||
grev = "git revert";
|
||||
greva = "git revert --abort";
|
||||
grevc = "git revert --continue";
|
||||
grf = "git reflog";
|
||||
grh = "git reset";
|
||||
grhh = "git reset --hard";
|
||||
grhk = "git reset --keep";
|
||||
grhs = "git reset --soft";
|
||||
grm = "git rm";
|
||||
grmc = "git rm --cached";
|
||||
grmv = "git remote rename";
|
||||
groh = "git reset origin/$(git branch --show-current) --hard";
|
||||
grrm = "git remote remove";
|
||||
grs = "git restore";
|
||||
grset = "git remote set-url";
|
||||
grss = "git restore --source";
|
||||
grst = "git restore --staged";
|
||||
grt = "cd \"$(git rev-parse --show-toplevel || echo .)\"";
|
||||
gru = "git reset --";
|
||||
grup = "git remote update";
|
||||
grv = "git remote --verbose";
|
||||
gsb = "git status --short --branch";
|
||||
gsh = "git show";
|
||||
gsi = "git submodule init";
|
||||
gsps = "git show --pretty=short --show-signature";
|
||||
gss = "git status --short";
|
||||
gst = "git status";
|
||||
gsta = "git stash push";
|
||||
gstaa = "git stash apply";
|
||||
gstall = "git stash --all";
|
||||
gstc = "git stash clear";
|
||||
gstd = "git stash drop";
|
||||
gstl = "git stash list";
|
||||
gstp = "git stash pop";
|
||||
gsts = "git stash show --patch";
|
||||
gstu = "git stash push --include-untracked";
|
||||
gsu = "git submodule update";
|
||||
gsw = "git switch";
|
||||
gswc = "git switch --create";
|
||||
gswd = "git switch develop";
|
||||
gswm = "git switch main";
|
||||
gta = "git tag --annotate";
|
||||
gts = "git tag --sign";
|
||||
gtv = "git tag | sort -V";
|
||||
gunignore = "git update-index --no-assume-unchanged";
|
||||
gunwip = "git rev-list --max-count=1 --format=\"%s\" HEAD | grep -q \"\\--wip--\" && git reset HEAD~1";
|
||||
gwch = "git whatchanged -p --abbrev-commit --pretty=medium";
|
||||
gwipe = "git reset --hard && git clean --force -df";
|
||||
gwt = "git worktree";
|
||||
gwta = "git worktree add";
|
||||
gwtls = "git worktree list";
|
||||
gwtmv = "git worktree move";
|
||||
gwtrm = "git worktree remove";
|
||||
gwip = "git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign --message \"--wip-- [skip ci]\"";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,58 +1,58 @@
|
||||
{
|
||||
programs.lazygit = {
|
||||
enable = true;
|
||||
settings = {
|
||||
git = {
|
||||
commit.signOff = true;
|
||||
pagers = [
|
||||
{
|
||||
delta = {
|
||||
colorArg = "always";
|
||||
pager = "DELTA_FEATURES=decorations delta --light --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format=\"lazygit-edit://{path}:{line}\"";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
programs.lazygit = {
|
||||
enable = true;
|
||||
settings = {
|
||||
git = {
|
||||
commit.signOff = true;
|
||||
pagers = [
|
||||
{
|
||||
delta = {
|
||||
colorArg = "always";
|
||||
pager = "DELTA_FEATURES=decorations delta --light --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format=\"lazygit-edit://{path}:{line}\"";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
gui = {
|
||||
authorColors = {
|
||||
"*" = "#7287fd";
|
||||
};
|
||||
theme = {
|
||||
activeBorderColor = [
|
||||
"#8839ef"
|
||||
"bold"
|
||||
];
|
||||
inactiveBorderColor = [
|
||||
"#6c6f85"
|
||||
];
|
||||
optionsTextColor = [
|
||||
"#1e66f5"
|
||||
];
|
||||
selectedLineBgColor = [
|
||||
"#ccd0da"
|
||||
];
|
||||
cherryPickedCommitBgColor = [
|
||||
"#bcc0cc"
|
||||
];
|
||||
cherryPickedCommitFgColor = [
|
||||
"#8839ef"
|
||||
];
|
||||
defaultFgColor = [
|
||||
"#4c4f69"
|
||||
];
|
||||
searchingActiveBorderColor = [
|
||||
"#df8e1d"
|
||||
];
|
||||
unstagedChangesColor = [
|
||||
"#d20f39"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
gui = {
|
||||
authorColors = {
|
||||
"*" = "#7287fd";
|
||||
};
|
||||
theme = {
|
||||
activeBorderColor = [
|
||||
"#8839ef"
|
||||
"bold"
|
||||
];
|
||||
inactiveBorderColor = [
|
||||
"#6c6f85"
|
||||
];
|
||||
optionsTextColor = [
|
||||
"#1e66f5"
|
||||
];
|
||||
selectedLineBgColor = [
|
||||
"#ccd0da"
|
||||
];
|
||||
cherryPickedCommitBgColor = [
|
||||
"#bcc0cc"
|
||||
];
|
||||
cherryPickedCommitFgColor = [
|
||||
"#8839ef"
|
||||
];
|
||||
defaultFgColor = [
|
||||
"#4c4f69"
|
||||
];
|
||||
searchingActiveBorderColor = [
|
||||
"#df8e1d"
|
||||
];
|
||||
unstagedChangesColor = [
|
||||
"#d20f39"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.shellAliases = {
|
||||
lg = "lazygit";
|
||||
};
|
||||
home.shellAliases = {
|
||||
lg = "lazygit";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
programs.mise = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
enableZshIntegration = true;
|
||||
settings = {
|
||||
auto_install = false;
|
||||
};
|
||||
};
|
||||
programs.mise = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
enableZshIntegration = true;
|
||||
settings = {
|
||||
auto_install = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,28 +1,28 @@
|
||||
{
|
||||
programs.nixvim = {
|
||||
autoGroups = {
|
||||
Christoph = {};
|
||||
};
|
||||
programs.nixvim = {
|
||||
autoGroups = {
|
||||
Christoph = {};
|
||||
};
|
||||
|
||||
autoCmd = [
|
||||
{
|
||||
event = "BufWritePre";
|
||||
group = "Christoph";
|
||||
pattern = "*";
|
||||
command = "%s/\\s\\+$//e";
|
||||
}
|
||||
{
|
||||
event = "BufReadPost";
|
||||
group = "Christoph";
|
||||
pattern = "*";
|
||||
command = "normal zR";
|
||||
}
|
||||
{
|
||||
event = "FileReadPost";
|
||||
group = "Christoph";
|
||||
pattern = "*";
|
||||
command = "normal zR";
|
||||
}
|
||||
];
|
||||
};
|
||||
autoCmd = [
|
||||
{
|
||||
event = "BufWritePre";
|
||||
group = "Christoph";
|
||||
pattern = "*";
|
||||
command = "%s/\\s\\+$//e";
|
||||
}
|
||||
{
|
||||
event = "BufReadPost";
|
||||
group = "Christoph";
|
||||
pattern = "*";
|
||||
command = "normal zR";
|
||||
}
|
||||
{
|
||||
event = "FileReadPost";
|
||||
group = "Christoph";
|
||||
pattern = "*";
|
||||
command = "normal zR";
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,36 +1,36 @@
|
||||
{
|
||||
imports = [
|
||||
./autocmd.nix
|
||||
./mappings.nix
|
||||
./options.nix
|
||||
./plugins/blink-cmp.nix
|
||||
./plugins/conform.nix
|
||||
./plugins/diffview.nix
|
||||
./plugins/grug-far.nix
|
||||
./plugins/harpoon.nix
|
||||
./plugins/lsp.nix
|
||||
./plugins/mini.nix
|
||||
./plugins/neogit.nix
|
||||
./plugins/oil.nix
|
||||
./plugins/treesitter.nix
|
||||
];
|
||||
imports = [
|
||||
./autocmd.nix
|
||||
./mappings.nix
|
||||
./options.nix
|
||||
./plugins/blink-cmp.nix
|
||||
./plugins/conform.nix
|
||||
./plugins/diffview.nix
|
||||
./plugins/grug-far.nix
|
||||
./plugins/harpoon.nix
|
||||
./plugins/lsp.nix
|
||||
./plugins/mini.nix
|
||||
./plugins/neogit.nix
|
||||
./plugins/oil.nix
|
||||
./plugins/treesitter.nix
|
||||
];
|
||||
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
luaLoader.enable = true;
|
||||
colorschemes.catppuccin = {
|
||||
enable = true;
|
||||
settings = {
|
||||
flavour = "latte";
|
||||
};
|
||||
};
|
||||
extraConfigLua = ''
|
||||
vim.ui.select = MiniPick.ui_select
|
||||
'';
|
||||
};
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
luaLoader.enable = true;
|
||||
colorschemes.catppuccin = {
|
||||
enable = true;
|
||||
settings = {
|
||||
flavour = "latte";
|
||||
};
|
||||
};
|
||||
extraConfigLua = ''
|
||||
vim.ui.select = MiniPick.ui_select
|
||||
'';
|
||||
};
|
||||
|
||||
home.shellAliases = {
|
||||
v = "nvim";
|
||||
};
|
||||
home.shellAliases = {
|
||||
v = "nvim";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,235 +1,235 @@
|
||||
{
|
||||
programs.nixvim.keymaps = [
|
||||
# clipboard - OSC52 yank and paste
|
||||
{
|
||||
mode = ["n" "v"];
|
||||
key = "<leader>y";
|
||||
action = ''"+y'';
|
||||
options.desc = "Yank to system clipboard (OSC52)";
|
||||
}
|
||||
# e - explore/edit
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>ef";
|
||||
action = ":lua require('oil').open()<CR>";
|
||||
options.desc = "File directory";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>er";
|
||||
action = ":lua require('grug-far').open()<CR>";
|
||||
options.desc = "Search and replace";
|
||||
}
|
||||
# f - find
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>f/";
|
||||
action = ":Pick history scope='/'<CR>";
|
||||
options.desc = "'/' history";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>f:";
|
||||
action = ":Pick history scope=':'<CR>";
|
||||
options.desc = "':' history";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fa";
|
||||
action = ":Pick git_hunks scope='staged'<CR>";
|
||||
options.desc = "Added hunks (all)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fA";
|
||||
action = ":Pick git_hunks path='%' scope='staged'<CR>";
|
||||
options.desc = "Added hunks (buffer)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fb";
|
||||
action = ":Pick buffers<CR>";
|
||||
options.desc = "Buffers";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fd";
|
||||
action = ":Pick diagnostic scope='all'<CR>";
|
||||
options.desc = "Diagnostic (workspace)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fD";
|
||||
action = ":Pick diagnostic scope='current'<CR>";
|
||||
options.desc = "Diagnostic (buffer)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>ff";
|
||||
action = ":Pick files<CR>";
|
||||
options.desc = "Search files";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fg";
|
||||
action = ":Pick grep_live<CR>";
|
||||
options.desc = "Grep";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fm";
|
||||
action = ":Pick git_hunks<CR>";
|
||||
options.desc = "Modified hunks (all)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fM";
|
||||
action = ":Pick git_hunks path='%'<CR>";
|
||||
options.desc = "Modified hunks (buffer)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fr";
|
||||
action = ":Pick lsp scope='references'<CR>";
|
||||
options.desc = "References (LSP)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fs";
|
||||
action = ":Pick lsp scope='workspace_symbol'<CR>";
|
||||
options.desc = "Symbols (LSP, workspace)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fS";
|
||||
action = ":Pick lsp scope='document_symbol'<CR>";
|
||||
options.desc = "Symbols (LSP, buffer)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fv";
|
||||
action = ":Pick visit_paths cwd=\"\"<CR>";
|
||||
options.desc = "Visit paths (all)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fV";
|
||||
action = ":Pick visit_paths<CR>";
|
||||
options.desc = "Visit paths (cwd)";
|
||||
}
|
||||
# g - git
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>gd";
|
||||
action = ":DiffviewOpen<CR>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>gg";
|
||||
action.__raw = ''
|
||||
function()
|
||||
require('neogit').open({})
|
||||
end
|
||||
'';
|
||||
options.desc = "Neogit";
|
||||
}
|
||||
# l - lsp/formatter
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>la";
|
||||
action = ":lua vim.lsp.buf.code_action()<CR>";
|
||||
options.desc = "Actions";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>ld";
|
||||
action = ":lua vim.diagnostic.open_float({ severity = { min = vim.diagnostic.severity.HINT } })<CR>";
|
||||
options.desc = "Diagnostics popup";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>lf";
|
||||
action = ":lua require('conform').format({ lsp_fallback = true })<CR>";
|
||||
options.desc = "Format";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>li";
|
||||
action = ":lua vim.lsp.buf.hover()<CR>";
|
||||
options.desc = "Information";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>lj";
|
||||
action = ":lua vim.diagnostic.goto_next()<CR>";
|
||||
options.desc = "Next diagnostic";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>lk";
|
||||
action = ":lua vim.diagnostic.goto_prev()<CR>";
|
||||
options.desc = "Prev diagnostic";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>lr";
|
||||
action = ":lua vim.lsp.buf.rename()<CR>";
|
||||
options.desc = "Rename";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>lR";
|
||||
action = ":lua vim.lsp.buf.references()<CR>";
|
||||
options.desc = "References";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>ls";
|
||||
action = ":lua vim.lsp.buf.definition()<CR>";
|
||||
options.desc = "Source definition";
|
||||
}
|
||||
# other
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>j";
|
||||
action = ":lua require('mini.jump2d').start(require('mini.jump2d').builtin_opts.query)<CR>";
|
||||
options.desc = "Jump to character";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>a";
|
||||
action = ":lua require('harpoon'):list():add()<CR>";
|
||||
options.desc = "Add harpoon";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<C-e>";
|
||||
action = ":lua require('harpoon').ui:toggle_quick_menu(require('harpoon'):list())<CR>";
|
||||
options.desc = "Toggle harpoon quick menu";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>1";
|
||||
action = ":lua require('harpoon'):list():select(1)<CR>";
|
||||
options.desc = "Go to harpoon 1";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>2";
|
||||
action = ":lua require('harpoon'):list():select(2)<CR>";
|
||||
options.desc = "Go to harpoon 2";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>3";
|
||||
action = ":lua require('harpoon'):list():select(3)<CR>";
|
||||
options.desc = "Go to harpoon 3";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>4";
|
||||
action = ":lua require('harpoon'):list():select(4)<CR>";
|
||||
options.desc = "Go to harpoon 4";
|
||||
}
|
||||
];
|
||||
programs.nixvim.keymaps = [
|
||||
# clipboard - OSC52 yank and paste
|
||||
{
|
||||
mode = ["n" "v"];
|
||||
key = "<leader>y";
|
||||
action = ''"+y'';
|
||||
options.desc = "Yank to system clipboard (OSC52)";
|
||||
}
|
||||
# e - explore/edit
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>ef";
|
||||
action = ":lua require('oil').open()<CR>";
|
||||
options.desc = "File directory";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>er";
|
||||
action = ":lua require('grug-far').open()<CR>";
|
||||
options.desc = "Search and replace";
|
||||
}
|
||||
# f - find
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>f/";
|
||||
action = ":Pick history scope='/'<CR>";
|
||||
options.desc = "'/' history";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>f:";
|
||||
action = ":Pick history scope=':'<CR>";
|
||||
options.desc = "':' history";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fa";
|
||||
action = ":Pick git_hunks scope='staged'<CR>";
|
||||
options.desc = "Added hunks (all)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fA";
|
||||
action = ":Pick git_hunks path='%' scope='staged'<CR>";
|
||||
options.desc = "Added hunks (buffer)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fb";
|
||||
action = ":Pick buffers<CR>";
|
||||
options.desc = "Buffers";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fd";
|
||||
action = ":Pick diagnostic scope='all'<CR>";
|
||||
options.desc = "Diagnostic (workspace)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fD";
|
||||
action = ":Pick diagnostic scope='current'<CR>";
|
||||
options.desc = "Diagnostic (buffer)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>ff";
|
||||
action = ":Pick files<CR>";
|
||||
options.desc = "Search files";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fg";
|
||||
action = ":Pick grep_live<CR>";
|
||||
options.desc = "Grep";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fm";
|
||||
action = ":Pick git_hunks<CR>";
|
||||
options.desc = "Modified hunks (all)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fM";
|
||||
action = ":Pick git_hunks path='%'<CR>";
|
||||
options.desc = "Modified hunks (buffer)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fr";
|
||||
action = ":Pick lsp scope='references'<CR>";
|
||||
options.desc = "References (LSP)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fs";
|
||||
action = ":Pick lsp scope='workspace_symbol'<CR>";
|
||||
options.desc = "Symbols (LSP, workspace)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fS";
|
||||
action = ":Pick lsp scope='document_symbol'<CR>";
|
||||
options.desc = "Symbols (LSP, buffer)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fv";
|
||||
action = ":Pick visit_paths cwd=\"\"<CR>";
|
||||
options.desc = "Visit paths (all)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fV";
|
||||
action = ":Pick visit_paths<CR>";
|
||||
options.desc = "Visit paths (cwd)";
|
||||
}
|
||||
# g - git
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>gd";
|
||||
action = ":DiffviewOpen<CR>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>gg";
|
||||
action.__raw = ''
|
||||
function()
|
||||
require('neogit').open({})
|
||||
end
|
||||
'';
|
||||
options.desc = "Neogit";
|
||||
}
|
||||
# l - lsp/formatter
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>la";
|
||||
action = ":lua vim.lsp.buf.code_action()<CR>";
|
||||
options.desc = "Actions";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>ld";
|
||||
action = ":lua vim.diagnostic.open_float({ severity = { min = vim.diagnostic.severity.HINT } })<CR>";
|
||||
options.desc = "Diagnostics popup";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>lf";
|
||||
action = ":lua require('conform').format({ lsp_fallback = true })<CR>";
|
||||
options.desc = "Format";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>li";
|
||||
action = ":lua vim.lsp.buf.hover()<CR>";
|
||||
options.desc = "Information";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>lj";
|
||||
action = ":lua vim.diagnostic.goto_next()<CR>";
|
||||
options.desc = "Next diagnostic";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>lk";
|
||||
action = ":lua vim.diagnostic.goto_prev()<CR>";
|
||||
options.desc = "Prev diagnostic";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>lr";
|
||||
action = ":lua vim.lsp.buf.rename()<CR>";
|
||||
options.desc = "Rename";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>lR";
|
||||
action = ":lua vim.lsp.buf.references()<CR>";
|
||||
options.desc = "References";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>ls";
|
||||
action = ":lua vim.lsp.buf.definition()<CR>";
|
||||
options.desc = "Source definition";
|
||||
}
|
||||
# other
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>j";
|
||||
action = ":lua require('mini.jump2d').start(require('mini.jump2d').builtin_opts.query)<CR>";
|
||||
options.desc = "Jump to character";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>a";
|
||||
action = ":lua require('harpoon'):list():add()<CR>";
|
||||
options.desc = "Add harpoon";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<C-e>";
|
||||
action = ":lua require('harpoon').ui:toggle_quick_menu(require('harpoon'):list())<CR>";
|
||||
options.desc = "Toggle harpoon quick menu";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>1";
|
||||
action = ":lua require('harpoon'):list():select(1)<CR>";
|
||||
options.desc = "Go to harpoon 1";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>2";
|
||||
action = ":lua require('harpoon'):list():select(2)<CR>";
|
||||
options.desc = "Go to harpoon 2";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>3";
|
||||
action = ":lua require('harpoon'):list():select(3)<CR>";
|
||||
options.desc = "Go to harpoon 3";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>4";
|
||||
action = ":lua require('harpoon'):list():select(4)<CR>";
|
||||
options.desc = "Go to harpoon 4";
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
{
|
||||
programs.nixvim = {
|
||||
globals = {
|
||||
clipboard = "osc52";
|
||||
};
|
||||
opts = {
|
||||
expandtab = true;
|
||||
ignorecase = true;
|
||||
mouse = "";
|
||||
relativenumber = true;
|
||||
shiftwidth = 2;
|
||||
smartcase = true;
|
||||
};
|
||||
};
|
||||
programs.nixvim = {
|
||||
globals = {
|
||||
clipboard = "osc52";
|
||||
};
|
||||
opts = {
|
||||
expandtab = false;
|
||||
tabstop = 2;
|
||||
ignorecase = true;
|
||||
mouse = "";
|
||||
relativenumber = true;
|
||||
shiftwidth = 2;
|
||||
smartcase = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{
|
||||
programs.nixvim.plugins.blink-cmp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
signature.enabled = true;
|
||||
completion = {
|
||||
accept = {
|
||||
auto_brackets = {
|
||||
enabled = true;
|
||||
semantic_token_resolution.enabled = false;
|
||||
};
|
||||
};
|
||||
documentation.auto_show = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.nixvim.plugins.blink-cmp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
signature.enabled = true;
|
||||
completion = {
|
||||
accept = {
|
||||
auto_brackets = {
|
||||
enabled = true;
|
||||
semantic_token_resolution.enabled = false;
|
||||
};
|
||||
};
|
||||
documentation.auto_show = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
programs.nixvim.plugins.conform-nvim = {
|
||||
enable = true;
|
||||
settings = {
|
||||
format_on_save = {};
|
||||
formatters_by_ft = {
|
||||
nix = ["alejandra"];
|
||||
javascript = ["prettier"];
|
||||
typescript = ["prettier"];
|
||||
vue = ["prettier"];
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.nixvim.plugins.conform-nvim = {
|
||||
enable = true;
|
||||
settings = {
|
||||
format_on_save = {};
|
||||
formatters_by_ft = {
|
||||
nix = ["alejandra"];
|
||||
javascript = ["prettier"];
|
||||
typescript = ["prettier"];
|
||||
vue = ["prettier"];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
programs.nixvim.plugins.diffview = {
|
||||
enable = true;
|
||||
};
|
||||
programs.nixvim.plugins.diffview = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
programs.nixvim.plugins = {
|
||||
grug-far = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
programs.nixvim.plugins = {
|
||||
grug-far = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
programs.nixvim.plugins = {
|
||||
harpoon = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
programs.nixvim.plugins = {
|
||||
harpoon = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{
|
||||
programs.nixvim.plugins = {
|
||||
lsp = {
|
||||
enable = true;
|
||||
inlayHints = true;
|
||||
servers = {
|
||||
nil_ls.enable = true;
|
||||
cssls.enable = true;
|
||||
dockerls.enable = true;
|
||||
yamlls.enable = true;
|
||||
vtsls.enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.nixvim.plugins = {
|
||||
lsp = {
|
||||
enable = true;
|
||||
inlayHints = true;
|
||||
servers = {
|
||||
nil_ls.enable = true;
|
||||
cssls.enable = true;
|
||||
dockerls.enable = true;
|
||||
yamlls.enable = true;
|
||||
vtsls.enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,153 +1,157 @@
|
||||
{
|
||||
programs.nixvim.plugins.mini = {
|
||||
enable = true;
|
||||
modules = {
|
||||
ai = {
|
||||
custom_textobjects = {
|
||||
B.__raw = "require('mini.extra').gen_ai_spec.buffer()";
|
||||
F.__raw = "require('mini.ai').gen_spec.treesitter({ a = '@function.outer', i = '@function.inner' })";
|
||||
};
|
||||
};
|
||||
align = {};
|
||||
basics = {
|
||||
options = {
|
||||
basic = true;
|
||||
extra_ui = true;
|
||||
};
|
||||
mappings = {
|
||||
basic = false;
|
||||
};
|
||||
autocommands = {
|
||||
basic = true;
|
||||
};
|
||||
};
|
||||
bracketed = {};
|
||||
clue = {
|
||||
clues.__raw = ''
|
||||
{
|
||||
{ mode = 'n', keys = '<Leader>e', desc = '+Explore/+Edit' },
|
||||
{ mode = 'n', keys = '<Leader>f', desc = '+Find' },
|
||||
{ mode = 'n', keys = '<Leader>g', desc = '+Git' },
|
||||
{ mode = 'n', keys = '<Leader>l', desc = '+LSP' },
|
||||
{ mode = 'x', keys = '<Leader>l', desc = '+LSP' },
|
||||
require("mini.clue").gen_clues.builtin_completion(),
|
||||
require("mini.clue").gen_clues.g(),
|
||||
require("mini.clue").gen_clues.marks(),
|
||||
require("mini.clue").gen_clues.registers(),
|
||||
require("mini.clue").gen_clues.windows({ submode_resize = true }),
|
||||
require("mini.clue").gen_clues.z(),
|
||||
}
|
||||
'';
|
||||
triggers = [
|
||||
{
|
||||
mode = "n";
|
||||
keys = "<Leader>";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "<Leader>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
keys = "[";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
keys = "]";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "[";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "]";
|
||||
}
|
||||
{
|
||||
mode = "i";
|
||||
keys = "<C-x>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
keys = "g";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "g";
|
||||
}
|
||||
programs.nixvim.plugins.mini = {
|
||||
enable = true;
|
||||
modules = {
|
||||
ai = {
|
||||
custom_textobjects = {
|
||||
B.__raw = "require('mini.extra').gen_ai_spec.buffer()";
|
||||
F.__raw = "require('mini.ai').gen_spec.treesitter({ a = '@function.outer', i = '@function.inner' })";
|
||||
};
|
||||
};
|
||||
align = {};
|
||||
basics = {
|
||||
options = {
|
||||
basic = true;
|
||||
extra_ui = true;
|
||||
};
|
||||
mappings = {
|
||||
basic = false;
|
||||
};
|
||||
autocommands = {
|
||||
basic = true;
|
||||
};
|
||||
};
|
||||
bracketed = {};
|
||||
clue = {
|
||||
clues.__raw = ''
|
||||
{
|
||||
{ mode = 'n', keys = '<Leader>e', desc = '+Explore/+Edit' },
|
||||
{ mode = 'n', keys = '<Leader>f', desc = '+Find' },
|
||||
{ mode = 'n', keys = '<Leader>g', desc = '+Git' },
|
||||
{ mode = 'n', keys = '<Leader>l', desc = '+LSP' },
|
||||
{ mode = 'x', keys = '<Leader>l', desc = '+LSP' },
|
||||
require("mini.clue").gen_clues.builtin_completion(),
|
||||
require("mini.clue").gen_clues.g(),
|
||||
require("mini.clue").gen_clues.marks(),
|
||||
require("mini.clue").gen_clues.registers(),
|
||||
require("mini.clue").gen_clues.windows({ submode_resize = true }),
|
||||
require("mini.clue").gen_clues.z(),
|
||||
}
|
||||
'';
|
||||
triggers = [
|
||||
{
|
||||
mode = "n";
|
||||
keys = "<Leader>";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "<Leader>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
keys = "[";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
keys = "]";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "[";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "]";
|
||||
}
|
||||
{
|
||||
mode = "i";
|
||||
keys = "<C-x>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
keys = "g";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "g";
|
||||
}
|
||||
|
||||
{
|
||||
mode = "n";
|
||||
keys = "\"";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "\"";
|
||||
}
|
||||
{
|
||||
mode = "i";
|
||||
keys = "<C-r>";
|
||||
}
|
||||
{
|
||||
mode = "c";
|
||||
keys = "<C-r>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
keys = "<C-w>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
keys = "z";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "z";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
keys = "'";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
keys = "`";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "'";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "`";
|
||||
}
|
||||
];
|
||||
};
|
||||
comment = {};
|
||||
diff = {};
|
||||
extra = {};
|
||||
git = {};
|
||||
icons = {};
|
||||
indentscope = {};
|
||||
jump = {};
|
||||
jump2d = {
|
||||
settings = {
|
||||
spotter.__raw = "require('mini.jump2d').gen_spotter.pattern('[^%s%p]+')";
|
||||
labels = "asdfghjkl";
|
||||
view = {
|
||||
dim = true;
|
||||
n_steps_ahead = 2;
|
||||
};
|
||||
};
|
||||
};
|
||||
move = {};
|
||||
pairs = {};
|
||||
pick = {};
|
||||
starter = {};
|
||||
statusline = {};
|
||||
surround = {};
|
||||
trailspace = {};
|
||||
visits = {};
|
||||
};
|
||||
mockDevIcons = true;
|
||||
};
|
||||
{
|
||||
mode = "n";
|
||||
keys = "\"";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "\"";
|
||||
}
|
||||
{
|
||||
mode = "i";
|
||||
keys = "<C-r>";
|
||||
}
|
||||
{
|
||||
mode = "c";
|
||||
keys = "<C-r>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
keys = "<C-w>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
keys = "z";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "z";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
keys = "'";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
keys = "`";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "'";
|
||||
}
|
||||
{
|
||||
mode = "x";
|
||||
keys = "`";
|
||||
}
|
||||
];
|
||||
};
|
||||
comment = {};
|
||||
diff = {};
|
||||
extra = {};
|
||||
git = {};
|
||||
icons = {};
|
||||
indentscope = {
|
||||
settings = {
|
||||
symbol = "|";
|
||||
};
|
||||
};
|
||||
jump = {};
|
||||
jump2d = {
|
||||
settings = {
|
||||
spotter.__raw = "require('mini.jump2d').gen_spotter.pattern('[^%s%p]+')";
|
||||
labels = "asdfghjkl";
|
||||
view = {
|
||||
dim = true;
|
||||
n_steps_ahead = 2;
|
||||
};
|
||||
};
|
||||
};
|
||||
move = {};
|
||||
pairs = {};
|
||||
pick = {};
|
||||
starter = {};
|
||||
statusline = {};
|
||||
surround = {};
|
||||
trailspace = {};
|
||||
visits = {};
|
||||
};
|
||||
mockDevIcons = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
programs.nixvim.plugins.neogit = {
|
||||
enable = true;
|
||||
settings = {
|
||||
disable_signs = false;
|
||||
integrations = {
|
||||
diffview = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.nixvim.plugins.neogit = {
|
||||
enable = true;
|
||||
settings = {
|
||||
disable_signs = false;
|
||||
integrations = {
|
||||
diffview = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,27 +1,27 @@
|
||||
{
|
||||
programs.nixvim.plugins.oil = {
|
||||
enable = true;
|
||||
settings = {
|
||||
keymaps = {
|
||||
"<C-r>" = "actions.refresh";
|
||||
"<leader>qq" = "actions.close";
|
||||
};
|
||||
skip_confirm_for_simple_edits = true;
|
||||
constrain_cursor = "editable";
|
||||
default_file_explorer = true;
|
||||
view_options = {
|
||||
show_hidden = true;
|
||||
};
|
||||
win_options = {
|
||||
concealcursor = "ncv";
|
||||
conceallevel = 3;
|
||||
cursorcolumn = false;
|
||||
foldcolumn = "0";
|
||||
list = false;
|
||||
signcolumn = "no";
|
||||
spell = false;
|
||||
wrap = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.nixvim.plugins.oil = {
|
||||
enable = true;
|
||||
settings = {
|
||||
keymaps = {
|
||||
"<C-r>" = "actions.refresh";
|
||||
"<leader>qq" = "actions.close";
|
||||
};
|
||||
skip_confirm_for_simple_edits = true;
|
||||
constrain_cursor = "editable";
|
||||
default_file_explorer = true;
|
||||
view_options = {
|
||||
show_hidden = true;
|
||||
};
|
||||
win_options = {
|
||||
concealcursor = "ncv";
|
||||
conceallevel = 3;
|
||||
cursorcolumn = false;
|
||||
foldcolumn = "0";
|
||||
list = false;
|
||||
signcolumn = "no";
|
||||
spell = false;
|
||||
wrap = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{pkgs, ...}: {
|
||||
programs.nixvim.plugins.treesitter = {
|
||||
enable = true;
|
||||
settings = {
|
||||
highlight.enable = true;
|
||||
indent.enable = true;
|
||||
};
|
||||
grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
|
||||
bash
|
||||
elixir
|
||||
fish
|
||||
heex
|
||||
json
|
||||
nix
|
||||
toml
|
||||
typescript
|
||||
vue
|
||||
yaml
|
||||
];
|
||||
};
|
||||
programs.nixvim.plugins.treesitter = {
|
||||
enable = true;
|
||||
settings = {
|
||||
highlight.enable = true;
|
||||
indent.enable = true;
|
||||
};
|
||||
grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
|
||||
bash
|
||||
elixir
|
||||
fish
|
||||
heex
|
||||
json
|
||||
nix
|
||||
toml
|
||||
typescript
|
||||
vue
|
||||
yaml
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
{
|
||||
programs.opencode = {
|
||||
enable = true;
|
||||
settings = {
|
||||
theme = "catppuccin";
|
||||
instructions = [
|
||||
"CLAUDE.md"
|
||||
"AGENT.md"
|
||||
"AGENTS.md"
|
||||
];
|
||||
formatter = {
|
||||
mix = {
|
||||
disabled = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.opencode = {
|
||||
enable = true;
|
||||
settings = {
|
||||
theme = "catppuccin";
|
||||
instructions = [
|
||||
"CLAUDE.md"
|
||||
"AGENT.md"
|
||||
"AGENTS.md"
|
||||
];
|
||||
formatter = {
|
||||
mix = {
|
||||
disabled = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
programs.ripgrep = {
|
||||
enable = true;
|
||||
arguments = [
|
||||
"--max-columns=150"
|
||||
"--max-columns-preview"
|
||||
"--smart-case"
|
||||
"--colors=column:none"
|
||||
"--colors=column:fg:4"
|
||||
"--colors=column:style:underline"
|
||||
"--colors=line:none"
|
||||
"--colors=line:fg:4"
|
||||
"--colors=match:none"
|
||||
"--colors=match:bg:0"
|
||||
"--colors=match:fg:6"
|
||||
"--colors=path:none"
|
||||
"--colors=path:fg:14"
|
||||
"--colors=path:style:bold"
|
||||
];
|
||||
};
|
||||
programs.ripgrep = {
|
||||
enable = true;
|
||||
arguments = [
|
||||
"--max-columns=150"
|
||||
"--max-columns-preview"
|
||||
"--smart-case"
|
||||
"--colors=column:none"
|
||||
"--colors=column:fg:4"
|
||||
"--colors=column:style:underline"
|
||||
"--colors=line:none"
|
||||
"--colors=line:fg:4"
|
||||
"--colors=match:none"
|
||||
"--colors=match:bg:0"
|
||||
"--colors=match:fg:6"
|
||||
"--colors=path:none"
|
||||
"--colors=path:fg:14"
|
||||
"--colors=path:style:bold"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
user,
|
||||
...
|
||||
pkgs,
|
||||
lib,
|
||||
user,
|
||||
...
|
||||
}: {
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
enableDefaultConfig = false;
|
||||
includes = [
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${user}/.ssh/config_external")
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "/Users/${user}/.ssh/config_external")
|
||||
];
|
||||
matchBlocks = {
|
||||
"*" = {};
|
||||
"github.com" = {
|
||||
identitiesOnly = true;
|
||||
identityFile = [
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${user}/.ssh/id_ed25519")
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "/Users/${user}/.ssh/id_ed25519")
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
enableDefaultConfig = false;
|
||||
includes = [
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${user}/.ssh/config_external")
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "/Users/${user}/.ssh/config_external")
|
||||
];
|
||||
matchBlocks = {
|
||||
"*" = {};
|
||||
"github.com" = {
|
||||
identitiesOnly = true;
|
||||
identityFile = [
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${user}/.ssh/id_ed25519")
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "/Users/${user}/.ssh/id_ed25519")
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,59 +1,59 @@
|
||||
{
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
settings = {
|
||||
add_newline = true;
|
||||
command_timeout = 200;
|
||||
format = "$directory$git_branch$git_commit$git_status$git_state$git_metrics\n$character";
|
||||
character = {
|
||||
error_symbol = "[✗ ](bold #d20f39)";
|
||||
success_symbol = "[❯](bold #40a02b)[❯](bold #df8e1d)[❯](bold #179299)";
|
||||
};
|
||||
directory = {
|
||||
truncation_length = 2;
|
||||
truncation_symbol = "…/";
|
||||
repo_root_style = "bold cyan";
|
||||
repo_root_format = "[$repo_root]($repo_root_style)[$path]($style)[$read_only]($read_only_style) ";
|
||||
};
|
||||
git_branch = {
|
||||
format = " @[$branch(:$remote_branch)]($style)";
|
||||
symbol = "";
|
||||
style = "bold #40a02b";
|
||||
truncation_length = 28;
|
||||
};
|
||||
git_commit = {
|
||||
commit_hash_length = 4;
|
||||
only_detached = false;
|
||||
tag_disabled = true;
|
||||
format = " [$hash]($style)";
|
||||
style = "bold #1e66f5";
|
||||
};
|
||||
git_status = {
|
||||
format = " [$ahead_behind$staged$modified$renamed$deleted$typechanged$untracked$stashed$conflicted]($style)";
|
||||
style = "bold #df8e1d";
|
||||
ahead = " a+$count";
|
||||
behind = " b+$count";
|
||||
diverged = " div:$ahead_count/$behind_count";
|
||||
staged = " s:$count";
|
||||
modified = " m:$count";
|
||||
renamed = " r:$count";
|
||||
deleted = " d:$count";
|
||||
typechanged = " t:$count";
|
||||
untracked = " u:$count";
|
||||
stashed = " st:$count";
|
||||
conflicted = " x:$count";
|
||||
};
|
||||
git_state = {
|
||||
format = " {$state($progress_current/$progress_total)}($style)";
|
||||
style = "bold #d20f39";
|
||||
};
|
||||
git_metrics = {
|
||||
disabled = false;
|
||||
format = " [+$added]($added_style)/[-$deleted]($deleted_style)";
|
||||
added_style = "bold #40a02b";
|
||||
deleted_style = "bold #d20f39";
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
settings = {
|
||||
add_newline = true;
|
||||
command_timeout = 200;
|
||||
format = "$directory$git_branch$git_commit$git_status$git_state$git_metrics\n$character";
|
||||
character = {
|
||||
error_symbol = "[✗ ](bold #d20f39)";
|
||||
success_symbol = "[❯](bold #40a02b)[❯](bold #df8e1d)[❯](bold #179299)";
|
||||
};
|
||||
directory = {
|
||||
truncation_length = 2;
|
||||
truncation_symbol = "…/";
|
||||
repo_root_style = "bold cyan";
|
||||
repo_root_format = "[$repo_root]($repo_root_style)[$path]($style)[$read_only]($read_only_style) ";
|
||||
};
|
||||
git_branch = {
|
||||
format = " @[$branch(:$remote_branch)]($style)";
|
||||
symbol = "";
|
||||
style = "bold #40a02b";
|
||||
truncation_length = 28;
|
||||
};
|
||||
git_commit = {
|
||||
commit_hash_length = 4;
|
||||
only_detached = false;
|
||||
tag_disabled = true;
|
||||
format = " [$hash]($style)";
|
||||
style = "bold #1e66f5";
|
||||
};
|
||||
git_status = {
|
||||
format = " [$ahead_behind$staged$modified$renamed$deleted$typechanged$untracked$stashed$conflicted]($style)";
|
||||
style = "bold #df8e1d";
|
||||
ahead = " a+$count";
|
||||
behind = " b+$count";
|
||||
diverged = " div:$ahead_count/$behind_count";
|
||||
staged = " s:$count";
|
||||
modified = " m:$count";
|
||||
renamed = " r:$count";
|
||||
deleted = " d:$count";
|
||||
typechanged = " t:$count";
|
||||
untracked = " u:$count";
|
||||
stashed = " st:$count";
|
||||
conflicted = " x:$count";
|
||||
};
|
||||
git_state = {
|
||||
format = " {$state($progress_current/$progress_total)}($style)";
|
||||
style = "bold #d20f39";
|
||||
};
|
||||
git_metrics = {
|
||||
disabled = false;
|
||||
format = " [+$added]($added_style)/[-$deleted]($deleted_style)";
|
||||
added_style = "bold #40a02b";
|
||||
deleted_style = "bold #d20f39";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,60 +1,60 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.zellij =
|
||||
{
|
||||
enable = true;
|
||||
settings = {
|
||||
theme = "catppuccin-latte";
|
||||
default_layout = "default";
|
||||
default_shell = "${pkgs.fish}/bin/fish";
|
||||
pane_frames = false;
|
||||
show_startup_tips = false;
|
||||
show_release_notes = false;
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
programs.zellij =
|
||||
{
|
||||
enable = true;
|
||||
settings = {
|
||||
theme = "catppuccin-latte";
|
||||
default_layout = "default";
|
||||
default_shell = "${pkgs.fish}/bin/fish";
|
||||
pane_frames = false;
|
||||
show_startup_tips = false;
|
||||
show_release_notes = false;
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
|
||||
xdg.configFile."zellij/layouts/default.kdl".text = ''
|
||||
layout {
|
||||
default_tab_template {
|
||||
pane split_direction="vertical" {
|
||||
pane
|
||||
}
|
||||
xdg.configFile."zellij/layouts/default.kdl".text = ''
|
||||
layout {
|
||||
default_tab_template {
|
||||
pane split_direction="vertical" {
|
||||
pane
|
||||
}
|
||||
|
||||
pane size=1 borderless=true {
|
||||
plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" {
|
||||
hide_frame_for_single_pane "true"
|
||||
pane size=1 borderless=true {
|
||||
plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" {
|
||||
hide_frame_for_single_pane "true"
|
||||
|
||||
format_left "{mode}#[fg=#1e66f5,bg=#eff1f5,bold] {session}#[bg=#eff1f5] {tabs}"
|
||||
format_right "{datetime}"
|
||||
format_space "#[bg=#eff1f5]"
|
||||
format_left "{mode}#[fg=#1e66f5,bg=#eff1f5,bold] {session}#[bg=#eff1f5] {tabs}"
|
||||
format_right "{datetime}"
|
||||
format_space "#[bg=#eff1f5]"
|
||||
|
||||
mode_normal "#[fg=#eff1f5,bg=#1e66f5] "
|
||||
mode_locked "#[fg=#eff1f5,bg=#fe640b] L "
|
||||
mode_tab "#[fg=#eff1f5,bg=#40a02b] T "
|
||||
mode_pane "#[fg=#eff1f5,bg=#8839ef] P "
|
||||
mode_session "#[fg=#eff1f5,bg=#04a5e5] S "
|
||||
mode_resize "#[fg=#eff1f5,bg=#df8e1d] R "
|
||||
mode_move "#[fg=#eff1f5,bg=#ea76cb] M "
|
||||
mode_search "#[fg=#eff1f5,bg=#d20f39] S "
|
||||
mode_normal "#[fg=#eff1f5,bg=#1e66f5] "
|
||||
mode_locked "#[fg=#eff1f5,bg=#fe640b] L "
|
||||
mode_tab "#[fg=#eff1f5,bg=#40a02b] T "
|
||||
mode_pane "#[fg=#eff1f5,bg=#8839ef] P "
|
||||
mode_session "#[fg=#eff1f5,bg=#04a5e5] S "
|
||||
mode_resize "#[fg=#eff1f5,bg=#df8e1d] R "
|
||||
mode_move "#[fg=#eff1f5,bg=#ea76cb] M "
|
||||
mode_search "#[fg=#eff1f5,bg=#d20f39] S "
|
||||
|
||||
tab_normal "#[fg=#acb0be,bg=#eff1f5] {index} {name} {fullscreen_indicator}{sync_indicator}{floating_indicator}"
|
||||
tab_active "#[fg=#eff1f5,bg=#1e66f5,bold,underline] {index} {name} {fullscreen_indicator}{sync_indicator}{floating_indicator}"
|
||||
tab_fullscreen_indicator "□ "
|
||||
tab_sync_indicator " "
|
||||
tab_floating_indicator " "
|
||||
tab_normal "#[fg=#acb0be,bg=#eff1f5] {index} {name} {fullscreen_indicator}{sync_indicator}{floating_indicator}"
|
||||
tab_active "#[fg=#eff1f5,bg=#1e66f5,bold,underline] {index} {name} {fullscreen_indicator}{sync_indicator}{floating_indicator}"
|
||||
tab_fullscreen_indicator "□ "
|
||||
tab_sync_indicator " "
|
||||
tab_floating_indicator " "
|
||||
|
||||
datetime "#[fg=#4c4f69,bg=#eff1f5] {format} "
|
||||
datetime_format "%A, %d %b %Y %H:%M"
|
||||
datetime_timezone "Europe/Berlin"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
'';
|
||||
datetime "#[fg=#4c4f69,bg=#eff1f5] {format} "
|
||||
datetime_format "%A, %d %b %Y %H:%M"
|
||||
datetime_timezone "Europe/Berlin"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
programs.zoxide = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
programs.zoxide = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
};
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,82 +1,82 @@
|
||||
{
|
||||
pkgs,
|
||||
nixvim,
|
||||
user,
|
||||
constants,
|
||||
sops-nix,
|
||||
...
|
||||
pkgs,
|
||||
nixvim,
|
||||
user,
|
||||
constants,
|
||||
sops-nix,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../core.nix
|
||||
../syncthing.nix
|
||||
../tailscale.nix
|
||||
sops-nix.nixosModules.sops
|
||||
];
|
||||
imports = [
|
||||
../core.nix
|
||||
../syncthing.nix
|
||||
../tailscale.nix
|
||||
sops-nix.nixosModules.sops
|
||||
];
|
||||
|
||||
security.sudo.enable = true;
|
||||
security.sudo.enable = true;
|
||||
|
||||
system.stateVersion = constants.stateVersions.nixos;
|
||||
time.timeZone = "UTC";
|
||||
system.stateVersion = constants.stateVersions.nixos;
|
||||
time.timeZone = "UTC";
|
||||
|
||||
nix = {
|
||||
settings.trusted-users = ["${user}"];
|
||||
gc.dates = "weekly";
|
||||
nixPath = ["nixos-config=/home/${user}/.local/share/src/nixos-config:/etc/nixos"];
|
||||
};
|
||||
nix = {
|
||||
settings.trusted-users = ["${user}"];
|
||||
gc.dates = "weekly";
|
||||
nixPath = ["nixos-config=/home/${user}/.local/share/src/nixos-config:/etc/nixos"];
|
||||
};
|
||||
|
||||
boot = {
|
||||
loader = {
|
||||
systemd-boot = {
|
||||
enable = true;
|
||||
configurationLimit = 42;
|
||||
};
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"nvme"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
};
|
||||
boot = {
|
||||
loader = {
|
||||
systemd-boot = {
|
||||
enable = true;
|
||||
configurationLimit = 42;
|
||||
};
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"nvme"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
};
|
||||
|
||||
users.users = {
|
||||
${user} = {
|
||||
isNormalUser = true;
|
||||
home = "/home/${user}";
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"sudo"
|
||||
"network"
|
||||
"systemd-journal"
|
||||
"docker"
|
||||
];
|
||||
shell = pkgs.fish;
|
||||
openssh.authorizedKeys.keys = constants.sshKeys;
|
||||
};
|
||||
users.users = {
|
||||
${user} = {
|
||||
isNormalUser = true;
|
||||
home = "/home/${user}";
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"sudo"
|
||||
"network"
|
||||
"systemd-journal"
|
||||
"docker"
|
||||
];
|
||||
shell = pkgs.fish;
|
||||
openssh.authorizedKeys.keys = constants.sshKeys;
|
||||
};
|
||||
|
||||
root = {
|
||||
openssh.authorizedKeys.keys = constants.sshKeys;
|
||||
};
|
||||
};
|
||||
root = {
|
||||
openssh.authorizedKeys.keys = constants.sshKeys;
|
||||
};
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
users.${user} = {
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
_module.args = {inherit user constants;};
|
||||
imports = [
|
||||
nixvim.homeModules.nixvim
|
||||
../home/default.nix
|
||||
./home/default.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
users.${user} = {
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
_module.args = {inherit user constants;};
|
||||
imports = [
|
||||
nixvim.homeModules.nixvim
|
||||
../home/default.nix
|
||||
./home/default.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{pkgs, ...}: {
|
||||
home = {
|
||||
packages = pkgs.callPackage ../packages.nix {};
|
||||
};
|
||||
home = {
|
||||
packages = pkgs.callPackage ../packages.nix {};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{pkgs}:
|
||||
with pkgs; [
|
||||
gcc15
|
||||
lm_sensors
|
||||
ghostty.terminfo
|
||||
gcc15
|
||||
lm_sensors
|
||||
ghostty.terminfo
|
||||
]
|
||||
|
||||
@@ -1,37 +1,37 @@
|
||||
{pkgs, ...}:
|
||||
with pkgs; [
|
||||
(callPackage ./bin/open-project.nix {})
|
||||
age
|
||||
alejandra
|
||||
amp-cli
|
||||
ast-grep
|
||||
codex
|
||||
delta
|
||||
devenv
|
||||
dig
|
||||
docker
|
||||
docker-compose
|
||||
fastfetch
|
||||
fd
|
||||
gh
|
||||
git
|
||||
gnumake
|
||||
gnupg
|
||||
htop
|
||||
hyperfine
|
||||
jq
|
||||
killall
|
||||
lsof
|
||||
nurl
|
||||
openssh
|
||||
postgresql_17
|
||||
sd
|
||||
sops
|
||||
sqlite
|
||||
tokei
|
||||
tree
|
||||
tree-sitter
|
||||
unzip
|
||||
vivid
|
||||
zip
|
||||
(callPackage ./bin/open-project.nix {})
|
||||
age
|
||||
alejandra
|
||||
amp-cli
|
||||
ast-grep
|
||||
codex
|
||||
delta
|
||||
devenv
|
||||
dig
|
||||
docker
|
||||
docker-compose
|
||||
fastfetch
|
||||
fd
|
||||
gh
|
||||
git
|
||||
gnumake
|
||||
gnupg
|
||||
htop
|
||||
hyperfine
|
||||
jq
|
||||
killall
|
||||
lsof
|
||||
nurl
|
||||
openssh
|
||||
postgresql_17
|
||||
sd
|
||||
sops
|
||||
sqlite
|
||||
tokei
|
||||
tree
|
||||
tree-sitter
|
||||
unzip
|
||||
vivid
|
||||
zip
|
||||
]
|
||||
|
||||
@@ -1,53 +1,53 @@
|
||||
{
|
||||
user,
|
||||
pkgs,
|
||||
...
|
||||
user,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
isDarwin = pkgs.stdenv.isDarwin;
|
||||
homeDir =
|
||||
if isDarwin
|
||||
then "/Users/${user}"
|
||||
else "/home/${user}";
|
||||
group =
|
||||
if isDarwin
|
||||
then "staff"
|
||||
else "users";
|
||||
isDarwin = pkgs.stdenv.isDarwin;
|
||||
homeDir =
|
||||
if isDarwin
|
||||
then "/Users/${user}"
|
||||
else "/home/${user}";
|
||||
group =
|
||||
if isDarwin
|
||||
then "staff"
|
||||
else "users";
|
||||
in {
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
openDefaultPorts = !isDarwin;
|
||||
dataDir = "${homeDir}/.local/share/syncthing";
|
||||
configDir = "${homeDir}/.config/syncthing";
|
||||
user = "${user}";
|
||||
group = group;
|
||||
guiAddress = "0.0.0.0:8384";
|
||||
overrideFolders = true;
|
||||
overrideDevices = true;
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
openDefaultPorts = !isDarwin;
|
||||
dataDir = "${homeDir}/.local/share/syncthing";
|
||||
configDir = "${homeDir}/.config/syncthing";
|
||||
user = "${user}";
|
||||
group = group;
|
||||
guiAddress = "0.0.0.0:8384";
|
||||
overrideFolders = true;
|
||||
overrideDevices = true;
|
||||
|
||||
settings = {
|
||||
devices = {
|
||||
"tahani" = {
|
||||
id = "6B7OZZF-TEAMUGO-FBOELXP-Z4OY7EU-5ZHLB5T-V6Z3UDB-Q2DYR43-QBYW6QM";
|
||||
addresses = ["tcp://tahani:22000"];
|
||||
};
|
||||
"jason" = {
|
||||
id = "42II2VO-QYPJG26-ZS3MB2I-AOPVZ67-JJNSE76-U54CO5Y-634A5OG-ECU4YQA";
|
||||
addresses = ["tcp://jason:22000"];
|
||||
};
|
||||
"chidi" = {
|
||||
id = "N7W6SUT-QO6J4BE-T3Y65SM-OFGYGNV-TGYBJPX-JVN4Z72-AENZ247-KWXOQA6";
|
||||
addresses = ["tcp://chidi:22000"];
|
||||
};
|
||||
};
|
||||
settings = {
|
||||
devices = {
|
||||
"tahani" = {
|
||||
id = "6B7OZZF-TEAMUGO-FBOELXP-Z4OY7EU-5ZHLB5T-V6Z3UDB-Q2DYR43-QBYW6QM";
|
||||
addresses = ["tcp://tahani:22000"];
|
||||
};
|
||||
"jason" = {
|
||||
id = "42II2VO-QYPJG26-ZS3MB2I-AOPVZ67-JJNSE76-U54CO5Y-634A5OG-ECU4YQA";
|
||||
addresses = ["tcp://jason:22000"];
|
||||
};
|
||||
"chidi" = {
|
||||
id = "N7W6SUT-QO6J4BE-T3Y65SM-OFGYGNV-TGYBJPX-JVN4Z72-AENZ247-KWXOQA6";
|
||||
addresses = ["tcp://chidi:22000"];
|
||||
};
|
||||
};
|
||||
|
||||
folders = {
|
||||
"nixos-config" = {
|
||||
path = "${homeDir}/nixos-config";
|
||||
devices = ["tahani" "jason" "chidi"];
|
||||
};
|
||||
};
|
||||
folders = {
|
||||
"nixos-config" = {
|
||||
path = "${homeDir}/nixos-config";
|
||||
devices = ["tahani" "jason" "chidi"];
|
||||
};
|
||||
};
|
||||
|
||||
options.globalAnnounceEnabled = false;
|
||||
};
|
||||
};
|
||||
options.globalAnnounceEnabled = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
services.tailscale =
|
||||
{
|
||||
enable = true;
|
||||
}
|
||||
// lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||
openFirewall = true;
|
||||
useRoutingFeatures = "server";
|
||||
};
|
||||
services.tailscale =
|
||||
{
|
||||
enable = true;
|
||||
}
|
||||
// lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||
openFirewall = true;
|
||||
useRoutingFeatures = "server";
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user