From 8394c1c665a9d74b34a88bec1aec8a6656f78480 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 8 Mar 2025 08:46:32 +0000 Subject: computers for the computing throne --- flake.lock | 22 +++++++++ flake.nix | 11 +++++ machines/biski/default.nix | 82 +++++++++++++++++++++++++++++++ machines/biski/disko.nix | 64 ++++++++++++++++++++++++ machines/biski/hardware-configuration.nix | 71 ++++++++++++++++++++++++++ modules/users/defin.nix | 1 + 6 files changed, 251 insertions(+) create mode 100644 machines/biski/default.nix create mode 100644 machines/biski/disko.nix create mode 100644 machines/biski/hardware-configuration.nix diff --git a/flake.lock b/flake.lock index c2fc251..f2d7eca 100644 --- a/flake.lock +++ b/flake.lock @@ -145,6 +145,27 @@ "type": "github" } }, + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736864502, + "narHash": "sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0=", + "owner": "nix-community", + "repo": "disko", + "rev": "0141aabed359f063de7413f80d906e1d98c0c123", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "latest", + "repo": "disko", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -682,6 +703,7 @@ "catppuccin-helix": "catppuccin-helix", "catppuccin-hyprland": "catppuccin-hyprland", "catppuccin-starship": "catppuccin-starship", + "disko": "disko", "home-manager": "home-manager", "hyprland": "hyprland", "lix-module": "lix-module", diff --git a/flake.nix b/flake.nix index 679d58c..b5b0d12 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + #for device formatting + disko = { + url = "github:nix-community/disko/latest"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # modern window compositor hyprland = { url = "github:hyprwm/Hyprland"; @@ -223,6 +229,11 @@ home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } ]; }; + biski = lib.nixosSystem { # another networking server, physical instead of cloud + modules = minimalConfigSettings ++ [ ./machines/biski + disko.nixosModules.disko + ]; + }; picast = lib.nixosSystem { # anger at chromecast modules = minimalConfigSettings ++ [ ./machines/picast home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } diff --git a/machines/biski/default.nix b/machines/biski/default.nix new file mode 100644 index 0000000..532ebe3 --- /dev/null +++ b/machines/biski/default.nix @@ -0,0 +1,82 @@ +# 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, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + # /home/defin/hardware-configuration.nix + ./hardware-configuration.nix + # /tmp/etc/nixos/hardware-configuartion.nix + ./disko.nix + + ../../modules/nixos/nix-common.nix + ../../modules/nixos/environment.nix + ../../modules/nixos/tailscale.nix + ../../modules/nixos/system-packages.nix + + ../../modules/users/defin.nix + ../../modules/users/git.nix + ../../modules/users/root.nix + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "biski"; # Define your hostname. + + security.pam.sshAgentAuth.enable = true; + + # Set your time zone. + time.timeZone = "US/Mountain"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkbOptions in tty. + # }; + + + # 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; + }; + + # Enable the OpenSSH daemon. + services.openssh = { + enable = true; + settings.X11Forwarding = true; + }; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # 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/machines/biski/disko.nix b/machines/biski/disko.nix new file mode 100644 index 0000000..9f50b2e --- /dev/null +++ b/machines/biski/disko.nix @@ -0,0 +1,64 @@ +{ + # required by impermanence + fileSystems."/persist".neededForBoot = true; + + disko.devices = { + disk.sda = { + type = "disk"; + device = "/dev/sda"; + content = { + type = "gpt"; + partitions = { + ESP = { + label = "boot"; + name = "ESP"; + size = "512M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ + "defaults" + ]; + }; + }; + root = { + size = "100%"; + label = "root"; + content = { + type = "btrfs"; + extraArgs = [ "-L" "nixos" "-f"]; + subvolumes = { + "@root" = { + mountpoint = "/"; + mountOptions = [ "subvol=root" "compress-force=zstd:2"]; + }; + "@home" = { + mountpoint = "/home"; + mountOptions = [ "subvol=home" "compress-force=zstd:2"]; + }; + "@nix" = { + mountpoint = "/nix"; + mountOptions = [ "subvol=nix" "compress-force=zstd:2"]; + }; + "@persist" = { + mountpoint = "/persist"; + mountOptions = [ "subvol=persist" "compress-force=zstd:2"]; + }; + "@log" = { + mountpoint = "/var/log"; + mountOptions = [ "subvol=log" "compress-force=zstd:2"]; + }; + "@swap" = { + mountpoint = "/swap"; + swap.swapfile.size = "8G"; + }; + }; + }; + }; + }; + }; + }; + }; +} diff --git a/machines/biski/hardware-configuration.nix b/machines/biski/hardware-configuration.nix new file mode 100644 index 0000000..dc2e787 --- /dev/null +++ b/machines/biski/hardware-configuration.nix @@ -0,0 +1,71 @@ +# 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" "ahci" "usbhid" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/8b016d79-af5b-4803-baa1-f1b4c1ba44b4"; + fsType = "btrfs"; + options = [ "subvol=@root" ]; + }; + + fileSystems."/nix" = + { device = "/dev/disk/by-uuid/8b016d79-af5b-4803-baa1-f1b4c1ba44b4"; + fsType = "btrfs"; + options = [ "subvol=@nix" ]; + }; + + fileSystems."/persist" = + { device = "/dev/disk/by-uuid/8b016d79-af5b-4803-baa1-f1b4c1ba44b4"; + fsType = "btrfs"; + options = [ "subvol=@persist" ]; + }; + + fileSystems."/var/log" = + { device = "/dev/disk/by-uuid/8b016d79-af5b-4803-baa1-f1b4c1ba44b4"; + fsType = "btrfs"; + options = [ "subvol=@log" ]; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/8b016d79-af5b-4803-baa1-f1b4c1ba44b4"; + fsType = "btrfs"; + options = [ "subvol=@home" ]; + }; + + fileSystems."/swap" = + { device = "/dev/disk/by-uuid/8b016d79-af5b-4803-baa1-f1b4c1ba44b4"; + fsType = "btrfs"; + options = [ "subvol=@swap" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/E24B-30F2"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + 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.eno1.useDHCP = lib.mkDefault true; + # networking.interfaces.tailscale0.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/modules/users/defin.nix b/modules/users/defin.nix index 2777354..811c851 100644 --- a/modules/users/defin.nix +++ b/modules/users/defin.nix @@ -26,6 +26,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAB4QbGvZ0YX5Clw02R1ffDfdWl1xL4dLUdcgIxHeHm0 defin@betsy" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDUIumSjqtj2fhYJvrFOgJGgQ2oEJBbG9ARzunKDX9mH defin@fairphone5" "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCCNKc3MpAm0FkMy9KG2U+Qq5nk/WN/qvVbxUZzEjsFzELEJ/iDF8YQ6K8gyBDe85QQk/AhKBLdzd5ZZPdM5GP8= defin@fairphone5" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5CATqAUsBWLTIaqtdAS/EO3L/04NwKEmnv7D68vO+a defin@biski" # keys for remote build "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPLx3RgUgbE7THS7hRZypyudEKffj0ppwQfQuxIpPf8H root@zenbook" ]; -- cgit v1.2.3 From 515bfc98f0581427d941c72c0f471721688decfd Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 10 Mar 2025 22:36:20 -0600 Subject: update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index f2d7eca..59cc537 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1739298463, - "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=", + "lastModified": 1741282631, + "narHash": "sha256-jZE1CmQ53uN1Gq4FjaLFzSSjDqzL0pG4mdRbjBqSmho=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16", + "rev": "81498562d0f53e613d30368bb5b076784fa86f80", "type": "github" }, "original": { @@ -334,11 +334,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1740707551, - "narHash": "sha256-khQu5pduq+KTid2lHYQpVkFPR3WigOdtE5/95PijxU4=", + "lastModified": 1741461862, + "narHash": "sha256-TNTtpDHoNB+wOEfypkGTu2zC0wHUwbabQo4HyU53Yok=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "445337d03dce7c9aef10ff4d57fc516ac8c1b24d", + "rev": "d30cc19d253a3db784ad10c3084f58cbb52d325a", "type": "github" }, "original": { @@ -456,11 +456,11 @@ ] }, "locked": { - "lastModified": 1739048914, - "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", + "lastModified": 1741191527, + "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a7334904d591f38757c46fbe2ab68651877d9099", + "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1739891528, - "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=", + "lastModified": 1741123584, + "narHash": "sha256-mprerMlucqtirmbx6L3VoFnF2bGYc2WSUCj7tuc6xTQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba", + "rev": "6b0154b183f9539097f13af9b5da78ca24da6df2", "type": "github" }, "original": { @@ -506,11 +506,11 @@ ] }, "locked": { - "lastModified": 1739049028, - "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", + "lastModified": 1739870480, + "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "04146df74a8d5ec0b579657307be01f1e241125f", + "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", "type": "github" }, "original": { @@ -596,11 +596,11 @@ ] }, "locked": { - "lastModified": 1737057290, - "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", + "lastModified": 1740947705, + "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", + "rev": "507911df8c35939050ae324caccc7cf4ffb76565", "type": "github" }, "original": { @@ -611,11 +611,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740603184, - "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", + "lastModified": 1741332913, + "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", + "rev": "20755fa05115c84be00b04690630cb38f0a203ad", "type": "github" }, "original": { @@ -642,11 +642,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1741379970, + "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "type": "github" }, "original": { @@ -682,11 +682,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { -- cgit v1.2.3