diff --git a/README.md b/README.md index 22f1f0f..2813215 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,13 @@ Ram: 3GB of Host Build: `nixos-rebuild build-vm --flake .#U3ncSovm` +### [Rubtrm](./systems/i686-linux/Rubtrm) +My Lenovo ideapad S10 4333-A13 + +Cpu: Intel Atom N270 (2 Cores, 1.6GHz) + +Ram: 2GB + ## License [MIT © kB01](../LICENSE) diff --git a/flake.lock b/flake.lock index 9b33ab2..26ea8b6 100644 --- a/flake.lock +++ b/flake.lock @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1733873195, - "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", + "lastModified": 1733951607, + "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", + "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", "type": "github" }, "original": { @@ -168,7 +168,7 @@ "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=", "rev": "9098ac95768f7006d7e070b88bae76939f6034e6", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz" }, "original": { "type": "tarball", @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1733709556, - "narHash": "sha256-u0ll0DDrKlO7tiLGGtmphv3wFy5ReDuf0USo/OlfROU=", + "lastModified": 1733968549, + "narHash": "sha256-r18fyuignDxOTgmgSRAvR2XRvdwoZOtPxqgRBuafqFQ=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "8d11f147df83fe137d3d94f6f3646e3a52bec855", + "rev": "8f4795cc29b2a1e62e0d1856d9f7dcf219829748", "type": "github" }, "original": { @@ -220,11 +220,11 @@ ] }, "locked": { - "lastModified": 1733706547, - "narHash": "sha256-BdFW7TMgES7q8I5FGX5hlz+0Xp4WyfAP3tHDwEupSWU=", + "lastModified": 1733965598, + "narHash": "sha256-0tlZU8xfQGPcBOdXZee7P3vJLyPjTrXw7WbIgXD34gM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "f5a0197ccfef7388885fc9455e74d6dd39e0c5e8", + "rev": "d162ffdf0a30f3d19e67df5091d6744ab8b9229f", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1733785344, - "narHash": "sha256-pm4cfEcPXripE36PYCl0A2Tu5ruwHEvTee+HzNk+SQE=", + "lastModified": 1733965552, + "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a80af8929781b5fe92ddb8ae52e9027fae780d2a", + "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c997566..b526e1a 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,7 @@ src = ./.; channels-config.allowUnfree = false; + supportedSystems = inputs.snowfall-lib.inputs.flake-utils-plus.lib.defaultSystems ++ ["i686-linux"]; nix.gc = { automatic = true; @@ -30,23 +31,43 @@ # Modules for Host HyperC systems.hosts.HyperC.modules = with inputs; [ + lix-module.nixosModules.default ]; # Modules for Host voloxo systems.hosts.voloxo.modules = with inputs; [ + lix-module.nixosModules.default ]; # Modules for Host kb-games-01 systems.hosts.kb-games-01.modules = with inputs; [ + lix-module.nixosModules.default + ]; + + # Modules for Host LoyAdjo + systems.hosts.LoyAdjo.modules = with inputs; [ + lix-module.nixosModules.default + ]; + + # Modules for Host Rubtrm + systems.hosts.Rubtrm.modules = with inputs; [ + # lix-module.nixosModules.default ]; # Modules that get imported to every NixOS system systems.modules.nixos = with inputs; [ - lix-module.nixosModules.default ]; outputs-builder = channels: { formatter = channels.nixpkgs.nixfmt-rfc-style; }; }; + + # outputs = { self, nixpkgs, ... }@inputs: { + # nixosConfigurations."Rubtrm" = nixpkgs.lib.nixosSystem { + # system = "i686-linux"; + # modules = [ ./systems/i686-linux/Rubtrm/default.nix ]; + # }; + # }; + } diff --git a/systems/i686-linux/Rubtrm/default.nix b/systems/i686-linux/Rubtrm/default.nix new file mode 100644 index 0000000..fbf1958 --- /dev/null +++ b/systems/i686-linux/Rubtrm/default.nix @@ -0,0 +1,97 @@ +# 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 = + [ + ./hardware.nix + ]; + + # Configure Nix + nix.settings = { + experimental-features = [ "nix-command" "flakes" ]; + substituters = [ + "https://cache.games01.kb-one.de" + ]; + trusted-public-keys = [ + "cache.game01.kb-one.de:XcqI+uobV7EoTKuRmnzYup/+oSfn8uLwnsiQFp8dk/g=" + ]; + }; + + # Use the GRUB 2 boot loader. + boot.loader.grub.enable = true; + # Define on which hard drive you want to install Grub. + boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only + + networking.hostName = "Rubtrm"; # Define your hostname. + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + console = { + font = "Lat2-Terminus16"; + keyMap = lib.mkForce "de"; + useXkbConfig = true; # use xkb.options in tty. + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Configure keymap in X11 + services.xserver.xkb.layout = "de"; + # services.xserver.xkb.options = "eurosign:e,caps:escape"; + + # Enable sound. + # hardware.pulseaudio.enable = true; + + # Enable touchpad support (enabled default in most desktopManager). + services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.kb = { + isNormalUser = true; + extraGroups = [ "wheel" "networkmanager" ]; + packages = with pkgs; [ + tree + ]; + }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + vim + wget + git + btop + fastfetch + ]; + + # 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 = [ ... ]; + + # 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.05"; # Did you read the comment? +} + diff --git a/systems/i686-linux/Rubtrm/hardware.nix b/systems/i686-linux/Rubtrm/hardware.nix new file mode 100644 index 0000000..0330d4d --- /dev/null +++ b/systems/i686-linux/Rubtrm/hardware.nix @@ -0,0 +1,41 @@ +# 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 = [ "uhci_hcd" "ehci_pci" "ata_piix" "usbhid" "usb_storage" "ums_realtek" "sd_mod" ]; + boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ]; + boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/NIXOS_LUKS"; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-label/NIXOS_ROOT"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-label/NIXOS_BOOT"; + fsType = "vfat"; + }; + + swapDevices = [ + { + device = "/.swapfile"; + } + ]; + + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "i686-linux"; + networking.enableIntel3945ABGFirmware = true; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + # hardware.enableAllFirmware = true; +}