Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Install satorictl from NUR #20

Merged
merged 3 commits into from
Mar 16, 2024
Merged

Install satorictl from NUR #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2ed7c4
Install satorictl from NUR
DanNixon Mar 16, 2024
4e426c9
Remove satori flake
DanNixon Mar 16, 2024
c5e55a9
Use Cachix cache for NUR
DanNixon Mar 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configurations/akane/home-manager/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ in
home.packages = with pkgs; [
lightburn
scrcpy
inputs.satori.packages.${system}.satorictl
nur.repos.DanNixon.satorictl-unstable
];

services.flatpak.packages = [
Expand Down
2 changes: 1 addition & 1 deletion configurations/maya/home-manager/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ in

({pkgs, ...}: {
home.packages = with pkgs; [
inputs.satori.packages.${system}.satorictl
nur.repos.DanNixon.satorictl-unstable
];

services.flatpak.packages = [
Expand Down
133 changes: 16 additions & 117 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";

nur.url = "github:nix-community/NUR";

disko = {
url = "github:nix-community/disko/v1.1.0";
inputs.nixpkgs.follows = "nixpkgs";
Expand Down Expand Up @@ -47,11 +49,6 @@
url = "github:tinted-theming/base16-vim";
flake = false;
};

satori = {
url = "github:dannixon/satori";
inputs.nixpkgs.follows = "nixpkgs";
};
};

outputs = {
Expand Down
1 change: 1 addition & 0 deletions modules/home-manager/base.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

overlays = [
outputs.overlays.additions
outputs.overlays.nur
];
};

Expand Down
8 changes: 8 additions & 0 deletions modules/nixos/base/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@
settings = {
experimental-features = ["nix-command" "flakes"];
auto-optimise-store = true;

substituters = [
"https://cache.nixos.org/"
"https://nur-dannixon.cachix.org"
];
trusted-public-keys = [
"nur-dannixon.cachix.org-1:EHgimU2oe7pLXRF9Gji96CboWtyaFHC4pv5dMp/CRvw="
];
};
};

Expand Down
7 changes: 7 additions & 0 deletions overlays/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
{inputs}: {
additions = final: _prev: import ./pkgs {pkgs = final;};

nur = final: prev: {
nur = import inputs.nur {
nurpkgs = prev;
pkgs = prev;
};
};
}