update
This commit is contained in:
parent
46fd7ad04c
commit
f756a1cdfe
17 changed files with 206 additions and 129 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,2 +1,3 @@
|
|||
result
|
||||
/.pre-commit-config.yaml
|
||||
home/emacs/config/var
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ in
|
|||
|
||||
services.aerospace = {
|
||||
enable = true;
|
||||
package = pkgs.custom.aerospace;
|
||||
# package = pkgs.custom.aerospace;
|
||||
settings = {
|
||||
enable-normalization-flatten-containers = false;
|
||||
enable-normalization-opposite-orientation-for-nested-containers = false;
|
||||
|
|
@ -248,12 +248,12 @@ in
|
|||
"move-node-to-workspace 10"
|
||||
];
|
||||
}
|
||||
{
|
||||
"if".app-id = "com.openai.chat";
|
||||
run = [
|
||||
"move-node-to-workspace 10"
|
||||
];
|
||||
}
|
||||
# {
|
||||
# "if".app-id = "com.openai.chat";
|
||||
# run = [
|
||||
# "move-node-to-workspace 10"
|
||||
# ];
|
||||
# }
|
||||
# {
|
||||
# "if".app-id = "app.mozilla.firefox";
|
||||
# run = [ "move-node-to-workspace 10" ];
|
||||
|
|
@ -306,6 +306,10 @@ in
|
|||
"if".app-id = "com.1password.1password";
|
||||
run = [ "layout floating" ];
|
||||
}
|
||||
{
|
||||
"if".app-id = "com.chabomakers.Antinote";
|
||||
run = [ "layout floating" ];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -129,8 +129,8 @@
|
|||
AppleMetricUnits = 1;
|
||||
AppleShowAllExtensions = true;
|
||||
# AppleTemperatureUnit = "Celsius";
|
||||
# AppleInterfaceStyle = "Dark";
|
||||
AppleInterfaceStyle = null; # -- light mode
|
||||
AppleInterfaceStyle = "Dark";
|
||||
# AppleInterfaceStyle = null; # -- light mode
|
||||
AppleInterfaceStyleSwitchesAutomatically = false;
|
||||
InitialKeyRepeat = 20;
|
||||
KeyRepeat = 2;
|
||||
|
|
|
|||
|
|
@ -39,6 +39,11 @@
|
|||
zed = mkEnableOption "Enable zed";
|
||||
orion = mkEnableOption "Enable orion";
|
||||
chatgpt = mkEnableOption "Enable ChatGPT";
|
||||
antinote = mkEnableOption "Enable Antinote";
|
||||
swish = mkEnableOption "Enable Swish";
|
||||
rectangle = mkEnableOption "Enable Rectangle";
|
||||
rectangle-pro = mkEnableOption "Enable Rectangle Pro";
|
||||
emacs = mkEnableOption "Enable Emacs";
|
||||
};
|
||||
|
||||
config = lib.mkMerge [
|
||||
|
|
@ -51,6 +56,7 @@
|
|||
"homebrew/homebrew-core" = inputs.homebrew-core;
|
||||
"homebrew/homebrew-cask" = inputs.homebrew-cask;
|
||||
"homebrew/homebrew-createzap" = inputs.homebrew-createzap;
|
||||
"d12frosted/homebrew-emacs-plus" = inputs.homebrew-emacs-plus;
|
||||
};
|
||||
mutableTaps = false;
|
||||
};
|
||||
|
|
@ -218,5 +224,30 @@
|
|||
"chatgpt"
|
||||
];
|
||||
})
|
||||
(lib.mkIf config.custom.brew.antinote {
|
||||
homebrew.casks = [
|
||||
"antinote"
|
||||
];
|
||||
})
|
||||
(lib.mkIf config.custom.brew.swish {
|
||||
homebrew.casks = [
|
||||
"swish"
|
||||
];
|
||||
})
|
||||
(lib.mkIf config.custom.brew.rectangle {
|
||||
homebrew.casks = [
|
||||
"rectangle"
|
||||
];
|
||||
})
|
||||
(lib.mkIf config.custom.brew.rectangle-pro {
|
||||
homebrew.casks = [
|
||||
"rectangle-pro"
|
||||
];
|
||||
})
|
||||
(lib.mkIf config.custom.brew.emacs {
|
||||
homebrew.brews = [
|
||||
"emacs-plus"
|
||||
];
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,43 +5,44 @@ local function with_alpha(color, alpha)
|
|||
return (color & 0x00ffffff) | (math.floor(alpha * 255.0) << 24)
|
||||
end
|
||||
|
||||
-- return {
|
||||
-- black = 0xff181819,
|
||||
-- white = 0xffd3b58d,
|
||||
-- red = 0xffF92672,
|
||||
-- blue = 0xff66D9EF,
|
||||
-- grey = 0xff7f8490,
|
||||
-- transparent = 0x00000000,
|
||||
--
|
||||
-- bar = {
|
||||
-- bg = 0xff072626,
|
||||
-- border = 0xffFD971F,
|
||||
-- },
|
||||
-- popup = {
|
||||
-- bg = with_alpha(0xff072626, 0.6),
|
||||
-- border = 0xffFD971F,
|
||||
-- },
|
||||
--
|
||||
-- with_alpha = with_alpha,
|
||||
-- }
|
||||
|
||||
return {
|
||||
fg = 0xff181819,
|
||||
fg = 0xffd3b58d,
|
||||
black = 0xff181819,
|
||||
white = 0xffffffff,
|
||||
red = 0xffff0000,
|
||||
blue = 0xff0000ff,
|
||||
white = 0xffd3b58d,
|
||||
red = 0xffF92672,
|
||||
blue = 0xff66D9EF,
|
||||
grey = 0xff7f8490,
|
||||
transparent = 0x00000000,
|
||||
|
||||
bar = {
|
||||
bg = 0xffffffff,
|
||||
border = 0xff000000,
|
||||
bg = 0xff072626,
|
||||
border = 0xffFD971F,
|
||||
},
|
||||
popup = {
|
||||
bg = with_alpha(0xffffffff, 0.6),
|
||||
border = 0xff000000,
|
||||
bg = with_alpha(0xff072626, 0.6),
|
||||
border = 0xffFD971F,
|
||||
},
|
||||
|
||||
with_alpha = with_alpha,
|
||||
}
|
||||
|
||||
-- return {
|
||||
-- fg = 0xff181819,
|
||||
-- black = 0xff181819,
|
||||
-- white = 0xffffffff,
|
||||
-- red = 0xffff0000,
|
||||
-- blue = 0xff0000ff,
|
||||
-- grey = 0xff7f8490,
|
||||
-- transparent = 0x00000000,
|
||||
--
|
||||
-- bar = {
|
||||
-- bg = 0xffffffff,
|
||||
-- border = 0xff000000,
|
||||
-- },
|
||||
-- popup = {
|
||||
-- bg = with_alpha(0xffffffff, 0.6),
|
||||
-- border = 0xff000000,
|
||||
-- },
|
||||
--
|
||||
-- with_alpha = with_alpha,
|
||||
-- }
|
||||
|
|
|
|||
|
|
@ -207,12 +207,12 @@ function setup()
|
|||
display = display,
|
||||
icon = {
|
||||
string = workspaceid,
|
||||
color = colors.black,
|
||||
color = colors.fg,
|
||||
highlight_color = colors.red,
|
||||
},
|
||||
label = {
|
||||
padding_right = 12,
|
||||
color = colors.black,
|
||||
color = colors.fg,
|
||||
highlight_color = colors.blue,
|
||||
font = "sketchybar-app-font:Regular:14.0",
|
||||
y_offset = -1,
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ local apple = sbar.add("item", {
|
|||
string = icons.apple,
|
||||
padding_right = settings.paddings,
|
||||
padding_left = 0,
|
||||
color = colors.black,
|
||||
color = colors.fg,
|
||||
},
|
||||
label = { drawing = false },
|
||||
background = {
|
||||
|
|
|
|||
127
flake.lock
127
flake.lock
|
|
@ -3,16 +3,16 @@
|
|||
"brew-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1742457334,
|
||||
"narHash": "sha256-Gn7ruyb3NDFr+SsHBfA2NsJI8YkkWdECqLRj/xcjt+E=",
|
||||
"lastModified": 1746795192,
|
||||
"narHash": "sha256-Cv+RXuzmn2iGBY2Ny/nXBTH+LFKDWIvMxf9a+btKI6M=",
|
||||
"owner": "Homebrew",
|
||||
"repo": "brew",
|
||||
"rev": "f3bd91d3afe086824d24708230e1f0c7f943135a",
|
||||
"rev": "6f39076b3c2251994419215279d0525ef667fc31",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Homebrew",
|
||||
"ref": "4.4.25",
|
||||
"ref": "4.5.2",
|
||||
"repo": "brew",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -39,11 +39,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745812220,
|
||||
"narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=",
|
||||
"lastModified": 1746729224,
|
||||
"narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "d0c543d740fad42fe2c035b43c9d41127e073c78",
|
||||
"rev": "85555d27ded84604ad6657ecca255a03fd878607",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -149,11 +149,11 @@
|
|||
"zon2nix": "zon2nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746045191,
|
||||
"narHash": "sha256-nqwo0TXEwYLTRjbj+akj30SkpXtVozEzaSAIyp41yTA=",
|
||||
"lastModified": 1746806042,
|
||||
"narHash": "sha256-Hx92i3f5IjHaWpReyCKvGdqG55bZFU3wxGzA3wv9VLA=",
|
||||
"owner": "ghostty-org",
|
||||
"repo": "ghostty",
|
||||
"rev": "2b4f1f8b84ac7960ecd4b9d06bc11cf47f0b9ee9",
|
||||
"rev": "7f9bb3c0e54f585e11259bc0c9064813d061929c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -171,11 +171,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742649964,
|
||||
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
|
||||
"lastModified": 1746537231,
|
||||
"narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
|
||||
"rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -212,11 +212,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746040799,
|
||||
"narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=",
|
||||
"lastModified": 1746892839,
|
||||
"narHash": "sha256-0b9us0bIOgA1j/s/6zlxVyP3m97yAh0U+YwKayJ6mmU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "5f217e5a319f6c186283b530f8c975e66c028433",
|
||||
"rev": "12e67385964d9c9304daa81d0ad5ba3b01fdd35e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -249,11 +249,11 @@
|
|||
"homebrew-cask": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1746063234,
|
||||
"narHash": "sha256-ZT4QJkRxbcgbiWLQvd/Fgc4oEUkCVK8cNZwbSTwb/TY=",
|
||||
"lastModified": 1746902608,
|
||||
"narHash": "sha256-sQ/jlqwzmdB8TMC95QWoSGZlYJyHVX6F3lIROJheXEs=",
|
||||
"owner": "homebrew",
|
||||
"repo": "homebrew-cask",
|
||||
"rev": "08d802bc32187c3383b0844c65d858464511d1a3",
|
||||
"rev": "031905379a385a18fc9d2a9bb43b29520b09c182",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -265,11 +265,11 @@
|
|||
"homebrew-core": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1746064485,
|
||||
"narHash": "sha256-KDrlnp4C20+PUUfDN7ZMoj6WR+BXrR5xXwQ8c7ztLxM=",
|
||||
"lastModified": 1746900684,
|
||||
"narHash": "sha256-dSY5hgqWx5OPEBXXFAvxZ6S4V7oprlRM32TAoHPhMZg=",
|
||||
"owner": "homebrew",
|
||||
"repo": "homebrew-core",
|
||||
"rev": "f0978448286b0e238ab41514c6a9cc6507d79cc9",
|
||||
"rev": "c538a4745d0187387ede7cddfb5cc5d2bdc8bd40",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -294,6 +294,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"homebrew-emacs-plus": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1743441558,
|
||||
"narHash": "sha256-Eepinxv05Yl79AoPVJveGDZPKHhlAes7XtUvrssflrU=",
|
||||
"owner": "d12frosted",
|
||||
"repo": "homebrew-emacs-plus",
|
||||
"rev": "3e95d573d5f13aba7808193b66312b38a7c66851",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "d12frosted",
|
||||
"repo": "homebrew-emacs-plus",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mac-app-util": {
|
||||
"inputs": {
|
||||
"cl-nix-lite": "cl-nix-lite",
|
||||
|
|
@ -323,11 +339,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745816321,
|
||||
"narHash": "sha256-Gyh/fkCDqVNGM0BWvk+4UAS17w2UI6iwnbQQCmc1TDI=",
|
||||
"lastModified": 1746708654,
|
||||
"narHash": "sha256-GeC99gu5H6+AjBXsn5dOhP4/ApuioGCBkufdmEIWPRs=",
|
||||
"owner": "nix-darwin",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "4515dacafb0ccd42e5395aacc49fd58a43027e01",
|
||||
"rev": "6cb36e8327421c61e5a3bbd08ed63491b616364a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -362,11 +378,11 @@
|
|||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1744563914,
|
||||
"narHash": "sha256-0exTKCXDE/8G7gZQ9Gk3EcZBAL7lwzxhD7DtUBsnlGI=",
|
||||
"lastModified": 1746844491,
|
||||
"narHash": "sha256-69KEURmqcFU0db6LkSiaxxdRhgkTXLVGskuR5RLOvk4=",
|
||||
"owner": "zhaofengli",
|
||||
"repo": "nix-homebrew",
|
||||
"rev": "53507607d69c88efc816e806b8139607c7257285",
|
||||
"rev": "fae199aa8b9a259aa8500aefea9e62b23d5ff007",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -382,11 +398,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746054057,
|
||||
"narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=",
|
||||
"lastModified": 1746330942,
|
||||
"narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "13ba07d54c6ccc5af30a501df669bf3fe3dd4db8",
|
||||
"rev": "137fd2bd726fff343874f85601b51769b48685cc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -397,11 +413,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1745955289,
|
||||
"narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
|
||||
"lastModified": 1746814339,
|
||||
"narHash": "sha256-hf2lICJzwACWuzHCmZn5NI6LUAOgGdR1yh8ip+duyhk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
|
||||
"rev": "3c5e12673265dfb0de3d9121420c0c2153bf21e0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -432,11 +448,11 @@
|
|||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746061784,
|
||||
"narHash": "sha256-QDdCdrdlr/HzaL1XnCrUxgAZpkwKhJNn1U2iY6Eg+k8=",
|
||||
"lastModified": 1746891730,
|
||||
"narHash": "sha256-AAJdk2IG+azEVm4Uy7RhkDMbTaoQ87XbnkuCnbXdrYo=",
|
||||
"owner": "bandithedoge",
|
||||
"repo": "nixpkgs-firefox-darwin",
|
||||
"rev": "93d7dcbe6884d4b1659d37b0ec56dd08ab2b1fff",
|
||||
"rev": "4a2ba4462b5aa95fd26079a7e755618fb6d3b9a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -492,11 +508,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1716330097,
|
||||
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
|
||||
"lastModified": 1746328495,
|
||||
"narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
|
||||
"rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -508,11 +524,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1745930157,
|
||||
"narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
|
||||
"lastModified": 1746663147,
|
||||
"narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
|
||||
"rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -524,11 +540,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1639237670,
|
||||
"narHash": "sha256-RTdL4rEQcgaZGpvtDgkp3oK/V+1LM3I53n0ACPSroAQ=",
|
||||
"lastModified": 1746683680,
|
||||
"narHash": "sha256-+5zk+UbG0+GQlKt+gIKm+OhlYvHmkAHFXvf7hl1HDeM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "edfb969386ebe6c3cf8f878775a7975cd88f926d",
|
||||
"rev": "16762245d811fdd74b417cc922223dc8eb741e8b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -547,6 +563,7 @@
|
|||
"homebrew-cask": "homebrew-cask",
|
||||
"homebrew-core": "homebrew-core",
|
||||
"homebrew-createzap": "homebrew-createzap",
|
||||
"homebrew-emacs-plus": "homebrew-emacs-plus",
|
||||
"mac-app-util": "mac-app-util",
|
||||
"nix-darwin": "nix-darwin",
|
||||
"nix-homebrew": "nix-homebrew",
|
||||
|
|
@ -566,11 +583,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745310711,
|
||||
"narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=",
|
||||
"lastModified": 1746485181,
|
||||
"narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c",
|
||||
"rev": "e93ee1d900ad264d65e9701a5c6f895683433386",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -616,11 +633,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745929750,
|
||||
"narHash": "sha256-k5ELLpTwRP/OElcLpNaFWLNf8GRDq4/eHBmFy06gGko=",
|
||||
"lastModified": 1746216483,
|
||||
"narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "82bf32e541b30080d94e46af13d46da0708609ea",
|
||||
"rev": "29ec5026372e0dec56f890e50dbe4f45930320fd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -637,11 +654,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746063875,
|
||||
"narHash": "sha256-+faDyJwlheRLUCbp9jaegHwCqjz/tDWVdp9gB3xBugE=",
|
||||
"lastModified": 1746901443,
|
||||
"narHash": "sha256-fG5B8lWJqtVPgebXtjoPLhPESkzOnqsM0omKY85/A1M=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "115e6a25fd1883598ee8d7eef0a0032a3abf4176",
|
||||
"rev": "954c70bb7b27882cccf7e282d304ef894344eee8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -34,6 +34,8 @@
|
|||
homebrew-cask.flake = false;
|
||||
homebrew-createzap.url = "github:nrlquaker/homebrew-createzap";
|
||||
homebrew-createzap.flake = false;
|
||||
homebrew-emacs-plus.url = "github:d12frosted/homebrew-emacs-plus";
|
||||
homebrew-emacs-plus.flake = false;
|
||||
};
|
||||
|
||||
outputs =
|
||||
|
|
|
|||
|
|
@ -63,12 +63,17 @@
|
|||
clean.extraArgs = "--keep-since 4d --keep 3";
|
||||
flake = dots;
|
||||
};
|
||||
|
||||
home-manager.enable = true;
|
||||
bash = {
|
||||
enable = true;
|
||||
enableVteIntegration = true;
|
||||
};
|
||||
direnv = {
|
||||
enable = true;
|
||||
enableBashIntegration = config.programs.bash.enable;
|
||||
enableFishIntegration = config.programs.fish.enable;
|
||||
enableZshIntegration = config.programs.zsh.enable;
|
||||
};
|
||||
zsh = {
|
||||
enable = true;
|
||||
enableVteIntegration = true;
|
||||
|
|
@ -103,6 +108,7 @@
|
|||
enable = true;
|
||||
enableBashIntegration = config.programs.bash.enable;
|
||||
enableFishIntegration = config.programs.fish.enable;
|
||||
enableZshIntegration = config.programs.zsh.enable;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -53,17 +53,21 @@
|
|||
;; Theme
|
||||
;; =========================
|
||||
|
||||
;; (use-package naysayer-theme
|
||||
;; :ensure nil
|
||||
;; ;; :defer t
|
||||
;; ;; :elpaca nil
|
||||
;; :config
|
||||
;; (load-theme 'naysayer t)
|
||||
;; :load-path rs/lib-dir)
|
||||
|
||||
(use-package tango-plus-theme
|
||||
(use-package naysayer-theme
|
||||
:ensure nil
|
||||
;; :defer t
|
||||
;; :elpaca nil
|
||||
:config
|
||||
(load-theme 'tango-plus t))
|
||||
(load-theme 'naysayer t)
|
||||
:load-path rs/lib-dir)
|
||||
|
||||
;; (use-package zenburn-theme
|
||||
;; :config
|
||||
;; (load-theme 'zenburn t))
|
||||
|
||||
;; (use-package tango-plus-theme
|
||||
;; :config
|
||||
;; (load-theme 'tango-plus t))
|
||||
|
||||
;; (custom-set-faces
|
||||
;; ;; custom-set-faces was added by Custom.
|
||||
|
|
|
|||
|
|
@ -21,8 +21,9 @@
|
|||
;; (setq default-frame-alist '((background-color . "#062329")
|
||||
;; (ns-appearance . dark)
|
||||
;; (ns-transparent-titlebar . t)))
|
||||
;; (setq default-frame-alist '((background-color . "#072626")
|
||||
;; (ns-appearance . dark)
|
||||
(setq default-frame-alist '((background-color . "#072626")
|
||||
(ns-appearance . dark)
|
||||
(ns-transparent-titlebar . t)
|
||||
(frame-resize-pixelwise . t)))
|
||||
;; (setq default-frame-alist '((ns-appearance . dark)
|
||||
;; (ns-transparent-titlebar . t)))
|
||||
(setq default-frame-alist '((ns-appearance . dark)
|
||||
(ns-transparent-titlebar . t)))
|
||||
|
|
|
|||
|
|
@ -43,17 +43,17 @@
|
|||
(elpaca elpaca-use-package
|
||||
(elpaca-use-package-mode))
|
||||
|
||||
;; (defun rs/get-default-font ()
|
||||
;; (cond
|
||||
;; ((eq system-type 'windows-nt) "Consolas-11")
|
||||
;; ((eq system-type 'gnu/linux) "Consolas-11")
|
||||
;; ((eq system-type 'darwin) "Consolas-11")))
|
||||
|
||||
(defun rs/get-default-font ()
|
||||
(cond
|
||||
((eq system-type 'windows-nt) "Consolas-11")
|
||||
((eq system-type 'gnu/linux) "Consolas-11")
|
||||
((eq system-type 'darwin) "SF Mono-11")))
|
||||
((eq system-type 'darwin) "Consolas-14")))
|
||||
|
||||
;; (defun rs/get-default-font ()
|
||||
;; (cond
|
||||
;; ((eq system-type 'windows-nt) "Consolas-11")
|
||||
;; ((eq system-type 'gnu/linux) "Consolas-11")
|
||||
;; ((eq system-type 'darwin) "SF Mono-11")))
|
||||
|
||||
;; Font settings
|
||||
;; (set-frame-font (font-spec :size 13))
|
||||
|
|
|
|||
|
|
@ -14,9 +14,12 @@
|
|||
};
|
||||
|
||||
config = lib.mkIf config.custom.emacs.enable {
|
||||
home.packages = with pkgs; [
|
||||
home.packages = lib.mkIf pkgs.stdenv.isLinux (
|
||||
with pkgs;
|
||||
[
|
||||
emacs
|
||||
];
|
||||
]
|
||||
);
|
||||
|
||||
home.file.".emacs.d" = {
|
||||
source = "${pkgs.custom.minimal-emacs-d}";
|
||||
|
|
|
|||
|
|
@ -33,7 +33,8 @@
|
|||
app-notifications = no-clipboard-copy
|
||||
macos-option-as-alt = left
|
||||
# theme = gruber-darker
|
||||
theme = xcodelighthc
|
||||
# theme = xcodelighthc
|
||||
theme = zenburned
|
||||
# font-family = Iosevka Nerd Font Mono
|
||||
# font-size = 13
|
||||
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
}:
|
||||
{
|
||||
custom = {
|
||||
aerospace.enable = true;
|
||||
sketchybar.enable = true;
|
||||
jankyborders.enable = true;
|
||||
aerospace.enable = false;
|
||||
sketchybar.enable = false;
|
||||
jankyborders.enable = false;
|
||||
brew = {
|
||||
zen-browser = true;
|
||||
zen-browser = false;
|
||||
webex = true;
|
||||
slack = true;
|
||||
zoom = true;
|
||||
|
|
@ -37,14 +37,18 @@
|
|||
contexts = true;
|
||||
flux = true;
|
||||
cleanshot = true;
|
||||
snippets-lab = true;
|
||||
snippets-lab = false;
|
||||
iina = true;
|
||||
itsycal = true;
|
||||
lookaway = false;
|
||||
obsidian = true;
|
||||
zed = true;
|
||||
zed = false;
|
||||
orion = true;
|
||||
chatgpt = true;
|
||||
antinote = true;
|
||||
swish = true;
|
||||
rectangle = false;
|
||||
emacs = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,8 @@
|
|||
|
||||
let
|
||||
appName = "AeroSpace.app";
|
||||
version = "0.18.4-Beta";
|
||||
# version = "0.18.4-Beta";
|
||||
version = "0.17.1-Beta";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "aerospace";
|
||||
|
|
@ -18,7 +19,8 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip";
|
||||
sha256 = "sha256-TjVxq1HS/gdGi32noj7i1P6e9lXKNtBoO373Cesnwks=";
|
||||
# sha256 = "sha256-TjVxq1HS/gdGi32noj7i1P6e9lXKNtBoO373Cesnwks=";
|
||||
sha256 = "sha256-IMU0s57dpes7Vm2Wv191LwkRgiF+ZIqNWHzrl4a1Pm0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
Loading…
Reference in a new issue