small fixes, nixpkgs-fmt

This commit is contained in:
Grigory Shipunov 2022-09-28 21:42:37 +02:00
parent e8ed378623
commit 090acb6881
Signed by: 0xa
GPG key ID: 91FA5E5BF9AA901C
7 changed files with 55 additions and 20 deletions

View file

@ -1,15 +1,21 @@
{
inputs = {
nixpkgs-unstable.url = github:NixOS/nixpkgs/nixos-unstable;
nixpkgs.url = github:NixOS/nixpkgs/nixos-22.05;
flake-utils.url = github:numtide/flake-utils;
sops-nix = {
url = github:Mic92/sops-nix;
inputs.nixpkgs.follows = "nixpkgs";
};
microvm = {
url = github:astro/microvm.nix;
inputs.nixpkgs.follows = "nixpkgs";
};
fenix = {
url = github:nix-community/fenix;
inputs.nixpkgs.follows = "nixpkgs-unstable";
@ -20,15 +26,31 @@
inputs@{ self
, nixpkgs
, nixpkgs-unstable
, flake-utils
, sops-nix
, microvm
, fenix
, ...
}:
flake-utils.lib.eachDefaultSystem
(system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
{
packages.slick = pkgs.callPackage "${self}/pkgs/slick.nix" { };
})
//
{
overlays.default = final: prev: {
inherit (self.packages.${prev.system})
slick;
};
nixosConfigurations = {
microwave = nixpkgs-unstable.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
sops-nix.nixosModules.sops
./hosts/microwave
@ -43,7 +65,10 @@
./modules/tlp.nix
./modules/virtualization.nix
({ pkgs, ... }: {
nixpkgs.overlays = [ fenix.overlay ];
nixpkgs.overlays = [
fenix.overlay
self.overlays.default
];
environment.systemPackages = with pkgs; [
(fenix.packages."x86_64-linux".stable.withComponents [
"cargo"

View file

@ -0,0 +1 @@
{ config, pkgs, lib, ... }: { }

View file

@ -17,13 +17,13 @@
traceroute
tcpdump
tree
liquidprompt
(aspellWithDicts (ps: with ps; [ en en-science en-computers ru de ]))
exfatprogs
nmap
bind
nnn
man-pages
wlsunset
];
nix = {
@ -70,7 +70,7 @@
bindkey -e
'';
promptInit = ''
source /run/current-system/sw/share/zsh/plugins/liquidprompt/liquidprompt
source ${pkgs.liquidprompt}/share/zsh/plugins/liquidprompt/liquidprompt
'';
};
@ -79,6 +79,9 @@
LP_ENABLE_SSH_COLORS=1
LP_ENABLE_TITLE=1
LP_ENABLE_SCREEN_TITLE=1
LP_ENABLE_TEMP=0
LP_ENABLE_SVN=0
LP_SSH_COLORS=1
'';
};

View file

@ -2,12 +2,14 @@
{
environment.systemPackages = with pkgs; [
(rWrapper.override{ packages = with rPackages; [
(rWrapper.override {
packages = with rPackages; [
ggplot2
swirl
dplyr
data_table
]; })
];
})
gnuplot
graphicsmagick
zotero

View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, rustPlatform }:
{ stdenv, lib, openssl, pkgconfig, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "slick";
@ -8,10 +8,13 @@ rustPlatform.buildRustPackage rec {
owner = "nbari";
repo = pname;
rev = version;
sha256 = "033ecd2696bfd59fd959eb95f66875a45e5aec54";
sha256 = "sha256-GM9OHnySc3RVkfaK7yMf1LqpGdz3emq2H/3tSAph4jw=";
};
cargoSha256 = lib.fakeSha256;
buildInputs = [ openssl pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
cargoSha256 = "sha256-2WxFprq+AcXGXDMjMQvqKTkeWQEWM/z2Fz6qYPtSFGw=";
meta = with lib; {
description = "Async ZSH prompt";

1
result Symbolic link
View file

@ -0,0 +1 @@
/nix/store/dv1a3c2766rxg7cxvls1cpzz3d2m8381-slick-0.10.0