From e92cbc3e69a631f34c3c3e3f8666fa92e9bea62c Mon Sep 17 00:00:00 2001 From: Ghostfox Date: Sun, 19 Apr 2026 20:35:17 +0200 Subject: [PATCH] Add Mocha --- flake.nix | 8 ++ modules/desktop/default.nix | 6 +- modules/gaming/default.nix | 5 +- systems/mocha/configuration.nix | 134 +++++++++++++++++++++++ systems/mocha/hardware-configuration.nix | 33 ++++++ systems/saturn/configuration.nix | 20 ++-- 6 files changed, 194 insertions(+), 12 deletions(-) create mode 100644 systems/mocha/configuration.nix create mode 100644 systems/mocha/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index 5118f08..d2b5126 100644 --- a/flake.nix +++ b/flake.nix @@ -47,6 +47,14 @@ ./systems/saturn/configuration.nix ]; }; + + mocha = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + inherit specialArgs; + modules = [ + ./systems/mocha/configuration.nix + ]; + }; kurin = nixpkgs.lib.nixosSystem { system = "aarch64-linux"; diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 1e48baf..08bb989 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ inputs, pkgs, ... }: { imports = [ ./tailscale.nix @@ -18,4 +18,8 @@ system.nixos.variantName = "Desktop"; system.nixos.variant_id = "desktop"; + + fonts.packages = with pkgs; [ + montserrat + ]; } \ No newline at end of file diff --git a/modules/gaming/default.nix b/modules/gaming/default.nix index 5dc3fa7..c46ca97 100644 --- a/modules/gaming/default.nix +++ b/modules/gaming/default.nix @@ -14,7 +14,10 @@ qpwgraph qsstv handbrake - wineWow64Packages.waylandFull + wineWow64Packages.base + # wineWow64Packages.waylandFull winetricks ]; + + services.flatpak.enable = true; } \ No newline at end of file diff --git a/systems/mocha/configuration.nix b/systems/mocha/configuration.nix new file mode 100644 index 0000000..2c16a31 --- /dev/null +++ b/systems/mocha/configuration.nix @@ -0,0 +1,134 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page, on +# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). + +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ../../modules/base + ../../modules/desktop + ../../modules/development + ../../modules/gaming + ../../modules/school + ../../modules/server + ../../modules/vibes + ./hardware-configuration.nix + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.efi.efiSysMountPoint = "/boot/efi"; + + networking.hostName = "mocha"; # Define your hostname. + + # Configure network connections interactively with nmcli or nmtui. + networking.networkmanager.enable = true; + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkb.options in tty. + # }; + + # Enable the X11 windowing system. + # services.xserver.enable = true; + + + + + # Configure keymap in X11 + # services.xserver.xkb.layout = "us"; + # services.xserver.xkb.options = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # services.pulseaudio.enable = true; + # OR + services.pipewire = { + enable = true; + pulse.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + services.libinput.enable = true; + + services.displayManager.plasma-login-manager.enable = true; + services.desktopManager.plasma6.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + # users.users.alice = { + # isNormalUser = true; + # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + # packages = with pkgs; [ + # tree + # ]; + # }; + + # programs.firefox.enable = true; + + # List packages installed in system profile. + # You can use https://search.nixos.org/ to find more packages (and options). + # environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + # ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + networking.firewall.enable = false; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # This option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "25.11"; # Did you read the comment? + +} + diff --git a/systems/mocha/hardware-configuration.nix b/systems/mocha/hardware-configuration.nix new file mode 100644 index 0000000..a717f2d --- /dev/null +++ b/systems/mocha/hardware-configuration.nix @@ -0,0 +1,33 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/55a87756-4f4e-4f7b-86d1-9020bb2f6b15"; + fsType = "btrfs"; + }; + + fileSystems."/boot/efi" = + { device = "/dev/disk/by-uuid/5849-E78F"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/ab78a072-6c11-4071-b5ac-5509765f068e"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/systems/saturn/configuration.nix b/systems/saturn/configuration.nix index a068a32..83f7fa3 100644 --- a/systems/saturn/configuration.nix +++ b/systems/saturn/configuration.nix @@ -70,16 +70,16 @@ services.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.dark = { - isNormalUser = true; - extraGroups = [ - "wheel" - "networkmanager" - "video" - ]; # Enable ‘sudo’ for the user. - packages = with pkgs; [ - ]; - }; + #users.users.dark = { + # isNormalUser = true; + # extraGroups = [ + # "wheel" + # "networkmanager" + # "video" + # ]; # Enable ‘sudo’ for the user. + # packages = with pkgs; [ + # ]; + #}; services.displayManager.plasma-login-manager.enable = true; services.desktopManager.plasma6.enable = true;