nix/config
2
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: nix:2e9eda64d4ee4fc9b76ab962de6ef7bb87a7d77d
Branches Tags
nix:main
nix:switch-fix
nix:julia
nix:chloe
nix:nats
..
compare: nix:13d8d059fc82340b4651a60e49d4ef90c4d31fce
Branches Tags
nix:main
nix:switch-fix
nix:julia
nix:chloe
nix:nats

No commits in common. "2e9eda64d4ee4fc9b76ab962de6ef7bb87a7d77d" and "13d8d059fc82340b4651a60e49d4ef90c4d31fce" have entirely different histories.
2e9eda64d4 ... 13d8d059fc

10 changed files with 19 additions and 152 deletions
Show stats Expand all files Collapse all files

110
flake.lock
View file

@ -1,28 +1,5 @@
{ {
"nodes": { "nodes": {
"android-nixpkgs": {
"inputs": {
"devshell": "devshell",
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1754511800,
"narHash": "sha256-/gYkj4dbzcAV1EWJYy+2ryHGtC57jhIrRwSGQKCT8Gk=",
"owner": "tadfisher",
"repo": "android-nixpkgs",
"rev": "5bb0f6e7b112c7be7895c6058925c29db360b205",
"type": "github"
},
"original": {
"owner": "tadfisher",
"ref": "stable",
"repo": "android-nixpkgs",
"type": "github"
}
},
"apple-fonts": { "apple-fonts": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -72,27 +49,6 @@
"type": "github" "type": "github"
} }
}, },
"devshell": {
"inputs": {
"nixpkgs": [
"android-nixpkgs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1741473158,
"narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
"owner": "numtide",
"repo": "devshell",
"rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -150,24 +106,6 @@
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
@ -182,9 +120,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -200,7 +138,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": [ "systems": [
"nvf", "nvf",
@ -221,9 +159,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -239,9 +177,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_6": { "flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -257,9 +195,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_7": { "flake-utils_6": {
"inputs": { "inputs": {
"systems": "systems_7" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -362,7 +300,7 @@
}, },
"moonlight": { "moonlight": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -403,7 +341,7 @@
}, },
"nix-options-search": { "nix-options-search": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
@ -487,12 +425,12 @@
"nvf": { "nvf": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"mnw": "mnw", "mnw": "mnw",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_4" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1754043154, "lastModified": 1754043154,
@ -523,7 +461,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"android-nixpkgs": "android-nixpkgs",
"apple-fonts": "apple-fonts", "apple-fonts": "apple-fonts",
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager", "home-manager": "home-manager",
@ -732,21 +669,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"zen-browser": { "zen-browser": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -770,7 +692,7 @@
"zig": { "zig": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
@ -790,7 +712,7 @@
"zig-overlay": { "zig-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_7", "flake-utils": "flake-utils_6",
"nixpkgs": [ "nixpkgs": [
"zls", "zls",
"nixpkgs" "nixpkgs"
@ -812,7 +734,7 @@
}, },
"zls": { "zls": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_5",
"gitignore": "gitignore_2", "gitignore": "gitignore_2",
"langref": "langref", "langref": "langref",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",

9
flake.nix
View file

@ -29,12 +29,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
android-nixpkgs = {
url = "github:tadfisher/android-nixpkgs/stable";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-options-search.url = "github:madsbv/nix-options-search"; nix-options-search.url = "github:madsbv/nix-options-search";
nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.url = "github:nix-community/nix-index-database";
@ -53,7 +47,6 @@
overlays = [ overlays = [
inputs.zig.overlays.default inputs.zig.overlays.default
inputs.rust-overlay.overlays.default inputs.rust-overlay.overlays.default
inputs.android-nixpkgs.overlays.default
# https://github.com/LnL7/nix-darwin/issues/1041 # https://github.com/LnL7/nix-darwin/issues/1041
(_: prev: { (_: prev: {
@ -135,8 +128,6 @@
user = "natalie"; user = "natalie";
host = "laptop"; host = "laptop";
system = "aarch64-darwin"; system = "aarch64-darwin";
extraModules = [
];
}; };
# chloe's mac studio "sandwich" # chloe's mac studio "sandwich"

1
lib/mkSystem.nix
View file

@ -75,7 +75,6 @@ let
]; ];
} }
inputs.nvf.homeManagerModules.default inputs.nvf.homeManagerModules.default
inputs.android-nixpkgs.hmModule
]; ];
in in
systemFunc { systemFunc {

32
modules/home/default.nix
View file

@ -22,40 +22,8 @@ in
default = { }; default = { };
description = "set the ghostty shader, relative to 'files/ghostty'"; description = "set the ghostty shader, relative to 'files/ghostty'";
}; };
programs.android-sdk.enable = lib.mkOption {
type = lib.types.bool;
default = false;
description = "enable android sdk stuff";
};
}; };
config = { config = {
android-sdk = {
enable = config.programs.android-sdk.enable;
packages =
sdk:
with sdk;
[
build-tools-35-0-0
cmdline-tools-latest
emulator
platform-tools
platforms-android-35
sources-android-35
ndk-27-1-12297006
cmake-3-22-1
]
++ lib.optionals host.darwin [
system-images-android-35-google-apis-arm64-v8a
system-images-android-35-google-apis-playstore-arm64-v8a
]
++ lib.optionals host.linux [
system-images-android-35-google-apis-arm64-v8a
system-images-android-3-google-apis-playstore-arm64-v8a
];
};
xdg = {
enable = true;
};
home.shell = { home.shell = {
enableShellIntegration = true; enableShellIntegration = true;
}; };

4
modules/home/macos/sketchybar.nix
View file

@ -63,7 +63,7 @@
source "$ITEM_DIR/calendar.sh" source "$ITEM_DIR/calendar.sh"
# Right # Right
# source $ITEM_DIR/calendar.sh source $ITEM_DIR/calendar.sh
source $ITEM_DIR/wifi.sh source $ITEM_DIR/wifi.sh
source $ITEM_DIR/battery.sh source $ITEM_DIR/battery.sh
source $ITEM_DIR/volume.sh source $ITEM_DIR/volume.sh
@ -322,7 +322,7 @@
label.color=$ITEM_COLOR \ label.color=$ITEM_COLOR \
icon.color=$ITEM_COLOR icon.color=$ITEM_COLOR
else else
sketchybar --set space.$sid background.drawing=off\ sketchybar --set space.$sid background.drawing=off \
label.color=$ACCENT_COLOR \ label.color=$ACCENT_COLOR \
icon.color=$ACCENT_COLOR icon.color=$ACCENT_COLOR
fi fi

2
modules/macos/tiling/aerospace.nix
View file

@ -149,7 +149,7 @@
exec-on-workspace-change = [ exec-on-workspace-change = [
"/bin/bash" "/bin/bash"
"-c" "-c"
"/run/current-system/sw/bin/sketchybar --trigger aerospace_workspace_change FOCUSED_WORKSPACE=$AEROSPACE_FOCUSED_WORKSPACE PREV_WORKSPACE=$AEROSPACE_PREV_WORKSPACE" "/run/current-system/sw/bin/sketchybar --trigger aerospace_workspace_change FOCUSED_WORKSPACE=$AEROSPACE_FOCUSED_WORKSPACE"
]; ];
on-window-detected = [ on-window-detected = [

1
modules/shared/nix.nix
View file

@ -2,7 +2,6 @@
{ {
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;
android_sdk.accept_license = true;
}; };
nix = { nix = {

3
users/natalie/home.nix
View file

@ -1,11 +1,9 @@
{ {
pkgs, pkgs,
lib, lib,
options,
... ...
}@args: }@args:
{ {
programs = { programs = {
# sort-lines:start # sort-lines:start
atuin.enable = true; atuin.enable = true;
@ -15,7 +13,6 @@
fish.enable = true; fish.enable = true;
man.generateCaches = false; man.generateCaches = false;
lsd.enable = true; lsd.enable = true;
android-sdk.enable = true;
# sort-lines:end # sort-lines:end
}; };

3
users/natalie/laptop/home.nix
View file

@ -16,9 +16,6 @@
"$HOME/.emacs.d/bin" "$HOME/.emacs.d/bin"
]; ];
sessionVariables = {
};
packages = with pkgs; [ packages = with pkgs; [
#PDF viewer for VimTeX #PDF viewer for VimTeX
skimpdf skimpdf

6
users/natalie/packages.nix
View file

@ -86,16 +86,10 @@ with pkgs;
#programming languages #programming languages
deno deno
ruby ruby
pnpm
nodejs_24
# nodePackages.npm # nodePackages.npm
go go
elan elan
#expo deps
watchman
zulu17
#browsers #browsers
tor tor
firefox firefox