From 7b7f3f4ab7b0b9c64e39b833672723ad6b0cd1f8 Mon Sep 17 00:00:00 2001 From: JakeGinesin Date: Wed, 30 Apr 2025 03:21:17 -0400 Subject: [PATCH] 42 current 2025-04-30 02:53:55 25.05.20250424.f771eb4 6.12.24 * --- configuration.nix | 229 ------------------------------------- flake-old.nix | 103 ----------------- hardware-configuration.nix | 43 ------- secrets/README.md | 1 - 4 files changed, 376 deletions(-) delete mode 100644 configuration.nix delete mode 100644 flake-old.nix delete mode 100644 hardware-configuration.nix delete mode 100644 secrets/README.md diff --git a/configuration.nix b/configuration.nix deleted file mode 100644 index 3cee014..0000000 --- a/configuration.nix +++ /dev/null @@ -1,229 +0,0 @@ -# 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 - ]; - - # 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/flake-old.nix b/flake-old.nix deleted file mode 100644 index 671ebf3..0000000 --- a/flake-old.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ - 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/hardware-configuration.nix b/hardware-configuration.nix deleted file mode 100644 index 8988e1a..0000000 --- a/hardware-configuration.nix +++ /dev/null @@ -1,43 +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 = ["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; -} diff --git a/secrets/README.md b/secrets/README.md deleted file mode 100644 index bdf0dd5..0000000 --- a/secrets/README.md +++ /dev/null @@ -1 +0,0 @@ -so yeah you gotta run `agenix -e secret.age` to actually edit a secret