Compare commits

...

7 Commits

Author SHA1 Message Date
Harsh Shandilya d88aa1e130 wailord: remove news
It's simpler to just use https://nixpkgs.news/
2024-04-28 01:58:50 +05:30
Harsh Shandilya 0e61cf5ac9 modules: remove useless arguments 2024-04-28 01:53:20 +05:30
Harsh Shandilya 925ee54c26 flake.lock: Update
Flake lock file updates:

• Updated input 'snowfall-lib':
    'github:snowfallorg/lib/5082cdac87c5fd99ef2ee5989d9f73888bc5ed14?narHash=sha256-vkcNo9pDhKObEU1xKDHcUUWKQbuYIi5051/5s/l6Iig%3D' (2024-03-04)
  → 'github:snowfallorg/lib/91ab40c2e01cc1bade8092604370964ee86e9317?narHash=sha256-IanrgtpgDqxGfzNczstspPljAHKaY0e4DGvYgdAwC1Y%3D' (2024-04-22)
2024-04-28 01:52:10 +05:30
Harsh Shandilya 9bf4db7a71 x: revert to older cleanup
`nh` also does a full store GC which is usually undesirable
2024-04-27 22:46:21 +05:30
Harsh Shandilya 0d802b6032 nix: remove repl-flake experimental feature 2024-04-27 18:22:01 +05:30
Harsh Shandilya ff485aab82 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:msfjarvis/nixpkgs/6a83987f4112cbc68d7ae90512bf23b4d2b1bbe2?narHash=sha256-gv3TDVVanskBOY%2BhpjjKj2n/fyMYH%2BU8uIHRMdLWHTk%3D' (2024-04-21)
  → 'github:msfjarvis/nixpkgs/698fd43e541a6b8685ed408aaf7a63561018f9f8?narHash=sha256-/VyiyGD2q6qN/uAvotKxXuQJWLlmSckAdf7S8jj4Q5c%3D' (2024-04-27)
2024-04-27 17:48:32 +05:30
Harsh Shandilya 6b881120bd android-dev: use tools from Nixpkgs 2024-04-27 17:42:20 +05:30
23 changed files with 26 additions and 72 deletions

39
flake.lock generated
View File

@ -685,11 +685,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1713686941,
"narHash": "sha256-gv3TDVVanskBOY+hpjjKj2n/fyMYH+U8uIHRMdLWHTk=",
"lastModified": 1714184256,
"narHash": "sha256-/VyiyGD2q6qN/uAvotKxXuQJWLlmSckAdf7S8jj4Q5c=",
"owner": "msfjarvis",
"repo": "nixpkgs",
"rev": "6a83987f4112cbc68d7ae90512bf23b4d2b1bbe2",
"rev": "698fd43e541a6b8685ed408aaf7a63561018f9f8",
"type": "github"
},
"original": {
@ -714,32 +714,6 @@
"type": "github"
}
},
"nixpkgs-news": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"snowfall-lib": [
"snowfall-lib"
],
"unstable": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1713813574,
"narHash": "sha256-/+DqeVTxbbv0jWVZ0mtk5Xnaghb9x80ryc/M/cx5S3k=",
"owner": "jakehamilton",
"repo": "nixpkgs.news",
"rev": "10640d97163a6c472d36396bb187d253d69f3ff1",
"type": "github"
},
"original": {
"owner": "jakehamilton",
"repo": "nixpkgs.news",
"type": "github"
}
},
"root": {
"inputs": {
"attic": "attic",
@ -761,7 +735,6 @@
"nixos-hardware": "nixos-hardware",
"nixos-vscode-server": "nixos-vscode-server",
"nixpkgs": "nixpkgs",
"nixpkgs-news": "nixpkgs-news",
"rust-manifest": "rust-manifest",
"snowfall-lib": "snowfall-lib",
"sops-nix": "sops-nix",
@ -814,11 +787,11 @@
]
},
"locked": {
"lastModified": 1709576611,
"narHash": "sha256-vkcNo9pDhKObEU1xKDHcUUWKQbuYIi5051/5s/l6Iig=",
"lastModified": 1713814392,
"narHash": "sha256-IanrgtpgDqxGfzNczstspPljAHKaY0e4DGvYgdAwC1Y=",
"owner": "snowfallorg",
"repo": "lib",
"rev": "5082cdac87c5fd99ef2ee5989d9f73888bc5ed14",
"rev": "91ab40c2e01cc1bade8092604370964ee86e9317",
"type": "github"
},
"original": {

View File

@ -215,11 +215,5 @@
wallpaper.url = "https://til.msfjarvis.dev/wallpaper.jpg";
wallpaper.flake = false;
nixpkgs-news = {
url = "github:jakehamilton/nixpkgs.news";
inputs.nixpkgs.follows = "nixpkgs";
inputs.snowfall-lib.follows = "snowfall-lib";
inputs.unstable.follows = "nixpkgs";
};
};
}

View File

@ -1,4 +1,4 @@
_: {
{
homebrew = {
enable = true;
brews = [

View File

@ -27,14 +27,13 @@
allowed-users = ["msfjarvis"];
auto-optimise-store = true;
builders-use-substitutes = true;
experimental-features = [
experimental-features = lib.mkForce [
"auto-allocate-uids"
"ca-derivations"
"cgroups"
"flakes"
"nix-command"
"recursive-nix"
"repl-flake"
];
flake-registry = "/etc/nix/registry.json";
http-connections = 50;

View File

@ -1,4 +1,4 @@
_: {
{
programs.atuin = {
enable = true;
enableBashIntegration = true;

View File

@ -1,4 +1,4 @@
_: {
{
programs.bat = {
enable = true;
config = {theme = "zenburn";};

View File

@ -1,3 +1,3 @@
_: {
{
programs.bottom = {enable = true;};
}

View File

@ -1,4 +1,4 @@
_: {
{
programs.direnv = {
enable = true;
enableBashIntegration = true;

View File

@ -1,3 +1,3 @@
_: {
{
fonts.fontconfig.enable = true;
}

View File

@ -1,4 +1,4 @@
_: {
{
programs.fzf = {
enable = true;
defaultCommand = "fd -tf";

View File

@ -1,4 +1,4 @@
_: {
{
programs.gh = {
enable = true;
settings = {

View File

@ -1,3 +1,3 @@
_: {
{
programs.gpg = {enable = true;};
}

View File

@ -1,3 +1,3 @@
_: {
{
programs.home-manager = {enable = true;};
}

View File

@ -1,3 +1,3 @@
_: {
{
programs.jq = {enable = true;};
}

View File

@ -1,4 +1,4 @@
_: {
{
programs.lsd = {
enable = true;
enableAliases = true;

View File

@ -1,4 +1,4 @@
_: {
{
programs.nix-index = {
enable = true;
enableBashIntegration = true;

View File

@ -1,4 +1,4 @@
_: {
{
programs.zoxide = {
enable = true;
enableBashIntegration = true;

View File

@ -1,4 +1,4 @@
_: {
{
i18n = let
locale = "en_US.UTF-8";
in {

View File

@ -44,14 +44,13 @@
allowed-users = ["@wheel"];
auto-optimise-store = true;
builders-use-substitutes = true;
experimental-features = [
experimental-features = lib.mkForce [
"auto-allocate-uids"
"ca-derivations"
"cgroups"
"flakes"
"nix-command"
"recursive-nix"
"repl-flake"
];
flake-registry = "/etc/nix/registry.json";
http-connections = 50;

View File

@ -15,6 +15,7 @@ in {
users.users.msfjarvis.packages = with pkgs; [
jarvis.adb-sync
jarvis.adx
android-tools
androidStudioPackages.stable
androidStudioPackages.beta
androidStudioPackages.canary

View File

@ -36,13 +36,6 @@ if [ -d ~/Android/Sdk ]; then
export ANDROID_HOME=~/Android/Sdk
fi
if [ -n "${ANDROID_HOME}" ]; then
export PATH="${ANDROID_HOME}/platform-tools:${PATH}"
if [ -d "${ANDROID_HOME}"/cmdline-tools/latest ]; then
export PATH="${ANDROID_HOME}/cmdline-tools/latest/bin:${PATH}"
fi
fi
# Sexy colors in `ls`
if type vivid &> /dev/null; then
LS_COLORS="$(vivid generate snazzy)"

View File

@ -97,12 +97,6 @@
reverse_proxy :${toString config.services.gitea.settings.server.HTTP_PORT}
'';
};
"https://news.msfjarvis.dev" = {
extraConfig = ''
root * ${inputs.nixpkgs-news.packages.${pkgs.system}.nixpkgs-news}
file_server
'';
};
"https://read.msfjarvis.dev" = {
extraConfig = ''
reverse_proxy ${toString config.services.yarr.addr}

3
x
View File

@ -12,7 +12,8 @@ function nom_build() {
}
function cleanup_generations() {
sudo nh clean all
sudo nix-env --delete-generations --profile /nix/var/nix/profiles/system old
nix-env --delete-generations --profile ~/.local/state/nix/profiles/home-manager old
sudo /nix/var/nix/profiles/system/bin/switch-to-configuration switch
}