rayandrew/nix
rayandrew/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update packages and fix aerospace bugs for now

Browse source
This commit is contained in:
Ray Andrew 2025-05-01 00:16:46 -05:00
parent 6207b1750b
commit 46fd7ad04c
Signed by: rayandrew
SSH key fingerprint: SHA256:XYrYrxF0Z3A72n8P/p6mqPRNQZT22F88XcLsG+kX4xw
9 changed files with 114 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
darwin/aerospace.nix
View file

@ -29,6 +29,7 @@ in
services.aerospace = { services.aerospace = {
enable = true; enable = true;
package = pkgs.custom.aerospace;
settings = { settings = {
enable-normalization-flatten-containers = false; enable-normalization-flatten-containers = false;
enable-normalization-opposite-orientation-for-nested-containers = false; enable-normalization-opposite-orientation-for-nested-containers = false;

4
darwin/default.nix
View file

@ -129,8 +129,8 @@
AppleMetricUnits = 1; AppleMetricUnits = 1;
AppleShowAllExtensions = true; AppleShowAllExtensions = true;
# AppleTemperatureUnit = "Celsius"; # AppleTemperatureUnit = "Celsius";
AppleInterfaceStyle = "Dark"; # AppleInterfaceStyle = "Dark";
# AppleInterfaceStyle = null; # -- light mode AppleInterfaceStyle = null; # -- light mode
AppleInterfaceStyleSwitchesAutomatically = false; AppleInterfaceStyleSwitchesAutomatically = false;
InitialKeyRepeat = 20; InitialKeyRepeat = 20;
KeyRepeat = 2; KeyRepeat = 2;

84
flake.lock
View file

@ -39,11 +39,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743598667, "lastModified": 1745812220,
"narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -149,11 +149,11 @@
"zon2nix": "zon2nix" "zon2nix": "zon2nix"
}, },
"locked": { "locked": {
"lastModified": 1743809482, "lastModified": 1746045191,
"narHash": "sha256-zzR3VX9+7fz+twG+84XKyyTzJhyjgQgZIkzSwr5W8HI=", "narHash": "sha256-nqwo0TXEwYLTRjbj+akj30SkpXtVozEzaSAIyp41yTA=",
"owner": "ghostty-org", "owner": "ghostty-org",
"repo": "ghostty", "repo": "ghostty",
"rev": "c0eaa4b158c418499b9963e84c9ce2787a09d473", "rev": "2b4f1f8b84ac7960ecd4b9d06bc11cf47f0b9ee9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -212,11 +212,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743788974, "lastModified": 1746040799,
"narHash": "sha256-2LeVyQZI2wTkSzMLvnN/kJjXVWp4HCVUoq17Bv8TNTk=", "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0f5908daf890c3d7e7052bef1d6deb0f2710aaa1", "rev": "5f217e5a319f6c186283b530f8c975e66c028433",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -249,11 +249,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1743826030, "lastModified": 1746063234,
"narHash": "sha256-UsALr6GdYIzQQJKVEa0dxfsl2lvTKkvbI4xt89Fe3HA=", "narHash": "sha256-ZT4QJkRxbcgbiWLQvd/Fgc4oEUkCVK8cNZwbSTwb/TY=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "280a26f1d237f1794d265143069db808d32a7469", "rev": "08d802bc32187c3383b0844c65d858464511d1a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -265,11 +265,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1743825975, "lastModified": 1746064485,
"narHash": "sha256-7n/XMkwZk/EwbK2+W6MHv6MgR54vP+kZ8z1QxIEVA4Q=", "narHash": "sha256-KDrlnp4C20+PUUfDN7ZMoj6WR+BXrR5xXwQ8c7ztLxM=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "7d6f347c4533509284d72ae6d6b7253c6248418b", "rev": "f0978448286b0e238ab41514c6a9cc6507d79cc9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,11 +323,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743496612, "lastModified": 1745816321,
"narHash": "sha256-emPWa5lmKbnyuj8c1mSJUkzJNT+iJoU9GMcXwjp2oVM=", "narHash": "sha256-Gyh/fkCDqVNGM0BWvk+4UAS17w2UI6iwnbQQCmc1TDI=",
"owner": "nix-darwin", "owner": "nix-darwin",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "73d59580d01e9b9f957ba749f336a272869c42dd", "rev": "4515dacafb0ccd42e5395aacc49fd58a43027e01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -362,11 +362,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1742619394, "lastModified": 1744563914,
"narHash": "sha256-8uwIBjbKxeJ7u0VACSNs634HwtgRLxP6/+cIkUXmuyI=", "narHash": "sha256-0exTKCXDE/8G7gZQ9Gk3EcZBAL7lwzxhD7DtUBsnlGI=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "nix-homebrew", "repo": "nix-homebrew",
"rev": "04b0536479d2d2e8d71dc8c8ee97c2b61f0c9987", "rev": "53507607d69c88efc816e806b8139607c7257285",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -382,11 +382,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743306489, "lastModified": 1746054057,
"narHash": "sha256-LROaIjSLo347cwcHRfSpqzEOa2FoLSeJwU4dOrGm55E=", "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "b3696bfb6c24aa61428839a99e8b40c53ac3a82d", "rev": "13ba07d54c6ccc5af30a501df669bf3fe3dd4db8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -397,11 +397,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1743420942, "lastModified": 1745955289,
"narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -432,11 +432,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1743814796, "lastModified": 1746061784,
"narHash": "sha256-NzvnPhm1qAnKRVapGIdyyiu79AHqYtEOa5c0doxLnWs=", "narHash": "sha256-QDdCdrdlr/HzaL1XnCrUxgAZpkwKhJNn1U2iY6Eg+k8=",
"owner": "bandithedoge", "owner": "bandithedoge",
"repo": "nixpkgs-firefox-darwin", "repo": "nixpkgs-firefox-darwin",
"rev": "767b994a4171d8fefd4f4b46a8f2ce2f0e639e0d", "rev": "93d7dcbe6884d4b1659d37b0ec56dd08ab2b1fff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -508,11 +508,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1743583204, "lastModified": 1745930157,
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -566,11 +566,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743756170, "lastModified": 1745310711,
"narHash": "sha256-2b11EYa08oqDmF3zEBLkG1AoNn9rB1k39ew/T/mSvbU=", "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "cff8437c5fe8c68fc3a840a21bf1f4dc801da40d", "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -616,11 +616,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743748085, "lastModified": 1745929750,
"narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=", "narHash": "sha256-k5ELLpTwRP/OElcLpNaFWLNf8GRDq4/eHBmFy06gGko=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d", "rev": "82bf32e541b30080d94e46af13d46da0708609ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -637,11 +637,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743798013, "lastModified": 1746063875,
"narHash": "sha256-tu1oPYFWY8dPtalV7On0DVrrNqrn4g2pYyR5yBt44NU=", "narHash": "sha256-+faDyJwlheRLUCbp9jaegHwCqjz/tDWVdp9gB3xBugE=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "48684cc5214f41f1e3fd64e41660fc064cf01815", "rev": "115e6a25fd1883598ee8d7eef0a0032a3abf4176",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
home/default.nix
View file

@ -58,7 +58,7 @@
programs = { programs = {
nh = { nh = {
enable = true; enable = true;
package = pkgs.custom.nh; # package = pkgs.custom.nh;
clean.enable = true; clean.enable = true;
clean.extraArgs = "--keep-since 4d --keep 3"; clean.extraArgs = "--keep-since 4d --keep 3";
flake = dots; flake = dots;

2
home/ghostty.nix
View file

@ -28,8 +28,10 @@
quit-after-last-window-closed = true quit-after-last-window-closed = true
# gtk-adwaita = false # gtk-adwaita = false
font-family = ${system-font} font-family = ${system-font}
# font-family = Consolas
font-size = 11 font-size = 11
app-notifications = no-clipboard-copy app-notifications = no-clipboard-copy
macos-option-as-alt = left
# theme = gruber-darker # theme = gruber-darker
theme = xcodelighthc theme = xcodelighthc
# font-family = Iosevka Nerd Font Mono # font-family = Iosevka Nerd Font Mono

4
home/i3/default.nix
View file

@ -13,9 +13,7 @@
}; };
}; };
config = lib.mkIf config.custom.gui.i3.enable { config = lib.mkIf config.custom.gui.i3.enable {
xdg.configFile."i3status/config".source = pkgs.substituteAll { xdg.configFile."i3status/config".source = pkgs.replaceVars ./i3status.config { };
src = ./i3status.config;
};
services.picom = { services.picom = {
enable = true; enable = true;
}; };

61
packages/aerospace/default.nix Normal file
View file

@ -0,0 +1,61 @@
{
fetchzip,
gitUpdater,
installShellFiles,
lib,
stdenv,
versionCheckHook,
}:
let
appName = "AeroSpace.app";
version = "0.18.4-Beta";
in
stdenv.mkDerivation {
pname = "aerospace";
inherit version;
src = fetchzip {
url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip";
sha256 = "sha256-TjVxq1HS/gdGi32noj7i1P6e9lXKNtBoO373Cesnwks=";
};
nativeBuildInputs = [ installShellFiles ];
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
mv ${appName} $out/Applications
cp -R bin $out
mkdir -p $out/share
runHook postInstall
'';
postInstall = ''
installManPage manpage/*
installShellCompletion --bash shell-completion/bash/aerospace
installShellCompletion --fish shell-completion/fish/aerospace.fish
installShellCompletion --zsh shell-completion/zsh/_aerospace
'';
doInstallCheck = true;
nativeInstallCheckInputs = [
versionCheckHook
];
passthru.updateScript = gitUpdater {
url = "https://github.com/nikitabobko/AeroSpace.git";
rev-prefix = "v";
};
meta = {
license = lib.licenses.mit;
mainProgram = "aerospace";
homepage = "https://github.com/nikitabobko/AeroSpace";
description = "i3-like tiling window manager for macOS";
platforms = lib.platforms.darwin;
maintainers = with lib.maintainers; [ alexandru0-dev ];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
};
}

3
packages/default.nix
View file

@ -9,7 +9,7 @@ in
rec { rec {
minimal-emacs-d = callPackage ./minimal-emacs-d { }; minimal-emacs-d = callPackage ./minimal-emacs-d { };
boomer = callPackage ./boomer { }; boomer = callPackage ./boomer { };
nh = callPackage ./nh { }; # nh = callPackage ./nh { };
whatsapp-for-mac = callPackage ./whatsapp-for-mac { }; whatsapp-for-mac = callPackage ./whatsapp-for-mac { };
sf-symbols = callPackage ./sf-symbols { full = true; }; sf-symbols = callPackage ./sf-symbols { full = true; };
sf-mono = callPackage ./sf-mono { }; sf-mono = callPackage ./sf-mono { };
@ -17,4 +17,5 @@ rec {
sbarlua = callPackage ./sbarlua { }; sbarlua = callPackage ./sbarlua { };
sk-utils = callPackage ./sk-utils { }; sk-utils = callPackage ./sk-utils { };
promise-lua = callPackage ./promise-lua { }; promise-lua = callPackage ./promise-lua { };
aerospace = callPackage ./aerospace { };
} }

5
packages/ps2pdfcrop/default.nix
View file

@ -3,7 +3,7 @@
nix, nix,
resholve, resholve,
ghostscript, ghostscript,
substituteAll, replaceVars,
isNixOS ? false, isNixOS ? false,
}: }:
resholve.mkDerivation rec { resholve.mkDerivation rec {
@ -11,8 +11,7 @@ resholve.mkDerivation rec {
version = "0.0.1"; version = "0.0.1";
src = substituteAll { src = replaceVars ./ps2pdfcrop.sh {
src = ./ps2pdfcrop.sh;
ps2pdf = "${ghostscript}/bin/ps2pdf"; ps2pdf = "${ghostscript}/bin/ps2pdf";
}; };