From 35a1fe0db84bac91b335d6393e9d120d2076aa73 Mon Sep 17 00:00:00 2001 From: s-prechtl Date: Sat, 29 Mar 2025 17:21:11 +0100 Subject: [PATCH] feat: add hitsugibune --- flake.nix | 7 + .../{default => goingmerry}/configuration.nix | 0 .../hardware-configuration.nix | 0 hosts/{default => goingmerry}/home.nix | 0 hosts/hitsugibune/configuration.nix | 121 ++++++++++++++++++ hosts/hitsugibune/hardware-configuration.nix | 43 +++++++ 6 files changed, 171 insertions(+) rename hosts/{default => goingmerry}/configuration.nix (100%) rename hosts/{default => goingmerry}/hardware-configuration.nix (100%) rename hosts/{default => goingmerry}/home.nix (100%) create mode 100644 hosts/hitsugibune/configuration.nix create mode 100644 hosts/hitsugibune/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index 8cf8d67..d8f7ca4 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; zen-browser.url = "github:MarceColl/zen-browser-flake"; + mms.url = "github:mkaito/nixos-modded-minecraft-servers"; home-manager = { url = "github:nix-community/home-manager"; @@ -24,5 +25,11 @@ inputs.home-manager.nixosModules.default ]; }; + nixosConfigurations.hitsugibune = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs;}; + modules = [ + ./hosts/hitsugibune/configuration.nix + ]; + }; }; } diff --git a/hosts/default/configuration.nix b/hosts/goingmerry/configuration.nix similarity index 100% rename from hosts/default/configuration.nix rename to hosts/goingmerry/configuration.nix diff --git a/hosts/default/hardware-configuration.nix b/hosts/goingmerry/hardware-configuration.nix similarity index 100% rename from hosts/default/hardware-configuration.nix rename to hosts/goingmerry/hardware-configuration.nix diff --git a/hosts/default/home.nix b/hosts/goingmerry/home.nix similarity index 100% rename from hosts/default/home.nix rename to hosts/goingmerry/home.nix diff --git a/hosts/hitsugibune/configuration.nix b/hosts/hitsugibune/configuration.nix new file mode 100644 index 0000000..211f70c --- /dev/null +++ b/hosts/hitsugibune/configuration.nix @@ -0,0 +1,121 @@ +# 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. + ./hardware-configuration.nix + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "hitsugibune"; # Define your hostname. + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # 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. + # hardware.pulseaudio.enable = true; + # OR + # services.pipewire = { + # enable = true; + # pulse.enable = true; + # }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.libinput.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. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + vim + wget + git + ]; + + + # List services that you want to enable: + + services.openssh = { + enable = true; + settings = { + PasswordAuthentication = true; + PermitRootLogin = "prohibit-password"; + }; + }; + + nix.settings.experimental-features = ["nix-command" "flakes"]; + + # 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 = "24.11"; # Did you read the comment? +} diff --git a/hosts/hitsugibune/hardware-configuration.nix b/hosts/hitsugibune/hardware-configuration.nix new file mode 100644 index 0000000..ca1f5bb --- /dev/null +++ b/hosts/hitsugibune/hardware-configuration.nix @@ -0,0 +1,43 @@ +# 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" "ahci" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/1c5b48ba-dc51-4c27-b6d6-438058de94c0"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/1A74-B74C"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; + + swapDevices = []; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}