From 89deb0d132e32c8538bc07ee9009361b525ae04e Mon Sep 17 00:00:00 2001 From: Skullheadx Date: Sat, 23 May 2026 19:11:44 -0400 Subject: mutli host --- configuration.nix | 130 -------------------------------- flake.nix | 69 +++++++++-------- hardware-configuration.nix | 57 -------------- hosts/icon/configuration.nix | 73 ++++++++++++++++++ hosts/nepsis/configuration.nix | 107 ++++++++++++++++++++++++++ hosts/nepsis/hardware-configuration.nix | 57 ++++++++++++++ linux-common.nix | 97 ++++++++++++++++++++++++ 7 files changed, 371 insertions(+), 219 deletions(-) delete mode 100644 configuration.nix delete mode 100644 hardware-configuration.nix create mode 100644 hosts/icon/configuration.nix create mode 100644 hosts/nepsis/configuration.nix create mode 100644 hosts/nepsis/hardware-configuration.nix create mode 100644 linux-common.nix diff --git a/configuration.nix b/configuration.nix deleted file mode 100644 index edda465..0000000 --- a/configuration.nix +++ /dev/null @@ -1,130 +0,0 @@ -{ - config, - pkgs, - inputs, - ... -}: { - imports = [ - ./hardware-configuration.nix - ./lockscreen.nix - ./x11.nix - ./hjem.nix - ./audio.nix - ./vim.nix - ./sh.nix - ]; - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - boot.supportedFilesystems = ["exfat"]; - - # Use latest kernel. - boot.kernelPackages = pkgs.linuxPackages_latest; - - networking.hostName = "nepsis"; - networking.networkmanager.enable = true; - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - time.timeZone = "America/Toronto"; - - i18n.defaultLocale = "en_CA.UTF-8"; - - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; - - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - wget - nixfmt - st - dmenu - feh - fastfetch - sxhkd - pamixer - maim - slop - xclip - xdotool - gcc - slstatus - scrolling-title - surf - surf_search - terminus_font - terminus_font_ttf - yt-dlp - ]; - - programs.git = { - enable = true; - config = { - user = { - name = "Skullheadx"; - email = "admonty1@protonmail.com"; - }; - pull.rebase = true; - url = { - "git@github.com:".insteadOf = "https://github.com/"; - }; - }; - }; - - programs.steam = { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers - }; - - programs.nix-ld.enable = true; - programs.nix-ld.libraries = with pkgs; [ - # Add any missing dynamic libraries for unpackaged - # programs here, NOT in environment.systemPackages - ]; - - environment.sessionVariables = { - BROWSER = "surf"; - SFEED_PLUMBER = "$BROWSER"; - SFEED_URL_FILE = "$HOME/.local/share/sfeed/sfeed_read_url_file"; - }; - - # 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; - }; - - # Services - services.openssh.enable = true; - services.rsync = { - enable = true; - }; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # 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 - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "25.05"; # Did you read the comment? -} diff --git a/flake.nix b/flake.nix index fa473f0..9b76d89 100644 --- a/flake.nix +++ b/flake.nix @@ -36,38 +36,43 @@ url = "github:notashelf/nvf"; inputs.nixpkgs.follows = "nixpkgs"; }; - }; - outputs = - { - self, - nixpkgs, - hjem, - my-slstatus, - my-surf, - my-dwm, - my-st, - my-dmenu, - nvf, - }@inputs: - let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - customNeovim = nvf.lib.neovimConfiguration { - inherit pkgs; - modules = [ ./nvf/nvf.nix ]; - }; - in - { - nixosConfigurations.nepsis = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs customNeovim; }; - modules = [ - hjem.nixosModules.default - ./configuration.nix - ./overlays.nix - ]; - }; - - packages.${system}.my-neovim = customNeovim.neovim; + outputs = { + self, + nixpkgs, + hjem, + my-slstatus, + my-surf, + my-dwm, + my-st, + my-dmenu, + nvf, + } @ inputs: let + system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; + customNeovim = nvf.lib.neovimConfiguration { + inherit pkgs; + modules = [./nvf/nvf.nix]; + }; + in { + nixosConfigurations.nepsis = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs customNeovim;}; + modules = [ + hjem.nixosModules.default + ./linux-common.nix + ./hosts/nepsis/configuration.nix + ./overlays.nix + ]; }; + nixosConfigurations.icon = nixpkgs.lib.nixosSystem { + modules = [ + hjem.nixosModules.default + ./linux-common.nix + ./hosts/icon/configuration.nix + ./overlays.nix + ]; + }; + + packages.${system}.my-neovim = customNeovim.neovim; + }; } diff --git a/hardware-configuration.nix b/hardware-configuration.nix deleted file mode 100644 index 9e77966..0000000 --- a/hardware-configuration.nix +++ /dev/null @@ -1,57 +0,0 @@ -# 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 = [ - "nvme" - "xhci_pci" - "ahci" - "usbhid" - "usb_storage" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/a0aa3a6b-4970-4c7d-b793-57561ed4ae03"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/5239-A4D8"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; - }; - - swapDevices = [ - { device = "/dev/disk/by-uuid/1efeebba-c2ce-4ab9-87d6-e986933d7678"; } - ]; - - # 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.enp10s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/icon/configuration.nix b/hosts/icon/configuration.nix new file mode 100644 index 0000000..e803175 --- /dev/null +++ b/hosts/icon/configuration.nix @@ -0,0 +1,73 @@ +{ + config, + pkgs, + inputs, + ... +}: { + imports = [ + ./hardware-configuration.nix + ]; + + networking.hostName = "icon"; + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + ]; + + programs.git = { + enable = true; + config = { + user = { + name = "Skullheadx"; + email = "admonty1@protonmail.com"; + }; + pull.rebase = true; + url = { + "git@github.com:".insteadOf = "https://github.com/"; + }; + }; + }; + + programs.nix-ld.enable = true; + programs.nix-ld.libraries = with pkgs; [ + # Add any missing dynamic libraries for unpackaged + # programs here, NOT in environment.systemPackages + ]; + + environment.sessionVariables = { + }; + + # 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; + }; + + # Services + services.openssh.enable = true; + services.rsync = { + enable = true; + }; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # 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 + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "25.05"; # Did you read the comment? +} diff --git a/hosts/nepsis/configuration.nix b/hosts/nepsis/configuration.nix new file mode 100644 index 0000000..6dc148e --- /dev/null +++ b/hosts/nepsis/configuration.nix @@ -0,0 +1,107 @@ +{ + config, + pkgs, + inputs, + ... +}: { + imports = [ + ./hardware-configuration.nix + ./../../lockscreen.nix + ./../../x11.nix + ./../../hjem.nix + ./../../audio.nix + ]; + + networking.hostName = "nepsis"; + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + wget + nixfmt + st + dmenu + feh + fastfetch + sxhkd + pamixer + maim + slop + xclip + xdotool + gcc + slstatus + scrolling-title + surf + surf_search + terminus_font + terminus_font_ttf + yt-dlp + ]; + + programs.git = { + enable = true; + config = { + user = { + name = "Skullheadx"; + email = "admonty1@protonmail.com"; + }; + pull.rebase = true; + url = { + "git@github.com:".insteadOf = "https://github.com/"; + }; + }; + }; + + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers + }; + + programs.nix-ld.enable = true; + programs.nix-ld.libraries = with pkgs; [ + # Add any missing dynamic libraries for unpackaged + # programs here, NOT in environment.systemPackages + ]; + + environment.sessionVariables = { + BROWSER = "surf"; + SFEED_PLUMBER = "$BROWSER"; + SFEED_URL_FILE = "$HOME/.local/share/sfeed/sfeed_read_url_file"; + }; + + # 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; + }; + + # Services + services.openssh.enable = true; + services.rsync = { + enable = true; + }; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # 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 + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "25.05"; # Did you read the comment? +} diff --git a/hosts/nepsis/hardware-configuration.nix b/hosts/nepsis/hardware-configuration.nix new file mode 100644 index 0000000..9e77966 --- /dev/null +++ b/hosts/nepsis/hardware-configuration.nix @@ -0,0 +1,57 @@ +# 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 = [ + "nvme" + "xhci_pci" + "ahci" + "usbhid" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/a0aa3a6b-4970-4c7d-b793-57561ed4ae03"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/5239-A4D8"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/1efeebba-c2ce-4ab9-87d6-e986933d7678"; } + ]; + + # 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.enp10s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/linux-common.nix b/linux-common.nix new file mode 100644 index 0000000..101d7eb --- /dev/null +++ b/linux-common.nix @@ -0,0 +1,97 @@ +{ + config, + pkgs, + inputs, + ... +}: { + imports = [ + ./sh.nix + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.supportedFilesystems = ["exfat"]; + + # Use latest kernel. + boot.kernelPackages = pkgs.linuxPackages_latest; + + networking.networkmanager.enable = true; + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + time.timeZone = "America/Toronto"; + + i18n.defaultLocale = "en_CA.UTF-8"; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + wget + nixfmt + fastfetch + pamixer + gcc + ]; + + programs.git = { + enable = true; + config = { + user = { + name = "Skullheadx"; + email = "admonty1@protonmail.com"; + }; + pull.rebase = true; + url = { + "git@github.com:".insteadOf = "https://github.com/"; + }; + }; + }; + + programs.nix-ld.enable = true; + programs.nix-ld.libraries = with pkgs; [ + # Add any missing dynamic libraries for unpackaged + # programs here, NOT in environment.systemPackages + ]; + + environment.sessionVariables = { + }; + + # 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; + }; + + # Services + services.openssh.enable = true; + services.rsync = { + enable = true; + }; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # 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 + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "25.05"; # Did you read the comment? +} -- cgit v1.3.1