From 329e5daff011a2ea86e5b80e7e8bbb11ea4e4ad0 Mon Sep 17 00:00:00 2001 From: intergrav Date: Wed, 31 Dec 2025 06:58:24 -0500 Subject: [PATCH] chore: cleanup --- flake.nix | 141 ++++++++++-------- hosts/bluepill/default.nix | 8 - hosts/bluepill/hardware.nix | 8 +- hosts/bluepill/services/jellyfin.nix | 1 - hosts/tank-wsl/default.nix | 8 +- hosts/trinity/default.nix | 14 +- hosts/trinity/hardware.nix | 8 +- hosts/trinity/services/fwupd.nix | 3 - hosts/trinity/services/ssh.nix | 10 -- hosts/trinity/services/tailscale.nix | 3 - modules/darwin/default.nix | 7 +- modules/nixos/default.nix | 11 ++ .../nixos}/services/fwupd.nix | 0 .../nixos}/services/ssh.nix | 1 - .../nixos}/services/tailscale.nix | 0 modules/users/devin.nix | 30 ++-- 16 files changed, 106 insertions(+), 147 deletions(-) delete mode 100644 hosts/trinity/services/fwupd.nix delete mode 100644 hosts/trinity/services/ssh.nix delete mode 100644 hosts/trinity/services/tailscale.nix rename {hosts/bluepill => modules/nixos}/services/fwupd.nix (100%) rename {hosts/bluepill => modules/nixos}/services/ssh.nix (99%) rename {hosts/bluepill => modules/nixos}/services/tailscale.nix (100%) diff --git a/flake.nix b/flake.nix index 8013889..ca2a903 100644 --- a/flake.nix +++ b/flake.nix @@ -1,81 +1,92 @@ { - description = "Darwin and NixOS system configurations"; - inputs = { - agenix.url = "github:ryantm/agenix"; - home-manager.url = "github:nix-community/home-manager"; - home-manager-stable.url = "github:nix-community/home-manager/release-25.11"; - mac-app-util.url = "github:hraban/mac-app-util"; - nix-darwin.url = "github:nix-darwin/nix-darwin/master"; - nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs-tlp-pr.url = "github:NixOS/nixpkgs/pull/473626/head"; - - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; - nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + home-manager-stable = { + url = "github:nix-community/home-manager/release-25.11"; + inputs.nixpkgs.follows = "nixpkgs-stable"; + }; + nix-darwin = { + url = "github:nix-darwin/nix-darwin"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + mac-app-util.url = "github:hraban/mac-app-util"; + nixos-wsl.url = "github:nix-community/NixOS-WSL"; + agenix.url = "github:ryantm/agenix"; }; - outputs = inputs: { - darwinConfigurations.neo = inputs.nix-darwin.lib.darwinSystem { - specialArgs = inputs; - modules = [ - ./modules/common - ./modules/darwin - ./hosts/neo - inputs.home-manager.darwinModules.home-manager - inputs.mac-app-util.darwinModules.default - { - home-manager = { - sharedModules = [inputs.mac-app-util.homeManagerModules.default]; - }; - } - ]; + outputs = { + self, + nixpkgs, + nixpkgs-stable, + nixpkgs-tlp-pr, + nix-darwin, + home-manager, + home-manager-stable, + mac-app-util, + nixos-wsl, + agenix, + }: let + commonModules = [./modules/common]; + in { + darwinConfigurations.neo = nix-darwin.lib.darwinSystem { + modules = + commonModules + ++ [ + ./modules/darwin + ./hosts/neo + home-manager.darwinModules.home-manager + mac-app-util.darwinModules.default + {home-manager.sharedModules = [mac-app-util.homeManagerModules.default];} + ]; }; - nixosConfigurations.trinity = inputs.nixpkgs-tlp-pr.lib.nixosSystem { - specialArgs = inputs; - modules = [ - ./modules/common - ./modules/nixos - ./hosts/trinity - inputs.home-manager.nixosModules.home-manager - ]; - }; + nixosConfigurations = { + trinity = nixpkgs-tlp-pr.lib.nixosSystem { + modules = + commonModules + ++ [ + ./modules/nixos + ./hosts/trinity + home-manager.nixosModules.home-manager + ]; + }; - nixosConfigurations.bluepill = inputs.nixpkgs-stable.lib.nixosSystem { - specialArgs = inputs; - modules = [ - ./modules/common - ./modules/nixos - ./hosts/bluepill - inputs.agenix.nixosModules.default - inputs.home-manager-stable.nixosModules.home-manager - { - nixpkgs.overlays = [ - (final: prev: { - tailscale = inputs.nixpkgs.legacyPackages.${prev.stdenv.hostPlatform.system}.tailscale; - }) + bluepill = nixpkgs-stable.lib.nixosSystem { + modules = + commonModules + ++ [ + ./modules/nixos + ./hosts/bluepill + agenix.nixosModules.default + home-manager-stable.nixosModules.home-manager + { + nixpkgs.overlays = [ + (final: prev: { + tailscale = nixpkgs.legacyPackages.${prev.stdenv.hostPlatform.system}.tailscale; + }) + ]; + } ]; - } - ]; - }; + }; - nixosConfigurations.tank-wsl = inputs.nixpkgs.lib.nixosSystem { - specialArgs = inputs; - modules = [ - ./modules/common - ./modules/nixos - ./hosts/tank-wsl - inputs.home-manager.nixosModules.home-manager - inputs.nixos-wsl.nixosModules.default - ]; + tank-wsl = nixpkgs.lib.nixosSystem { + modules = + commonModules + ++ [ + ./modules/nixos + ./hosts/tank-wsl + home-manager.nixosModules.home-manager + nixos-wsl.nixosModules.default + ]; + }; }; - formatter = { - aarch64-darwin = inputs.nixpkgs.legacyPackages.aarch64-darwin.alejandra; - x86_64-linux = inputs.nixpkgs.legacyPackages.x86_64-linux.alejandra; - }; + formatter = nixpkgs.lib.genAttrs ["aarch64-darwin" "x86_64-linux"] (system: nixpkgs.legacyPackages.${system}.alejandra); }; } diff --git a/hosts/bluepill/default.nix b/hosts/bluepill/default.nix index 84f83f4..cb4e78c 100644 --- a/hosts/bluepill/default.nix +++ b/hosts/bluepill/default.nix @@ -1,7 +1,6 @@ {pkgs, ...}: { imports = [ ./hardware.nix - ./services/fwupd.nix ./services/homepage.nix ./services/jellyfin.nix ./services/mikusmp67.nix @@ -10,16 +9,9 @@ ./services/restic.nix ./services/samba.nix ./services/slskd.nix - ./services/ssh.nix - ./services/tailscale.nix ./services/transmission.nix ]; - boot.loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; - }; - networking.hostName = "bluepill"; environment.systemPackages = with pkgs; [ diff --git a/hosts/bluepill/hardware.nix b/hosts/bluepill/hardware.nix index 0bb64ff..9193fb4 100644 --- a/hosts/bluepill/hardware.nix +++ b/hosts/bluepill/hardware.nix @@ -1,16 +1,10 @@ -# 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") - ]; + imports = [(modulesPath + "/installer/scan/not-detected.nix")]; boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "xhci_pci_renesas" "usbhid" "sd_mod"]; boot.initrd.kernelModules = []; diff --git a/hosts/bluepill/services/jellyfin.nix b/hosts/bluepill/services/jellyfin.nix index 19498a6..ec9e515 100644 --- a/hosts/bluepill/services/jellyfin.nix +++ b/hosts/bluepill/services/jellyfin.nix @@ -8,7 +8,6 @@ openFirewall = true; }; - # enable nvidia shit hardware.graphics.enable = true; services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia = { diff --git a/hosts/tank-wsl/default.nix b/hosts/tank-wsl/default.nix index 91e17b5..a66fb9a 100644 --- a/hosts/tank-wsl/default.nix +++ b/hosts/tank-wsl/default.nix @@ -1,11 +1,5 @@ -{ - config, - lib, - pkgs, - ... -}: { +{...}: { wsl.enable = true; wsl.defaultUser = "devin"; - system.stateVersion = "25.05"; } diff --git a/hosts/trinity/default.nix b/hosts/trinity/default.nix index f3e22b8..01a4cf7 100644 --- a/hosts/trinity/default.nix +++ b/hosts/trinity/default.nix @@ -1,21 +1,9 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { imports = [ ./hardware.nix - ./services/fwupd.nix ./services/power.nix - ./services/ssh.nix - ./services/tailscale.nix ]; - boot.loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; - }; - networking.hostName = "trinity"; networking.networkmanager.enable = true; diff --git a/hosts/trinity/hardware.nix b/hosts/trinity/hardware.nix index 4cd5d4a..5146f57 100644 --- a/hosts/trinity/hardware.nix +++ b/hosts/trinity/hardware.nix @@ -1,16 +1,10 @@ -# 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") - ]; + imports = [(modulesPath + "/installer/scan/not-detected.nix")]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "sd_mod" "rtsx_pci_sdmmc"]; boot.initrd.kernelModules = []; diff --git a/hosts/trinity/services/fwupd.nix b/hosts/trinity/services/fwupd.nix deleted file mode 100644 index 999ca72..0000000 --- a/hosts/trinity/services/fwupd.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - services.fwupd.enable = true; -} diff --git a/hosts/trinity/services/ssh.nix b/hosts/trinity/services/ssh.nix deleted file mode 100644 index 6298a88..0000000 --- a/hosts/trinity/services/ssh.nix +++ /dev/null @@ -1,10 +0,0 @@ -{...}: { - services = { - openssh = { - enable = true; - settings.PasswordAuthentication = false; - }; - - fail2ban.enable = true; - }; -} diff --git a/hosts/trinity/services/tailscale.nix b/hosts/trinity/services/tailscale.nix deleted file mode 100644 index ef50609..0000000 --- a/hosts/trinity/services/tailscale.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - services.tailscale.enable = true; -} diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index 2f8ec72..82cdee1 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -1,10 +1,5 @@ {lib, ...}: { - system = { - stateVersion = 6; - configurationRevision = null; - primaryUser = "devin"; - }; - + system.stateVersion = 6; nixpkgs.hostPlatform = lib.mkDefault "aarch64-darwin"; homebrew = { diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 97ed9ab..81dab9f 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,7 +1,18 @@ {lib, ...}: { + imports = [ + ./services/fwupd.nix + ./services/ssh.nix + ./services/tailscale.nix + ]; + system.stateVersion = lib.mkDefault "24.11"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + boot.loader = { + systemd-boot.enable = lib.mkDefault true; + efi.canTouchEfiVariables = lib.mkDefault true; + }; + zramSwap.enable = true; time.timeZone = lib.mkDefault "America/Nassau"; i18n.defaultLocale = lib.mkDefault "en_US.UTF-8"; diff --git a/hosts/bluepill/services/fwupd.nix b/modules/nixos/services/fwupd.nix similarity index 100% rename from hosts/bluepill/services/fwupd.nix rename to modules/nixos/services/fwupd.nix diff --git a/hosts/bluepill/services/ssh.nix b/modules/nixos/services/ssh.nix similarity index 99% rename from hosts/bluepill/services/ssh.nix rename to modules/nixos/services/ssh.nix index 6298a88..15619ba 100644 --- a/hosts/bluepill/services/ssh.nix +++ b/modules/nixos/services/ssh.nix @@ -4,7 +4,6 @@ enable = true; settings.PasswordAuthentication = false; }; - fail2ban.enable = true; }; } diff --git a/hosts/bluepill/services/tailscale.nix b/modules/nixos/services/tailscale.nix similarity index 100% rename from hosts/bluepill/services/tailscale.nix rename to modules/nixos/services/tailscale.nix diff --git a/modules/users/devin.nix b/modules/users/devin.nix index 65275a2..87d5336 100644 --- a/modules/users/devin.nix +++ b/modules/users/devin.nix @@ -1,10 +1,7 @@ -{ - lib, - pkgs, - ... -}: let +{pkgs, ...}: let + isDarwin = pkgs.stdenv.isDarwin; homeDir = - if pkgs.stdenv.isDarwin + if isDarwin then "/Users/devin" else "/home/devin"; in { @@ -13,13 +10,14 @@ in { home = homeDir; shell = pkgs.fish; } - // lib.optionalAttrs (!pkgs.stdenv.isDarwin) { - isNormalUser = true; - extraGroups = ["networkmanager" "wheel"]; - } - // lib.optionalAttrs pkgs.stdenv.isDarwin { - uid = 501; - }; + // ( + if isDarwin + then {uid = 501;} + else { + isNormalUser = true; + extraGroups = ["networkmanager" "wheel"]; + } + ); home-manager.users.devin = {pkgs, ...}: { home = { @@ -57,9 +55,9 @@ in { git = { enable = true; - settings = { - user.name = "intergrav"; - user.email = "devin@devins.page"; + userName = "intergrav"; + userEmail = "devin@devins.page"; + extraConfig = { credential.helper = "!gh auth git-credential"; pull.rebase = true; rebase.autoStash = true; -- 2.51.2