lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use nixpkgs unstable rtx

Browse source
This commit is contained in:
Daniel Flanagan 2023-10-02 16:02:01 -05:00
parent d3b9597459
commit 9c31607cd9
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
5 changed files with 3 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
flake.lock
View file

@ -121,21 +121,6 @@
}
},
"flake-utils_3": {
"locked": {
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@ -271,22 +256,6 @@
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1679410443,
"narHash": "sha256-xDHO/jixWD+y5pmW5+2q4Z4O/I/nA4MAa30svnZKK+M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c9ece0059f42e0ab53ac870104ca4049df41b133",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1694760568,
"narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=",
@ -309,30 +278,10 @@
"helix": "helix",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_4",
"rtx": "rtx",
"sops-nix": "sops-nix",
"utils": "utils"
}
},
"rtx": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1696266788,
"narHash": "sha256-TH2JC+Cjw+ed1O33QKGq+lonIKlu6pHuY1jtrZh/FMM=",
"owner": "jdx",
"repo": "rtx",
"rev": "f333ac5f8e8de399fcb3ce40576baeef0271081b",
"type": "github"
},
"original": {
"owner": "jdx",
"repo": "rtx",
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": [
@ -360,7 +309,7 @@
},
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_5",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
@ -409,7 +358,7 @@
},
"utils": {
"inputs": {
"flake-utils": "flake-utils_4"
"flake-utils": "flake-utils_3"
},
"locked": {
"lastModified": 1696272629,

1
flake.nix
View file

@ -13,7 +13,6 @@
disko.url = "github:nix-community/disko/master";
sops-nix.url = "github:Mic92/sops-nix";
helix.url = "github:helix-editor/helix";
rtx.url = "github:jdx/rtx";
# TODO: hyprland.url = "github:hyprwm/Hyprland";
};

1
home.nix
View file

@ -2,7 +2,6 @@ inputs:
let
overlay = system: final: prev: {
helix = prev.helix // inputs.helix.packages.${system}.helix;
rtx = prev.rtx // inputs.rtx.packages.${system}.rtx;
};
# TODO: be functional - have a mkHome function?
in

1
nixos.nix
View file

@ -5,7 +5,6 @@ let
nixpkgs.overlays = [
(final: prev: {
helix = prev.helix // inputs.helix.packages.${system}.helix;
rtx = prev.rtx // inputs.rtx.packages.${system}.rtx;
})
];
imports = [ ./home/user.nix ./home/linux.nix ];

3
nixos/common.nix
View file

@ -2,7 +2,6 @@
let
overlay = final: prev: {
helix = prev.helix // inputs.helix.packages.${system}.helix;
rtx = prev.rtx // inputs.rtx.packages.${system}.rtx;
};
pkgs = inputs.nixpkgs.legacyPackages.${system}.extend overlay;
in
@ -47,6 +46,7 @@ in
restic
ripgrep
rsync
rtx
sd
sops
smartmontools
@ -59,7 +59,6 @@ in
zstd
] ++ [
inputs.helix.packages."x86_64-linux".helix
inputs.rtx.packages."x86_64-linux".rtx
];
};