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

Tidying

Browse source
This commit is contained in:
Aires 2024-05-01 21:10:26 -04:00
parent 2667732682
commit d8743f1549
18 changed files with 151 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -117,11 +117,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714430505, "lastModified": 1714515075,
"narHash": "sha256-SSJQ/KOy8uISnoZgqDoRha7g7PFLSFP/BtMWm0wUz8Q=", "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f8e6694edabe4aaa7a85aac47b43ea5d978b116d", "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
hosts/Khanda/default.nix
View file

@ -18,7 +18,7 @@
kdeconnect.enable = true; kdeconnect.enable = true;
media.enable = true; media.enable = true;
office.enable = true; office.enable = true;
pandoc.enable = true; writing.enable = true;
}; };
ui = { ui = {
flatpak.enable = true; flatpak.enable = true;

2
hosts/Shura/default.nix
View file

@ -32,8 +32,8 @@ in
kdeconnect.enable = true; kdeconnect.enable = true;
media.enable = true; media.enable = true;
office.enable = true; office.enable = true;
pandoc.enable = true;
recording.enable = true; recording.enable = true;
writing.enable = true;
}; };
ui = { ui = {
flatpak.enable = true; flatpak.enable = true;

2
modules/apps/default.nix
View file

@ -6,7 +6,7 @@
./kdeconnect.nix ./kdeconnect.nix
./media.nix ./media.nix
./office.nix ./office.nix
./pandoc.nix
./recording.nix ./recording.nix
./writing.nix
]; ];
} }

1
modules/apps/development.nix
View file

@ -26,6 +26,7 @@ with lib;
kubectl kubectl
kubernetes-helm kubernetes-helm
kubevirt # Virtctl command-line tool kubevirt # Virtctl command-line tool
statix # Nix linting tool
]; ];
}) })
]; ];

8
modules/apps/office.nix
View file

@ -16,13 +16,5 @@ with lib;
"org.libreoffice.LibreOffice" "org.libreoffice.LibreOffice"
"us.zoom.Zoom" "us.zoom.Zoom"
]; ];
# Spelling and grammer checking: hosted on localhost:8081
services.languagetool = {
enable = true;
port = 8090;
public = false;
allowOrigin = "*";
};
}; };
} }

20
modules/apps/pandoc.nix
View file

@ -1,20 +0,0 @@
{ pkgs, config, lib, ... }:
let
cfg = config.host.apps.pandoc;
in
with lib;
{
options = {
host.apps.pandoc.enable = mkEnableOption (mdDoc "Enables pandoc");
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [
haskellPackages.pandoc
haskellPackages.pandoc-cli
haskellPackages.pandoc-crossref
texliveSmall
];
};
}

29
modules/apps/writing.nix Normal file
View file

@ -0,0 +1,29 @@
{ pkgs, config, lib, ... }:
let
cfg = config.host.apps.writing;
in
with lib;
{
options = {
host.apps.writing.enable = mkEnableOption (mdDoc "Enables writing and editing tools");
};
config = mkIf cfg.enable {
# Install packages for building ebooks
environment.systemPackages = with pkgs; [
haskellPackages.pandoc
haskellPackages.pandoc-cli
haskellPackages.pandoc-crossref
texliveSmall
];
# Spelling and grammer checking: hosted on localhost:8081
services.languagetool = {
enable = true;
port = 8090;
public = false;
allowOrigin = "*";
};
};
}

1
modules/base/default.nix
View file

@ -4,6 +4,7 @@
./bootloader.nix ./bootloader.nix
./network.nix ./network.nix
./nix.nix ./nix.nix
./programs.nix
./shell.nix ./shell.nix
./system.nix ./system.nix
]; ];

4
modules/base/network.nix
View file

@ -5,8 +5,6 @@ _: {
# Enable firewall # Enable firewall
nftables.enable = true; nftables.enable = true;
firewall = { firewall.enable = true;
enable = true;
};
}; };
} }

29
modules/base/programs.nix Normal file
View file

@ -0,0 +1,29 @@
# Set up program defaults
{ config, ... }: {
# Set up base apps
programs = {
direnv.enable = true;
nano = {
enable = true;
syntaxHighlight = true;
nanorc = ''
set linenumbers
set tabsize 4
set softwrap
'';
};
nh = {
enable = true;
flake = "${config.users.users.aires.home}/Development/nix-configuration";
# Alternative garbage collection system to nix.gc.automatic
clean = {
enable = true;
dates = "daily";
extraArgs = "--keep-since 7d --keep 10"; # Keep the last 10 entries
};
};
};
}

161
modules/base/system.nix
View file

@ -1,121 +1,54 @@
{ pkgs, config, lib, inputs, ... }:
# System options # System options
let { pkgs, config, ... }: {
cfg = config.host.system; # Set up the environment
in environment = {
with lib; # Install base packages
{ systemPackages = with pkgs; [
config = { bash
# Set up the environment dconf # Needed to fix an issue with Home-manager. See https://github.com/nix-community/home-manager/issues/3113
environment = { direnv
# Install base packages git
systemPackages = with pkgs; [ home-manager
bash nano
dconf # Needed to fix an issue with Home-manager. See https://github.com/nix-community/home-manager/issues/3113 p7zip
git fastfetch
home-manager nh # Nix Helper: https://github.com/viperML/nh
nano ];
p7zip
fastfetch
nh # Nix Helper: https://github.com/viperML/nh
];
variables = { variables = {
EDITOR = "nano"; # Set default editor to nano EDITOR = "nano"; # Set default editor to nano
};
# System configuration file overrides
etc = {
# Reduce systemd logout time to 30s
"systemd/system.conf.d/10-reduce-logout-wait-time.conf" = {
text = ''
[Manager]
DefaultTimeoutStopSec=30s
'';
};
};
}; };
};
# Configure automatic updates # Configure automatic updates
system = { system.autoUpgrade = {
# Enable automatic updates enable = true;
autoUpgrade = { flake = "${config.users.users.aires.home}/Development/nix-configuration";
enable = true; dates = "daily";
flake = "${config.users.users.aires.home}/Development/nix-configuration"; allowReboot = false;
dates = "daily"; operation = "boot"; # Don't switch, just create a boot entry
allowReboot = false; };
operation = "boot"; # Don't switch, just create a boot entry
}; # Enable fwupd (firmware updater)
services.fwupd.enable = true;
# Set your time zone.
time.timeZone = "America/New_York";
# Select internationalisation properties.
i18n = {
defaultLocale = "en_US.UTF-8";
extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
}; };
# Set your time zone.
time.timeZone = "America/New_York";
# Select internationalisation properties.
i18n = {
defaultLocale = "en_US.UTF-8";
extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
};
# Set up base apps
programs = {
direnv.enable = true;
nano = {
enable = true;
syntaxHighlight = true;
nanorc = ''
set linenumbers
set tabsize 4
set softwrap
'';
};
nh = {
enable = true;
flake = "/home/aires/Development/nix-configuration";
# Alternative garbage collection system to nix.gc.automatic
clean = {
enable = true;
dates = "daily";
extraArgs = "--keep-since 7d --keep 10"; # Keep the last 10 entries
};
};
};
services = {
# Scrub BTRFS partitions if the root partition is btrfs
btrfs.autoScrub = lib.mkIf (config.fileSystems."/".fsType == "btrfs") {
enable = true;
interval = "weekly";
fileSystems = [ "/" ];
};
# Enable fwupd (firmware updater)
fwupd.enable = true;
# Allow systemd user services to keep running after the user has logged out
logind.killUserProcesses = false;
# Enable SMART monitoring
smartd = {
enable = true;
autodetect = true;
notifications.wall.enable = true;
};
};
}; };
} }

1
modules/roles/server.nix
View file

@ -8,7 +8,6 @@ in
config = mkIf (role == "server") { config = mkIf (role == "server") {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
direnv
htop htop
]; ];
}; };

5
modules/roles/workstation.nix
View file

@ -14,11 +14,6 @@ in
flatpak.enable = true; flatpak.enable = true;
}; };
environment.systemPackages = with pkgs; [
direnv
statix # Nix linting tool
];
boot = { boot = {
# Enable Plymouth # Enable Plymouth
plymouth.enable = true; plymouth.enable = true;

9
modules/services/btrfs.nix Normal file
View file

@ -0,0 +1,9 @@
# Services to run on BTRFS filesystems.
# Only run if the root partition is BTRFS.
{ config, lib, ... }: {
services.btrfs.autoScrub = lib.mkIf (config.fileSystems."/".fsType == "btrfs") {
enable = true;
interval = "weekly";
fileSystems = [ "/" ];
};
}

3
modules/services/default.nix
View file

@ -1,8 +1,11 @@
{ ... }: { { ... }: {
imports = [ imports = [
./apcupsd.nix ./apcupsd.nix
./btrfs.nix
./duplicacy-web.nix ./duplicacy-web.nix
./k3s.nix ./k3s.nix
./msmtp.nix ./msmtp.nix
./smartd.nix
./systemd.nix
]; ];
} }

8
modules/services/smartd.nix Normal file
View file

@ -0,0 +1,8 @@
# Configure SMART monitoring
_: {
services.smartd = {
enable = true;
autodetect = true;
notifications.wall.enable = true;
};
}

17
modules/services/systemd.nix Normal file
View file

@ -0,0 +1,17 @@
# Configure systemD
_: {
services = {
# Allow systemd user services to keep running after the user has logged out
logind.killUserProcesses = false;
};
# Reduce systemd logout time to 30s
environment.etc = {
"systemd/system.conf.d/10-reduce-logout-wait-time.conf" = {
text = ''
[Manager]
DefaultTimeoutStopSec=30s
'';
};
};
}