From 9c8cb0aef4ce2a648c1c38fb1214fa30dadd8baa Mon Sep 17 00:00:00 2001 From: Jake Ginesin Date: Thu, 22 May 2025 01:53:13 -0400 Subject: [PATCH] 399 current 2025-05-22 01:52:54 25.05.20250424.f771eb4 6.12.24 * --- hosts/rq/configuration.nix | 75 +----------------------------- hosts/thonkpad/configuration.nix | 78 +------------------------------- hosts/yoga/configuration.nix | 75 +----------------------------- system/system.nix | 19 ++++---- system/users/default.nix | 78 ++++++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+), 234 deletions(-) create mode 100644 system/users/default.nix diff --git a/hosts/rq/configuration.nix b/hosts/rq/configuration.nix index 2c428f9..a1b9091 100644 --- a/hosts/rq/configuration.nix +++ b/hosts/rq/configuration.nix @@ -3,14 +3,7 @@ pkgs, lib, ... -}: let - pkg_with_working_nitrogen = import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/c0c50dfcb70d48e5b79c4ae9f1aa9d339af860b4.tar.gz"; - sha256 = "17p3w4mgfr4yj2p0jz6kqgzhyr04h4fap5hnd837664xd1xhwdjb"; - }) {inherit (pkgs) system;}; - - old-nitrogen = pkg_with_working_nitrogen.nitrogen; -in { +}: { # import system, hardware config, and home manager imports = [ ./hardware-configuration.nix @@ -70,71 +63,5 @@ in { # boot.loader.systemd-boot.enable = true; # boot.loader.efi.canTouchEfiVariables = true; # boot.loader.grub.enable = false; - - users.users.synchronous = { - isNormalUser = true; - description = "jake"; - extraGroups = ["networkmanager" "wheel" "docker"]; - packages = with pkgs; [ - kdePackages.kate - # firefox - git - arandr - procs - htop - zsh - ripgrep - rofi - alacritty - python3 - tree - old-nitrogen - polybar - sxhkd - bspwm - # librewolf - eza - flameshot - neofetch - lolcat - nnn - xclip - brightnessctl - xbindkeys - pulseaudio - xorg.xf86inputsynaptics - libnotify # for notify-send - alejandra - discord - legcord - polybar-pulseaudio-control - bluez # polybar - zotero - texliveFull - texlivePackages.latexmk - nmap - procps # for pgrep - # xorg.xrandr - # thunderbird - ]; - }; - - environment.systemPackages = with pkgs; [ - vim - neovim - linux-manual - man-pages - man-pages-posix - fontconfig - python3 - rofi - flameshot - tree - # nitrogen - polybar - sxhkd - bspwm - # librewolf - ]; }; } diff --git a/hosts/thonkpad/configuration.nix b/hosts/thonkpad/configuration.nix index e70292a..9a3a0c2 100644 --- a/hosts/thonkpad/configuration.nix +++ b/hosts/thonkpad/configuration.nix @@ -3,14 +3,7 @@ pkgs, lib, ... -}: let - pkg_with_working_nitrogen = import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/c0c50dfcb70d48e5b79c4ae9f1aa9d339af860b4.tar.gz"; - sha256 = "17p3w4mgfr4yj2p0jz6kqgzhyr04h4fap5hnd837664xd1xhwdjb"; - }) {inherit (pkgs) system;}; - - old-nitrogen = pkg_with_working_nitrogen.nitrogen; -in { +}: { imports = [ ./hardware-configuration.nix ../../system/system.nix @@ -49,74 +42,5 @@ in { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.loader.grub.enable = false; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - users.users.synchronous = { - isNormalUser = true; - description = "jake"; - extraGroups = ["networkmanager" "wheel"]; - packages = with pkgs; [ - kdePackages.kate - # firefox - git - arandr - procs - htop - zsh - ripgrep - rofi - alacritty - python3 - tree - old-nitrogen - polybar - sxhkd - bspwm - # librewolf - eza - flameshot - neofetch - lolcat - nnn - xclip - brightnessctl - xbindkeys - pulseaudio - xorg.xf86inputsynaptics - libnotify # for notify-send - alejandra - discord - legcord - polybar-pulseaudio-control - bluez # polybar - zotero - texliveFull - texlivePackages.latexmk - nmap - procps # for pgrep - # xorg.xrandr - # thunderbird - ]; - }; - - environment.systemPackages = with pkgs; [ - vim - neovim - linux-manual - man-pages - man-pages-posix - fontconfig - python3 - rofi - flameshot - tree - # nitrogen - polybar - sxhkd - bspwm - # librewolf - ]; }; } diff --git a/hosts/yoga/configuration.nix b/hosts/yoga/configuration.nix index ef0ee94..2769309 100644 --- a/hosts/yoga/configuration.nix +++ b/hosts/yoga/configuration.nix @@ -3,14 +3,7 @@ pkgs, lib, ... -}: let - pkg_with_working_nitrogen = import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/c0c50dfcb70d48e5b79c4ae9f1aa9d339af860b4.tar.gz"; - sha256 = "17p3w4mgfr4yj2p0jz6kqgzhyr04h4fap5hnd837664xd1xhwdjb"; - }) {inherit (pkgs) system;}; - - old-nitrogen = pkg_with_working_nitrogen.nitrogen; -in { +}: { # import system, hardware config, and home manager imports = [ ./hardware-configuration.nix @@ -51,71 +44,5 @@ in { boot.loader.efi.efiSysMountPoint = "/boot"; services.logind.lidSwitchExternalPower = "ignore"; boot.loader.systemd-boot.enable = true; - - users.users.synchronous = { - isNormalUser = true; - description = "jake"; - extraGroups = ["networkmanager" "wheel" "docker"]; - packages = with pkgs; [ - kdePackages.kate - # firefox - git - arandr - procs - htop - zsh - ripgrep - rofi - alacritty - python3 - tree - old-nitrogen - polybar - sxhkd - bspwm - # librewolf - eza - flameshot - neofetch - lolcat - nnn - xclip - brightnessctl - xbindkeys - pulseaudio - xorg.xf86inputsynaptics - libnotify # for notify-send - alejandra - discord - legcord - polybar-pulseaudio-control - bluez # polybar - zotero - texliveFull - texlivePackages.latexmk - nmap - procps # for pgrep - # xorg.xrandr - # thunderbird - ]; - }; - - environment.systemPackages = with pkgs; [ - vim - neovim - linux-manual - man-pages - man-pages-posix - fontconfig - python3 - rofi - flameshot - tree - # nitrogen - polybar - sxhkd - bspwm - # librewolf - ]; }; } diff --git a/system/system.nix b/system/system.nix index dfbcd4a..ecd9dcc 100644 --- a/system/system.nix +++ b/system/system.nix @@ -3,6 +3,16 @@ pkgs, ... }: { + imports = [ + # ./wm/bspwm.nix + ./xserver/default.nix + ./services/services.nix + ./fonts/fonts.nix + ./hardware/hardware.nix + ./networking/default.nix + ./users/default.nix + ]; + # Set your time zone. time.timeZone = "America/New_York"; @@ -116,13 +126,4 @@ # 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 = "24.11"; # Did you read the comment? - - imports = [ - # ./wm/bspwm.nix - ./xserver/default.nix - ./services/services.nix - ./fonts/fonts.nix - ./hardware/hardware.nix - ./networking/default.nix - ]; } diff --git a/system/users/default.nix b/system/users/default.nix new file mode 100644 index 0000000..56a6137 --- /dev/null +++ b/system/users/default.nix @@ -0,0 +1,78 @@ +{ + config, + pkgs, + ... +}: let + pkg_with_working_nitrogen = import (builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/c0c50dfcb70d48e5b79c4ae9f1aa9d339af860b4.tar.gz"; + sha256 = "17p3w4mgfr4yj2p0jz6kqgzhyr04h4fap5hnd837664xd1xhwdjb"; + }) {inherit (pkgs) system;}; + + old-nitrogen = pkg_with_working_nitrogen.nitrogen; +in { + users.users.synchronous = { + isNormalUser = true; + description = "jake"; + extraGroups = ["networkmanager" "wheel" "docker"]; + packages = with pkgs; [ + kdePackages.kate + # firefox + git + arandr + procs + htop + zsh + ripgrep + rofi + alacritty + python3 + tree + old-nitrogen + polybar + sxhkd + bspwm + # librewolf + eza + flameshot + neofetch + lolcat + nnn + xclip + brightnessctl + xbindkeys + pulseaudio + xorg.xf86inputsynaptics + libnotify # for notify-send + alejandra + discord + legcord + polybar-pulseaudio-control + bluez # polybar + zotero + texliveFull + texlivePackages.latexmk + nmap + procps # for pgrep + # xorg.xrandr + # thunderbird + ]; + }; + + environment.systemPackages = with pkgs; [ + vim + neovim + linux-manual + man-pages + man-pages-posix + fontconfig + python3 + rofi + flameshot + tree + # nitrogen + polybar + sxhkd + bspwm + # librewolf + ]; +}