Formatting with alejandra

This commit is contained in:
Erwin Boskma 2022-03-01 22:19:03 +01:00
parent 4bb96c16be
commit d331343012
Signed by: erwin
GPG key ID: 270B20D17394F7E5
60 changed files with 1061 additions and 907 deletions

View file

@ -69,10 +69,14 @@
};
};
outputs = { self, sops, ha-now-playing, pamedia, ... }@inputs:
with inputs;
let
outputs = {
self,
sops,
ha-now-playing,
pamedia,
...
} @ inputs:
with inputs; let
defSystem = system: baseConfig:
nixpkgs.lib.nixosSystem {
system = "${system}";
@ -80,7 +84,9 @@
{_module.args.inputs = inputs;}
{_module.args.self-overlay = self.overlay;}
({...}: {
imports = builtins.attrValues self.nixosModules ++ [
imports =
builtins.attrValues self.nixosModules
++ [
{
nix.nixPath = ["nixpkgs=${nixpkgs}"];
nixpkgs.overlays = [
@ -110,7 +116,9 @@
{_module.args.inputs = inputs;}
{_module.args.self-overlay = self.overlay;}
({...}: {
imports = builtins.attrValues self.nixosModules ++ [
imports =
builtins.attrValues self.nixosModules
++ [
{
nix.nixPath = ["nixpkgs=${nixpkgs}"];
nixpkgs.overlays = [
@ -131,7 +139,6 @@
sops.nixosModules.sops
];
};
in
{
overlay = import ./overlays;
@ -152,30 +159,30 @@
nixosConfigurations = {
vm1 = defSystem "x86_64-linux" {
imports = [
(import (./machines/vm1/configuration.nix) { inherit self; })
(import ./machines/vm1/configuration.nix {inherit self;})
];
};
vm2 = defSystem "x86_64-linux" {
imports = [
(import (./machines/vm2/configuration.nix) { inherit self; })
(import ./machines/vm2/configuration.nix {inherit self;})
];
};
loki = defSystem "x86_64-linux" {
imports = [
(import (./machines/loki/configuration.nix) { inherit self; })
(import ./machines/loki/configuration.nix {inherit self;})
];
};
drone = defSystem "x86_64-linux" {
imports = [
(import (./machines/drone/configuration.nix) { inherit self; })
(import ./machines/drone/configuration.nix {inherit self;})
];
};
proxy = defSystem "x86_64-linux" {
imports = [
(import (./machines/proxy/configuration.nix) { inherit self; })
(import ./machines/proxy/configuration.nix {inherit self;})
];
};
};
@ -183,20 +190,20 @@
nixosContainers = {
drone = defContainer "x86_64-linux" {
imports = [
(import (./machines/drone/configuration.nix) { inherit self; })
(import ./machines/drone/configuration.nix {inherit self;})
];
};
proxy = defContainer "x86_64-linux" {
imports = [
(import (./machines/proxy/configuration.nix) { inherit self; })
(import ./machines/proxy/configuration.nix {inherit self;})
];
};
};
} //
(flake-utils.lib.eachSystem [ "aarch64-linux" "x86_64-linux" ])
(system:
let
}
// (flake-utils.lib.eachSystem ["aarch64-linux" "x86_64-linux"])
(
system: let
pkgs = import nixpkgs {
inherit system;
overlays = [
@ -209,8 +216,7 @@
allowUnfree = true;
};
};
in
rec {
in rec {
packages = flake-utils.lib.flattenTree {
rofi-wayland = pkgs.rofi-wayland;
nix-plugins = pkgs.nix-plugins;
@ -223,7 +229,8 @@
backscrub = flake-utils.lib.mkApp {drv = packages.backscrub;};
};
devShell = with pkgs; mkShell {
devShell = with pkgs;
mkShell {
nativeBuildInputs = [sops ssh-to-pgp];
packages = [sops];
};

View file

@ -1,21 +1,25 @@
{ lib, pkgs, config, ... }:
with lib;
let
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.eboskma.programs.alacritty;
importYAML = name: yamlFile: (lib.importJSON ((pkgs.runCommandNoCC name {} ''
mkdir -p $out
${pkgs.yaml2json}/bin/yaml2json < ${yamlFile} | ${pkgs.jq}/bin/jq -a '.' > $out/tmp.json
'').outPath + "/tmp.json"));
'')
.outPath
+ "/tmp.json"));
theme = importYAML "theme" (builtins.fetchurl {
url = "https://raw.githubusercontent.com/dracula/alacritty/05faff15c0158712be87d200081633d9f4850a7d/dracula.yml";
sha256 = "1366rvvni2shbqlcrbypjv4f7p7ccdr6bvr685jnj8ipwqjjb6rn";
});
in
{
in {
options.eboskma.programs.alacritty.enable = mkEnableOption "Enable alacritty";
config = mkIf cfg.enable {
programs.alacritty = {
enable = true;
settings = {
@ -99,7 +103,6 @@ in
mouse = {
hide_when_typing = true;
};
};
};
};

View file

@ -1,8 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let cfg = config.eboskma.programs.bat;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.programs.bat;
in {
options.eboskma.programs.bat = {
enable = mkEnableOption "enable bat";
};

View file

@ -1,9 +1,12 @@
{ lib, pkgs, config, ... }:
with lib;
let
cfg = config.eboskma.programs.dropbox;
in
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.eboskma.programs.dropbox;
in {
options.eboskma.programs.dropbox = {enable = mkEnableOption "activate dropbox";};
config = mkIf cfg.enable {

View file

@ -1,9 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.eboskma.programs.dunst;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.programs.dunst;
in {
options.eboskma.programs.dunst = {
enable = mkEnableOption "activate dunst";
};

View file

@ -1,9 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.eboskma.programs.electron;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.programs.electron;
in {
options.eboskma.programs.electron = {
enable = mkEnableOption "activate electron settings";
wayland = mkEnableOption "set Wayland compatibility settings";

View file

@ -1,9 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.eboskma.programs.emacs;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.programs.emacs;
in {
options.eboskma.programs.emacs = {enable = mkEnableOption "activate emacs";};
# imports = [ inputs.nix-doom-emacs.hmModule ];

View file

@ -1,7 +1,10 @@
{ pkgs, config, lib, ... }:
with lib;
let
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.programs.firefox;
profileSettings = {
@ -19,9 +22,23 @@ let
};
nonDefaultDesktop = pkgs.makeDesktopItem {
name = "firefox-" + (if cfg.work then "private" else "horus");
desktopName = "Firefox (" + (if cfg.work then "Private" else "Horus") + ")";
exec = "firefox -P " + (if cfg.work then "private" else "horus") + " %u";
name =
"firefox-"
+ (if cfg.work
then "private"
else "horus");
desktopName =
"Firefox ("
+ (if cfg.work
then "Private"
else "Horus")
+ ")";
exec =
"firefox -P "
+ (if cfg.work
then "private"
else "horus")
+ " %u";
icon = "firefox";
categories = "GNOME;GTK;Network;WebBrowser";
mimeType = "text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;";
@ -30,8 +47,7 @@ let
"X-MultipleArgs" = "false";
};
};
in
{
in {
options.eboskma.programs.firefox = {
enable = mkEnableOption "enable firefox";
work = mkOption {

View file

@ -1,9 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let cfg = config.eboskma.programs.fish;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.programs.fish;
in {
options.eboskma.programs.fish = {
enable = mkEnableOption "Enable fish shell";
};
@ -11,7 +14,7 @@ in
config = mkIf (cfg.enable) {
programs.fish = {
enable = true;
functions = (import ./functions.nix { inherit (pkgs) git; });
functions = import ./functions.nix {inherit (pkgs) git;};
plugins = [
{

View file

@ -1,5 +1,4 @@
{ git }:
{
{git}: {
reload = {
body = ''
history --save

View file

@ -1,9 +1,12 @@
{ lib, pkgs, config, ... }:
with lib;
let
cfg = config.eboskma.programs.foot;
in
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.eboskma.programs.foot;
in {
options.eboskma.programs.foot = {
enable = mkEnableOption "activate foot";
server = mkEnableOption "enable foot server";

View file

@ -1,8 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let cfg = config.eboskma.programs.git;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.programs.git;
in {
options.eboskma.programs.git = {
enable = mkEnableOption "enable git";

View file

@ -1,8 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let cfg = config.eboskma.programs.gpg;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.programs.gpg;
in {
options.eboskma.programs.gpg = {
enable = mkEnableOption "enable gpg";
};

View file

@ -1,9 +1,12 @@
{ lib, pkgs, config, ... }:
with lib;
let
cfg = config.eboskma.programs.neovim;
in
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.eboskma.programs.neovim;
in {
options.eboskma.programs.neovim = {enable = mkEnableOption "activate neovim";};
config = mkIf cfg.enable {

View file

@ -1,9 +1,12 @@
{ lib, pkgs, config, ... }:
with lib;
let
cfg = config.eboskma.programs.obs-studio;
in
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.eboskma.programs.obs-studio;
in {
options.eboskma.programs.obs-studio = {enable = mkEnableOption "activate obs-studio";};
config = mkIf cfg.enable {

View file

@ -1,13 +1,15 @@
{ lib, pkgs, config, ... }:
with lib;
let
cfg = config.eboskma.programs.rofi;
in
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.eboskma.programs.rofi;
in {
options.eboskma.programs.rofi.enable = mkEnableOption "Enable rofi";
config = mkIf cfg.enable {
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;

View file

@ -1,9 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.eboskma.programs.solvespace;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.programs.solvespace;
in {
options.eboskma.programs.solvespace = {enable = mkEnableOption "activate solvespace";};
config = mkIf (cfg.enable) {

View file

@ -1,9 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.eboskma.programs.ssh;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.programs.ssh;
in {
options.eboskma.programs.ssh = {enable = mkEnableOption "activate ssh";};
config = mkIf (cfg.enable) {

View file

@ -1,13 +1,16 @@
{ lib, pkgs, config, ... }:
with lib;
let
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.eboskma.programs.sway;
mod = "Mod4";
swaylockcmd = "${pkgs.swaylock-effects}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --clock --image ~/.wallpapers/river-2560.png --fade-in 0.5 --scaling fill";
# swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --image ~/.wallpapers/river-2560.png --scaling fill";
rofiPower = pkgs.writeShellScriptBin "rofi-power" (builtins.readFile ./powermenu.sh);
in
{
in {
options.eboskma.programs.sway.enable = mkEnableOption "Enable sway";
config = mkIf cfg.enable {
@ -166,26 +169,16 @@ in
"${mod}+9" = "workspace number 9";
"${mod}+0" = "workspace number 10";
"${mod}+Shift+1" =
"move container to workspace number 1";
"${mod}+Shift+2" =
"move container to workspace number 2";
"${mod}+Shift+3" =
"move container to workspace number 3";
"${mod}+Shift+4" =
"move container to workspace number 4";
"${mod}+Shift+5" =
"move container to workspace number 5";
"${mod}+Shift+6" =
"move container to workspace number 6";
"${mod}+Shift+7" =
"move container to workspace number 7";
"${mod}+Shift+8" =
"move container to workspace number 8";
"${mod}+Shift+9" =
"move container to workspace number 9";
"${mod}+Shift+0" =
"move container to workspace number 10";
"${mod}+Shift+1" = "move container to workspace number 1";
"${mod}+Shift+2" = "move container to workspace number 2";
"${mod}+Shift+3" = "move container to workspace number 3";
"${mod}+Shift+4" = "move container to workspace number 4";
"${mod}+Shift+5" = "move container to workspace number 5";
"${mod}+Shift+6" = "move container to workspace number 6";
"${mod}+Shift+7" = "move container to workspace number 7";
"${mod}+Shift+8" = "move container to workspace number 8";
"${mod}+Shift+9" = "move container to workspace number 9";
"${mod}+Shift+0" = "move container to workspace number 10";
"${mod}+Shift+minus" = "move scratchpad";
"${mod}+minus" = "scratchpad show";
@ -222,7 +215,6 @@ in
hide_cursor = "when-typing enable";
};
};
};
extraConfig = ''
assign [app_id="firefox"] 1
@ -282,11 +274,20 @@ in
swayidle = {
enable = true;
events = [
{ event = "after-resume"; command = "${pkgs.sway}/bin/swaymsg 'output * dpms on'"; }
{
event = "after-resume";
command = "${pkgs.sway}/bin/swaymsg 'output * dpms on'";
}
];
timeouts = [
{ timeout = 900; command = swaylockcmd; }
{ timeout = 1200; command = "${pkgs.sway}/bin/swaymsg 'output * dpms off'"; }
{
timeout = 900;
command = swaylockcmd;
}
{
timeout = 1200;
command = "${pkgs.sway}/bin/swaymsg 'output * dpms off'";
}
];
};
};

View file

@ -1,8 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let cfg = config.eboskma.programs.tmux;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.programs.tmux;
in {
options.eboskma.programs.tmux = {
enable = mkEnableOption "enable tmux";
};

View file

@ -1,17 +1,20 @@
{ lib, pkgs, config, flake-inputs, ... }:
with lib;
let cfg = config.eboskma.programs.vscode;
in
{
lib,
pkgs,
config,
flake-inputs,
...
}:
with lib; let
cfg = config.eboskma.programs.vscode;
in {
options.eboskma.programs.vscode.enable = mkEnableOption "enable vscode";
config = mkIf cfg.enable {
programs.vscode = {
enable = true;
package = pkgs.vscode;
extensions =
(with pkgs.vscode-extensions; [
extensions = with pkgs.vscode-extensions; [
arrterian.nix-env-selector
bbenoist.nix
# brettm12345.nixfmt-vscode
@ -56,7 +59,7 @@ in
wholroyd.jinja
xaver.clang-format
zxh404.vscode-proto3
]);
];
keybindings = [
{
@ -73,7 +76,7 @@ in
}
];
userSettings = (builtins.fromJSON (builtins.readFile ./settings.json));
userSettings = builtins.fromJSON (builtins.readFile ./settings.json);
};
home.packages = with pkgs; [

View file

@ -1,9 +1,12 @@
{ lib, pkgs, config, ... }:
with lib;
let
cfg = config.eboskma.programs.waybar;
in
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.eboskma.programs.waybar;
in {
options.eboskma.programs.waybar.enable = mkEnableOption "Enable waybar";
config = mkIf cfg.enable {
@ -169,13 +172,10 @@ in
};
};
};
}
];
style =
''
style = ''
@keyframes blink-warning {
70% {
color: white;

View file

@ -1,16 +1,19 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.eboskma.programs.zathura;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.programs.zathura;
in {
options.eboskma.programs.zathura = {enable = mkEnableOption "activate zathura";};
config = mkIf (cfg.enable) {
programs.zathura = {
enable = true;
extraConfig = (builtins.readFile ./theme);
extraConfig = builtins.readFile ./theme;
};
};
}

View file

@ -6,9 +6,11 @@ let
lib = import "${krops}/lib";
pkgs = import "${krops}/pkgs" {};
source = name:
lib.evalSource [{
lib.evalSource [
{
machine-config.file = toString ./.;
}];
}
];
command = targetPath: ''
nix-shell -p git --run '
@ -23,9 +25,7 @@ let
source = source name;
target = target;
};
in
rec {
in rec {
# Deployments
# Run with:

View file

@ -1,5 +1,4 @@
{ self, ... }:
{
{self, ...}: {
imports = [
./hardware-configuration.nix
../../users/root
@ -24,10 +23,12 @@
interfaces = {
eth0 = {
ipv4.addresses = [{
ipv4.addresses = [
{
address = "10.0.0.202";
prefixLength = 24;
}];
}
];
};
};

View file

@ -1,5 +1,10 @@
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/virtualisation/lxc-container.nix")
];

View file

@ -1,5 +1,4 @@
{ self, ... }:
{
{self, ...}: {
imports = [./hardware-configuration.nix ../../users/erwin ../../users/root];
eboskma = {

View file

@ -1,11 +1,14 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
@ -14,26 +17,22 @@
boot.kernelModules = ["kvm-amd" "apple-mfi-fastcharge"];
boot.extraModulePackages = [];
fileSystems."/" =
{
fileSystems."/" = {
device = "/dev/disk/by-uuid/42065c7e-d0aa-4de8-a913-014cf59d48ac";
fsType = "ext4";
};
fileSystems."/boot" =
{
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/4064-A1BE";
fsType = "vfat";
};
fileSystems."/home" =
{
fileSystems."/home" = {
device = "/dev/disk/by-uuid/36d7ee19-f591-4c29-b7da-cafd9bf2c7f6";
fsType = "ext4";
};
swapDevices =
[{ device = "/dev/disk/by-uuid/d93788f7-1b94-4687-8313-055d17f42b7e"; }];
swapDevices = [{device = "/dev/disk/by-uuid/d93788f7-1b94-4687-8313-055d17f42b7e";}];
# high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true;

View file

@ -1,5 +1,4 @@
{ self, ... }:
{
{self, ...}: {
imports = [
./hardware-configuration.nix
../../users/root
@ -24,10 +23,12 @@
interfaces = {
eth0 = {
ipv4.addresses = [{
ipv4.addresses = [
{
address = "10.0.0.251";
prefixLength = 24;
}];
}
];
};
};

View file

@ -1,5 +1,10 @@
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/virtualisation/lxc-container.nix")
];

View file

@ -1,5 +1,4 @@
{ self, ... }:
{
{self, ...}: {
imports = [./hardware-configuration.nix];
eboskma = {

View file

@ -1,11 +1,14 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
@ -14,19 +17,15 @@
boot.kernelModules = [];
boot.extraModulePackages = [];
fileSystems."/" =
{
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
};
fileSystems."/boot" =
{
fileSystems."/boot" = {
device = "/dev/disk/by-label/boot";
fsType = "vfat";
};
swapDevices =
[{ device = "/dev/disk/by-label/swap"; }];
swapDevices = [{device = "/dev/disk/by-label/swap";}];
}

View file

@ -1,5 +1,4 @@
{ self, ... }:
{
{self, ...}: {
imports = [./hardware-configuration.nix];
eboskma = {

View file

@ -1,11 +1,14 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
@ -14,19 +17,15 @@
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];
fileSystems."/" =
{
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
};
fileSystems."/boot" =
{
fileSystems."/boot" = {
device = "/dev/disk/by-label/boot";
fsType = "vfat";
};
swapDevices =
[{ device = "/dev/disk/by-label/swap"; }];
swapDevices = [{device = "/dev/disk/by-label/swap";}];
}

View file

@ -1,9 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.eboskma.backscrub;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.backscrub;
in {
options.eboskma.backscrub = {
enable = mkEnableOption "enable v4l2loopback kernel module";
};

View file

@ -1,11 +1,13 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.eboskma.base;
qmkUdevRules = (builtins.readFile ./qmk.rules);
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.base;
qmkUdevRules = builtins.readFile ./qmk.rules;
in {
options.eboskma.base = {
kernel = mkOption {
description = "which kernel to run";

View file

@ -1,9 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.eboskma.bluetooth;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.bluetooth;
in {
options.eboskma.bluetooth = {
enable = mkEnableOption "activate bluetooth";
};

View file

@ -1,10 +1,15 @@
{ lib, pkgs, config, inputs, self-overlay, ... }:
with lib;
let
{
lib,
pkgs,
config,
inputs,
self-overlay,
...
}:
with lib; let
cfg = config.eboskma.desktop;
bt = config.eboskma.bluetooth;
in
{
in {
# imports = [ ../../users/erwin.nix ../../users/root.nix ];
options.eboskma.desktop = {
@ -79,7 +84,8 @@ in
};
};
home.packages = with pkgs; [
home.packages = with pkgs;
[
bandwhich
bitwarden
bottom
@ -109,8 +115,8 @@ in
xdg-utils
wireshark
wl-clipboard
] ++
(with gst_all_1; [ gstreamer gstreamer.dev gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-vaapi ]);
]
++ (with gst_all_1; [gstreamer gstreamer.dev gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-vaapi]);
xdg = {
enable = true;
@ -278,6 +284,5 @@ in
environment.etc = {
"X11/xkb".source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
};
};
}

View file

@ -1,14 +1,15 @@
{ lib, pkgs, config, ... }:
with lib;
let
cfg = config.eboskma.docker;
in
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.eboskma.docker;
in {
options.eboskma.docker = {enable = mkEnableOption "activate docker";};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [docker-compose];
virtualisation.docker = {
@ -19,8 +20,6 @@ in
};
};
users.extraUsers.${config.eboskma.var.mainUser}.extraGroups =
[ "docker" ];
users.extraUsers.${config.eboskma.var.mainUser}.extraGroups = ["docker"];
};
}

View file

@ -1,9 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.eboskma.drone;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.drone;
in {
options.eboskma.drone = {
enable = mkEnableOption "activate drone CI";
};

View file

@ -1,15 +1,16 @@
{ lib, pkgs, config, ... }:
with lib;
let
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.eboskma.element-web;
matrixClientConfig = pkgs.writeText "element-web.json" (builtins.readFile ./element-web.json);
in
{
in {
options.eboskma.element-web = {enable = mkEnableOption "activate element-web";};
config = mkIf cfg.enable {
eboskma.docker.enable = true;
virtualisation.oci-containers.containers = {

View file

@ -1,15 +1,16 @@
{ lib, pkgs, config, ... }:
with lib;
let cfg = config.eboskma.fonts;
in
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.eboskma.fonts;
in {
options.eboskma.fonts = {enable = mkEnableOption "activate fonts";};
config = mkIf cfg.enable {
fonts = {
fontDir.enable = true;
fonts = with pkgs; [

View file

@ -1,8 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let cfg = config.eboskma.gnome;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.gnome;
in {
options.eboskma.gnome.enable = mkEnableOption "activate gnome support settings";
config = mkIf (cfg.enable) {

View file

@ -1,9 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.eboskma.greetd;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.greetd;
in {
options.eboskma.greetd = {
enable = mkEnableOption "enable greetd";
};

View file

@ -1,9 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.eboskma.livebook;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.livebook;
in {
options.eboskma.livebook = {
enable = mkEnableOption "Start a livebook container";
dataDir = mkOption {

View file

@ -1,8 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let cfg = config.eboskma.networking;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.networking;
in {
options.eboskma.networking = {
enable = mkEnableOption "activate networing settings";

View file

@ -1,9 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.eboskma.nginx-proxy-manager;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.nginx-proxy-manager;
in {
options.eboskma.nginx-proxy-manager = {enable = mkEnableOption "Nginx Proxy Manager";};
config = mkIf (cfg.enable) {

View file

@ -1,8 +1,12 @@
{ lib, pkgs, config, ... }:
with lib;
let cfg = config.eboskma.nix-common;
in
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.eboskma.nix-common;
in {
options.eboskma.nix-common = {
enable = mkEnableOption "activate nix-common";
disable-cache = mkEnableOption "no not use binary cache";
@ -29,7 +33,6 @@ in
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};
gc = {
@ -37,7 +40,6 @@ in
dates = "weekly";
options = "--delete-older-than=30d";
};
};
};
}

View file

@ -1,9 +1,12 @@
{ lib, pkgs, config, ... }:
with lib;
let cfg = config.eboskma.var;
in
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.eboskma.var;
in {
options.eboskma.var.mainUser = lib.mkOption {
type = lib.types.str;
default = "erwin";
@ -19,5 +22,4 @@ in
System type
'';
};
}

View file

@ -1,8 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let cfg = config.eboskma.sound;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.sound;
in {
options.eboskma.sound.enable = mkEnableOption "activate sound settings";
config = mkIf (cfg.enable) {

View file

@ -1,9 +1,12 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.eboskma.systemd;
in
{
pkgs,
config,
lib,
...
}:
with lib; let
cfg = config.eboskma.systemd;
in {
options.eboskma.systemd = {
enable = mkEnableOption "activate systemd settings";
};

View file

@ -1,4 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, opencv, gcc, curl, git, tensorflow-lite, flatbuffers }:
{
stdenv,
fetchFromGitHub,
cmake,
opencv,
gcc,
curl,
git,
tensorflow-lite,
flatbuffers,
}:
stdenv.mkDerivation {
name = "backscrub";
pname = "backscrub";

View file

@ -1,6 +1,5 @@
{pkgs, ...}:
with pkgs;
let
with pkgs; let
nvim-customized = wrapNeovim neovim-unwrapped {};
in
stdenv.mkDerivation rec {

View file

@ -1,5 +1,13 @@
{ lib, stdenv, fetchFromGitHub, nixUnstable, cmake, pkg-config, boost, nlohmann_json }:
{
lib,
stdenv,
fetchFromGitHub,
nixUnstable,
cmake,
pkg-config,
boost,
nlohmann_json,
}:
stdenv.mkDerivation rec {
pname = "nix-plugins";
version = "d0df32b31f3054180741adf5865fd56d6731c572";

View file

@ -1,4 +1,12 @@
{ fetchFromGitHub, stdenv, cmake, obs-studio, opencv, onnx-runtime, git }:
{
fetchFromGitHub,
stdenv,
cmake,
obs-studio,
opencv,
onnx-runtime,
git,
}:
stdenv.mkDerivation rec {
pname = "obs-backgroundremoval";
version = "0.4.0";

View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
users.users.erwin = {
isNormalUser = true;
home = "/home/erwin";

View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
users.users.root = {
openssh.authorizedKeys.keyFiles = [
(pkgs.fetchurl {