Changes

9 changed files (+25/-107)

• ThinkPad-X1-Yoga-Gen-6/default.nix > Framework-13/default.nix
  • @@ -11,7 +11,7 @@
    ./hardware-configuration.nix ]; - networking.hostName = "ThinkPad-X1-Yoga-Gen-6"; + networking.hostName = "Framework-13"; # Fingerprint authentication services.fprintd.enable = true;
• README.md
  • @@ -5,3 +5,5 @@ My NixOS configuration files for my laptop and the server running this site.
    I generally try to keep these configs simple and pragmatic, so stuff like Home Manager, Firefox extensions, and other 3rd-party flakes are out-of-scope. Besides, I don't want to write hundreds of lines of Nix and spend all day Nixifying my entire setup. This repo is for machine-specific stuff. For my machine-independent configs, see [my dotfiles repo](/dotfiles). Another reason for this separation is so that I can just clone my dotfiles anywhere, not just on NixOS machines. I also made a [NixOS cheatsheet](https://forgejo.mit.edu/SIPB/nixos-cheatsheet/). + + Run `NIX_SSHOPTS="-i ~/.ssh/xvm_ed25519" nixos-rebuild switch --target-host root@unnamed.website --flake .#Unnamed-Server` to remotely deploy the server.
• ThinkPad-X1-Yoga-Gen-6/hardware-configuration.nix (deleted)
  • @@ -1,55 +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 = [ - "xhci_pci" - "thunderbolt" - "nvme" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/854ed839-314f-44bd-b57f-655437c254bd"; - fsType = "btrfs"; - }; - - boot.initrd.luks.devices."luksdev".device = - "/dev/disk/by-uuid/f4e1fd6b-f03c-428f-a31e-7355a10b9a2c"; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/3A93-17DE"; - 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.<interface>.useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s13f0u2u1u2.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - }
• ThinkPad-Yoga-14/default.nix
  • @@ -11,5 +11,18 @@
    ./hardware-configuration.nix ]; + hardware = { + # Auto screen rotation in tablet mode + sensor.iio.enable = true; + # VA-API + graphics.extraPackages = with pkgs; [ intel-vaapi-driver ]; + }; + networking.hostName = "ThinkPad-Yoga-14"; + + systemd.user.services.switch-virtual-keyboard = { + wantedBy = [ "default.target" ]; + path = with pkgs; [ kdePackages.kconfig ]; + serviceConfig.ExecStart = pkgs.writers.writeFish "switch-virtual-keyboard" ./switch-virtual-keyboard.fish; + }; }
• switch-virtual-keyboard.fish > ThinkPad-Yoga-14/switch-virtual-keyboard.fish
• Unnamed-Server/default.nix
  • @@ -110,7 +110,7 @@
    "github.com/caddy-dns/porkbun@v0.3.1" "dev.mediocregopher.com/mediocre-caddy-plugins.git@v0.0.0-20250308145011-421597d7c920" ]; - hash = "sha256-ZXosfEyvNQo6VvR+Jz5+KQr7qTJjfSP4yHvSKNLVkXg="; + hash = "sha256-ljrlhAbXSkg+yzIgpbG69AJm6BsAYvAUvedGTv+7Lu8="; }; # Porkbun API keys environmentFile = "/etc/caddy/env";
• flake.lock
  • @@ -23,11 +23,11 @@
    }, "nixpkgs": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": {
  • @@ -37,27 +37,10 @@
    "type": "github" } }, - "nixpkgs-old": { - "locked": { - "lastModified": 1762844143, - "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", - "type": "github" - } - }, "root": { "inputs": { "disko": "disko", - "nixpkgs": "nixpkgs", - "nixpkgs-old": "nixpkgs-old" + "nixpkgs": "nixpkgs" } } },
• flake.nix
  • @@ -1,8 +1,6 @@
    { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - # For Rnote fix - nixpkgs-old.url = "github:NixOS/nixpkgs/9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4"; # For building an image for XVM # https://lantian.pub/en/article/modify-computer/nixos-low-ram-vps.lantian/ # https://unnamed.website/posts/nixvm/
  • @@ -19,24 +17,21 @@
    in { nixosConfigurations = { - # Very creative names, I know - ThinkPad-X1-Yoga-Gen-6 = nixpkgs.lib.nixosSystem { - specialArgs.pkgs-old = import inputs.nixpkgs-old { inherit system; }; + # Very creative names, I know, I ran out of name ideas sorry + Framework-13 = nixpkgs.lib.nixosSystem { modules = [ ./configuration.nix ./laptop.nix - ./ThinkPad-X1-Yoga-Gen-6 + ./Framework-13 ]; }; ThinkPad-Yoga-14 = nixpkgs.lib.nixosSystem { - specialArgs.pkgs-old = import inputs.nixpkgs-old { inherit system; }; modules = [ ./configuration.nix ./laptop.nix ./ThinkPad-Yoga-14 ]; }; - # I ran out of name ideas sorry Unnamed-Server = nixpkgs.lib.nixosSystem { modules = [ ./configuration.nix
• laptop.nix
  • @@ -2,18 +2,10 @@
    config, lib, pkgs, - pkgs-old, ... }: { - hardware = { - # Auto screen rotation in tablet mode - sensor.iio.enable = true; - # VA-API - graphics.extraPackages = with pkgs; [ intel-media-driver ]; - }; - boot.loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true;
  • @@ -96,19 +88,13 @@
    kdePackages.tokodon keepassxc kile - # TODO: Wait for the Krita 6 PR to be merged - # https://github.com/NixOS/nixpkgs/pull/487214 - # krita (mpv.override { scripts = with pkgs.mpvScripts; [ mpris visualizer ]; }) - # TODO: Rnote in nixos-unstable is broken due to gtk4 - # I could replace only gtk4 in the buildInputs which would shrink the closure, but that requires compiling Rnote - # https://github.com/flxzt/rnote/issues/1543 - pkgs-old.rnote + rnote signal-desktop # Utilities and other random junk
  • @@ -211,12 +197,6 @@
    ''; }; - systemd.user.services.switch-virtual-keyboard = { - wantedBy = [ "default.target" ]; - path = with pkgs; [ kdePackages.kconfig ]; - serviceConfig.ExecStart = pkgs.writers.writeFish "switch-virtual-keyboard" ./switch-virtual-keyboard.fish; - }; - # Add SSH key to agent during desktop login systemd.user.services.ssh-add = { wantedBy = [ "graphical-session.target" ];