diff --git a/common.nix b/common.nix index 65e0601..9f0a3ab 100644 --- a/common.nix +++ b/common.nix @@ -101,6 +101,7 @@ in { mira = { isNormalUser = true; group = "mira"; + uid = 1000; extraGroups = ["wheel" "docker" "dockremap" "audio"]; packages = with pkgs; [ firefox diff --git a/flake.nix b/flake.nix index 9cc1ead..0027a80 100644 --- a/flake.nix +++ b/flake.nix @@ -84,6 +84,17 @@ ./orexin/hardware-configuration.nix ]; }; + galanin = nixos-unstable.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { + meta = {hostname = "galanin";}; + }; + modules = [ + ./common.nix + ./galanin/configuration.nix + ./galanin/hardware-configuration.nix + ]; + }; gastrin = nixos-unstable.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { diff --git a/galanin/configuration.nix b/galanin/configuration.nix new file mode 100644 index 0000000..cd6504f --- /dev/null +++ b/galanin/configuration.nix @@ -0,0 +1,114 @@ +# 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 = { + nameservers = ["192.168.1.207"]; + firewall = { + enable = false; + }; + networkmanager.enable = true; + defaultGateway.address = "192.168.1.1"; + }; + + +# List packages installed in system profile. To search, run: +# $ nix search wget +# 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 +# ]; + + users = { + users = { + dockremap = { + isSystemUser = true; + uid = 100000; + group = "dockremap"; + subUidRanges = [ + { + startUid = 100000; + count = 65536; + } + ]; + subGidRanges = [ + { + startGid = 100000; + count = 65536; + } + ]; + }; + }; + }; +# Some programs need SUID wrappers, can be configured further or are +# started in user sessions. +# programs.mtr.enable = true; +# programs. + programs = { + gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + + nh = { + enable = true; + clean.enable = true; + clean.extraArgs = "--keep-since 4d --keep 3"; + flake = "/etc/nixos/"; + }; + zsh.enable = true; + + neovim = { + enable = true; + configure = { + customRC = '' + set number relativenumber + ''; + }; + + defaultEditor = true; + }; + }; + virtualisation.docker = { + storageDriver = "overlay2"; + enableOnBoot = true; + enable = true; + autoPrune.enable = true; + extraOptions = "--userns-remap=default"; + liveRestore = false; # NOTE: Incompatible with swarm + }; +# 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. + +# 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; +services.logind.lidSwitch = "ignore"; + systemd.targets.sleep.enable = false; + systemd.targets.suspend.enable = false; + systemd.targets.hibernate.enable = false; + systemd.targets.hybrid-sleep.enable = false; + + system.stateVersion = "24.05"; # Did you read the comment? + +} diff --git a/galanin/hardware-configuration.nix b/galanin/hardware-configuration.nix new file mode 100644 index 0000000..42aed11 --- /dev/null +++ b/galanin/hardware-configuration.nix @@ -0,0 +1,51 @@ +# 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" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/d857aa86-e441-4b4b-84d7-f718099c9d81"; + fsType = "btrfs"; + options = [ "subvol=@" ]; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/d857aa86-e441-4b4b-84d7-f718099c9d81"; + fsType = "btrfs"; + options = [ "subvol=@home" ]; + }; + + fileSystems."/nix" = + { device = "/dev/disk/by-uuid/d857aa86-e441-4b4b-84d7-f718099c9d81"; + fsType = "btrfs"; + options = [ "subvol=@nix" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/12CE-A600"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + 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; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/orexin/configuration.nix b/orexin/configuration.nix index cbbcb25..00d57c7 100644 --- a/orexin/configuration.nix +++ b/orexin/configuration.nix @@ -21,11 +21,6 @@ }; networkmanager.enable = true; defaultGateway.address = "192.168.1.1"; - interfaces.enp59s0.ipv4.addresses = [ - {address = "192.168.1.77"; - prefixLength = 24; - } - ]; };