diff options
| -rw-r--r-- | hosts/underworld/default.nix | 53 | ||||
| -rw-r--r-- | hosts/underworld/home.nix | 2 | ||||
| -rw-r--r-- | hosts/wonderland/default.nix | 48 | ||||
| -rw-r--r-- | hosts/wonderland/home.nix | 4 | ||||
| -rw-r--r-- | share/system/client-common.nix | 53 |
5 files changed, 55 insertions, 105 deletions
diff --git a/hosts/underworld/default.nix b/hosts/underworld/default.nix index 05ee61d..24e030a 100644 --- a/hosts/underworld/default.nix +++ b/hosts/underworld/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, flakeRoot, inputs, ... }: { +{ pkgs, flakeRoot, inputs, ... }: { imports = [ # Include the results of the hardware scan. ./hardware.nix @@ -10,14 +10,6 @@ { _module.args = { inherit inputs; }; } ]; - nixpkgs.config.allowUnfree = true; - nix.gc = { - dates = "weekly"; - automatic = true; - persistent = true; - randomizedDelaySec = "15min"; - }; - # Using grub because the disko docs tell me to use it boot = { # TODO: remove in favour of kernel 6.7 when it makes it's way into nixpkgs @@ -29,38 +21,10 @@ }; }; - networking = { - hostName = "underworld"; - useNetworkd = true; - - firewall = { - enable = true; - allowedTCPPorts = [ 80 443 34197 ]; - }; - }; - + networking.hostName = "underworld"; time.timeZone = "Europe/Zagreb"; i18n.defaultLocale = "en_US.UTF-8"; - # Enable sound. - sound.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - pulse.enable = true; - }; - - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - - virtualisation.podman = { - enable = true; - dockerCompat = true; - autoPrune.enable = true; - }; - users.users = { osiris = { isNormalUser = true; @@ -72,19 +36,6 @@ }; }; - programs.zsh.enable = true; - users.defaultUserShell = pkgs.zsh; - - fonts.packages = with pkgs; [ - noto-fonts - noto-fonts-cjk - noto-fonts-emoji - proggyfonts - (nerdfonts.override { fonts = [ "FiraCode" ]; }) - overpass - inter - ]; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/hosts/underworld/home.nix b/hosts/underworld/home.nix index 2df3430..7f2b9fc 100644 --- a/hosts/underworld/home.nix +++ b/hosts/underworld/home.nix @@ -14,7 +14,7 @@ imports = [ (flakeRoot + /share/home/gallery-dl.nix) ]; - home.packages = with pkgs; [ vscodium ]; + home.packages = with pkgs; [ mullvad ]; home.stateVersion = "23.11"; }; diff --git a/hosts/wonderland/default.nix b/hosts/wonderland/default.nix index e6487eb..8c4a7e0 100644 --- a/hosts/wonderland/default.nix +++ b/hosts/wonderland/default.nix @@ -11,14 +11,6 @@ { _module.args = { inherit inputs; }; } ]; - nixpkgs.config.allowUnfree = true; - nix.gc = { - dates = "weekly"; - automatic = true; - persistent = true; - randomizedDelaySec = "15min"; - }; - # Use the systemd-boot EFI boot loader. boot = { loader.systemd-boot.enable = true; @@ -28,13 +20,6 @@ networking = { hostName = "wonderland"; - useNetworkd = true; - - firewall = { - enable = true; - allowedTCPPorts = [ 80 443 34197 ]; - }; - wireless = { enable = true; environmentFile = config.sops.secrets."wireless.env".path; @@ -66,28 +51,8 @@ time.timeZone = "Europe/Zagreb"; i18n.defaultLocale = "en_US.UTF-8"; - # Enable sound. - sound.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - pulse.enable = true; - }; - services.upower.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - hardware.bluetooth.enable = true; - services.mullvad-vpn.enable = true; - - virtualisation.podman = { - enable = true; - dockerCompat = true; - autoPrune.enable = true; - }; users.users = { alice = { @@ -104,19 +69,6 @@ }; }; - programs.zsh.enable = true; - users.defaultUserShell = pkgs.zsh; - - fonts.packages = with pkgs; [ - noto-fonts - noto-fonts-cjk - noto-fonts-emoji - proggyfonts - (nerdfonts.override { fonts = [ "FiraCode" ]; }) - overpass - inter - ]; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/hosts/wonderland/home.nix b/hosts/wonderland/home.nix index fa51157..a87a203 100644 --- a/hosts/wonderland/home.nix +++ b/hosts/wonderland/home.nix @@ -16,9 +16,7 @@ ]; services.poweralertd.enable = true; - home.packages = with pkgs; [ - mullvad - ]; + home.packages = with pkgs; [ mullvad ]; home.stateVersion = "22.05"; }; # End of users.alice diff --git a/share/system/client-common.nix b/share/system/client-common.nix index c6ae988..b6b9981 100644 --- a/share/system/client-common.nix +++ b/share/system/client-common.nix @@ -1,9 +1,58 @@ # Common configuration options for client machines (i.e. not servers) -{ ... }: +{ pkgs, ... }: { - boot.supportedFilesystems = [ "ntfs" "bcachefs" ]; imports = [ ./hyprland.nix ./steam.nix ]; + + boot.supportedFilesystems = [ "ntfs" "bcachefs" ]; + + nixpkgs.config.allowUnfree = true; + nix.gc = { + dates = "weekly"; + automatic = true; + persistent = true; + randomizedDelaySec = "15min"; + }; + + networking = { + useNetworkd = true; + firewall = { + enable = true; + allowedTCPPorts = [ 80 443 34197 ]; + }; + }; + services.mullvad-vpn.enable = true; + + virtualisation.podman = { + enable = true; + dockerCompat = true; + autoPrune.enable = true; + }; + + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + + sound.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + pulse.enable = true; + }; + + fonts.packages = with pkgs; [ + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + proggyfonts + (nerdfonts.override { fonts = [ "FiraCode" ]; }) + overpass + inter + ]; + + programs.zsh.enable = true; + users.defaultUserShell = pkgs.zsh; } |