From 7d51a56a7a606d17736e8898686c7a0572120683 Mon Sep 17 00:00:00 2001 From: JakeGinesin Date: Mon, 28 Apr 2025 21:37:05 -0400 Subject: [PATCH] 23 current 2025-04-28 21:36:52 25.05.20250424.f771eb4 6.12.24 * --- flake-old.nix | 103 ++++++++++ flake.lock | 38 +--- flake.nix | 120 +++-------- home/home.nix | 6 + home/programs/polybar/config.ini | 5 +- home/scripts/res.sh | 2 + hosts/thonkpad/configuration.nix | 236 ++++++++++++++++++++++ hosts/thonkpad/hardware-configuration.nix | 43 ++++ 8 files changed, 426 insertions(+), 127 deletions(-) create mode 100644 flake-old.nix create mode 100644 home/scripts/res.sh create mode 100644 hosts/thonkpad/configuration.nix create mode 100644 hosts/thonkpad/hardware-configuration.nix diff --git a/flake-old.nix b/flake-old.nix new file mode 100644 index 0000000..671ebf3 --- /dev/null +++ b/flake-old.nix @@ -0,0 +1,103 @@ +{ + description = "Nixos config flake"; + + inputs = { + flake-parts.url = "github:hercules-ci/flake-parts"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + # haumea = { + # url = "github:nix-community/haumea/v0.2.2"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; + }; + + outputs = inputs @ { + flake-parts, + self, + nixpkgs, + ... + }: + flake-parts.lib.mkFlake { + inherit inputs; + } { + imports = []; + + systems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin"]; + perSystem = { + config, + self, + inputs, + system, + nixpkgs, + pkgs, + ... + }: { + # Per-system attributes can be defined here. The self' and inputs' + # module parameters provide easy access to attributes of the same + # system. + + # Equivalent to inputs'.nixpkgs.legacyPackages.hello; + # packages.default = pkgs.hello; + # formatter = pkgs.nixfmt-rfc-style; + + formatter = pkgs.alejandra; + }; + flake = { + # The usual flake attributes can be defined here, including system- + # agnostic ones like nixosModule and system-enumerating ones, although + # those are more easily expressed in perSystem. + # nixosConfigurations.myhostname = "thonkpad"; + nixosConfigurations.thonkpad = inputs.nixpkgs.lib.nixosSystem rec { + system = "x86_64-linux"; + pkgs = import inputs.nixpkgs { + inherit system; + + config = { + allowUnfree = true; + packageOverrides = pkgs: { + # "package" = pkgs."package".overrideAttrs (attrs: {...}) + }; + }; + overlays = []; + + # home.packages = with pkgs; [xrandr procps polybar bspwm sxhkd polybar-pulseaudio-control bluez]; + }; + + specialArgs = {inherit inputs;}; + # extraSpecialArgs = {inherit inputs;}; + modules = [ + ./hosts/thonkpad/configuration.nix + # ./configuration.nix + # self.module + # inputs.home-manager.nixosModules.home-manager + # { + # home-manager.useGlobalPkgs = true; + # home-manager.useUserPackages = true; + # home-manager.users.synchronous = import ./home/home.nix; + # home-manager.extraSpecialArgs = {inherit inputs;}; + # home-manager.backupFileExtension = "hm-backup"; + + # Optionally, use home-manager.extraSpecialArgs to pass + # arguments to home.nix + } + ]; + }; + }; + + # outputs = { self, nixpkgs, ... }@inputs: { + # nixosConfigurations.default = nixpkgs.lib.nixosSystem { + # specialArgs = {inherit inputs;}; + # modules = [ + # ./configuration.nix + # # inputs.home-manager.nixosModules.default + # { home-manager.users.synch = import ./home.nix; } + # ]; + # }; + # }; + }; +} diff --git a/flake.lock b/flake.lock index 696aad1..3d8d275 100644 --- a/flake.lock +++ b/flake.lock @@ -1,23 +1,5 @@ { "nodes": { - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -42,36 +24,20 @@ "locked": { "lastModified": 1745526057, "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", - "owner": "nixos", + "owner": "NixOS", "repo": "nixpkgs", "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "root": { "inputs": { - "flake-parts": "flake-parts", "home-manager": "home-manager", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index f7fc67f..a996ff0 100644 --- a/flake.nix +++ b/flake.nix @@ -1,102 +1,44 @@ { - description = "Nixos config flake"; + description = "NixOS system configuration"; + + nixConfig = { + substituters = [ + "https://cache.nixos.org/" + "https://nix-community.cachix.org" + ]; + trusted-public-keys = [ + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; inputs = { - flake-parts.url = "github:hercules-ci/flake-parts"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - - # haumea = { - # url = "github:nix-community/haumea/v0.2.2"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; }; - outputs = inputs @ { - flake-parts, + outputs = { self, nixpkgs, - ... - }: - flake-parts.lib.mkFlake { - inherit inputs; - } { - imports = []; - - systems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin"]; - perSystem = { - config, - self, - inputs, - system, - nixpkgs, - pkgs, - ... - }: { - # Per-system attributes can be defined here. The self' and inputs' - # module parameters provide easy access to attributes of the same - # system. - - # Equivalent to inputs'.nixpkgs.legacyPackages.hello; - # packages.default = pkgs.hello; - # formatter = pkgs.nixfmt-rfc-style; - - formatter = pkgs.alejandra; - }; - flake = { - # The usual flake attributes can be defined here, including system- - # agnostic ones like nixosModule and system-enumerating ones, although - # those are more easily expressed in perSystem. - # nixosConfigurations.myhostname = "thonkpad"; - nixosConfigurations.thonkpad = inputs.nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; - pkgs = import inputs.nixpkgs { - inherit system; - - config = { - allowUnfree = true; - packageOverrides = pkgs: { - # "package" = pkgs."package".overrideAttrs (attrs: {...}) - }; - }; - overlays = []; - - # home.packages = with pkgs; [xrandr procps polybar bspwm sxhkd polybar-pulseaudio-control bluez]; - }; - - specialArgs = {inherit inputs;}; - # extraSpecialArgs = {inherit inputs;}; - modules = [ - ./configuration.nix - # self.module - inputs.home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.synchronous = import ./home/home.nix; - home-manager.extraSpecialArgs = {inherit inputs;}; - home-manager.backupFileExtension = "hm-backup"; - - # Optionally, use home-manager.extraSpecialArgs to pass - # arguments to home.nix - } - ]; - }; - }; - - # outputs = { self, nixpkgs, ... }@inputs: { - # nixosConfigurations.default = nixpkgs.lib.nixosSystem { - # specialArgs = {inherit inputs;}; - # modules = [ - # ./configuration.nix - # # inputs.home-manager.nixosModules.default - # { home-manager.users.synch = import ./home.nix; } - # ]; - # }; - # }; + home-manager, + }: let + baseModule = { + imports = [ + home-manager.nixosModules.default + ]; + system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; + nixpkgs.overlays = []; }; + in { + nixosConfigurations.thonkpad = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + baseModule + ./hosts/thonkpad/configuration.nix + ]; + }; + }; } diff --git a/home/home.nix b/home/home.nix index 8060b03..2a7dd6d 100644 --- a/home/home.nix +++ b/home/home.nix @@ -65,4 +65,10 @@ in { (builtins.readFile file) ) ); + + # home.file.".profile".text = '' + # if [ -f "$HOME/.scripts/res.sh" ]; then + # . "$HOME/.scripts/res.sh" + # fi + # ''; } diff --git a/home/programs/polybar/config.ini b/home/programs/polybar/config.ini index 4329d24..7cb03c7 100644 --- a/home/programs/polybar/config.ini +++ b/home/programs/polybar/config.ini @@ -32,12 +32,13 @@ tray-detached = false background = ${colors.background} foreground = ${colors.foreground} -; noto -> text font -; jetbrains -> icons font-0 = "NotoSans-Regular:size=11;2.5" font-1 = "JetBrainsMono Nerd Font:style=Regular:size=11;2.5" font-2 = "Noto Sans Symbols:size=13;1" +; noto -> text font +; jetbrains -> icons + ; font-0 = B612:style=Regular:size=9;3 ; font-0 = "NotoSans Nerd Font:size=9;3" ; font-2 = "Noto Color Emoji:style=Regular:size=9;3" diff --git a/home/scripts/res.sh b/home/scripts/res.sh new file mode 100644 index 0000000..a0b39f1 --- /dev/null +++ b/home/scripts/res.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +export SCREEN_RES=$(xrandr | grep "*" | awk '{print $1}') diff --git a/hosts/thonkpad/configuration.nix b/hosts/thonkpad/configuration.nix new file mode 100644 index 0000000..3f067ae --- /dev/null +++ b/hosts/thonkpad/configuration.nix @@ -0,0 +1,236 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). +{ + 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 { + imports = [ + ./hardware-configuration.nix + ../../system/system.nix + ]; + + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + backupFileExtension = "hm-backup"; + users.synchronous = import ../../home/home.nix; + }; + + # Bootloader. + # boot.loader.grub.enable = true; + # boot.loader.grub.device = "/dev/sda"; + # boot.loader.grub.useOSProber = true; + # boot.loader.grub.version = 2; + #boot = { + # loader.systemd-boot = { + # enable = true; + # editor = false; + # }; + # kernelPackages = pkgs.linuxPackages; + #}; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.grub.enable = false; + + networking.hostName = "thonkpad"; # 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=" + ]; + }; + }; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + networking.networkmanager.enable = true; + + # 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"]; + 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 = "/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 switch --flake /home/synchronous/nix-cfg/flake.nix"; + 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 + ]; + + # 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; + + # 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/thonkpad/hardware-configuration.nix b/hosts/thonkpad/hardware-configuration.nix new file mode 100644 index 0000000..8988e1a --- /dev/null +++ b/hosts/thonkpad/hardware-configuration.nix @@ -0,0 +1,43 @@ +# 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 = ["ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/aa4ec46a-b4aa-4a7c-a016-7d6e224cd7ba"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/CCA5-0BDD"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; + + swapDevices = []; + + # 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; +}