foosinn/nix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

nixfmt

Browse source
This commit is contained in:
foosinn 2022-02-13 00:31:58 +01:00
parent 4146b5aece
commit 2e10a00830
32 changed files with 2944 additions and 2163 deletions
Download patch file Download diff file Expand all files Collapse all files

7
configuration.nix
View file

@ -5,8 +5,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [
[
./modules/colors.nix ./modules/colors.nix
# Include the results of the hardware scan. # Include the results of the hardware scan.
@ -32,9 +31,7 @@
services.openssh.enable = true; services.openssh.enable = true;
networking.firewall.enable = true; networking.firewall.enable = true;
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [ "openssl-1.0.2u" ];
"openssl-1.0.2u"
];
system.autoUpgrade.enable = true; system.autoUpgrade.enable = true;
system.stateVersion = "20.03"; # We can stay here system.stateVersion = "20.03"; # We can stay here

22
hardware/desktop.nix
View file

@ -3,30 +3,28 @@
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
let let unstable = import <nixos-unstable> { config.allowUnfree = true; };
unstable = import <nixos-unstable> { config.allowUnfree = true; };
in { in {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules =
[ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "tank/root/nixos"; device = "tank/root/nixos";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/home" = fileSystems."/home" = {
{ device = "tank/root/home"; device = "tank/root/home";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/587C-36F9"; device = "/dev/disk/by-uuid/587C-36F9";
fsType = "vfat"; fsType = "vfat";
}; };

37
hardware/vison14.nix
View file

@ -4,40 +4,37 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
let let
tuxedo-keyboard = pkgs.callPackage (import ../packages/tuxedo-keyboard.nix) {}; tuxedo-keyboard =
tuxedo-cc = pkgs.callPackage (import ../packages/tuxedo-control-center/default.nix) {}; pkgs.callPackage (import ../packages/tuxedo-keyboard.nix) { };
tuxedo-cc =
pkgs.callPackage (import ../packages/tuxedo-control-center/default.nix) { };
in { in {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules =
[ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ boot.extraModulePackages = [ tuxedo-keyboard ];
tuxedo-keyboard environment.systemPackages = with pkgs; [ tuxedo-cc ];
];
environment.systemPackages = with pkgs; [
tuxedo-cc
];
fileSystems."/" = fileSystems."/" = {
{ device = "private/root/nixos"; device = "private/root/nixos";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/home" = fileSystems."/home" = {
{ device = "private/root/home"; device = "private/root/home";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/tmp" = fileSystems."/tmp" = {
{ device = "private/root/tmp"; device = "private/root/tmp";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/7E36-C774"; device = "/dev/disk/by-uuid/7E36-C774";
fsType = "vfat"; fsType = "vfat";
}; };

29
hardware/x220-discovery.nix
View file

@ -3,30 +3,35 @@
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let unstable = import <nixos-unstable> { config.allowUnfree = true; };
unstable = import <nixos-unstable> { config.allowUnfree = true; };
in { in {
imports = imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"ehci_pci"
"ahci"
"usbhid"
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "cube/root/nixos"; device = "cube/root/nixos";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/home" = fileSystems."/home" = {
{ device = "cube/home"; device = "cube/home";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/2AD7-4F18"; device = "/dev/disk/by-uuid/2AD7-4F18";
fsType = "vfat"; fsType = "vfat";
}; };

26
hardware/x360-raven.nix
View file

@ -3,8 +3,7 @@
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let unstable = import <nixos-unstable> { config.allowUnfree = true; };
unstable = import <nixos-unstable> { config.allowUnfree = true; };
in { in {
imports = [ imports = [
<nixpkgs/nixos/modules/installer/scan/not-detected.nix> <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
@ -19,14 +18,8 @@ in {
"w /sys/class/drm/card0/device/power_dpm_force_performance_level - - - - low" "w /sys/class/drm/card0/device/power_dpm_force_performance_level - - - - low"
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules =
"nvme" [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
"xhci_pci"
"ahci"
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
@ -35,7 +28,6 @@ in {
boot.kernelPackages = unstable.linuxPackages_latest; boot.kernelPackages = unstable.linuxPackages_latest;
#boot.kernelPackages = unstable.linux_testing; #boot.kernelPackages = unstable.linux_testing;
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
@ -45,18 +37,18 @@ in {
networking.interfaces.wlo1.useDHCP = true; networking.interfaces.wlo1.useDHCP = true;
networking.resolvconf.useLocalResolver = true; networking.resolvconf.useLocalResolver = true;
fileSystems."/" = fileSystems."/" = {
{ device = "tank/root/nixos"; device = "tank/root/nixos";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/home" = fileSystems."/home" = {
{ device = "tank/home"; device = "tank/home";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/B048-FBC8"; device = "/dev/disk/by-uuid/B048-FBC8";
fsType = "vfat"; fsType = "vfat";
}; };

22
hardware/xps15-sphere.nix
View file

@ -3,15 +3,13 @@
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let unstable = import <nixos-unstable> { config.allowUnfree = true; };
unstable = import <nixos-unstable> { config.allowUnfree = true; };
in { in {
imports = imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.kernelParams = [ "intel_pstate=active" ]; boot.kernelParams = [ "intel_pstate=active" ];
@ -32,18 +30,18 @@ in {
]; ];
}; };
fileSystems."/" = fileSystems."/" = {
{ device = "tank/work/nixos"; device = "tank/work/nixos";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/home" = fileSystems."/home" = {
{ device = "tank/work/home"; device = "tank/work/home";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/DC7B-5E2D"; device = "/dev/disk/by-uuid/DC7B-5E2D";
fsType = "vfat"; fsType = "vfat";
}; };

9
packages/certmanager.nix
View file

@ -1,16 +1,15 @@
with import <nixpkgs> {}; with import <nixpkgs> { };
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cert-manager"; name = "cert-manager";
version = "v1.7.1"; version = "v1.7.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/cert-manager/cert-manager/releases/download/${version}/cmctl-linux-amd64.tar.gz"; url =
"https://github.com/cert-manager/cert-manager/releases/download/${version}/cmctl-linux-amd64.tar.gz";
sha256 = "1z5n2rcfhrl1vm5vxqa1759m3prlv08mmg96n16p4gwkdxycznx4"; sha256 = "1z5n2rcfhrl1vm5vxqa1759m3prlv08mmg96n16p4gwkdxycznx4";
}; };
nativeBuildInputs = [ nativeBuildInputs = [ autoPatchelfHook ];
autoPatchelfHook
];
unpackPhase = '' unpackPhase = ''
tar xvpzf $src tar xvpzf $src

21
packages/cloudstation.nix
View file

@ -1,22 +1,14 @@
{ stdenv { stdenv, buildFHSUserEnv, fetchurl, lib, pkgs, writeScript }:
, buildFHSUserEnv
, fetchurl
, lib
, pkgs
, writeScript
}:
let let
version = "4.3.3"; version = "4.3.3";
release = "4469"; release = "4469";
cloudstation = stdenv.mkDerivation rec { cloudstation = stdenv.mkDerivation rec {
name = "cloudstation-unpack"; name = "cloudstation-unpack";
buildInputs = [ buildInputs = [ pkgs.dpkg pkgs.qt5.qtbase ];
pkgs.dpkg
pkgs.qt5.qtbase
];
src = fetchurl { src = fetchurl {
url = "https://global.download.synology.com/download/Tools/CloudStationDrive/${version}-${release}/Ubuntu/Installer/x86_64/synology-cloud-station-drive-${release}.x86_64.deb"; url =
"https://global.download.synology.com/download/Tools/CloudStationDrive/${version}-${release}/Ubuntu/Installer/x86_64/synology-cloud-station-drive-${release}.x86_64.deb";
sha256 = "0v84yb70knmmjzp7lyn6jgy5bnfsfd47wmqh29phybqg4zk3d47j"; sha256 = "0v84yb70knmmjzp7lyn6jgy5bnfsfd47wmqh29phybqg4zk3d47j";
}; };
unpackPhase = '' unpackPhase = ''
@ -35,11 +27,12 @@ let
dontWrapQtApps = true; dontWrapQtApps = true;
}; };
in buildFHSUserEnv { in buildFHSUserEnv {
name = "cloudstation"; name = "cloudstation";
targetPkgs = pkgs: with pkgs; with xorg; [ targetPkgs = pkgs:
with pkgs;
with xorg; [
cloudstation cloudstation
curl curl
dbus_libs dbus_libs

6
packages/helm2.nix
View file

@ -1,4 +1,4 @@
with import <nixpkgs> {}; with import <nixpkgs> { };
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "helm2"; name = "helm2";
@ -8,9 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "38614a665859c0f01c9c1d84fa9a5027364f936814d1e47839b05327e400bf55"; sha256 = "38614a665859c0f01c9c1d84fa9a5027364f936814d1e47839b05327e400bf55";
}; };
nativeBuildInputs = [ nativeBuildInputs = [ autoPatchelfHook ];
autoPatchelfHook
];
unpackPhase = '' unpackPhase = ''
tar xvpzf $src tar xvpzf $src

2
packages/neovim.nix
View file

@ -1,4 +1,4 @@
with import <nixos-unstable> {}; with import <nixos-unstable> { };
neovim.override { neovim.override {
vimAlias = true; vimAlias = true;

14
packages/notcoal/default.nix
View file

@ -5,20 +5,14 @@ rustPlatform.buildRustPackage rec {
version = "0.3.0"; version = "0.3.0";
src = fetchTarball { src = fetchTarball {
url = https://ghom.niij.org/eaon/notcoal/archive/v0.3.0.tar.gz; url = "https://ghom.niij.org/eaon/notcoal/archive/v0.3.0.tar.gz";
sha256 = "19gaba6asid5vplcy9q0ama40dvwwxglc40ks5240lydrvgfrimq"; sha256 = "19gaba6asid5vplcy9q0ama40dvwwxglc40ks5240lydrvgfrimq";
}; };
cargoPatches = [ cargoPatches = [ ./Cargo.lock.patch ];
./Cargo.lock.patch
];
cargoSha256 = "0kgjxq2319l2gh1xc0f3ir1pa6z7p62z3fccswwxrz7gbn7nc07c"; cargoSha256 = "0kgjxq2319l2gh1xc0f3ir1pa6z7p62z3fccswwxrz7gbn7nc07c";
cargoBuildFlags = ["--features=standalone"]; cargoBuildFlags = [ "--features=standalone" ];
buildInputs = [
bash
notmuch
];
buildInputs = [ bash notmuch ];
meta = with lib; { meta = with lib; {
description = "An email tagger for notmuch"; description = "An email tagger for notmuch";

9
packages/oc311.nix
View file

@ -1,16 +1,15 @@
with import <nixpkgs> {}; with import <nixpkgs> { };
stdenv.mkDerivation { stdenv.mkDerivation {
name = "oc311"; name = "oc311";
version = "3.11"; version = "3.11";
src = fetchurl { src = fetchurl {
url = "https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz"; url =
"https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz";
sha256 = "4b0f07428ba854174c58d2e38287e5402964c9a9355f6c359d1242efd0990da3"; sha256 = "4b0f07428ba854174c58d2e38287e5402964c9a9355f6c359d1242efd0990da3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [ autoPatchelfHook ];
autoPatchelfHook
];
unpackPhase = '' unpackPhase = ''
tar xvpzf $src --strip-components=1 tar xvpzf $src --strip-components=1

9
packages/oc46.nix
View file

@ -1,16 +1,15 @@
with import <nixpkgs> {}; with import <nixpkgs> { };
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "oc46"; name = "oc46";
version = "4.6"; version = "4.6";
src = fetchurl { src = fetchurl {
url = "https://github.com/openshift/okd/releases/download/4.6.0-0.okd-2021-02-14-205305/openshift-client-linux-4.6.0-0.okd-2021-02-14-205305.tar.gz"; url =
"https://github.com/openshift/okd/releases/download/4.6.0-0.okd-2021-02-14-205305/openshift-client-linux-4.6.0-0.okd-2021-02-14-205305.tar.gz";
sha256 = "741c456f1d5227eb40722b0dac328c78dceba5103fd306cf7fe57a9474eb3d35"; sha256 = "741c456f1d5227eb40722b0dac328c78dceba5103fd306cf7fe57a9474eb3d35";
}; };
nativeBuildInputs = [ nativeBuildInputs = [ autoPatchelfHook ];
autoPatchelfHook
];
unpackPhase = '' unpackPhase = ''
tar xvpzf $src tar xvpzf $src

9
packages/openshift-install-4.5.nix
View file

@ -1,17 +1,16 @@
with import <nixpkgs> {}; with import <nixpkgs> { };
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openshift-install-4.5"; name = "openshift-install-4.5";
version = "4.5.0-0"; version = "4.5.0-0";
release = "2020-10-03-012432"; release = "2020-10-03-012432";
src = fetchurl { src = fetchurl {
url = "https://github.com/openshift/okd/releases/download/${version}.okd-${release}/openshift-install-linux-${version}.okd-${release}.tar.gz"; url =
"https://github.com/openshift/okd/releases/download/${version}.okd-${release}/openshift-install-linux-${version}.okd-${release}.tar.gz";
sha256 = "f497193e8918840a4fd3267839affdc91ec166c5fd2ae3fdc64f498b5fc56f55"; sha256 = "f497193e8918840a4fd3267839affdc91ec166c5fd2ae3fdc64f498b5fc56f55";
}; };
nativeBuildInputs = [ nativeBuildInputs = [ autoPatchelfHook ];
autoPatchelfHook
];
unpackPhase = '' unpackPhase = ''
tar xvpzf $src tar xvpzf $src

9
packages/skaffold.nix
View file

@ -1,16 +1,15 @@
with import <nixpkgs> {}; with import <nixpkgs> { };
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "skaffold"; name = "skaffold";
version = "1.17.2"; version = "1.17.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/GoogleContainerTools/skaffold/releases/download/v${version}/skaffold-linux-amd64"; url =
"https://github.com/GoogleContainerTools/skaffold/releases/download/v${version}/skaffold-linux-amd64";
sha256 = "55dea8be16fa3abd81820a6a03f5d708beb5e152fe71e00f00744a4dd321c55a"; sha256 = "55dea8be16fa3abd81820a6a03f5d708beb5e152fe71e00f00744a4dd321c55a";
}; };
nativeBuildInputs = [ nativeBuildInputs = [ autoPatchelfHook ];
autoPatchelfHook
];
unpackPhase = '' unpackPhase = ''
cp $src skaffold cp $src skaffold

46
packages/tuxedo-cc.nix
View file

@ -1,36 +1,8 @@
{ lib { lib, stdenv, makeWrapper, fetchurl, rpmextract, autoPatchelfHook, alsa-lib
, stdenv , cups, gdk-pixbuf, glib, gtk3, libnotify, libuuid, libX11, libXScrnSaver
, makeWrapper , libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr
, fetchurl , libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss, pango, systemd
, rpmextract , libappindicator-gtk3, libdbusmenu
, autoPatchelfHook
, alsa-lib
, cups
, gdk-pixbuf
, glib
, gtk3
, libnotify
, libuuid
, libX11
, libXScrnSaver
, libXcomposite
, libXcursor
, libXdamage
, libXext
, libXfixes
, libXi
, libXrandr
, libXrender
, libXtst
, libxcb
, libxshmfence
, mesa
, nspr
, nss
, pango
, systemd
, libappindicator-gtk3
, libdbusmenu
}: }:
@ -39,11 +11,11 @@ stdenv.mkDerivation rec {
version = "1.1.0"; version = "1.1.0";
src = fetchurl { src = fetchurl {
url = "https://rpm.tuxedocomputers.com/opensuse/15.2/x86_64/tuxedo-control-center_${version}.rpm"; url =
"https://rpm.tuxedocomputers.com/opensuse/15.2/x86_64/tuxedo-control-center_${version}.rpm";
sha256 = "0rqhfi1slnh0kkn1vnxqynxm6yb4w1mhk4vi92vj0lrxlwdxf80c"; sha256 = "0rqhfi1slnh0kkn1vnxqynxm6yb4w1mhk4vi92vj0lrxlwdxf80c";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
rpmextract rpmextract
makeWrapper makeWrapper
@ -112,9 +84,9 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
meta = with lib; { meta = with lib; {
description = "A tool to help you control performance, energy, fan and comfort settings on TUXEDO laptops."; description =
"A tool to help you control performance, energy, fan and comfort settings on TUXEDO laptops.";
homepage = "github.com/tuxedocomputers/tuxedo-control-center"; homepage = "github.com/tuxedocomputers/tuxedo-control-center";
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];

12
packages/tuxedo-control-center/default.nix
View file

@ -1,9 +1,8 @@
{ pkgs, lib, stdenv, makeDesktopItem, desktop-file-utils, { pkgs, lib, stdenv, makeDesktopItem, desktop-file-utils,
python, python,
makeWrapper, nodejs, electron_9, fetchFromGitHub makeWrapper, nodejs, electron_9, fetchFromGitHub }:
}:
let let
baseName = "tuxedo-control-center"; baseName = "tuxedo-control-center";
@ -27,13 +26,13 @@ let
# #
# This means we have to provide our own electron binaries when # This means we have to provide our own electron binaries when
# wrapping this program. # wrapping this program.
ELECTRON_SKIP_BINARY_DOWNLOAD=1; ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
# Angular prompts for analytics, which in turn fails the build. # Angular prompts for analytics, which in turn fails the build.
# #
# We can disable analytics using false or empty string # We can disable analytics using false or empty string
# (See https://github.com/angular/angular-cli/blob/1a39c5202a6fe159f8d7db85a1c186176240e437/packages/angular/cli/models/analytics.ts#L506) # (See https://github.com/angular/angular-cli/blob/1a39c5202a6fe159f8d7db85a1c186176240e437/packages/angular/cli/models/analytics.ts#L506)
NG_CLI_ANALYTICS="false"; NG_CLI_ANALYTICS = "false";
}; };
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -44,9 +43,8 @@ let
icon = "tuxedo-control-center"; icon = "tuxedo-control-center";
categories = "System;"; categories = "System;";
}; };
in
stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${baseName}-${version}"; name = "${baseName}-${version}";
src = "${nodePackages}/lib/node_modules/tuxedo-control-center/"; src = "${nodePackages}/lib/node_modules/tuxedo-control-center/";

8
packages/tuxedo-control-center/node-composition.nix
View file

@ -1,8 +1,7 @@
# This file has been generated by node2nix 1.9.0. Do not edit! # This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> { { pkgs ? import <nixpkgs> { inherit system; }, system ? builtins.currentSystem
inherit system; , nodejs ? pkgs."nodejs-14_x" }:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {
@ -10,8 +9,7 @@ let
inherit pkgs nodejs; inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
}; };
in in import ./node-packages.nix {
import ./node-packages.nix {
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv; inherit nodeEnv;
} }

190
packages/tuxedo-control-center/node-env.nix
View file

@ -1,6 +1,6 @@
# This file originates from node2nix # This file originates from node2nix
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: { lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile }:
let let
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
@ -9,7 +9,7 @@ let
python = if nodejs ? python then nodejs.python else python2; python = if nodejs ? python then nodejs.python else python2;
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
tarWrapper = runCommand "tarWrapper" {} '' tarWrapper = runCommand "tarWrapper" { } ''
mkdir -p $out/bin mkdir -p $out/bin
cat > $out/bin/tar <<EOF cat > $out/bin/tar <<EOF
@ -21,8 +21,7 @@ let
''; '';
# Function that generates a TGZ file from a NPM project # Function that generates a TGZ file from a NPM project
buildNodeSourceDist = buildNodeSourceDist = { name, version, src, ... }:
{ name, version, src, ... }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "node-tarball-${name}-${version}"; name = "node-tarball-${name}-${version}";
@ -40,10 +39,9 @@ let
''; '';
}; };
includeDependencies = {dependencies}: includeDependencies = { dependencies }:
lib.optionalString (dependencies != []) lib.optionalString (dependencies != [ ]) (lib.concatMapStrings
(lib.concatMapStrings (dependency: (dependency: ''
''
# Bundle the dependencies of the package # Bundle the dependencies of the package
mkdir -p node_modules mkdir -p node_modules
cd node_modules cd node_modules
@ -55,11 +53,10 @@ let
fi fi
cd .. cd ..
'' '') dependencies);
) dependencies);
# Recursively composes the dependencies of a package # Recursively composes the dependencies of a package
composePackage = { name, packageName, src, dependencies ? [], ... }@args: composePackage = { name, packageName, src, dependencies ? [ ], ... }@args:
builtins.addErrorContext "while evaluating node package '${packageName}'" '' builtins.addErrorContext "while evaluating node package '${packageName}'" ''
DIR=$(pwd) DIR=$(pwd)
cd $TMPDIR cd $TMPDIR
@ -106,7 +103,7 @@ let
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
''; '';
pinpointDependencies = {dependencies, production}: pinpointDependencies = { dependencies, production }:
let let
pinpointDependenciesFromPackageJSON = writeTextFile { pinpointDependenciesFromPackageJSON = writeTextFile {
name = "pinpointDependencies.js"; name = "pinpointDependencies.js";
@ -160,16 +157,20 @@ let
fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
''; '';
}; };
in in ''
'' node ${pinpointDependenciesFromPackageJSON} ${
node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} if production then "production" else "development"
}
${lib.optionalString (dependencies != []) ${lib.optionalString (dependencies != [ ]) ''
''
if [ -d node_modules ] if [ -d node_modules ]
then then
cd node_modules cd node_modules
${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} ${
lib.concatMapStrings
(dependency: pinpointDependenciesOfPackage dependency)
dependencies
}
cd .. cd ..
fi fi
''} ''}
@ -179,20 +180,23 @@ let
# dependencies in the package.json file to the versions that are actually # dependencies in the package.json file to the versions that are actually
# being used. # being used.
pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: pinpointDependenciesOfPackage =
'' { packageName, dependencies ? [ ], production ? true, ... }@args: ''
if [ -d "${packageName}" ] if [ -d "${packageName}" ]
then then
cd "${packageName}" cd "${packageName}"
${pinpointDependencies { inherit dependencies production; }} ${pinpointDependencies { inherit dependencies production; }}
cd .. cd ..
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${
lib.optionalString (builtins.substring 0 1 packageName == "@")
"cd .."
}
fi fi
''; '';
# Extract the Node.js source code which is used to compile packages with # Extract the Node.js source code which is used to compile packages with
# native bindings # native bindings
nodeSources = runCommand "node-sources" {} '' nodeSources = runCommand "node-sources" { } ''
tar --no-same-owner --no-same-permissions -xf ${nodejs.src} tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
mv node-* $out mv node-* $out
''; '';
@ -320,11 +324,14 @@ let
''; '';
}; };
prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: prepareAndInvokeNPM =
{ packageName, bypassCache, reconstructLock, npmFlags, production }:
let let
forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; forceOfflineFlag = if bypassCache then
in "--offline"
'' else
"--registry http://www.example.com";
in ''
# Pinpoint the versions of all dependencies to the ones that are actually being used # Pinpoint the versions of all dependencies to the ones that are actually being used
echo "pinpointing versions of dependencies..." echo "pinpointing versions of dependencies..."
source $pinpointDependenciesScriptPath source $pinpointDependenciesScriptPath
@ -364,49 +371,50 @@ let
node ${addIntegrityFieldsScript} node ${addIntegrityFieldsScript}
''} ''}
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${
lib.optionalString production "--production"
} rebuild
if [ "''${dontNpmInstall-}" != "1" ] if [ "''${dontNpmInstall-}" != "1" ]
then then
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used. # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
rm -f npm-shrinkwrap.json rm -f npm-shrinkwrap.json
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${
lib.optionalString production "--production"
} install
fi fi
''; '';
# Builds and composes an NPM package including all its dependencies # Builds and composes an NPM package including all its dependencies
buildNodePackage = buildNodePackage = { name, packageName, version, dependencies ? [ ]
{ name , buildInputs ? [ ], production ? true, npmFlags ? ""
, packageName , dontNpmInstall ? false, bypassCache ? false, reconstructLock ? false
, version , preRebuild ? "", dontStrip ? true, unpackPhase ? "true"
, dependencies ? [] , buildPhase ? "true", meta ? { }, ... }@args:
, buildInputs ? []
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
, bypassCache ? false
, reconstructLock ? false
, preRebuild ? ""
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, meta ? {}
, ... }@args:
let let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; extraArgs = removeAttrs args [
in "name"
stdenv.mkDerivation ({ "dependencies"
"buildInputs"
"dontStrip"
"dontNpmInstall"
"preRebuild"
"unpackPhase"
"buildPhase"
"meta"
];
in stdenv.mkDerivation ({
name = "${name}-${version}"; name = "${name}-${version}";
buildInputs = [ tarWrapper python nodejs ] buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isDarwin) libtool ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs;
++ buildInputs;
inherit nodejs; inherit nodejs;
inherit dontStrip; # Stripping may fail a build for some package deployments inherit
dontStrip; # Stripping may fail a build for some package deployments
inherit dontNpmInstall preRebuild unpackPhase buildPhase; inherit dontNpmInstall preRebuild unpackPhase buildPhase;
compositionScript = composePackage args; compositionScript = composePackage args;
@ -422,7 +430,9 @@ let
# Compose the package and all its dependencies # Compose the package and all its dependencies
source $compositionScriptPath source $compositionScriptPath
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} ${prepareAndInvokeNPM {
inherit packageName bypassCache reconstructLock npmFlags production;
}}
# Create symlink to the deployed executable folder, if applicable # Create symlink to the deployed executable folder, if applicable
if [ -d "$out/lib/node_modules/.bin" ] if [ -d "$out/lib/node_modules/.bin" ]
@ -455,35 +465,21 @@ let
} // extraArgs); } // extraArgs);
# Builds a node environment (a node_modules folder and a set of binaries) # Builds a node environment (a node_modules folder and a set of binaries)
buildNodeDependencies = buildNodeDependencies = { name, packageName, version, src, dependencies ? [ ]
{ name , buildInputs ? [ ], production ? true, npmFlags ? ""
, packageName , dontNpmInstall ? false, bypassCache ? false, reconstructLock ? false
, version , dontStrip ? true, unpackPhase ? "true", buildPhase ? "true", ... }@args:
, src
, dependencies ? []
, buildInputs ? []
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
, bypassCache ? false
, reconstructLock ? false
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, ... }@args:
let let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; in stdenv.mkDerivation ({
in
stdenv.mkDerivation ({
name = "node-dependencies-${name}-${version}"; name = "node-dependencies-${name}-${version}";
buildInputs = [ tarWrapper python nodejs ] buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isDarwin) libtool ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs;
++ buildInputs;
inherit dontStrip; # Stripping may fail a build for some package deployments inherit
dontStrip; # Stripping may fail a build for some package deployments
inherit dontNpmInstall unpackPhase buildPhase; inherit dontNpmInstall unpackPhase buildPhase;
includeScript = includeDependencies { inherit dependencies; }; includeScript = includeDependencies { inherit dependencies; };
@ -509,13 +505,17 @@ let
# Go to the parent folder to make sure that all packages are pinpointed # Go to the parent folder to make sure that all packages are pinpointed
cd .. cd ..
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${lib.optionalString (builtins.substring 0 1 packageName == "@")
"cd .."}
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} ${prepareAndInvokeNPM {
inherit packageName bypassCache reconstructLock npmFlags production;
}}
# Expose the executables that were installed # Expose the executables that were installed
cd .. cd ..
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${lib.optionalString (builtins.substring 0 1 packageName == "@")
"cd .."}
mv ${packageName} lib mv ${packageName} lib
ln -s $out/lib/node_modules/.bin $out/bin ln -s $out/lib/node_modules/.bin $out/bin
@ -523,30 +523,17 @@ let
} // extraArgs); } // extraArgs);
# Builds a development shell # Builds a development shell
buildNodeShell = buildNodeShell = { name, packageName, version, src, dependencies ? [ ]
{ name , buildInputs ? [ ], production ? true, npmFlags ? ""
, packageName , dontNpmInstall ? false, bypassCache ? false, reconstructLock ? false
, version , dontStrip ? true, unpackPhase ? "true", buildPhase ? "true", ... }@args:
, src
, dependencies ? []
, buildInputs ? []
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
, bypassCache ? false
, reconstructLock ? false
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, ... }@args:
let let nodeDependencies = buildNodeDependencies args;
nodeDependencies = buildNodeDependencies args; in stdenv.mkDerivation {
in
stdenv.mkDerivation {
name = "node-shell-${name}-${version}"; name = "node-shell-${name}-${version}";
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux
++ buildInputs;
buildCommand = '' buildCommand = ''
mkdir -p $out/bin mkdir -p $out/bin
cat > $out/bin/shell <<EOF cat > $out/bin/shell <<EOF
@ -559,13 +546,12 @@ let
# Provide the dependencies in a development shell through the NODE_PATH environment variable # Provide the dependencies in a development shell through the NODE_PATH environment variable
inherit nodeDependencies; inherit nodeDependencies;
shellHook = lib.optionalString (dependencies != []) '' shellHook = lib.optionalString (dependencies != [ ]) ''
export NODE_PATH=${nodeDependencies}/lib/node_modules export NODE_PATH=${nodeDependencies}/lib/node_modules
export PATH="${nodeDependencies}/bin:$PATH" export PATH="${nodeDependencies}/bin:$PATH"
''; '';
}; };
in in {
{
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
buildNodePackage = lib.makeOverridable buildNodePackage; buildNodePackage = lib.makeOverridable buildNodePackage;
buildNodeDependencies = lib.makeOverridable buildNodeDependencies; buildNodeDependencies = lib.makeOverridable buildNodeDependencies;

4075
packages/tuxedo-control-center/node-packages.nix
View file

File diff suppressed because it is too large Load diff

6
packages/tuxedo-keyboard.nix
View file

@ -3,9 +3,8 @@
let let
kernel = linuxPackages.kernel; kernel = linuxPackages.kernel;
kernelDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; kernelDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
in
stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "tuxedo-keyboard"; name = "tuxedo-keyboard";
version = "v3.0.8"; version = "v3.0.8";
@ -33,7 +32,8 @@ stdenv.mkDerivation rec {
''; '';
meta = { meta = {
homepage = https://github.com/tuxedocomputers/tuxedo-keyboard/blob/master/Makefile; homepage =
"https://github.com/tuxedocomputers/tuxedo-keyboard/blob/master/Makefile";
}; };
} }

9
packages/vaultsink.nix
View file

@ -1,16 +1,15 @@
with import <nixpkgs> {}; with import <nixpkgs> { };
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vaultsink"; name = "vaultsink";
version = "0.1.8"; version = "0.1.8";
src = fetchurl { src = fetchurl {
url = "https://github.com/cookiefactory/vault-sink/releases/download/v${version}/vault-sink-linux-amd64"; url =
"https://github.com/cookiefactory/vault-sink/releases/download/v${version}/vault-sink-linux-amd64";
sha256 = "057799e7f907186993b591e3b2f743b69d7a9fed"; sha256 = "057799e7f907186993b591e3b2f743b69d7a9fed";
}; };
nativeBuildInputs = [ nativeBuildInputs = [ autoPatchelfHook ];
autoPatchelfHook
];
installPhase = '' installPhase = ''
install -m 755 -D vault-sink-linux-amd64 $out/bin/sink install -m 755 -D vault-sink-linux-amd64 $out/bin/sink

5
roles/admin.nix
View file

@ -1,7 +1,6 @@
{ pkgs, options, ...}: { pkgs, options, ... }:
let let unstable = import <nixos-unstable> { };
unstable = import <nixos-unstable> {};
in { in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
cryptsetup cryptsetup

7
roles/base.nix
View file

@ -1,7 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let unstable = import <nixos-unstable> { };
unstable = import <nixos-unstable> {};
in { in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
acpi acpi
@ -42,9 +41,7 @@ in {
]; ];
environment = { environment = {
etc = { etc = { "starship.toml".source = ../dotfiles/starship.toml; };
"starship.toml".source = ../dotfiles/starship.toml;
};
variables = { variables = {
BAT_THEME = "ansi"; BAT_THEME = "ansi";

53
roles/desktop.nix
View file

@ -26,21 +26,15 @@ in {
wf-recorder wf-recorder
xwayland xwayland
]; ];
extraSessionCommands = '' extraSessionCommands = "";
'';
}; };
xdg.portal = { xdg.portal = {
enable = true; enable = true;
gtkUsePortal = true; gtkUsePortal = true;
extraPortals = with pkgs; [ extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-wlr ];
xdg-desktop-portal-gtk
xdg-desktop-portal-wlr
];
}; };
boot.extraModulePackages = with config.boot.kernelPackages; [ boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
v4l2loopback
];
colors = { colors = {
background = "#282a36"; background = "#282a36";
@ -50,7 +44,7 @@ in {
green = "#50fa7b"; green = "#50fa7b";
yellow = "#f1fa8c"; yellow = "#f1fa8c";
cyan = "#8be9fd"; cyan = "#8be9fd";
magenta ="#bd93f9"; magenta = "#bd93f9";
blue = "#61bfff"; blue = "#61bfff";
white = "#ffffff"; white = "#ffffff";
}; };
@ -60,15 +54,15 @@ in {
"sway/config".source = ../dotfiles/sway/config; "sway/config".source = ../dotfiles/sway/config;
"sway/status.toml".source = ../dotfiles/sway/status.toml; "sway/status.toml".source = ../dotfiles/sway/status.toml;
"xdg/alacritty/alacritty.yml".text = '' "xdg/alacritty/alacritty.yml".text = ''
font: font:
normal: normal:
family: CaskaydiaCove Nerd Font family: CaskaydiaCove Nerd Font
size: 12 size: 12
background_opacity: 0.98 background_opacity: 0.98
draw_bold_text_with_bright_colors: true draw_bold_text_with_bright_colors: true
colors: colors:
primary: primary:
background: "${colors.background}" background: "${colors.background}"
foreground: "${colors.foreground}" foreground: "${colors.foreground}"
@ -83,13 +77,13 @@ colors:
blue: "${colors.blue}" blue: "${colors.blue}"
white: "${colors.white}" white: "${colors.white}"
window: window:
dynamic_title: true dynamic_title: true
env: env:
TERM: xterm-256color TERM: xterm-256color
key_bindings: key_bindings:
- { key: Escape, mods: Control, action: ToggleViMode } - { key: Escape, mods: Control, action: ToggleViMode }
''; '';
}; };
@ -105,9 +99,7 @@ key_bindings:
jack.enable = true; jack.enable = true;
config.pipewire = { config.pipewire = {
"context.properties" = { "context.properties" = { "default.clock.rate" = 48000; };
"default.clock.rate" = 48000;
};
}; };
}; };
services.udev.packages = [ services.udev.packages = [
@ -128,13 +120,11 @@ key_bindings:
fira-code fira-code
noto-fonts noto-fonts
noto-fonts-emoji noto-fonts-emoji
(nerdfonts.override { (nerdfonts.override { fonts = [ "CascadiaCode" "Meslo" ]; })
fonts = [ "CascadiaCode" "Meslo" ];
})
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
environment.pathsToLink = ["/libexec"]; environment.pathsToLink = [ "/libexec" ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
polkit_gnome polkit_gnome
@ -194,8 +184,7 @@ key_bindings:
xfce.thunar xfce.thunar
xfce.thunar-volman xfce.thunar-volman
ydotool ydotool
( (pkgs.writeTextFile {
pkgs.writeTextFile {
name = "startsway"; name = "startsway";
destination = "/bin/startsway"; destination = "/bin/startsway";
executable = true; executable = true;
@ -217,8 +206,7 @@ key_bindings:
${pkgs.dbus}/bin/dbus-run-session ${pkgs.sway}/bin/sway ${pkgs.dbus}/bin/dbus-run-session ${pkgs.sway}/bin/sway
''; '';
} })
)
]; ];
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
@ -233,14 +221,9 @@ key_bindings:
}; };
services.printing.enable = true; services.printing.enable = true;
services.printing.drivers = [ services.printing.drivers = [ pkgs.gutenprint ];
pkgs.gutenprint
];
services.avahi.enable = true; services.avahi.enable = true;
services.avahi.nssmdns = true; services.avahi.nssmdns = true;
hardware.opengl = { enable = true; };
hardware.opengl = {
enable = true;
};
} }

19
roles/dev.nix
View file

@ -1,7 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let unstable = import <nixos-unstable> { };
unstable = import <nixos-unstable> {};
in { in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -15,12 +14,8 @@ in {
#unstable.esphome #unstable.esphome
nodePackages.pyright nodePackages.pyright
(python39.withPackages(python-packages: with python-packages; [ (python39.withPackages
black (python-packages: with python-packages; [ black pyyaml requests black ]))
pyyaml
requests
black
]))
mariadb-client mariadb-client
musl musl
@ -35,6 +30,12 @@ in {
tig tig
unstable.bazel unstable.bazel
openssl pkg-config nasm cmake zlib gcc binutils-unwrapped openssl
pkg-config
nasm
cmake
zlib
gcc
binutils-unwrapped
]; ];
} }

2
roles/mail.nix
View file

@ -2,7 +2,7 @@
let let
unstable = import <nixos-unstable> { config.allowUnfree = true; }; unstable = import <nixos-unstable> { config.allowUnfree = true; };
notcoal = pkgs.callPackage (import ../packages/notcoal) {}; notcoal = pkgs.callPackage (import ../packages/notcoal) { };
in { in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
unstable.astroid unstable.astroid

3
roles/network.nix
View file

@ -1,7 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let unstable = import <nixos-unstable> { config.allowUnfree = true; };
unstable = import <nixos-unstable> { config.allowUnfree = true; };
in { in {
networking.networkmanager.enable = true; networking.networkmanager.enable = true;

6
roles/private.nix
View file

@ -1,9 +1,9 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let unstable = import <nixos-unstable> { };
unstable = import <nixos-unstable> {};
in { in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs;
[
# embedded # embedded
#arduino #arduino
#avrdude #avrdude

4
roles/vpn.nix
View file

@ -2,7 +2,5 @@
{ {
networking.wireguard.enable = true; networking.wireguard.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [ wireguard ];
wireguard
];
} }

5
roles/work.nix
View file

@ -2,8 +2,9 @@
let let
unstable = import <nixos-unstable> { config.allowUnfree = true; }; unstable = import <nixos-unstable> { config.allowUnfree = true; };
cloudstation = pkgs.callPackage (import ../packages/cloudstation.nix) {}; cloudstation = pkgs.callPackage (import ../packages/cloudstation.nix) { };
nagstamon = pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) {}; nagstamon =
pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) { };
in { in {
security.pki.certificateFiles = [ security.pki.certificateFiles = [