refactor: nix fmt classic to nix fmt
This commit is contained in:
parent
ca78adc858
commit
f9614371a3
57 changed files with 923 additions and 493 deletions
|
|
@ -1,8 +1,14 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) mkIf mkOption types;
|
||||
cfg = config.rsydn.systemPackages;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.rsydn.systemPackages = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
|
|
@ -13,8 +19,7 @@ in {
|
|||
packages = mkOption {
|
||||
type = types.listOf types.package;
|
||||
default = with pkgs; [ tailscale ];
|
||||
description =
|
||||
"System packages that must be available globally across macOS.";
|
||||
description = "System packages that must be available globally across macOS.";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ config, pkgs, lib, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
# Import shared cross-platform home configuration
|
||||
imports = [
|
||||
../../home/base.nix
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@ let
|
|||
};
|
||||
|
||||
userSettings = import ./user-settings.nix { modes = modes; };
|
||||
in {
|
||||
in
|
||||
{
|
||||
programs.aerospace = {
|
||||
enable = true;
|
||||
package = pkgs.aerospace;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ workspaceFocusBindings, workspaceSendBindings }: {
|
||||
{ workspaceFocusBindings, workspaceSendBindings }:
|
||||
{
|
||||
main.binding = {
|
||||
"alt-h" = "focus left";
|
||||
"alt-j" = "focus down";
|
||||
|
|
@ -27,7 +28,9 @@
|
|||
"alt-r" = "mode resize";
|
||||
"alt-f" = "mode float";
|
||||
"alt-shift-semicolon" = "mode service";
|
||||
} // workspaceFocusBindings // workspaceSendBindings;
|
||||
}
|
||||
// workspaceFocusBindings
|
||||
// workspaceSendBindings;
|
||||
|
||||
float.binding = {
|
||||
enter = ''exec-and-forget open -na "Ghostty" && aerospace layout floating'';
|
||||
|
|
@ -36,8 +39,11 @@
|
|||
"layout floating"
|
||||
"mode main"
|
||||
];
|
||||
g =
|
||||
[ ''exec-and-forget open -na "Ghostty"'' "layout floating" "mode main" ];
|
||||
g = [
|
||||
''exec-and-forget open -na "Ghostty"''
|
||||
"layout floating"
|
||||
"mode main"
|
||||
];
|
||||
esc = "mode main";
|
||||
};
|
||||
|
||||
|
|
@ -52,13 +58,37 @@
|
|||
};
|
||||
|
||||
service.binding = {
|
||||
esc = [ "reload-config" "mode main" ];
|
||||
r = [ "flatten-workspace-tree" "mode main" ];
|
||||
f = [ "layout floating tiling" "mode main" ];
|
||||
backspace = [ "close-all-windows-but-current" "mode main" ];
|
||||
h = [ "join-with left" "mode main" ];
|
||||
j = [ "join-with down" "mode main" ];
|
||||
k = [ "join-with up" "mode main" ];
|
||||
l = [ "join-with right" "mode main" ];
|
||||
esc = [
|
||||
"reload-config"
|
||||
"mode main"
|
||||
];
|
||||
r = [
|
||||
"flatten-workspace-tree"
|
||||
"mode main"
|
||||
];
|
||||
f = [
|
||||
"layout floating tiling"
|
||||
"mode main"
|
||||
];
|
||||
backspace = [
|
||||
"close-all-windows-but-current"
|
||||
"mode main"
|
||||
];
|
||||
h = [
|
||||
"join-with left"
|
||||
"mode main"
|
||||
];
|
||||
j = [
|
||||
"join-with down"
|
||||
"mode main"
|
||||
];
|
||||
k = [
|
||||
"join-with up"
|
||||
"mode main"
|
||||
];
|
||||
l = [
|
||||
"join-with right"
|
||||
"mode main"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ modes }: {
|
||||
{ modes }:
|
||||
{
|
||||
enable-normalization-flatten-containers = true;
|
||||
enable-normalization-opposite-orientation-for-nested-containers = true;
|
||||
default-root-container-layout = "tiles";
|
||||
|
|
|
|||
|
|
@ -4,13 +4,20 @@ let
|
|||
|
||||
workspaceNumbers = map toString (lib.range 1 9);
|
||||
|
||||
workspaceFocusBindings = listToAttrs (map (ws: {
|
||||
name = "alt-${ws}";
|
||||
value = "workspace ${ws}";
|
||||
}) workspaceNumbers);
|
||||
workspaceFocusBindings = listToAttrs (
|
||||
map (ws: {
|
||||
name = "alt-${ws}";
|
||||
value = "workspace ${ws}";
|
||||
}) workspaceNumbers
|
||||
);
|
||||
|
||||
workspaceSendBindings = listToAttrs (map (ws: {
|
||||
name = "alt-shift-${ws}";
|
||||
value = "move-node-to-workspace ${ws}";
|
||||
}) workspaceNumbers);
|
||||
in { inherit workspaceNumbers workspaceFocusBindings workspaceSendBindings; }
|
||||
workspaceSendBindings = listToAttrs (
|
||||
map (ws: {
|
||||
name = "alt-shift-${ws}";
|
||||
value = "move-node-to-workspace ${ws}";
|
||||
}) workspaceNumbers
|
||||
);
|
||||
in
|
||||
{
|
||||
inherit workspaceNumbers workspaceFocusBindings workspaceSendBindings;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ config, ... }: {
|
||||
{ config, ... }:
|
||||
{
|
||||
programs.ghostty = {
|
||||
enable = true;
|
||||
package = null;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
let
|
||||
inherit (lib) mkIf mkOption types;
|
||||
cfg = config.rsydn.homebrew;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.rsydn.homebrew = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
|
|
@ -16,7 +17,12 @@ in {
|
|||
};
|
||||
brews = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ "curl" "yt-dlp" "infisical" "mole" ];
|
||||
default = [
|
||||
"curl"
|
||||
"yt-dlp"
|
||||
"infisical"
|
||||
"mole"
|
||||
];
|
||||
description = "Homebrew formulae to install.";
|
||||
};
|
||||
casks = mkOption {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,15 @@
|
|||
{ config, pkgs, lib, user, ... }: {
|
||||
imports = [ ./homebrew.nix ./devtools.nix ];
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
user,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
./homebrew.nix
|
||||
./devtools.nix
|
||||
];
|
||||
|
||||
nix = {
|
||||
# Use default nix version from nixpkgs (don't pin to avoid rebuild issues)
|
||||
|
|
@ -8,12 +18,14 @@
|
|||
keep-outputs = true
|
||||
'';
|
||||
settings = {
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
warn-dirty = false;
|
||||
# Numtide binary cache for llm-agents.nix packages
|
||||
extra-substituters = [ "https://cache.numtide.com" ];
|
||||
extra-trusted-public-keys =
|
||||
[ "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ber8L+2z9FqRZJ+KBKGE4NNsT0=" ];
|
||||
extra-trusted-public-keys = [ "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ber8L+2z9FqRZJ+KBKGE4NNsT0=" ];
|
||||
};
|
||||
optimise.automatic = true;
|
||||
gc = {
|
||||
|
|
@ -27,7 +39,10 @@
|
|||
};
|
||||
};
|
||||
|
||||
environment.shells = [ pkgs.nushell "/etc/profiles/per-user/${user}/bin/nu" ];
|
||||
environment.shells = [
|
||||
pkgs.nushell
|
||||
"/etc/profiles/per-user/${user}/bin/nu"
|
||||
];
|
||||
|
||||
# Set XDG Base Directory environment variables globally
|
||||
# This ensures nushell and other XDG-compliant tools use ~/.config
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue