daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2025-02-22 15:15:50 -06:00
Code Issues Projects Releases Packages Wiki Activity

use nixpkgs jj

Browse source
This commit is contained in:
Daylin Morgan 2025-02-17 11:45:15 -06:00
parent 57546d875e
commit 9c50fd5c25
Signed by: daylin
GPG key ID: 950D13E9719334AD
3 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -30,7 +30,6 @@
nim2nix.url = "github:daylinmorgan/nim2nix"; nim2nix.url = "github:daylinmorgan/nim2nix";
utils.url = "git+https://git.dayl.in/daylin/utils.git"; utils.url = "git+https://git.dayl.in/daylin/utils.git";
pixi.url = "github:daylinmorgan/pixi-flake"; pixi.url = "github:daylinmorgan/pixi-flake";
jj.url = "github:martinvonz/jj/v0.26.0";
roc.url = "github:roc-lang/roc/0.0.0-alpha2-rolling"; roc.url = "github:roc-lang/roc/0.0.0-alpha2-rolling";
# master as of 2024.12.12 # master as of 2024.12.12
@ -49,7 +48,6 @@
# hyprland.inputs.nixpkgs.follows = "nixpkgs"; # hyprland.inputs.nixpkgs.follows = "nixpkgs";
# hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs"; # hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs";
hyprman.inputs.nixpkgs.follows = "nixpkgs"; hyprman.inputs.nixpkgs.follows = "nixpkgs";
jj.inputs.nixpkgs.follows = "nixpkgs";
nim2nix.inputs.nixpkgs.follows = "nixpkgs"; nim2nix.inputs.nixpkgs.follows = "nixpkgs";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
nixos-wsl.inputs.nixpkgs.follows = "nixpkgs"; nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
@ -85,7 +83,6 @@
flake-utils.inputs.systems.follows = "systems"; flake-utils.inputs.systems.follows = "systems";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
jj.inputs.flake-utils.follows = "flake-utils";
lib-aggregate.inputs.flake-utils.follows = "flake-utils"; lib-aggregate.inputs.flake-utils.follows = "flake-utils";
roc.inputs.flake-utils.follows = "flake-utils"; roc.inputs.flake-utils.follows = "flake-utils";
@ -97,10 +94,9 @@
rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.url = "github:oxalica/rust-overlay";
rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
jj.inputs.rust-overlay.follows = "rust-overlay";
roc.inputs.rust-overlay.follows = "rust-overlay"; roc.inputs.rust-overlay.follows = "rust-overlay";
## nil inputs, I don't *ALL* your flake inputs... ## nil inputs, I don't want *ALL* your flake inputs...
# hyprland.inputs.pre-commit-hooks.follows = ""; # hyprland.inputs.pre-commit-hooks.follows = "";
nixos-wsl.inputs.flake-compat.follows = ""; nixos-wsl.inputs.flake-compat.follows = "";
nixpkgs-wayland.inputs.flake-compat.follows = ""; nixpkgs-wayland.inputs.flake-compat.follows = "";

14
modules/development/git.nix
View file

@ -1,17 +1,13 @@
{ pkgs, flake, ... }: { pkgs, ... }:
{ {
environment.systemPackages = environment.systemPackages = with pkgs; [
[
# not technically git ¯\_(ツ)_/¯
(flake.pkg "jj")
]
++ (with pkgs; [
git git
git-lfs git-lfs
gh gh
lazygit lazygit
delta delta
]);
jujutsu
];
} }

2
pkgs/default.nix
View file

@ -30,6 +30,4 @@ in
"pixi" "pixi"
"f1multiviewer" "f1multiviewer"
"tsm" "tsm"
"jj"
]) ])