From dc1c44633f2cec085a06544685cb6ce9e3a8bfff Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 2 Aug 2023 13:34:14 -0500 Subject: [PATCH] Add files again --- os/linux/nix/daniel.nix | 11 ++ os/linux/nix/flake.nix | 15 ++ os/linux/nix/machines/thinker-disks.nix | 58 +++++++ os/linux/nix/machines/thinker-hardware.nix | 27 ++++ os/linux/nix/machines/thinker.nix | 171 +++++++++++++++++++++ os/linux/nix/machines/virt.nix | 0 6 files changed, 282 insertions(+) create mode 100644 os/linux/nix/daniel.nix create mode 100644 os/linux/nix/machines/thinker-disks.nix create mode 100644 os/linux/nix/machines/thinker-hardware.nix create mode 100644 os/linux/nix/machines/thinker.nix delete mode 100644 os/linux/nix/machines/virt.nix diff --git a/os/linux/nix/daniel.nix b/os/linux/nix/daniel.nix new file mode 100644 index 0000000..ac73092 --- /dev/null +++ b/os/linux/nix/daniel.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: { + home.username = "daniel"; + home.homeDirectory = "/home/daniel/.home"; + home.stateVersion = "23.05"; + + programs.home-manager.enable = true; + + wayland.windowManager.sway = { + enable = true; + } +} \ No newline at end of file diff --git a/os/linux/nix/flake.nix b/os/linux/nix/flake.nix index 983c98e..d485a37 100644 --- a/os/linux/nix/flake.nix +++ b/os/linux/nix/flake.nix @@ -42,6 +42,21 @@ } ]; }; + + thinker = inputs.nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ + ./machines/thinker.nix + inputs.home-manager.nixosModules.home-manager + inputs.sops-nix.nixosModules.sops + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.daniel = import ./daniel.nix; + } + ]; + }; }; }; } diff --git a/os/linux/nix/machines/thinker-disks.nix b/os/linux/nix/machines/thinker-disks.nix new file mode 100644 index 0000000..e0d33df --- /dev/null +++ b/os/linux/nix/machines/thinker-disks.nix @@ -0,0 +1,58 @@ +{ disks ? [ "/dev/vda" ], ... }: { + disk = { + vdb = { + type = "disk"; + device = builtins.elemAt disks 0; + content = { + type = "gpt"; + partitions = { + ESP = { + label = "EFI"; + name = "ESP"; + size = "512M"; + type = "EF00" ; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ + "defaults" + ]; + }; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "crypted"; + extraOpenArgs = [ "--allow-discards" ]; + # if you want to use the key for interactive login be sure there is no trailing newline + # for example use `echo -n "password" > /tmp/secret.key` + keyFile = "/tmp/secret.key"; # Interactive + # settings.keyFile = "/tmp/password.key"; + # additionalKeyFiles = ["/tmp/additionalSecret.key"]; + content = { + type = "btrfs"; + extraArgs = [ "-f" ]; + subvolumes = { + "/root" = { + mountpoint = "/"; + mountOptions = [ "compress=zstd" "noatime" ]; + }; + "/home" = { + mountpoint = "/home"; + mountOptions = [ "compress=zstd" "noatime" ]; + }; + "/nix" = { + mountpoint = "/nix"; + mountOptions = [ "compress=zstd" "noatime" ]; + }; + }; + }; + }; + }; + }; + }; + }; + }; +} diff --git a/os/linux/nix/machines/thinker-hardware.nix b/os/linux/nix/machines/thinker-hardware.nix new file mode 100644 index 0000000..29217e6 --- /dev/null +++ b/os/linux/nix/machines/thinker-hardware.nix @@ -0,0 +1,27 @@ +# 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, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + # 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.wlp3s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/os/linux/nix/machines/thinker.nix b/os/linux/nix/machines/thinker.nix new file mode 100644 index 0000000..27b0f75 --- /dev/null +++ b/os/linux/nix/machines/thinker.nix @@ -0,0 +1,171 @@ +# 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`). + +{ pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./thinker-hardware.nix + "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "thinker"; # Define your hostname. + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "America/Chicago"; + + # 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. + # }; + + # Enable the X11 windowing system. + # services.xserver.enable = true; + + # Configure keymap in X11 + services.xserver.layout = "us"; + services.xserver.xkbOptions = "caps:escape"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # sound.enable = true; + # hardware.pulseaudio.enable = true; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.daniel = { + isNormalUser = true; + home = "/home/daniel/.home"; + extraGroups = [ "wheel" ]; + packages = []; + }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + curl + dtach + exa + fd + fish + fwupd + git + git-delta + helix + ripgrep + sd + skim + mosh + bat + htop + bottom + hexyl + rsync + rclone + restic + unzip + dog + bind + nmap + traceroute + iputils + xh + age + sops + nnn + broot + dua + git-lfs + libinput + libinput-gesture + brightnessctl + thunar + # TODO: my font? + noto-fonts + gimp + inkscape + krita + vlc + zathura + feh + kitty + pulsemixer + pavucontrol + pamixer + libpulse + playerctl + # TODO: wireplumber? + swaybg + swaylock + waybar + wofi + swayidle + mako + slurp + grim + wl-clipboard + wireplumber + # TODO: wayland screensharing + watchexec + wget + ]; + + services.tailscale = { + enable = true; + }; + + + # 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 = false; # TODO: disable password auth + + # Open ports in the firewall. + networking.firewall.allowedTCPPorts = [ 22 ]; + 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 = "23.05"; # Did you read the comment? + +} + diff --git a/os/linux/nix/machines/virt.nix b/os/linux/nix/machines/virt.nix deleted file mode 100644 index e69de29..0000000