From e70818bdae21938c3350dd8a78c782558d239513 Mon Sep 17 00:00:00 2001 From: JakeGinesin Date: Thu, 22 May 2025 00:56:50 -0400 Subject: [PATCH] test --- flake.nix | 15 ++ hosts/yoga/configuration.nix | 289 ++++++++++++++++++++++++++ hosts/yoga/hardware-configuration.nix | 45 ++++ system/networking/default.nix | 16 ++ system/system.nix | 1 + 5 files changed, 366 insertions(+) create mode 100644 hosts/yoga/configuration.nix create mode 100644 hosts/yoga/hardware-configuration.nix create mode 100644 system/networking/default.nix diff --git a/flake.nix b/flake.nix index 329860c..269f5b2 100644 --- a/flake.nix +++ b/flake.nix @@ -64,5 +64,20 @@ ./hosts/rq/configuration.nix ]; }; + + nixosConfigurations.yoga = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + + modules = [ + baseModule + { + environment.systemPackages = [agenix.packages.x86_64-linux.default]; + } + home-manager.nixosModules.default + agenix.nixosModules.default + # agenix.homeManagerModules.age + ./hosts/yoga/configuration.nix + ]; + }; }; } diff --git a/hosts/yoga/configuration.nix b/hosts/yoga/configuration.nix new file mode 100644 index 0000000..0f9c4fa --- /dev/null +++ b/hosts/yoga/configuration.nix @@ -0,0 +1,289 @@ +{ + config, + 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 + ../../system/system.nix + ]; + + options.res = lib.mkOption { + type = lib.types.str; + default = "1920x1080"; + description = "screen resolution"; + }; + + options.zsh_remote = lib.mkOption { + type = lib.types.str; + default = "1920x1080"; + description = "zsh remote secret"; + }; + + + config = { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + backupFileExtension = "backup"; + # sharedModules = [agenix.homeManagerModules.default]; + # extraSpecialArgs = {inherit (config);}; + # users.synchronous.imports = [ + # ({ + # config, + # lib, + # ... + # }: + # import ../../home/home.nix { + # inherit config pkgs lib; + # }) + # ]; + users.synchronous.imports = [../../home/home.nix]; + }; + + # nixPath = [ + # "nixpkgs=${inputs.nixpkgs}" # FLAKE, NIXD + # "/nix/var/nix/profiles/per-user/root/channels" + # ]; + + + res = "1920x1080"; + age = { + secrets.zsh_remote = { + file = ../../secrets/zsh_remote.age; + owner = "synchronous"; + mode = "0400"; + }; + secretsDir = "/home/synchronous/.agenix/agenix"; + secretsMountPoint = "/home/synchronous/.agenix/agenix.d"; + identityPaths = ["/home/synchronous/.ssh/id_ed25519"]; + }; + + # config = { + # res = "1366x768"; + # }; + + # system.res = "1366x768"; + + # Bootloader. + #boot.loader.grub.enable = true; + #boot.loader.grub.device = "nodev"; + #boot.loader.grub.useOSProber = true; + #boot.loader.grub.version = 2; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.efi.efiSysMountPoint = "/boot"; + services.logind.lidSwitchExternalPower = "ignore"; + boot.loader.systemd-boot.enable = true; + + services.udisks2.enable = true; + + virtualisation.docker = { + enable = true; + enableOnBoot = true; + liveRestore = false; + }; + + virtualisation.libvirtd.enable = true; + programs.virt-manager.enable = true; + + xdg.mime.defaultApplications = { + "application/pdf" = "firefox.desktop"; + "text/html" = "firefox.desktop"; + "text/markdown" = "firefox.desktop"; + "text/x-markdown" = "firefox.desktop"; + "x-scheme-handler/about" = "firefox.desktop"; + "x-scheme-handler/http" = "firefox.desktop"; + "x-scheme-handler/https" = "firefox.desktop"; + "x-scheme-handler/unknown" = "firefox.desktop"; + }; + #boot = { + # loader.systemd-boot = { + # enable = true; + # editor = false; + # }; + # kernelPackages = pkgs.linuxPackages; + #}; + # boot.loader.grub.enable = false; + + networking.hostName = "yoga"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + nix = { + nixPath = [ + "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos" + "nixos-config=/home/synchronous/nix-cfg/configuration.nix" + "/nix/var/nix/profiles/per-user/root/channels" + ]; + + settings = { + experimental-features = ["nix-command" "flakes"]; + substituters = [ + "https://nix-community.cachix.org" + ]; + trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; + }; + + + # Set your time zone. + time.timeZone = "America/New_York"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + hardware.bluetooth.enable = true; + programs.dconf.enable = true; + + # Enable sound with pipewire. + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.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 + ]; + }; + + security.sudo = { + # me ne frego. i dare you to privilege escalate me + enable = true; + extraRules = [ + { + commands = [ + { + command = "/etc/profiles/per-user/synchronous/bin/rebuild"; + options = ["NOPASSWD"]; + } + { + command = "/home/synchronous/nix-cfg/home/scripts/nixos-rebuild.sh"; + options = ["NOPASSWD"]; + } + { + command = "/home/synchronous/.scripts/nixos-rebuild.sh"; + options = ["NOPASSWD"]; + } + { + # are you serious? + command = "/run/current-system/sw/bin/nixos-rebuild"; + options = ["NOPASSWD"]; + } + ]; + users = ["synchronous"]; + } + ]; + }; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + vim + neovim + linux-manual + man-pages + man-pages-posix + fontconfig + python3 + rofi + flameshot + tree + # nitrogen + polybar + sxhkd + bspwm + # librewolf + ]; + + # 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 = "24.11"; # Did you read the comment? + }; +} diff --git a/hosts/yoga/hardware-configuration.nix b/hosts/yoga/hardware-configuration.nix new file mode 100644 index 0000000..c723d06 --- /dev/null +++ b/hosts/yoga/hardware-configuration.nix @@ -0,0 +1,45 @@ +# 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" "nvme" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/4350b6fc-d6b5-4298-a735-600358dadbc5"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/FF8C-91BE"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; + + swapDevices = [ + {device = "/dev/disk/by-uuid/9e9e3982-d408-4a5d-9c53-a6798b928d24";} + ]; + + # 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; + # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/system/networking/default.nix b/system/networking/default.nix new file mode 100644 index 0000000..001885b --- /dev/null +++ b/system/networking/default.nix @@ -0,0 +1,16 @@ +{ + config, + pkgs, + ... +}: { + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + networking.interfaces = { + enp0s31f6 = {}; + wlp4s0 = {}; + }; + + networking.networkmanager.enable = true; +} diff --git a/system/system.nix b/system/system.nix index 5d9eaf0..1c6cb8a 100644 --- a/system/system.nix +++ b/system/system.nix @@ -9,5 +9,6 @@ ./services/services.nix ./fonts/fonts.nix ./hardware/hardware.nix + ./networking/default.nix ]; }