Syzygial/NixMachines
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Syzygial:c644d7d51b4e36da412e6b34865b0ab7b0dce1ee
Branches Tags
Syzygial:main
...
compare: Syzygial:442ed943a5e8634efbeca99dd04d54fd92a1444f
Branches Tags
Syzygial:main

3 Commits
c644d7d51b ... 442ed943a5

Author SHA1 Message Date
david
442ed943a5 universeair: moar casks 2025-03-13 11:20:10 -04:00
david
9fc4e369cb universeair: catchup 2025-03-13 11:20:10 -04:00
david
1337395df3 flake.lock: Update 
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/304a011325b7ac7b8c9950333cd215a7aa146b0e' (2024-07-24)
  → 'github:nix-community/home-manager/2598861031b78aadb4da7269df7ca9ddfc3e1671' (2024-08-18)
• Updated input 'nix-darwin':
    'github:LnL7/nix-darwin/884f3fe6d9bf056ba0017c132c39c1f0d07d4fec' (2024-07-23)
  → 'github:LnL7/nix-darwin/076b9a905af8a52b866c8db068d6da475839d97b' (2024-08-17)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/68c9ed8bbed9dfce253cc91560bf9043297ef2fe' (2024-07-21)
  → 'github:NixOS/nixpkgs/8a3354191c0d7144db9756a74755672387b702ba' (2024-08-18)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/aff2f88277dabe695de4773682842c34a0b7fd54' (2024-07-22)
  → 'github:Mic92/sops-nix/be0eec2d27563590194a9206f551a6f73d52fa34' (2024-08-12)
 2025-03-13 11:20:08 -04:00
2 changed files with 180 additions and 6 deletions
Expand all files Collapse all files

95
flake.lock generated
View File

@@ -9,11 +9,19 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
<<<<<<< HEAD
"lastModified": 1737825153,
"narHash": "sha256-R1p2ZXOydII+MT/SpeOXBjo/dgfD/gIArge2YAgSw38=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "4ebe4c890e7c8662ae31192359a56b0505cf10ba",
=======
"lastModified": 1724086605,
"narHash": "sha256-kZm8GJfEt8Na5JyNfjXCIUKiMOAbWDNsCejh2OeF7r8=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "d153d9f118d71fa8f4d3204639b4fd32d793ab57",
>>>>>>> 75336a2 (flake.lock: Update)
"type": "github"
},
"original": {
@@ -27,11 +35,19 @@
"systems": "systems"
},
"locked": {
<<<<<<< HEAD
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
=======
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
>>>>>>> 75336a2 (flake.lock: Update)
"type": "github"
},
"original": {
@@ -45,11 +61,19 @@
"systems": "systems_2"
},
"locked": {
<<<<<<< HEAD
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
=======
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
>>>>>>> 75336a2 (flake.lock: Update)
"type": "github"
},
"original": {
@@ -80,11 +104,19 @@
]
},
"locked": {
<<<<<<< HEAD
"lastModified": 1741701235,
"narHash": "sha256-gBlb8R9gnjUAT5XabJeel3C2iEUiBHx3+91651y3Sqo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c630dfa8abcc65984cc1e47fb25d4552c81dd37e",
=======
"lastModified": 1723986931,
"narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
>>>>>>> 75336a2 (flake.lock: Update)
"type": "github"
},
"original": {
@@ -137,17 +169,24 @@
]
},
"locked": {
<<<<<<< HEAD
"lastModified": 1741711436,
"narHash": "sha256-Kfj4ZKupTKUq4UYukqerHlhG0SBhPIbNyMf4DrlboJ8=",
"ref": "refs/heads/master",
"rev": "c4135ecee1752ab5f35812951eeef23250f883c6",
"revCount": 71,
=======
"dirtyRev": "a02c16d51dc2979e911a4652e17c8df3aca6e2e2-dirty",
"dirtyShortRev": "a02c16d-dirty",
"lastModified": 1724089813,
"narHash": "sha256-o/nV+HC3KIhWZhl3w4iPh4+rd/+ASSQrVBRiRJhbYIw=",
>>>>>>> 75336a2 (flake.lock: Update)
"type": "git",
"url": "https://git.syzygial.cc/Syzygial/EmacsConfig.git"
"url": "file:///Users/universelaptop/.emacs.d"
},
"original": {
"type": "git",
"url": "https://git.syzygial.cc/Syzygial/EmacsConfig.git"
"url": "file:///Users/universelaptop/.emacs.d"
}
},
"nix-darwin": {
@@ -157,11 +196,19 @@
]
},
"locked": {
<<<<<<< HEAD
"lastModified": 1741229100,
"narHash": "sha256-0HwrTDXp9buEwal/1ymK9uQmzUD5ozIA7CJGqnT/gLs=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "adf5c88ba1fe21af5c083b4d655004431f20c5ab",
=======
"lastModified": 1723859949,
"narHash": "sha256-kiaGz4deGYKMjJPOji/JVvSP/eTefrIA3rAjOnOpXl4=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "076b9a905af8a52b866c8db068d6da475839d97b",
>>>>>>> 75336a2 (flake.lock: Update)
"type": "github"
},
"original": {
@@ -173,11 +220,19 @@
},
"nixpkgs": {
"locked": {
<<<<<<< HEAD
"lastModified": 1741513245,
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
=======
"lastModified": 1723991338,
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8a3354191c0d7144db9756a74755672387b702ba",
>>>>>>> 75336a2 (flake.lock: Update)
"type": "github"
},
"original": {
@@ -189,16 +244,44 @@
},
"nixpkgs-stable": {
"locked": {
<<<<<<< HEAD
"lastModified": 1737672001,
"narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
=======
"lastModified": 1723938990,
"narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890",
>>>>>>> 75336a2 (flake.lock: Update)
"type": "github"
},
"original": {
"owner": "NixOS",
<<<<<<< HEAD
"ref": "nixos-24.11",
=======
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1721524707,
"narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-24.05",
>>>>>>> 75336a2 (flake.lock: Update)
"repo": "nixpkgs",
"type": "github"
}
@@ -234,11 +317,19 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
<<<<<<< HEAD
"lastModified": 1741644481,
"narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "e653d71e82575a43fe9d228def8eddb73887b866",
=======
"lastModified": 1723501126,
"narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
>>>>>>> 75336a2 (flake.lock: Update)
"type": "github"
},
"original": {

91
machines/universeair/configuration.nix
View File

@@ -65,6 +65,82 @@ in
VISUAL = "emacs";
};
nixpkgs.overlays = [
(final: prev: {
skia-aseprite = prev.skia-aseprite.overrideAttrs (old: {
postPatch = (old.postPatch or "") + ''
sed -i -e 's/"-march=armv7-a",//g' gn/skia/BUILD.gn
'';
buildInputs = old.buildInputs ++ [
final.xcbuild
final.darwin.apple_sdk.frameworks.ApplicationServices
];
meta.maintainers = with pkgs.lib.maintainers; [
davidcromp
];
});
aseprite = prev.aseprite.overrideAttrs (old: {
cmakeFlags = [
"-DENABLE_DESKTOP_INTEGRATION=OFF"
"-DENABLE_UPDATER=OFF"
"-DUSE_SHARED_CMARK=ON"
"-DUSE_SHARED_CURL=ON"
"-DUSE_SHARED_FMT=ON"
"-DUSE_SHARED_FREETYPE=ON"
"-DUSE_SHARED_GIFLIB=ON"
"-DUSE_SHARED_HARFBUZZ=ON"
"-DUSE_SHARED_JPEGLIB=ON"
"-DUSE_SHARED_LIBPNG=ON"
"-DPNG_ARM_NEON:STRING=on"
"-DUSE_SHARED_LIBWEBP=ON"
"-DUSE_SHARED_PIXMAN=ON"
"-DUSE_SHARED_TINYXML=ON"
"-DUSE_SHARED_WEBP=ON"
"-DUSE_SHARED_ZLIB=ON"
# Disable libarchive programs.
"-DENABLE_CAT=OFF"
"-DENABLE_CPIO=OFF"
"-DENABLE_TAR=OFF"
# UI backend.
"-DLAF_OS_BACKEND=skia"
"-DLAF_WITH_EXAMPLES=OFF"
"-DSKIA_DIR=${final.skia-aseprite}"
"-DSKIA_LIBRARY_DIR=${final.skia-aseprite}/lib"
"-DSKIA_LIBRARYR=${final.skia-aseprite}/lib/libskia.a"
];
buildInputs = with pkgs; [
cmark
curl
fmt
fontconfig
freetype
giflib
glib
harfbuzzFull
libjpeg
libpng
libwebp
pcre2
pixman
skia-aseprite
tinyxml-2
zlib
# MacOS:
] ++ (with darwin.apple_sdk.frameworks; [
Cocoa
QuickLook
Quartz
]);
hardeningDisable = [
"format" # Darwin Specific
];
meta.broken = false;
});
})
];
environment.systemPackages = (with pkgs; [
me-emacs
(aspellWithDicts (p: with p;[
@@ -76,7 +152,7 @@ in
texliveFull
wget
xquartz
#xquartz
kitty
btop
@@ -90,9 +166,12 @@ in
tailscale
discord
slack
inkscape
gimp
# aseprite
# TODO: Consider using Yabai??
# Games
prismlauncher
]);
homebrew = {
@@ -110,17 +189,21 @@ in
"bitwarden"
"zoom-for-it-admins"
"libreoffice"
"microsoft-office"
"kicad"
"tailscale"
"r" "rstudio"
"godot"
"pixelorama"
"blender"
"inkscape"
];
# Apps to install outside of nix for when wanting to test/run
# things that... aren't used by other people who use nix, like
# python apps (which is why poetry is there)
brews = [
"poetry"
"pdm"
"python@3.11"
"python@3.10"
"pygments"
# sudo ln -sfn /opt/homebrew/opt/openjdk/libexec/openjdk.jdk \
# /Library/Java/JavaVirtualMachines/openjdk.jdk