anthonycicc/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Wiki Activity

fmt, and jujutsu overlay

Browse source
This commit is contained in:
Anthony Cicchetti 2024-11-16 13:50:08 -05:00
parent 0a5faf47c2
commit 600a5aa862
3 changed files with 118 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

135
nix/home-manager/flake.lock generated
View file

@ -44,11 +44,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1731652660,
"narHash": "sha256-vau17dcGvfEWX9DLWuSPC0dfE0XcDe9ZNlsqXy46P88=",
"lastModified": 1731738660,
"narHash": "sha256-tIXhc9lX1b030v812yVJanSR37OnpTb/OY5rU3TbShA=",
"owner": "nix-community",
"repo": "fenix",
"rev": "664e2f335aa5ae28c8759ff206444edb198dc1c9",
"rev": "e10ba121773f754a30d31b6163919a3e404a434f",
"type": "github"
},
"original": {
@ -131,11 +131,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@ -237,11 +237,11 @@
]
},
"locked": {
"lastModified": 1731604581,
"narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
"lastModified": 1731782173,
"narHash": "sha256-l0vlBmqQOJneVtvRjAJuYPGV5wtiqq1+OTkVti8b3CY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
"rev": "c7c251761235282acfc681accf8d3deea6681cc0",
"type": "github"
},
"original": {
@ -278,6 +278,28 @@
"type": "github"
}
},
"jujutsu": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1731751919,
"narHash": "sha256-8Z+Y2PvA2rAPQdKSm3wYJXqtoU5GiDAlVlXoYnFe4oE=",
"owner": "martinvonz",
"repo": "jj",
"rev": "eb91547e520ebed79bf6daf21627f266b26a87a1",
"type": "github"
},
"original": {
"owner": "martinvonz",
"repo": "jj",
"type": "github"
}
},
"libpng": {
"flake": false,
"locked": {
@ -303,11 +325,11 @@
]
},
"locked": {
"lastModified": 1731454423,
"narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=",
"lastModified": 1731642829,
"narHash": "sha256-vG+O2RZRzYZ8BUMNNJ+BLSj6PUoGW7taDQbp6QNJ3Xo=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "6c71c49e2448e51ad830ed211024e6d0edc50116",
"rev": "f86f158efd4bab8dce3e207e4621f1df3a760b7a",
"type": "github"
},
"original": {
@ -347,11 +369,11 @@
]
},
"locked": {
"lastModified": 1731692000,
"narHash": "sha256-CEj34UDiJFZgP7BUUdf4KwS7m0pvIZSk2R+wB0ci6Mw=",
"lastModified": 1731777811,
"narHash": "sha256-AewyPy+YOT7mXm45+X6RgTAUiMKeAD17buE7Aw0ANbc=",
"owner": "m15a",
"repo": "flake-awesome-neovim-plugins",
"rev": "dd0fa93238f21d1bb268b4c8ac0bf223aab14d62",
"rev": "cdc8fd03e54ffe1c4b9c0ba86a55fd5956b6dd36",
"type": "github"
},
"original": {
@ -362,11 +384,25 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1731711458,
"narHash": "sha256-eE/cl0wyxwI0l95/IasVFKfMrSbWgv/00X320uKnFjw=",
"lastModified": 1728538411,
"narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1731782469,
"narHash": "sha256-cWOJcYeqkb3Bk8NcHKORa+NmlE5jLhZGbs1FcwBUvd0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "889e8c78eb59124b2d84ce4fa74510c5f27dac8c",
"rev": "ddfd26721ee7dbb799db2c39a6fdd90ac788f576",
"type": "github"
},
"original": {
@ -375,7 +411,7 @@
"type": "github"
}
},
"nixpkgs_2": {
"nixpkgs_3": {
"locked": {
"lastModified": 1729265718,
"narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
@ -408,16 +444,15 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1731712649,
"narHash": "sha256-yNO1mabiVekXoO8ZGEiW04kWtQmOf4TOnpmSG4oo0mY=",
"owner": "anthonycicc",
"lastModified": 1731780782,
"narHash": "sha256-CG3rcxcZEViYEUTAXatqXrW0Gn9tQvydF+lLYH+0VPA=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "c0f77b1abf79264a4cee3768a72d65357adc3a6a",
"rev": "9d99d7cfdbd7f94da9571a4d7bbb9de185241935",
"type": "github"
},
"original": {
"owner": "anthonycicc",
"ref": "fix-bufls",
"owner": "nix-community",
"repo": "nixvim",
"type": "github"
}
@ -432,11 +467,11 @@
]
},
"locked": {
"lastModified": 1731347683,
"narHash": "sha256-BcSWCEUBShuB32LPif+EG0XGXyUi2jyjCSpGE1rbOws=",
"lastModified": 1731582522,
"narHash": "sha256-1w6aM4bG5cl2E4jHLPnMKkrUO4tY1jUX1NI6/RwJN7Y=",
"owner": "NuschtOS",
"repo": "search",
"rev": "135d202e032be70c93b6d7d53592ef4799d6efde",
"rev": "13300b2297c51368e0892c3ebe220f688014fe15",
"type": "github"
},
"original": {
@ -450,9 +485,10 @@
"fenix": "fenix",
"flake-utils": "flake-utils",
"home-manager": "home-manager",
"jujutsu": "jujutsu",
"nix-index-database": "nix-index-database",
"nixneovimplugins": "nixneovimplugins",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"nixvim": "nixvim",
"wezterm": "wezterm",
"zjstatus": "zjstatus"
@ -461,11 +497,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1731342671,
"narHash": "sha256-36eYDHoPzjavnpmEpc2MXdzMk557S0YooGms07mDuKk=",
"lastModified": 1731693936,
"narHash": "sha256-uHUUS1WPyW6ohp5Bt3dAZczUlQ22vOn7YZF8vaPKIEw=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "fc98e0657abf3ce07eed513e38274c89bbb2f8ad",
"rev": "1b90e979aeee8d1db7fe14603a00834052505497",
"type": "github"
},
"original": {
@ -476,6 +512,27 @@
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"jujutsu",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729304879,
"narHash": "sha256-H7KGGJUU9BcDNnfXiATBGgs6FJKWQdfftNJS+/v2aMU=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "b259ef799b5ac014604da71ecd92d4a52603ed2d",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"nixpkgs": [
"wezterm",
@ -496,7 +553,7 @@
"type": "github"
}
},
"rust-overlay_2": {
"rust-overlay_3": {
"inputs": {
"nixpkgs": [
"zjstatus",
@ -576,8 +633,8 @@
"freetype2": "freetype2",
"harfbuzz": "harfbuzz",
"libpng": "libpng",
"nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay",
"nixpkgs": "nixpkgs_3",
"rust-overlay": "rust-overlay_2",
"zlib": "zlib"
},
"locked": {
@ -605,14 +662,14 @@
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay_2"
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1730748983,
"narHash": "sha256-72uoWm/34SU5aHgvUJgKqYMhvt4Y9X39bFhcDwVS+P0=",
"lastModified": 1731757608,
"narHash": "sha256-yWY2aGfsBVTT9vtwRqVnNqkiB0xcWcB1MoITrvPmEtA=",
"owner": "dj95",
"repo": "zjstatus",
"rev": "d5794fbec93860ead015b0beee70489f50cd87b1",
"rev": "5d6ff93551882fddc7773f108470001fe87a5187",
"type": "github"
},
"original": {

24
nix/home-manager/flake.nix
View file

@ -2,8 +2,16 @@
description = "Home Manager configuration of acicchetti";
nixConfig = {
extra-substituters = ["https://devenv.cachix.org" "https://nixpkgs.cachix.org" "https://nix-community.cachix.org"];
extra-trusted-public-keys = ["devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" "nixpkgs.cachix.org-1:q91R6hxbwFvDqTSDKwDAV4T5PxqXGxswD8vhONFMeOE=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
extra-substituters = [
"https://devenv.cachix.org"
"https://nixpkgs.cachix.org"
"https://nix-community.cachix.org"
];
extra-trusted-public-keys = [
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
"nixpkgs.cachix.org-1:q91R6hxbwFvDqTSDKwDAV4T5PxqXGxswD8vhONFMeOE="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};
inputs = {
@ -20,7 +28,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nixvim = {
url = "github:anthonycicc/nixvim/fix-bufls";
url = "github:nix-community/nixvim";
inputs = {
nixpkgs.follows = "nixpkgs";
home-manager.follows = "home-manager";
@ -53,6 +61,12 @@
flake-utils.follows = "flake-utils";
};
};
jujutsu = {
url = "github:martinvonz/jj";
inputs = {
flake-utils.follows = "flake-utils";
};
};
};
outputs = inputs @ {
@ -64,6 +78,7 @@
zjstatus,
fenix,
wezterm,
jujutsu,
# neovidenixpkgs,
nixneovimplugins,
...
@ -89,6 +104,9 @@
# (_final: prev: {inherit (neovidenixpkgs.legacyPackages.${prev.system}) neovide;})
nixneovimplugins.overlays.default
fenix.overlays.default
(_final: prev: {
jujutsu = jujutsu.packages.${prev.system}.default;
})
];
}
);

3
nix/home-manager/modules/packages/default.nix
View file

@ -4,7 +4,7 @@
if isLinux
# ncdu (well, all zig packages) don't work on macOS nix right now
then [zsh racket mold ncdu zed-editor]
else [keka colima];
else [keka colima neovide];
in {
imports = [
./git.nix
@ -51,7 +51,6 @@ in {
litecli
magic-wormhole-rs
martian-mono
neovide
page
pandoc
parallel