From 0c0d5e398c163cea2f3430fd562a29b290483d40 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Sat, 29 Nov 2025 10:53:59 -0500 Subject: [PATCH 1/5] cleanup saffron and enable tailscale --- .../flake/machines/saffron/configuration.nix | 97 +------------------ 1 file changed, 5 insertions(+), 92 deletions(-) diff --git a/dot_config/flake/machines/saffron/configuration.nix b/dot_config/flake/machines/saffron/configuration.nix index a7b4f2e..2cb2e59 100644 --- a/dot_config/flake/machines/saffron/configuration.nix +++ b/dot_config/flake/machines/saffron/configuration.nix @@ -16,52 +16,13 @@ # Use the GRUB 2 boot loader. boot.loader.systemd-boot.enable = true; - # boot.loader.grub.efiSupport = true; - # boot.loader.grub.efiInstallAsRemovable = true; - # boot.loader.efi.efiSysMountPoint = "/boot/efi"; - # Define on which hard drive you want to install Grub. - # boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only - # networking.hostName = "nixos"; # 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; # Easiest to use and most distros use this by default. + services.tailscale.enable = true; + + networking.hostName = "saffron"; # Define your hostname. # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; - - # 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 xkb.options in tty. - # }; - - # Enable the X11 windowing system. - # services.xserver.enable = true; - - # Configure keymap in X11 - # services.xserver.xkb.layout = "us"; - # services.xserver.xkb.options = "eurosign:e,caps:escape"; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # services.pulseaudio.enable = true; - # OR - # services.pipewire = { - # enable = true; - # pulse.enable = true; - # }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.libinput.enable = true; + time.timeZone = "America/Toronto"; users.users.tyler = { isNormalUser = true; @@ -71,55 +32,7 @@ }; programs.fish.enable = true; - # programs.firefox.enable = true; + services.openssh.enable = true; - # List packages installed in system profile. - # You can use https://search.nixos.org/ to find more packages (and options). - # environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget - # ]; - - # 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; - - # 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 option defines the first version of NixOS you have installed on this particular machine, - # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. - # - # Most users should NEVER change this value after the initial install, for any reason, - # even if you've upgraded your system to a new NixOS release. - # - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how - # to actually do that. - # - # This value being lower than the current NixOS release does NOT mean your system is - # out of date, out of support, or vulnerable. - # - # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, - # and migrated your data accordingly. - # - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . system.stateVersion = "25.05"; # Did you read the comment? } From 9645914e1021c501845fa2739c1d66e7bddd4559 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Sat, 29 Nov 2025 10:59:29 -0500 Subject: [PATCH 2/5] removed themes --- dot_config/flake/home/fish.nix | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/dot_config/flake/home/fish.nix b/dot_config/flake/home/fish.nix index a2f7f7a..9d66306 100644 --- a/dot_config/flake/home/fish.nix +++ b/dot_config/flake/home/fish.nix @@ -1,18 +1,4 @@ -{pkgs, ...}: let - catppuccin-fish = pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "fish"; - rev = "6a85af2ff722ad0f9fbc8424ea0a5c454661dfed"; - hash = "sha256-Oc0emnIUI4LV7QJLs4B2/FQtCFewRFVp7EDv8GawFsA="; - }; - - rose-pine = pkgs.fetchFromGitHub { - owner = "rose-pine"; - repo = "fish"; - rev = "main"; - hash = "sha256-Dvaw1k7XOU2NUQbTJAXPgAOPN1zTLVrc7NZDY5/KHeM="; - }; -in { +{pkgs, ...}: { programs.fish = { enable = true; interactiveShellInit = '' @@ -50,12 +36,4 @@ in { } ]; }; - - xdg.configFile."fish/themes/Catppuccin Latte.theme".source = "${catppuccin-fish}/themes/Catppuccin Latte.theme"; - - xdg.configFile."fish/themes/Catppuccin Macchiato.theme".source = "${catppuccin-fish}/themes/Catppuccin Macchiato.theme"; - - xdg.configFile."fish/themes/Rosé Pine.theme".source = "${rose-pine}/themes/Rosé Pine.theme"; - - xdg.configFile."fish/themes/Rosé Pine Dawn.theme".source = "${rose-pine}/themes/Rosé Pine Dawn.theme"; } From 55baa57ebc45bc358d4c5f06aa08a9bb35eceb3c Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Sat, 29 Nov 2025 11:24:38 -0500 Subject: [PATCH 3/5] hardware-config --- .../saffron/hardware-configuration.nix | 42 ++++--------------- 1 file changed, 7 insertions(+), 35 deletions(-) diff --git a/dot_config/flake/machines/saffron/hardware-configuration.nix b/dot_config/flake/machines/saffron/hardware-configuration.nix index a55cc69..4b798d2 100644 --- a/dot_config/flake/machines/saffron/hardware-configuration.nix +++ b/dot_config/flake/machines/saffron/hardware-configuration.nix @@ -1,39 +1,11 @@ -# 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. -{ - lib, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; - +{modulesPath, ...}: { + imports = [(modulesPath + "/profiles/qemu-guest.nix")]; + boot.loader.grub.device = "/dev/vda"; + boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; + boot.initrd.kernelModules = ["nvme"]; fileSystems."/" = { - device = "/dev/disk/by-uuid/50f54744-19c2-4119-8ff5-c64917c5e5d2"; + device = "/dev/vda1"; fsType = "ext4"; }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/301D-B62F"; - 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.ens3.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + swapDevices = [{device = "/dev/vdb";}]; } From 155be8e82178ae7e3e7c515b3c0acd92ce2e248e Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Sat, 29 Nov 2025 11:31:14 -0500 Subject: [PATCH 4/5] hostPlatform --- dot_config/flake/machines/saffron/hardware-configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/dot_config/flake/machines/saffron/hardware-configuration.nix b/dot_config/flake/machines/saffron/hardware-configuration.nix index 4b798d2..2166ba6 100644 --- a/dot_config/flake/machines/saffron/hardware-configuration.nix +++ b/dot_config/flake/machines/saffron/hardware-configuration.nix @@ -8,4 +8,5 @@ fsType = "ext4"; }; swapDevices = [{device = "/dev/vdb";}]; + nixpkgs.hostPlatform = "x86_64-linux"; } From a561ea2194d7366fc568883f1641625e6015ae86 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 29 Nov 2025 16:33:31 +0000 Subject: [PATCH 5/5] chore(deps): update quickshell digest to e9bad67 --- dot_config/flake/flake.lock | 8 ++++---- dot_config/flake/flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock index d26475e..c1d2e7e 100644 --- a/dot_config/flake/flake.lock +++ b/dot_config/flake/flake.lock @@ -512,17 +512,17 @@ ] }, "locked": { - "lastModified": 1759997568, - "narHash": "sha256-xQyzPkgpgjAceJKwZhLU2//Y1jAmvPGOq80svqkWFhQ=", + "lastModified": 1764045583, + "narHash": "sha256-W24ReyRrhOKTKIsuAMkY5hnVlCufGoONM79sjUoyQkk=", "owner": "outfoxxed", "repo": "quickshell", - "rev": "3e32ae595f97bd2d2e5ed4512fb4bb25edb4eae6", + "rev": "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3", "type": "github" }, "original": { "owner": "outfoxxed", "repo": "quickshell", - "rev": "3e32ae595f97bd2d2e5ed4512fb4bb25edb4eae6", + "rev": "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3", "type": "github" } }, diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index 657fb04..76cbc2e 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -35,7 +35,7 @@ }; quickshell = { - url = "github:outfoxxed/quickshell/3e32ae595f97bd2d2e5ed4512fb4bb25edb4eae6"; + url = "github:outfoxxed/quickshell/e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3"; inputs.nixpkgs.follows = "nixpkgs-unstable"; };