From 92a12b490e52b22fb904a1ba490194e13b509100 Mon Sep 17 00:00:00 2001 From: "Frankie B." Date: Fri, 16 Feb 2024 12:21:48 +0000 Subject: Everything is FUCKED --- hosts/default.nix | 6 +- hosts/nixpad/configuration.nix | 155 ----------------------- hosts/nixpad/hardware-configuration.nix | 40 ------ hosts/watermelon/configuration.nix | 185 ++++++++++++++++++++++++++++ hosts/watermelon/hardware-configuration.nix | 40 ++++++ 5 files changed, 228 insertions(+), 198 deletions(-) delete mode 100644 hosts/nixpad/configuration.nix delete mode 100644 hosts/nixpad/hardware-configuration.nix create mode 100644 hosts/watermelon/configuration.nix create mode 100644 hosts/watermelon/hardware-configuration.nix (limited to 'hosts') diff --git a/hosts/default.nix b/hosts/default.nix index 5abd965..8cf2a0a 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -3,7 +3,7 @@ inherit (self) inputs; # get necessary inputs from self.inputs inherit (inputs) nixpkgs lanzaboote nixos-hardware; - inherit (inputs.home-manager.nixosModules) home-manager; + inherit (inputs.home-manager.nixosModules) home-manager; # get lib from nixpkgs and create and alias for lib.nixosSystem # for potential future overrides & abstractions inherit (nixpkgs) lib; @@ -20,11 +20,11 @@ commonArgs = {inherit self inputs;}; in { - "nixpad" = mkSystem { + "watermelon" = mkSystem { specialArgs = commonArgs; modules = [ # this list defines which files will be imported to be used as "modules" in the system config - ./nixpad/configuration.nix + ./watermelon/configuration.nix # use the nixos-module for home-manager home-manager home diff --git a/hosts/nixpad/configuration.nix b/hosts/nixpad/configuration.nix deleted file mode 100644 index 092ffde..0000000 --- a/hosts/nixpad/configuration.nix +++ /dev/null @@ -1,155 +0,0 @@ -# This is your system's configuration file. -# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) -{ - inputs, - lib, - config, - pkgs, - ... -}: { - # You can import other NixOS modules here - imports = [ - ./hardware-configuration.nix - ]; - - services.xserver = { - enable = true; - displayManager.sddm.enable = true; - xkb.layout = "us"; - libinput.enable = true; - }; - - hardware.opengl = { - enable = true; - driSupport = true; - driSupport32Bit = true; - }; - - nixpkgs = { - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - }; - }; - - nix = { - # This will add each flake input as a registry - # To make nix3 commands consistent with your flake - registry = lib.mapAttrs (_: value: {flake = value;}) inputs; - - # This will additionally add your inputs to the system's legacy channels - # Making legacy nix commands consistent as well, awesome! - nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; - - settings = { - # Enable flakes and new 'nix' command - experimental-features = "nix-command flakes"; - # Deduplicate and optimize nix store - auto-optimise-store = true; - }; - }; - - # the configuration (pain) - programs = { - gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - hyprland = { - enable = true; - xwayland.enable = true; - }; - zsh.enable = true; - }; - - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - environment.systemPackages = with pkgs; [ - gcc - git - grim - lxqt.lxqt-policykit - pavucontrol - pciutils - pulseaudio - screen - slurp - usbutils - wget - wl-clipboard - xdg-utils - swaynotificationcenter - swayidle - wofi - swaylock - gnome.gnome-keyring - ]; - - services.printing.enable = true; - - fonts.packages = with pkgs; [ - font-awesome - nerdfonts - jetbrains-mono - winePackages.fonts - ]; - - networking.hostName = "nixpad"; - networking.networkmanager.enable = true; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.initrd.systemd.enable = true; - boot.kernelPackages = pkgs.linuxPackages_latest; - - # Set a time zone, idiot - time.timeZone = "Europe/London"; - - # Fun internationalisation stuffs (AAAAAAAA) - i18n.defaultLocale = "en_GB.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_GB.UTF-8"; - LC_IDENTIFICATION = "en_GB.UTF-8"; - LC_MEASUREMENT = "en_GB.UTF-8"; - LC_MONETARY = "en_GB.UTF-8"; - LC_NAME = "en_GB.UTF-8"; - LC_NUMERIC = "en_GB.UTF-8"; - LC_PAPER = "en_GB.UTF-8"; - LC_TELEPHONE = "en_GB.UTF-8"; - LC_TIME = "en_GB.UTF-8"; - }; - - # define user acc - users.users.floppydisk = { - isNormalUser = true; - description = "Frankie B."; - extraGroups = ["networkmanager" "wheel"]; - openssh.authorizedKeys.keys = [ - # TODO: Add your SSH public key(s) here, if you plan on using SSH to connect - ]; - shell = pkgs.zsh; - }; - - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 30d"; - }; - - # This setups a SSH server. Very important if you're setting up a headless system. - # Feel free to remove if you don't need it. - - services.openssh.enable = true; - - networking.firewall.enable = false; - - system.stateVersion = "24.05"; -} diff --git a/hosts/nixpad/hardware-configuration.nix b/hosts/nixpad/hardware-configuration.nix deleted file mode 100644 index bf0bc0a..0000000 --- a/hosts/nixpad/hardware-configuration.nix +++ /dev/null @@ -1,40 +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 = [ "xhci_pci" "ehci_pci" "ata_piix" "usb_storage" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/82b7f887-2059-45ae-9bdd-60082718d922"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/C630-E94C"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/3ce61b0c-691d-4452-93f2-e64e4b926f30"; } - ]; - - # 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.enp0s25.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/watermelon/configuration.nix b/hosts/watermelon/configuration.nix new file mode 100644 index 0000000..10eddce --- /dev/null +++ b/hosts/watermelon/configuration.nix @@ -0,0 +1,185 @@ +# This is your system's configuration file. +# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) +{ + inputs, + lib, + config, + pkgs, + ... +}: { + # You can import other NixOS modules here + imports = [ + ./hardware-configuration.nix + ]; + + services.xserver = { + enable = true; + xkb.layout = "us"; + libinput.enable = true; + }; + + services.tailscale.enable = true; + + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + }; + + nixpkgs = { + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; + + nix = { + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; + + # the configuration (pain) + programs = { + gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + hyprland = { + enable = true; + xwayland.enable = true; + }; + zsh.enable = true; + }; + + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + environment.systemPackages = with pkgs; [ + gcc + git + grim + lxqt.lxqt-policykit + pavucontrol + pciutils + pulseaudio + screen + slurp + usbutils + wget + wl-clipboard + xdg-utils + swaynotificationcenter + swayidle + wofi + swaylock + gnome.gnome-keyring + gtklock + fprintd + tailscale + ]; + + services.fprintd = { + enable = true; + }; + services.printing.enable = true; + + fonts.packages = with pkgs; [ + font-awesome + nerdfonts + jetbrains-mono + winePackages.fonts + ]; + + networking.hostName = "watermelon"; + networking.networkmanager.enable = true; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.initrd.systemd.enable = true; + boot.kernelPackages = pkgs.linuxPackages_latest; + + # Set a time zone, idiot + time.timeZone = "Europe/London"; + + # Fun internationalisation stuffs (AAAAAAAA) + i18n.defaultLocale = "en_GB.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_GB.UTF-8"; + LC_IDENTIFICATION = "en_GB.UTF-8"; + LC_MEASUREMENT = "en_GB.UTF-8"; + LC_MONETARY = "en_GB.UTF-8"; + LC_NAME = "en_GB.UTF-8"; + LC_NUMERIC = "en_GB.UTF-8"; + LC_PAPER = "en_GB.UTF-8"; + LC_TELEPHONE = "en_GB.UTF-8"; + LC_TIME = "en_GB.UTF-8"; + }; + + # define user acc + users.users.floppydisk = { + isNormalUser = true; + description = "Frankie B."; + extraGroups = ["networkmanager" "wheel"]; + openssh.authorizedKeys.keys = [ + # TODO: Add your SSH public key(s) here, if you plan on using SSH to connect + ]; + shell = pkgs.zsh; + }; + + nix.gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 30d"; + }; + + # This setups a SSH server. Very important if you're setting up a headless system. + # Feel free to remove if you don't need it. + + services.openssh.enable = true; + + services.greetd = { + enable = true; + restart = true; + settings = { + default_session = { + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland"; + user = "greeter"; + }; + }; + }; + + systemd.services.greetd.serviceConfig = { + Type = "idle"; + StandardInput = "tty"; + StandardOutput = "tty"; + StandardError = "journal"; + TTYReset = "true"; + TTYHangup = "true"; + TTYVTDisallocate = true; + }; + + security.pam.services.gtklock.text = lib.readFile "${pkgs.gtklock}/etc/pam.d/gtklock"; + + networking.firewall.enable = false; + + system.stateVersion = "24.05"; +} diff --git a/hosts/watermelon/hardware-configuration.nix b/hosts/watermelon/hardware-configuration.nix new file mode 100644 index 0000000..bf0bc0a --- /dev/null +++ b/hosts/watermelon/hardware-configuration.nix @@ -0,0 +1,40 @@ +# 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" "ehci_pci" "ata_piix" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/82b7f887-2059-45ae-9bdd-60082718d922"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/C630-E94C"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/3ce61b0c-691d-4452-93f2-e64e4b926f30"; } + ]; + + # 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.enp0s25.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} -- cgit v1.2.3-54-g00ecf