Unify indentation
This commit is contained in:
parent
0b936b1f6e
commit
6b7909f0b7
|
@ -70,10 +70,10 @@
|
|||
];
|
||||
};
|
||||
|
||||
Pihole = nixpkgs.lib.nixosSystem {
|
||||
Pihole = nixpkgs.lib.nixosSystem {
|
||||
system = "aarch64-linux";
|
||||
modules = defaultModules.base ++ [
|
||||
nixos-hardware.nixosModules.raspberry-pi-4
|
||||
nixos-hardware.nixosModules.raspberry-pi-4
|
||||
./hosts/Pihole
|
||||
];
|
||||
};
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
apps = {
|
||||
development.enable = true;
|
||||
hugo.enable = true;
|
||||
media.enable = true;
|
||||
office.enable = true;
|
||||
media.enable = true;
|
||||
office.enable = true;
|
||||
pandoc.enable = true;
|
||||
};
|
||||
ui = {
|
||||
|
@ -40,7 +40,7 @@
|
|||
|
||||
# Configure the virtual machine created by nixos-rebuild build-vm
|
||||
virtualisation.vmVariant.virtualisation = {
|
||||
memorySize = 2048;
|
||||
memorySize = 2048;
|
||||
cores = 2;
|
||||
};
|
||||
}
|
|
@ -12,9 +12,9 @@
|
|||
generic-extlinux-compatible.enable = true;
|
||||
};
|
||||
|
||||
#boot.kernelParams = [
|
||||
# "console=serial0,115200n8"
|
||||
#];
|
||||
#boot.kernelParams = [
|
||||
# "console=serial0,115200n8"
|
||||
#];
|
||||
|
||||
fileSystems ."/" = {
|
||||
device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
|
||||
|
|
|
@ -24,11 +24,11 @@ in
|
|||
role = "workstation";
|
||||
apps = {
|
||||
development.enable = true;
|
||||
dj.enable = true;
|
||||
dj.enable = true;
|
||||
gaming.enable = true;
|
||||
hugo.enable = true;
|
||||
media.enable = true;
|
||||
office.enable = true;
|
||||
media.enable = true;
|
||||
office.enable = true;
|
||||
pandoc.enable = true;
|
||||
recording.enable = true;
|
||||
};
|
||||
|
@ -85,7 +85,7 @@ in
|
|||
|
||||
# Configure the virtual machine created by nixos-rebuild build-vm
|
||||
virtualisation.vmVariant.virtualisation = {
|
||||
memorySize = 4096;
|
||||
memorySize = 4096;
|
||||
cores = 4;
|
||||
};
|
||||
|
||||
|
@ -98,7 +98,7 @@ in
|
|||
title NixOS
|
||||
linux /live/vmlinuz-linux
|
||||
initrd /live/initramfs-linux.img
|
||||
options img_dev=/dev/nvme0n1p3 img_loop=nixos-gnome-23.11.3019.8bf65f17d807-x86_64-linux.isosudo copytoram
|
||||
options img_dev=/dev/nvme0n1p3 img_loop=nixos-gnome-23.11.3019.8bf65f17d807-x86_64-linux.isosudo copytoram
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
{ lib, ... }:
|
||||
let
|
||||
# Fetch secrets
|
||||
# IMPORTANT: Make sure this repo exists on the filesystem first!
|
||||
nix-secrets = builtins.fetchGit {
|
||||
url = "/home/aires/Development/nix-configuration/nix-secrets";
|
||||
ref = "main";
|
||||
rev = "55fc814d477d956ab885e157f24c2d43f433dc7a";
|
||||
};
|
||||
# Fetch secrets
|
||||
# IMPORTANT: Make sure this repo exists on the filesystem first!
|
||||
nix-secrets = builtins.fetchGit {
|
||||
url = "/home/aires/Development/nix-configuration/nix-secrets";
|
||||
ref = "main";
|
||||
rev = "55fc814d477d956ab885e157f24c2d43f433dc7a";
|
||||
};
|
||||
in{
|
||||
imports = [
|
||||
../../modules
|
||||
"${nix-secrets}/default.nix"
|
||||
];
|
||||
imports = [
|
||||
../../modules
|
||||
"${nix-secrets}/default.nix"
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{ ... }: {
|
||||
imports = [
|
||||
./Dimaga
|
||||
./Haven
|
||||
./Pihole
|
||||
./Shura
|
||||
];
|
||||
imports = [
|
||||
./Dimaga
|
||||
./Haven
|
||||
./Pihole
|
||||
./Shura
|
||||
];
|
||||
}
|
|
@ -1,11 +1,11 @@
|
|||
{ ... }: {
|
||||
imports = [
|
||||
./development.nix
|
||||
./dj.nix
|
||||
./dj.nix
|
||||
./gaming.nix
|
||||
./hugo.nix
|
||||
./media.nix
|
||||
./office.nix
|
||||
./media.nix
|
||||
./office.nix
|
||||
./pandoc.nix
|
||||
./recording.nix
|
||||
];
|
||||
|
|
|
@ -1,20 +1,20 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.host.apps.development;
|
||||
cfg = config.host.apps.development;
|
||||
in
|
||||
with lib;
|
||||
{
|
||||
options = {
|
||||
host.apps.development.enable = mkEnableOption (mdDoc "Enables development tools");
|
||||
};
|
||||
options = {
|
||||
host.apps.development.enable = mkEnableOption (mdDoc "Enables development tools");
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
host.ui.flatpak.enable = true;
|
||||
config = mkIf cfg.enable {
|
||||
host.ui.flatpak.enable = true;
|
||||
|
||||
services.flatpak.packages = [
|
||||
"com.vscodium.codium"
|
||||
services.flatpak.packages = [
|
||||
"com.vscodium.codium"
|
||||
"dev.k8slens.OpenLens"
|
||||
];
|
||||
};
|
||||
];
|
||||
};
|
||||
}
|
|
@ -1,19 +1,19 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.host.apps.dj;
|
||||
cfg = config.host.apps.dj;
|
||||
in
|
||||
with lib;
|
||||
{
|
||||
options = {
|
||||
host.apps.dj.enable = mkEnableOption (mdDoc "Enables DJing tools (i.e. Mixxx)");
|
||||
};
|
||||
options = {
|
||||
host.apps.dj.enable = mkEnableOption (mdDoc "Enables DJing tools (i.e. Mixxx)");
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
host.ui.flatpak.enable = true;
|
||||
config = mkIf cfg.enable {
|
||||
host.ui.flatpak.enable = true;
|
||||
|
||||
services.flatpak.packages = [
|
||||
"org.mixxx.Mixxx"
|
||||
];
|
||||
};
|
||||
services.flatpak.packages = [
|
||||
"org.mixxx.Mixxx"
|
||||
];
|
||||
};
|
||||
}
|
|
@ -1,28 +1,28 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.host.apps.media;
|
||||
cfg = config.host.apps.media;
|
||||
in
|
||||
with lib;
|
||||
{
|
||||
options = {
|
||||
host.apps.media.enable = mkEnableOption (mdDoc "Enables media playback and editing apps");
|
||||
};
|
||||
options = {
|
||||
host.apps.media.enable = mkEnableOption (mdDoc "Enables media playback and editing apps");
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
host.ui.flatpak.enable = true;
|
||||
config = mkIf cfg.enable {
|
||||
host.ui.flatpak.enable = true;
|
||||
|
||||
services.flatpak = {
|
||||
packages = [
|
||||
"com.calibre_ebook.calibre"
|
||||
"com.github.unrud.VideoDownloader"
|
||||
"io.github.celluloid_player.Celluloid"
|
||||
"org.kde.krita"
|
||||
"org.kde.KStyle.Adwaita//5.15-23.08" # Retrieved from https://docs.flatpak.org/en/latest/desktop-integration.html
|
||||
"org.kde.KStyle.Adwaita//6.5"
|
||||
"org.kde.WaylandDecoration.QAdwaitaDecorations//5.15-23.08" # Replaced deprecated QGnomePlatform https://wiki.archlinux.org/title/Uniform_look_for_Qt_and_GTK_applications
|
||||
"org.kde.WaylandDecoration.QAdwaitaDecorations//6.5"
|
||||
];
|
||||
};
|
||||
};
|
||||
services.flatpak = {
|
||||
packages = [
|
||||
"com.calibre_ebook.calibre"
|
||||
"com.github.unrud.VideoDownloader"
|
||||
"io.github.celluloid_player.Celluloid"
|
||||
"org.kde.krita"
|
||||
"org.kde.KStyle.Adwaita//5.15-23.08" # Retrieved from https://docs.flatpak.org/en/latest/desktop-integration.html
|
||||
"org.kde.KStyle.Adwaita//6.5"
|
||||
"org.kde.WaylandDecoration.QAdwaitaDecorations//5.15-23.08" # Replaced deprecated QGnomePlatform https://wiki.archlinux.org/title/Uniform_look_for_Qt_and_GTK_applications
|
||||
"org.kde.WaylandDecoration.QAdwaitaDecorations//6.5"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,20 +1,20 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.host.apps.office;
|
||||
cfg = config.host.apps.office;
|
||||
in
|
||||
with lib;
|
||||
{
|
||||
options = {
|
||||
host.apps.office.enable = mkEnableOption (mdDoc "Enables office and workstation apps");
|
||||
};
|
||||
options = {
|
||||
host.apps.office.enable = mkEnableOption (mdDoc "Enables office and workstation apps");
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
host.ui.flatpak.enable = true;
|
||||
config = mkIf cfg.enable {
|
||||
host.ui.flatpak.enable = true;
|
||||
|
||||
services.flatpak.packages = [
|
||||
"org.libreoffice.LibreOffice"
|
||||
"us.zoom.Zoom"
|
||||
];
|
||||
};
|
||||
services.flatpak.packages = [
|
||||
"org.libreoffice.LibreOffice"
|
||||
"us.zoom.Zoom"
|
||||
];
|
||||
};
|
||||
}
|
|
@ -16,7 +16,7 @@ with lib;
|
|||
packages = [
|
||||
"com.obsproject.Studio"
|
||||
"com.obsproject.Studio.Plugin.DroidCam"
|
||||
"org.kde.kdenlive"
|
||||
"org.kde.kdenlive"
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{ ... }: {
|
||||
imports = [
|
||||
./apps
|
||||
./base
|
||||
./roles
|
||||
./services
|
||||
./ui
|
||||
./users
|
||||
];
|
||||
imports = [
|
||||
./apps
|
||||
./base
|
||||
./roles
|
||||
./services
|
||||
./ui
|
||||
./users
|
||||
];
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
{ ... }: {
|
||||
imports = [
|
||||
./apcupsd.nix
|
||||
./duplicacy-web.nix
|
||||
./duplicacy-web.nix
|
||||
./k3s.nix
|
||||
./msmtp.nix
|
||||
];
|
||||
|
|
|
@ -32,9 +32,9 @@ with lib;
|
|||
# Install Flatpaks. For details, see https://github.com/gmodena/nix-flatpak
|
||||
packages = [
|
||||
"com.github.tchx84.Flatseal"
|
||||
"md.obsidian.Obsidian"
|
||||
"org.keepassxc.KeePassXC"
|
||||
"org.mozilla.firefox"
|
||||
"md.obsidian.Obsidian"
|
||||
"org.keepassxc.KeePassXC"
|
||||
"org.mozilla.firefox"
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -50,7 +50,7 @@ with lib;
|
|||
aggregatedIcons = pkgs.buildEnv {
|
||||
name = "system-icons";
|
||||
paths = with pkgs; [
|
||||
#libsForQt5.breeze-qt5 # for plasma
|
||||
#libsForQt5.breeze-qt5 # for plasma
|
||||
gnome.gnome-themes-extra
|
||||
];
|
||||
pathsToLink = [ "/share/icons" ];
|
||||
|
|
|
@ -73,7 +73,7 @@ with lib;
|
|||
|
||||
# Install Flatpaks
|
||||
services.flatpak.packages = [
|
||||
"com.mattjakeman.ExtensionManager"
|
||||
"com.mattjakeman.ExtensionManager"
|
||||
"org.bluesabre.MenuLibre"
|
||||
"org.gnome.baobab"
|
||||
"org.gnome.Calculator"
|
||||
|
|
|
@ -65,13 +65,13 @@ with lib;
|
|||
# Set up git
|
||||
programs.git = {
|
||||
enable = true;
|
||||
# Username and email set in nix-secrets
|
||||
# Username and email set in nix-secrets
|
||||
extraConfig = {
|
||||
push.autoSetupRemote = "true";
|
||||
};
|
||||
};
|
||||
|
||||
# SSH set up in nix-secrets
|
||||
# SSH set up in nix-secrets
|
||||
|
||||
# Set up Zsh
|
||||
programs.zsh = {
|
||||
|
@ -85,9 +85,9 @@ with lib;
|
|||
};
|
||||
enableAutosuggestions = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
history.ignoreDups = true; # Do not enter command lines into the history list if they are duplicates of the previous event.
|
||||
history.ignoreDups = true; # Do not enter command lines into the history list if they are duplicates of the previous event.
|
||||
prezto = {
|
||||
git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked.
|
||||
git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked.
|
||||
};
|
||||
shellAliases = {
|
||||
dry-build = "cd ~/Development/nix-configuration && nix flake update && nixos-rebuild dry-build --flake .";
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ ... }: {
|
||||
imports = [
|
||||
./aires
|
||||
./gremlin
|
||||
./media
|
||||
];
|
||||
imports = [
|
||||
./aires
|
||||
./gremlin
|
||||
./media
|
||||
];
|
||||
}
|
|
@ -58,7 +58,7 @@ with lib;
|
|||
|
||||
# Set up git
|
||||
programs.git = {
|
||||
# Name and email set in nix-secrets
|
||||
# Name and email set in nix-secrets
|
||||
enable = true;
|
||||
extraConfig = {
|
||||
push.autoSetupRemote = "true";
|
||||
|
@ -77,9 +77,9 @@ with lib;
|
|||
];
|
||||
enableAutosuggestions = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
history.ignoreDups = true; # Do not enter command lines into the history list if they are duplicates of the previous event.
|
||||
history.ignoreDups = true; # Do not enter command lines into the history list if they are duplicates of the previous event.
|
||||
prezto = {
|
||||
git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked.
|
||||
git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked.
|
||||
};
|
||||
shellAliases = {
|
||||
please = "sudo";
|
||||
|
|
Loading…
Reference in a new issue