Move linux into its own directory
This commit is contained in:
parent
8f231ab2ab
commit
9817f1998f
|
@ -86,7 +86,7 @@
|
||||||
modules = [
|
modules = [
|
||||||
sops-nix.nixosModules.sops
|
sops-nix.nixosModules.sops
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
./modules/default.nix
|
./modules/linux/default.nix
|
||||||
({ pkgs, lib, config, ... }: {
|
({ pkgs, lib, config, ... }: {
|
||||||
# Configure hostname
|
# Configure hostname
|
||||||
networking = {
|
networking = {
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
with lib; {
|
|
||||||
|
|
||||||
config = {
|
|
||||||
nix = mkIf config.nathan.config.nix.autoGC {
|
|
||||||
gc = {
|
|
||||||
automatic = true;
|
|
||||||
dates = "weekly";
|
|
||||||
options = "--delete-older-than 7d";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,59 +1,14 @@
|
||||||
{ config, lib, pkgs, inputs, ... }@attrs:
|
{ config, lib, pkgs, ... }:
|
||||||
with lib;
|
|
||||||
{
|
with lib; {
|
||||||
config = mkMerge [
|
|
||||||
(mkIf pkgs.stdenv.isLinux
|
config = {
|
||||||
{
|
nix = mkIf config.nathan.config.nix.autoGC {
|
||||||
zramSwap = mkIf config.nathan.services.zramSwap
|
gc = {
|
||||||
{
|
automatic = true;
|
||||||
enable = true;
|
dates = "weekly";
|
||||||
algorithm = "lz4";
|
options = "--delete-older-than 7d";
|
||||||
memoryPercent = 25;
|
|
||||||
};
|
|
||||||
nix = mkIf config.nathan.config.nix.autoGC {
|
|
||||||
autoOptimiseStore = true;
|
|
||||||
};
|
|
||||||
})
|
|
||||||
(mkIf config.nathan.config.harden (import "${inputs.nixpkgs}/nixos/modules/profiles/hardened.nix" attrs))
|
|
||||||
(mkIf config.nathan.config.harden {
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_5_18_hardened;
|
|
||||||
security = {
|
|
||||||
allowSimultaneousMultithreading = true;
|
|
||||||
unprivilegedUsernsClone = true;
|
|
||||||
};
|
};
|
||||||
})
|
};
|
||||||
(mkIf ((! config.nathan.config.harden) && config.nathan.config.isDesktop) {
|
};
|
||||||
# Use the zen kernel with muqss turned on
|
|
||||||
boot.kernelPackages =
|
|
||||||
let
|
|
||||||
linuxZenWMuQSS = pkgs.linuxPackagesFor (pkgs.linuxPackages_zen.kernel.override {
|
|
||||||
structuredExtraConfig = with lib.kernel; {
|
|
||||||
SCHED_MUQSS = yes;
|
|
||||||
};
|
|
||||||
ignoreConfigErrors = true;
|
|
||||||
}
|
|
||||||
);
|
|
||||||
in
|
|
||||||
linuxZenWMuQSS;
|
|
||||||
})
|
|
||||||
(mkIf
|
|
||||||
(config.nathan.config.nix.autoUpdate && pkgs.stdenv.isLinux)
|
|
||||||
{
|
|
||||||
# Auto update daily at 2 am
|
|
||||||
system.autoUpgrade = {
|
|
||||||
enable = true;
|
|
||||||
allowReboot = true;
|
|
||||||
# Update from the flake
|
|
||||||
flake = "github:nathans-flakes/system";
|
|
||||||
# Attempt to update daily at 2AM
|
|
||||||
dates = "2:00";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
# Systemd user service cludge
|
|
||||||
{
|
|
||||||
systemd.user.extraConfig = ''
|
|
||||||
DefaultEnvironment="PATH=/run/current-system/sw/bin:/etc/profiles/per-user/${config.nathan.config.user}/bin"
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
let
|
||||||
|
inherit (import ../lib.nix { inherit lib; inherit pkgs; }) nLib;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
../options.nix
|
||||||
|
./base.nix
|
||||||
|
./user.nix
|
||||||
|
./desktop.nix
|
||||||
|
./swaywm.nix
|
||||||
|
./hardware.nix
|
||||||
|
./virtualization.nix
|
||||||
|
./windows.nix
|
||||||
|
./programs/games.nix
|
||||||
|
./programs/gpg.nix
|
||||||
|
./programs/utils.nix
|
||||||
|
./services/ssh.nix
|
||||||
|
./services/tailscale.nix
|
||||||
|
./services/borg.nix
|
||||||
|
./services/nginx.nix
|
||||||
|
./services/matrix.nix
|
||||||
|
./linux/base.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
config = {
|
||||||
|
# Enable the firewall
|
||||||
|
networking.firewall.enable = true;
|
||||||
|
# Enable unfree packages
|
||||||
|
nixpkgs.config.allowUnfree = config.nathan.config.enableUnfree;
|
||||||
|
# Work around for discord jank ugh
|
||||||
|
nixpkgs.config.permittedInsecurePackages = [
|
||||||
|
"electron-13.6.9"
|
||||||
|
];
|
||||||
|
# Set system state version
|
||||||
|
system.stateVersion = "22.05";
|
||||||
|
# Enable flakes
|
||||||
|
# Enable nix flakes
|
||||||
|
nix.package = pkgs.nixFlakes;
|
||||||
|
nix.extraOptions = ''
|
||||||
|
experimental-features = nix-command flakes
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,59 @@
|
||||||
|
{ config, lib, pkgs, inputs, ... }@attrs:
|
||||||
|
with lib;
|
||||||
|
{
|
||||||
|
config = mkMerge [
|
||||||
|
(mkIf pkgs.stdenv.isLinux
|
||||||
|
{
|
||||||
|
zramSwap = mkIf config.nathan.services.zramSwap
|
||||||
|
{
|
||||||
|
enable = true;
|
||||||
|
algorithm = "lz4";
|
||||||
|
memoryPercent = 25;
|
||||||
|
};
|
||||||
|
nix = mkIf config.nathan.config.nix.autoGC {
|
||||||
|
autoOptimiseStore = true;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
(mkIf config.nathan.config.harden (import "${inputs.nixpkgs}/nixos/modules/profiles/hardened.nix" attrs))
|
||||||
|
(mkIf config.nathan.config.harden {
|
||||||
|
boot.kernelPackages = pkgs.linuxPackages_5_18_hardened;
|
||||||
|
security = {
|
||||||
|
allowSimultaneousMultithreading = true;
|
||||||
|
unprivilegedUsernsClone = true;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
(mkIf ((! config.nathan.config.harden) && config.nathan.config.isDesktop) {
|
||||||
|
# Use the zen kernel with muqss turned on
|
||||||
|
boot.kernelPackages =
|
||||||
|
let
|
||||||
|
linuxZenWMuQSS = pkgs.linuxPackagesFor (pkgs.linuxPackages_zen.kernel.override {
|
||||||
|
structuredExtraConfig = with lib.kernel; {
|
||||||
|
SCHED_MUQSS = yes;
|
||||||
|
};
|
||||||
|
ignoreConfigErrors = true;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
in
|
||||||
|
linuxZenWMuQSS;
|
||||||
|
})
|
||||||
|
(mkIf
|
||||||
|
(config.nathan.config.nix.autoUpdate && pkgs.stdenv.isLinux)
|
||||||
|
{
|
||||||
|
# Auto update daily at 2 am
|
||||||
|
system.autoUpgrade = {
|
||||||
|
enable = true;
|
||||||
|
allowReboot = true;
|
||||||
|
# Update from the flake
|
||||||
|
flake = "github:nathans-flakes/system";
|
||||||
|
# Attempt to update daily at 2AM
|
||||||
|
dates = "2:00";
|
||||||
|
};
|
||||||
|
})
|
||||||
|
# Systemd user service cludge
|
||||||
|
{
|
||||||
|
systemd.user.extraConfig = ''
|
||||||
|
DefaultEnvironment="PATH=/run/current-system/sw/bin:/etc/profiles/per-user/${config.nathan.config.user}/bin"
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
|
@ -10,8 +10,8 @@ with lib;
|
||||||
# https://github.com/Admicos/minecraft-wayland
|
# https://github.com/Admicos/minecraft-wayland
|
||||||
glfw-patched = pkgs.glfw-wayland.overrideAttrs (attrs: {
|
glfw-patched = pkgs.glfw-wayland.overrideAttrs (attrs: {
|
||||||
patches = attrs.patches ++ [
|
patches = attrs.patches ++ [
|
||||||
../../patches/minecraft/0003-Don-t-crash-on-calls-to-focus-or-icon.patch
|
../../../patches/minecraft/0003-Don-t-crash-on-calls-to-focus-or-icon.patch
|
||||||
../../patches/minecraft/0004-wayland-fix-broken-opengl-screenshots-on-mutter.patch
|
../../../patches/minecraft/0004-wayland-fix-broken-opengl-screenshots-on-mutter.patch
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
stable-packages = with pkgs; [
|
stable-packages = with pkgs; [
|
|
@ -16,7 +16,7 @@ with lib;
|
||||||
|
|
||||||
# Setup sops
|
# Setup sops
|
||||||
sops.secrets."tailscale-auth" = {
|
sops.secrets."tailscale-auth" = {
|
||||||
sopsFile = ../../secrets/all/tailscale.yaml;
|
sopsFile = ../../../secrets/all/tailscale.yaml;
|
||||||
format = "yaml";
|
format = "yaml";
|
||||||
};
|
};
|
||||||
|
|
|
@ -23,8 +23,8 @@ with lib;{
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "forking";
|
Type = "forking";
|
||||||
ExecStart =
|
ExecStart =
|
||||||
"${../scripts/windows/mount.sh} ${mount.device} ${mount.mountPoint} ${mount.keyFile}";
|
"${../../scripts/windows/mount.sh} ${mount.device} ${mount.mountPoint} ${mount.keyFile}";
|
||||||
ExecStop = "${../scripts/windows/unmount.sh} ${mount.device} ${mount.mountPoint}";
|
ExecStop = "${../../scripts/windows/unmount.sh} ${mount.device} ${mount.mountPoint}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
|
@ -1,27 +1,9 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (import ./lib.nix { inherit lib; inherit pkgs; }) nLib;
|
inherit (import ./lib.nix { inherit lib; inherit pkgs; }) nLib;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
|
||||||
./base.nix
|
|
||||||
./user.nix
|
|
||||||
./desktop.nix
|
|
||||||
./swaywm.nix
|
|
||||||
./hardware.nix
|
|
||||||
./virtualization.nix
|
|
||||||
./windows.nix
|
|
||||||
./programs/games.nix
|
|
||||||
./programs/gpg.nix
|
|
||||||
./programs/utils.nix
|
|
||||||
./services/ssh.nix
|
|
||||||
./services/tailscale.nix
|
|
||||||
./services/borg.nix
|
|
||||||
./services/nginx.nix
|
|
||||||
./services/matrix.nix
|
|
||||||
./linux/base.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
options = with lib; with nLib; {
|
options = with lib; with nLib; {
|
||||||
nathan = {
|
nathan = {
|
||||||
# Control enabling of services
|
# Control enabling of services
|
||||||
|
@ -199,23 +181,4 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
|
||||||
# Enable the firewall
|
|
||||||
networking.firewall.enable = true;
|
|
||||||
# Enable unfree packages
|
|
||||||
nixpkgs.config.allowUnfree = config.nathan.config.enableUnfree;
|
|
||||||
# Work around for discord jank ugh
|
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
|
||||||
"electron-13.6.9"
|
|
||||||
];
|
|
||||||
# Set system state version
|
|
||||||
system.stateVersion = "22.05";
|
|
||||||
# Enable flakes
|
|
||||||
# Enable nix flakes
|
|
||||||
nix.package = pkgs.nixFlakes;
|
|
||||||
nix.extraOptions = ''
|
|
||||||
experimental-features = nix-command flakes
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
}
|
Loading…
Reference in New Issue