From 418835c0c0b4236d166de05bf144f8f88ab59d98 Mon Sep 17 00:00:00 2001 From: Jacob Babor Date: Sun, 3 May 2026 00:41:36 -0500 Subject: [PATCH] Carve away --- base/system.nix | 57 +++++++++++++++++++++++ base/users.nix | 14 ++++++ configuration.nix | 107 +++---------------------------------------- desktop/flatpak.nix | 8 ++++ desktop/fonts.nix | 17 +++++++ desktop/hyprland.nix | 53 +++++++++++++++++++++ 6 files changed, 155 insertions(+), 101 deletions(-) create mode 100644 base/system.nix create mode 100644 base/users.nix create mode 100644 desktop/flatpak.nix create mode 100644 desktop/fonts.nix create mode 100644 desktop/hyprland.nix diff --git a/base/system.nix b/base/system.nix new file mode 100644 index 0000000..323c3cf --- /dev/null +++ b/base/system.nix @@ -0,0 +1,57 @@ +# 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, ... }: + +{ + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + # Latest kernel, not LTS + boot.kernelPackages = pkgs.linuxPackages_latest; + # TODO: Dynamically configure hostname + networking.hostName = "laptop-nixos-1"; + # Configure network connections interactively with nmcli or nmtui. + networking.networkmanager.enable = true; + # Set your time zone. + time.timeZone = "America/Chicago"; + # Enable CUPS to print documents. + services.printing.enable = true; + # Pipewire for audio + services.pipewire = { + enable = true; + pulse.enable = true; + }; + # Enable touchpad support (enabled default in most desktopManager). + services.libinput.enable = true; + # Bash is bash is bash + programs.bash.enable = true; + + # List packages installed in system profile. + # You can use https://search.nixos.org/ to find more packages (and options). + environment.systemPackages = with pkgs; [ + git + jq + procps + stow + vim + wget + ]; + + # Enable the OpenSSH daemon. + services.openssh.enable = true; + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Copies and links NixOS config to /run/current-system/configuration.nix + # Case you nuke it. Idiot. + system.copySystemConfiguration = true; + + # Don't touch. It's used for migration compatibility and should not change + system.stateVersion = "25.11"; + +} diff --git a/base/users.nix b/base/users.nix new file mode 100644 index 0000000..e24fa70 --- /dev/null +++ b/base/users.nix @@ -0,0 +1,14 @@ +# +# User configuration +# +{ config, lib, pkgs, ... }: + +{ + users.users.salt = { + isNormalUser = true; + description = "Salt"; + extraGroups = [ "wheel" ]; + shell = pkgs.bash; + home = "/home/salt"; + }; +} diff --git a/configuration.nix b/configuration.nix index 71d601b..8648e23 100644 --- a/configuration.nix +++ b/configuration.nix @@ -5,105 +5,10 @@ { 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; - - boot.kernelPackages = pkgs.linuxPackages_latest; - - networking.hostName = "laptop-nixos-1"; - - # Configure network connections interactively with nmcli or nmtui. - networking.networkmanager.enable = true; - - # Set your time zone. - time.timeZone = "America/Chicago"; - - # Enable CUPS to print documents. - services.printing.enable = true; - - 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 - # ]; - # }; - users.users.salt = { - isNormalUser = true; - description = "Salt"; - extraGroups = [ "wheel" ]; - shell = pkgs.bash; - home = "/home/salt"; - }; - - # programs.firefox.enable = true; - programs.bash.enable = true; - - # List packages installed in system profile. - # You can use https://search.nixos.org/ to find more packages (and options). - environment.systemPackages = with pkgs; [ - git - stow - vim - wget - ]; - - # 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 = [ ... ]; - # 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 = "25.11"; # Did you read the comment? - + imports = [ + ./hardware-configuration.nix + ./base/system.nix + ./base/users.nix + ./desktop/hyprland.nix + ]; } diff --git a/desktop/flatpak.nix b/desktop/flatpak.nix new file mode 100644 index 0000000..3e0c4fb --- /dev/null +++ b/desktop/flatpak.nix @@ -0,0 +1,8 @@ +# +# Flatpak +# +{ config, lib, pkgs, ... }: + +{ + services.flatpak.enable = true; +} diff --git a/desktop/fonts.nix b/desktop/fonts.nix new file mode 100644 index 0000000..05f0bde --- /dev/null +++ b/desktop/fonts.nix @@ -0,0 +1,17 @@ +# +# Basic system fonts +# +{ config, lib, pkgs, ... }: + +{ + fonts.fontconfig.enable = true; + fonts.packages = with pkgs; [ + dejavu_fonts + font-awesome + ibm-plex + noto-fonts + noto-fonts-emoji + noto-fonts-cjk + roboto + ]; +} diff --git a/desktop/hyprland.nix b/desktop/hyprland.nix new file mode 100644 index 0000000..4b6f0ab --- /dev/null +++ b/desktop/hyprland.nix @@ -0,0 +1,53 @@ +# +# Configuration for a Hyprland stack +# +{ config, lib, pkgs, ... }: + +{ + imports = [ + ./flatpak.nix + ./fonts.nix + ]; + # Enable SDDM as our display manager + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; + services.displayManager.defaultSession = "hyprland"; + + # Hyprland as the star of the show + programs.hyprland.enable = true; + + # XDG portal + xdg.portal.enable = true; + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; + + # Supplementary packages + environment.systemPackages = with pkgs; [ + # Hyprland stack + dunst + hyprland + hypridle + hyprlock + rofi-wayland + swww + waybar + wlsunset + wofi + + # Helpers + flatpak + networkmanagerapplet + python3 + xdg-utils + + # Common utilities + brightnessctl + foot + pavucontrol + pulseaudio # For pactl + + # Clipboarding + grim + slurp + wl-clipboard + ]; +}