diff options
| -rw-r--r-- | flake.nix | 27 | ||||
| -rw-r--r-- | hosts/microwave/configuration.nix | 16 | ||||
| -rw-r--r-- | microvms/dn42/default.nix | 1 | ||||
| -rw-r--r-- | modules/basic-tools.nix | 7 | ||||
| -rw-r--r-- | modules/science.nix | 14 | ||||
| -rw-r--r-- | pkgs/slick.nix | 9 | ||||
| l--------- | result | 1 |
7 files changed, 55 insertions, 20 deletions
@@ -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" diff --git a/hosts/microwave/configuration.nix b/hosts/microwave/configuration.nix index a6a9b54..83475be 100644 --- a/hosts/microwave/configuration.nix +++ b/hosts/microwave/configuration.nix @@ -89,15 +89,15 @@ programs.steam.enable = true; services.udev.extraRules = '' - # MCH2022 Badge - SUBSYSTEM=="usb", ATTR{idVendor}=="16d0", ATTR{idProduct}=="0f9a", MODE="0666" + # MCH2022 Badge + SUBSYSTEM=="usb", ATTR{idVendor}=="16d0", ATTR{idProduct}=="0f9a", MODE="0666" - #Flipper Zero serial port - SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="5740", ATTRS{manufacturer}=="Flipper Devices Inc.", TAG+="uaccess" - #Flipper Zero DFU - SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", ATTRS{manufacturer}=="STMicroelectronics", TAG+="uaccess" - #Flipper ESP32s2 BlackMagic - SUBSYSTEMS=="usb", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="40??", ATTRS{manufacturer}=="Flipper Devices Inc.", TAG+="uaccess" + #Flipper Zero serial port + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="5740", ATTRS{manufacturer}=="Flipper Devices Inc.", TAG+="uaccess" + #Flipper Zero DFU + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", ATTRS{manufacturer}=="STMicroelectronics", TAG+="uaccess" + #Flipper ESP32s2 BlackMagic + SUBSYSTEMS=="usb", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="40??", ATTRS{manufacturer}=="Flipper Devices Inc.", TAG+="uaccess" ''; diff --git a/microvms/dn42/default.nix b/microvms/dn42/default.nix new file mode 100644 index 0000000..3f9e239 --- /dev/null +++ b/microvms/dn42/default.nix @@ -0,0 +1 @@ +{ config, pkgs, lib, ... }: { } diff --git a/modules/basic-tools.nix b/modules/basic-tools.nix index 69312f3..41ef860 100644 --- a/modules/basic-tools.nix +++ b/modules/basic-tools.nix @@ -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 ''; }; diff --git a/modules/science.nix b/modules/science.nix index afa5c98..fc102dc 100644 --- a/modules/science.nix +++ b/modules/science.nix @@ -2,12 +2,14 @@ { environment.systemPackages = with pkgs; [ - (rWrapper.override{ packages = with rPackages; [ - ggplot2 - swirl - dplyr - data_table - ]; }) + (rWrapper.override { + packages = with rPackages; [ + ggplot2 + swirl + dplyr + data_table + ]; + }) gnuplot graphicsmagick zotero diff --git a/pkgs/slick.nix b/pkgs/slick.nix index 8db0f48..c476440 100644 --- a/pkgs/slick.nix +++ b/pkgs/slick.nix @@ -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"; @@ -0,0 +1 @@ +/nix/store/dv1a3c2766rxg7cxvls1cpzz3d2m8381-slick-0.10.0
\ No newline at end of file |