aires/nix-configuration
aires/nix-configuration
1
0
Fork 0
Code Actions Activity

Unify indentation

Browse source
This commit is contained in:
Andre Newman 2024-03-04 10:57:41 -05:00
parent 0b936b1f6e
commit 6b7909f0b7
19 changed files with 110 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

@ -70,10 +70,10 @@
]; ];
}; };
Pihole = nixpkgs.lib.nixosSystem { Pihole = nixpkgs.lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
modules = defaultModules.base ++ [ modules = defaultModules.base ++ [
nixos-hardware.nixosModules.raspberry-pi-4 nixos-hardware.nixosModules.raspberry-pi-4
./hosts/Pihole ./hosts/Pihole
]; ];
}; };

6
hosts/Dimaga/default.nix
View file

@ -15,8 +15,8 @@
apps = { apps = {
development.enable = true; development.enable = true;
hugo.enable = true; hugo.enable = true;
media.enable = true; media.enable = true;
office.enable = true; office.enable = true;
pandoc.enable = true; pandoc.enable = true;
}; };
ui = { ui = {
@ -40,7 +40,7 @@
# Configure the virtual machine created by nixos-rebuild build-vm # Configure the virtual machine created by nixos-rebuild build-vm
virtualisation.vmVariant.virtualisation = { virtualisation.vmVariant.virtualisation = {
memorySize = 2048; memorySize = 2048;
cores = 2; cores = 2;
}; };
} }

6
hosts/Pihole/hardware-configuration.nix
View file

@ -12,9 +12,9 @@
generic-extlinux-compatible.enable = true; generic-extlinux-compatible.enable = true;
}; };
#boot.kernelParams = [ #boot.kernelParams = [
# "console=serial0,115200n8" # "console=serial0,115200n8"
#]; #];
fileSystems ."/" = { fileSystems ."/" = {
device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";

10
hosts/Shura/default.nix
View file

@ -24,11 +24,11 @@ in
role = "workstation"; role = "workstation";
apps = { apps = {
development.enable = true; development.enable = true;
dj.enable = true; dj.enable = true;
gaming.enable = true; gaming.enable = true;
hugo.enable = true; hugo.enable = true;
media.enable = true; media.enable = true;
office.enable = true; office.enable = true;
pandoc.enable = true; pandoc.enable = true;
recording.enable = true; recording.enable = true;
}; };
@ -85,7 +85,7 @@ in
# Configure the virtual machine created by nixos-rebuild build-vm # Configure the virtual machine created by nixos-rebuild build-vm
virtualisation.vmVariant.virtualisation = { virtualisation.vmVariant.virtualisation = {
memorySize = 4096; memorySize = 4096;
cores = 4; cores = 4;
}; };
@ -98,7 +98,7 @@ in
title NixOS title NixOS
linux /live/vmlinuz-linux linux /live/vmlinuz-linux
initrd /live/initramfs-linux.img 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
''; '';
}; };
} }

22
hosts/common/default.nix
View file

@ -1,15 +1,15 @@
{ lib, ... }: { lib, ... }:
let let
# Fetch secrets # Fetch secrets
# IMPORTANT: Make sure this repo exists on the filesystem first! # IMPORTANT: Make sure this repo exists on the filesystem first!
nix-secrets = builtins.fetchGit { nix-secrets = builtins.fetchGit {
url = "/home/aires/Development/nix-configuration/nix-secrets"; url = "/home/aires/Development/nix-configuration/nix-secrets";
ref = "main"; ref = "main";
rev = "55fc814d477d956ab885e157f24c2d43f433dc7a"; rev = "55fc814d477d956ab885e157f24c2d43f433dc7a";
}; };
in{ in{
imports = [ imports = [
../../modules ../../modules
"${nix-secrets}/default.nix" "${nix-secrets}/default.nix"
]; ];
} }

12
hosts/default.nix
View file

@ -1,8 +1,8 @@
{ ... }: { { ... }: {
imports = [ imports = [
./Dimaga ./Dimaga
./Haven ./Haven
./Pihole ./Pihole
./Shura ./Shura
]; ];
} }

6
modules/apps/default.nix
View file

@ -1,11 +1,11 @@
{ ... }: { { ... }: {
imports = [ imports = [
./development.nix ./development.nix
./dj.nix ./dj.nix
./gaming.nix ./gaming.nix
./hugo.nix ./hugo.nix
./media.nix ./media.nix
./office.nix ./office.nix
./pandoc.nix ./pandoc.nix
./recording.nix ./recording.nix
]; ];

20
modules/apps/development.nix
View file

@ -1,20 +1,20 @@
{ config, lib, ... }: { config, lib, ... }:
let let
cfg = config.host.apps.development; cfg = config.host.apps.development;
in in
with lib; with lib;
{ {
options = { options = {
host.apps.development.enable = mkEnableOption (mdDoc "Enables development tools"); host.apps.development.enable = mkEnableOption (mdDoc "Enables development tools");
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
host.ui.flatpak.enable = true; host.ui.flatpak.enable = true;
services.flatpak.packages = [ services.flatpak.packages = [
"com.vscodium.codium" "com.vscodium.codium"
"dev.k8slens.OpenLens" "dev.k8slens.OpenLens"
]; ];
}; };
} }

20
modules/apps/dj.nix
View file

@ -1,19 +1,19 @@
{ config, lib, ... }: { config, lib, ... }:
let let
cfg = config.host.apps.dj; cfg = config.host.apps.dj;
in in
with lib; with lib;
{ {
options = { options = {
host.apps.dj.enable = mkEnableOption (mdDoc "Enables DJing tools (i.e. Mixxx)"); host.apps.dj.enable = mkEnableOption (mdDoc "Enables DJing tools (i.e. Mixxx)");
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
host.ui.flatpak.enable = true; host.ui.flatpak.enable = true;
services.flatpak.packages = [ services.flatpak.packages = [
"org.mixxx.Mixxx" "org.mixxx.Mixxx"
]; ];
}; };
} }

38
modules/apps/media.nix
View file

@ -1,28 +1,28 @@
{ config, lib, ... }: { config, lib, ... }:
let let
cfg = config.host.apps.media; cfg = config.host.apps.media;
in in
with lib; with lib;
{ {
options = { options = {
host.apps.media.enable = mkEnableOption (mdDoc "Enables media playback and editing apps"); host.apps.media.enable = mkEnableOption (mdDoc "Enables media playback and editing apps");
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
host.ui.flatpak.enable = true; host.ui.flatpak.enable = true;
services.flatpak = { services.flatpak = {
packages = [ packages = [
"com.calibre_ebook.calibre" "com.calibre_ebook.calibre"
"com.github.unrud.VideoDownloader" "com.github.unrud.VideoDownloader"
"io.github.celluloid_player.Celluloid" "io.github.celluloid_player.Celluloid"
"org.kde.krita" "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//5.15-23.08" # Retrieved from https://docs.flatpak.org/en/latest/desktop-integration.html
"org.kde.KStyle.Adwaita//6.5" "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//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" "org.kde.WaylandDecoration.QAdwaitaDecorations//6.5"
]; ];
}; };
}; };
} }

22
modules/apps/office.nix
View file

@ -1,20 +1,20 @@
{ config, lib, ... }: { config, lib, ... }:
let let
cfg = config.host.apps.office; cfg = config.host.apps.office;
in in
with lib; with lib;
{ {
options = { options = {
host.apps.office.enable = mkEnableOption (mdDoc "Enables office and workstation apps"); host.apps.office.enable = mkEnableOption (mdDoc "Enables office and workstation apps");
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
host.ui.flatpak.enable = true; host.ui.flatpak.enable = true;
services.flatpak.packages = [ services.flatpak.packages = [
"org.libreoffice.LibreOffice" "org.libreoffice.LibreOffice"
"us.zoom.Zoom" "us.zoom.Zoom"
]; ];
}; };
} }

2
modules/apps/recording.nix
View file

@ -16,7 +16,7 @@ with lib;
packages = [ packages = [
"com.obsproject.Studio" "com.obsproject.Studio"
"com.obsproject.Studio.Plugin.DroidCam" "com.obsproject.Studio.Plugin.DroidCam"
"org.kde.kdenlive" "org.kde.kdenlive"
]; ];
}; };

16
modules/default.nix
View file

@ -1,10 +1,10 @@
{ ... }: { { ... }: {
imports = [ imports = [
./apps ./apps
./base ./base
./roles ./roles
./services ./services
./ui ./ui
./users ./users
]; ];
} }

2
modules/services/default.nix
View file

@ -1,7 +1,7 @@
{ ... }: { { ... }: {
imports = [ imports = [
./apcupsd.nix ./apcupsd.nix
./duplicacy-web.nix ./duplicacy-web.nix
./k3s.nix ./k3s.nix
./msmtp.nix ./msmtp.nix
]; ];

8
modules/ui/flatpak.nix
View file

@ -32,9 +32,9 @@ with lib;
# Install Flatpaks. For details, see https://github.com/gmodena/nix-flatpak # Install Flatpaks. For details, see https://github.com/gmodena/nix-flatpak
packages = [ packages = [
"com.github.tchx84.Flatseal" "com.github.tchx84.Flatseal"
"md.obsidian.Obsidian" "md.obsidian.Obsidian"
"org.keepassxc.KeePassXC" "org.keepassxc.KeePassXC"
"org.mozilla.firefox" "org.mozilla.firefox"
]; ];
}; };
@ -50,7 +50,7 @@ with lib;
aggregatedIcons = pkgs.buildEnv { aggregatedIcons = pkgs.buildEnv {
name = "system-icons"; name = "system-icons";
paths = with pkgs; [ paths = with pkgs; [
#libsForQt5.breeze-qt5 # for plasma #libsForQt5.breeze-qt5 # for plasma
gnome.gnome-themes-extra gnome.gnome-themes-extra
]; ];
pathsToLink = [ "/share/icons" ]; pathsToLink = [ "/share/icons" ];

2
modules/ui/gnome.nix
View file

@ -73,7 +73,7 @@ with lib;
# Install Flatpaks # Install Flatpaks
services.flatpak.packages = [ services.flatpak.packages = [
"com.mattjakeman.ExtensionManager" "com.mattjakeman.ExtensionManager"
"org.bluesabre.MenuLibre" "org.bluesabre.MenuLibre"
"org.gnome.baobab" "org.gnome.baobab"
"org.gnome.Calculator" "org.gnome.Calculator"

8
modules/users/aires/default.nix
View file

@ -65,13 +65,13 @@ with lib;
# Set up git # Set up git
programs.git = { programs.git = {
enable = true; enable = true;
# Username and email set in nix-secrets # Username and email set in nix-secrets
extraConfig = { extraConfig = {
push.autoSetupRemote = "true"; push.autoSetupRemote = "true";
}; };
}; };
# SSH set up in nix-secrets # SSH set up in nix-secrets
# Set up Zsh # Set up Zsh
programs.zsh = { programs.zsh = {
@ -85,9 +85,9 @@ with lib;
}; };
enableAutosuggestions = true; enableAutosuggestions = true;
syntaxHighlighting.enable = 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 = { prezto = {
git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked. git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked.
}; };
shellAliases = { shellAliases = {
dry-build = "cd ~/Development/nix-configuration && nix flake update && nixos-rebuild dry-build --flake ."; dry-build = "cd ~/Development/nix-configuration && nix flake update && nixos-rebuild dry-build --flake .";

10
modules/users/default.nix
View file

@ -1,7 +1,7 @@
{ ... }: { { ... }: {
imports = [ imports = [
./aires ./aires
./gremlin ./gremlin
./media ./media
]; ];
} }

6
modules/users/gremlin/default.nix
View file

@ -58,7 +58,7 @@ with lib;
# Set up git # Set up git
programs.git = { programs.git = {
# Name and email set in nix-secrets # Name and email set in nix-secrets
enable = true; enable = true;
extraConfig = { extraConfig = {
push.autoSetupRemote = "true"; push.autoSetupRemote = "true";
@ -77,9 +77,9 @@ with lib;
]; ];
enableAutosuggestions = true; enableAutosuggestions = true;
syntaxHighlighting.enable = 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 = { prezto = {
git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked. git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked.
}; };
shellAliases = { shellAliases = {
please = "sudo"; please = "sudo";