trying flakes

This commit is contained in:
ari committed 2024-04-27 13:52:14 -04:00
1 parent 5412fe0b7b
commit 5b2e284501
11 files changed
+152 -103

No files matched your search

+14 -4
View File
@@ -31,12 +31,22 @@
(import ./hosts/fwbook.nix {
user = user;
})
(import ./modules/os/nix.nix {
(import ./modules/os/main.nix {
user = user;
hostName = hostName;
firewall = {
enable = true;
};
enableCore = true;
enableFonts = true;
enableNetowrking = true;
enableSSH = false;
hardware = {
enable = true;
enableFingerPrint = true;
};
systemStateVersion = systemStateVersion;
})
{
networking.hostName = hostName;
}
# (import ./modules/optional/hyprland.nix {
# user = user;
# })
+1
View File
@@ -20,6 +20,7 @@
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.tmp.useTmpfs = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
# Amd GPU Support
environment.systemPackages = with pkgs; [
rocmPackages.rocm-smi
+11 -2
View File
@@ -17,11 +17,15 @@ in
(import ./modules/os/nix.nix {
systemStateVersion = systemStateVersion;
})
(import ./modules/os/core.nix {
user = user;
(import ./modules/os/networking.nix {
hostName = hostName;
firewall = firewall;
})
import
./modules/os/fonts.nix
(import ./modules/os/core.nix {
user = user;
})
(import ./modules/os/hardware.nix {
enableFingerPrint = enableFingerPrint;
})
@@ -45,4 +49,9 @@ in
user = user;
})
] else [ ]);
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.tmp.useTmpfs = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
}
+11
View File
@@ -0,0 +1,11 @@
{ ... }:
{
# Enable the X11 windowing system.
services.xserver.enable = true;
# Configure keymap in X11
services.xserver = {
xkb.layout = "us";
xkb.variant = "";
};
}
+4 -49
View File
@@ -1,17 +1,6 @@
{ hostName, firewall, user }:
{ user }:
{ pkgs, ... }:
{
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.tmp.useTmpfs = true;
networking.hostName = hostName; # Define your hostname.
# Enable networking
networking.networkmanager.enable = true;
networking.firewall = firewall;
# Set your time zone.
time.timeZone = "America/Toronto";
@@ -21,8 +10,6 @@
# System Packages
programs.zsh.enable = true;
programs.nix-ld.enable = true;
services.tailscale.enable = true;
services.tailscale.useRoutingFeatures = "client";
environment.systemPackages = with pkgs; [
zsh
git
@@ -40,40 +27,8 @@
glib-networking
(import (fetchTarball "https://install.devenv.sh/latest")).default
];
boot.kernelPackages = pkgs.linuxPackages_latest;
services.nfs.server.enable = true;
services.hydra.useSubstitutes = true;
nix.settings.trusted-substituters = [
"https://cache.flox.dev"
"https://devenv.cachix.org"
];
nix.settings.trusted-users = [ "root" user.name ];
nix.settings.trusted-public-keys = [
"flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs="
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
];
# Fonts
fonts = {
packages = with pkgs; [
fira-code
fira-code-symbols
font-awesome
liberation_ttf
mplus-outline-fonts.githubRelease
nerdfonts
noto-fonts
noto-fonts-emoji
proggyfonts
flatpak
];
fontDir.enable = true;
fontconfig = {
enable = true;
defaultFonts = {
serif = [ "FiraCode" "DroidSansMono" ];
sansSerif = [ "FiraCode" "DroidSansMono" ];
monospace = [ "FiraCode" ];
};
};
programs.tmux = {
enable = true;
clock24 = true;
};
}
+27
View File
@@ -0,0 +1,27 @@
{ pkgs, ... }:
{
# Fonts
fonts = {
packages = with pkgs; [
fira-code
fira-code-symbols
font-awesome
liberation_ttf
mplus-outline-fonts.githubRelease
nerdfonts
noto-fonts
noto-fonts-emoji
proggyfonts
flatpak
];
fontDir.enable = true;
fontconfig = {
enable = true;
defaultFonts = {
serif = [ "FiraCode" "DroidSansMono" ];
sansSerif = [ "FiraCode" "DroidSansMono" ];
monospace = [ "FiraCode" ];
};
};
};
}
+17 -2
View File
@@ -6,8 +6,6 @@
services.fprintd =
if enableFingerPrint then {
enable = true;
# tod.enable = true;
# tod.driver = pkgs.libfprint-2-tod1-goodix;
} else { };
# Enable all license firmware
hardware.enableAllFirmware = true;
@@ -17,6 +15,9 @@
hardware.bluetooth.powerOnBoot = true;
services.blueman.enable = true;
# Enable CUPS to print documents.
services.printing.enable = true;
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
@@ -70,4 +71,18 @@
turbo = "auto";
};
};
# Logind
services.logind = {
lidSwitchExternalPower = "suspend-then-hibernate";
lidSwitch = "suspend-then-hibernate";
powerKey = "lock";
extraConfig = ''
HandlePowerKey=suspend-then-hibernate
IdleAction=suspend-then-hibernate
IdleActionSec=2m
'';
};
systemd.sleep.extraConfig = "HibernateDelaySec=30m";
# Yubikey
services.yubikey-agent.enable = true;
}
+37
View File
@@ -0,0 +1,37 @@
{ user
, hostName
, firewall
, systemStateVersion
, enableCore ? true
, enableFonts ? true
, enableNetowrking ? true
, enableSSH ? true
, hardware ? {
enable = false;
}
}:
{ pkgs, ... }:
{
imports = [
(import ./nix.nix {
systemStateVersion = systemStateVersion
})
] ++ (if enableCore then [
(import ./core.nix {
user = user;
})
] else [ ]) ++ (if enableFonts then [
./fonts.nix
] else [ ]) ++ (if hardware.enable then [
(import ./hardware.nix hardware)
] else [ ]) ++ (if enableNetowrking then [
(import ./networking.nix {
hostName = hostName;
firewall = firewall;
})
] else [ ]) ++ (if enableSSH then [
(import ./core.nix {
enableSSHServer = true;
})
] else []);
}
+17
View File
@@ -0,0 +1,17 @@
{ hostName, firewall }:
{ pkgs, ... }:
{
# Define your hostname.
networking.hostName = hostName;
# Enable networking
networking.networkmanager.enable = true;
networking.firewall = firewall;
# NFS Support
services.nfs.server.enable = true;
# Tailscale
services.tailscale.enable = true;
services.tailscale.useRoutingFeatures = "client";
}
+13 -3
View File
@@ -2,14 +2,24 @@
{ pkgs, ... }:
{
nixpkgs.config.allowUnfree = true;
system.stateVersion = systemStateVersion;
system.stateVersion = systemStateVersion;
services.hydra.useSubstitutes = true;
nix = {
optimise = {
automatic = true;
dates = [ "01:00" ];
automatic = true;
dates = [ "01:00" ];
};
settings = {
experimental-features = [ "nix-command" "flakes" ];
};
settings.trusted-substituters = [
"https://cache.flox.dev"
"https://devenv.cachix.org"
];
settings.trusted-users = [ "root" user.name ];
settings.trusted-public-keys = [
"flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs="
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
];
};
}
-43
View File
@@ -1,43 +0,0 @@
{ ... }:
{
# Enable the X11 windowing system.
services.xserver.enable = true;
# Configure keymap in X11
services.xserver = {
xkb.layout = "us";
xkb.variant = "";
};
# Logind
services.logind = {
lidSwitchExternalPower = "suspend-then-hibernate";
lidSwitch = "suspend-then-hibernate";
powerKey = "lock";
extraConfig = ''
HandlePowerKey=suspend-then-hibernate
IdleAction=suspend-then-hibernate
IdleActionSec=2m
'';
};
systemd.sleep.extraConfig = "HibernateDelaySec=30m";
# Enable CUPS to print documents.
services.printing.enable = true;
# Yubikey
services.yubikey-agent.enable = true;
# Special Cronjobs
services.cron = {
enable = true;
systemCronJobs = [
"0 0 * * * root nix-channel --update >> /var/log/cron/updater.log"
];
};
# Programs
programs.tmux = {
enable = true;
clock24 = true;
};
}