diff --git a/flake.nix b/flake.nix index 6ce3db4..eadf85b 100644 --- a/flake.nix +++ b/flake.nix @@ -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; # }) diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 1ce50f2..0b5ef1e 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -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 diff --git a/main.nix b/main.nix index c5436c6..60b84a2 100644 --- a/main.nix +++ b/main.nix @@ -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; } diff --git a/modules/optional/x11.nix b/modules/optional/x11.nix new file mode 100644 index 0000000..ba7d1ff --- /dev/null +++ b/modules/optional/x11.nix @@ -0,0 +1,11 @@ +{ ... }: +{ + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Configure keymap in X11 + services.xserver = { + xkb.layout = "us"; + xkb.variant = ""; + }; +} diff --git a/modules/os/core.nix b/modules/os/core.nix index f7a351b..695db89 100644 --- a/modules/os/core.nix +++ b/modules/os/core.nix @@ -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; }; } diff --git a/modules/os/fonts.nix b/modules/os/fonts.nix new file mode 100644 index 0000000..301cb6a --- /dev/null +++ b/modules/os/fonts.nix @@ -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" ]; + }; + }; + }; +} diff --git a/modules/os/hardware.nix b/modules/os/hardware.nix index 83cea87..d272093 100644 --- a/modules/os/hardware.nix +++ b/modules/os/hardware.nix @@ -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; } diff --git a/modules/os/main.nix b/modules/os/main.nix new file mode 100644 index 0000000..9002166 --- /dev/null +++ b/modules/os/main.nix @@ -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 []); +} diff --git a/modules/os/networking.nix b/modules/os/networking.nix new file mode 100644 index 0000000..780a663 --- /dev/null +++ b/modules/os/networking.nix @@ -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"; +} diff --git a/modules/os/nix.nix b/modules/os/nix.nix index 6629efd..4b4d90d 100644 --- a/modules/os/nix.nix +++ b/modules/os/nix.nix @@ -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=" + ]; }; } diff --git a/modules/os/services.nix b/modules/os/services.nix deleted file mode 100644 index 726b8ea..0000000 --- a/modules/os/services.nix +++ /dev/null @@ -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; - }; -}