Skip to content

Commit

Permalink
refactor(flake): add inputs.nixpkgs-stable; migrate packages
Browse files Browse the repository at this point in the history
  • Loading branch information
piyoki committed Nov 4, 2024
1 parent 2ae6b54 commit d8f7a3c
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 22 deletions.
53 changes: 35 additions & 18 deletions flake.lock

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

2 changes: 2 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
# function to generate specialArgs
genSpecialArgs = system: {
pkgs-small = (import nixpkgs-small) { inherit system; config.allowUnfree = lib.mkDefault true; };
pkgs-stable = (import nixpkgs-stable) { inherit system; config.allowUnfree = lib.mkDefault true; };
inherit (import ./shared/lib { inherit lib; }) sharedLib;
inherit inputs pkgs system user;
};
Expand Down Expand Up @@ -126,6 +127,7 @@
# public source
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
nixpkgs-stable.url = "github:nixos/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb";
pilots.url = "github:NixOS-Pilots/pilots";
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
chaotic-kernel.url = "github:chaotic-cx/nyx/93e6cdc6335d9c7652e89466b5e05a3cce836906";
Expand Down
7 changes: 7 additions & 0 deletions home/packages/stable/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{ pkgs-stable, ... }:

{
home.packages = with pkgs-stable; [
mountpoint-s3 # A simple, high-throughput file client for mounting an Amazon S3 bucket as a local file system.
];
}
1 change: 0 additions & 1 deletion home/packages/windowmanager/terminal/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
jp2a # A small utility that converts JPG images to ASCII
vivid
zoxide
tailspin # A log file highlighter
entr # Run arbitrary commands when files change
];
}
3 changes: 0 additions & 3 deletions system/packages/server.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,5 @@

# monitoring
htop

# terminal
tailspin # A log file highlighter
];
}
8 changes: 8 additions & 0 deletions system/packages/stable.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{ pkgs-stable, ... }:

{
# ebpf
environment.systemPackages = with pkgs-stable; [
tailspin # A log file highlighter
];
}

0 comments on commit d8f7a3c

Please sign in to comment.