From 3d9519a934ba1745ef7bda22834598723eb0e4d2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 6 Nov 2025 00:10:56 +0000 Subject: [PATCH 01/21] Copy initial configuration files from lemp11 --- hosts/lemp11/configuration.nix | 133 ++++++++++++++++++++++++ hosts/lemp11/hardware-configuration.nix | 40 +++++++ 2 files changed, 173 insertions(+) create mode 100644 hosts/lemp11/configuration.nix create mode 100644 hosts/lemp11/hardware-configuration.nix diff --git a/hosts/lemp11/configuration.nix b/hosts/lemp11/configuration.nix new file mode 100644 index 00000000..96a0e976 --- /dev/null +++ b/hosts/lemp11/configuration.nix @@ -0,0 +1,133 @@ +# 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. + ./hardware-configuration.nix + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "lemp11"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "Europe/London"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_GB.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_GB.UTF-8"; + LC_IDENTIFICATION = "en_GB.UTF-8"; + LC_MEASUREMENT = "en_GB.UTF-8"; + LC_MONETARY = "en_GB.UTF-8"; + LC_NAME = "en_GB.UTF-8"; + LC_NUMERIC = "en_GB.UTF-8"; + LC_PAPER = "en_GB.UTF-8"; + LC_TELEPHONE = "en_GB.UTF-8"; + LC_TIME = "en_GB.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the Cinnamon Desktop Environment. + services.xserver.displayManager.lightdm.enable = true; + services.xserver.desktopManager.cinnamon.enable = true; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "gb"; + variant = ""; + }; + + # Configure console keymap + console.keyMap = "uk"; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + services.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.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.opdavies = { + isNormalUser = true; + description = "opdavies"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; [ + # thunderbird + ]; + }; + + # Install firefox. + programs.firefox.enable = true; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + 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; + + # 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 = "25.05"; # Did you read the comment? + +} diff --git a/hosts/lemp11/hardware-configuration.nix b/hosts/lemp11/hardware-configuration.nix new file mode 100644 index 00000000..b0c1df14 --- /dev/null +++ b/hosts/lemp11/hardware-configuration.nix @@ -0,0 +1,40 @@ +# 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" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/ee7ce610-9185-4f9a-9def-0a1dc018e8c3"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/4726-8F9B"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/79837741-31fd-460c-ab36-7f9ae203d44a"; } + ]; + + # 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.wlp0s20f3.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From 24c5fb5ec03f1193ef1fe2f8953058d45fea3d31 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 6 Nov 2025 18:19:39 +0000 Subject: [PATCH 02/21] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'bop-scripts': 'github:breadonpenguins/scripts/1396a09a206dbd6f9a08ffa7a5603e6d55ae5f00?narHash=sha256-SpQ4TMOsYCr9EoCdUZ1GeX5cOoPHfxEYyRakYznc91w%3D' (2025-10-12) → 'github:breadonpenguins/scripts/7c01cb65b5f5e06b1e80adb2d397fb972d9f9783?narHash=sha256-Gdv0vWULnVnX2JVFU7Cu/g0%2Bc%2BDYMsRy4JjTAuRc8sA%3D' (2025-11-04) • Updated input 'disko': 'github:nix-community/disko/6f4cf5abbe318e4cd1e879506f6eeafd83f7b998?narHash=sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM%3D' (2025-10-31) → 'github:nix-community/disko/af087d076d3860760b3323f6b583f4d828c1ac17?narHash=sha256-TtcPgPmp2f0FAnc%2BDMEw4ardEgv1SGNR3/WFGH0N19M%3D' (2025-11-04) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/864599284fc7c0ba6357ed89ed5e2cd5040f0c04?narHash=sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4%3D' (2025-10-20) → 'github:hercules-ci/flake-parts/26d05891e14c88eb4a5d5bee659c0db5afb609d8?narHash=sha256-xxdepIcb39UJ94%2BYydGP221rjnpkDZUlykKuF54PsqI%3D' (2025-11-06) • Updated input 'flake-parts/nixpkgs-lib': 'github:nix-community/nixpkgs.lib/a73b9c743612e4244d865a2fdee11865283c04e6?narHash=sha256-x2rJ%2BOvzq0sCMpgfgGaaqgBSwY%2BLST%2BWbZ6TytnT9Rk%3D' (2025-08-10) → 'github:nix-community/nixpkgs.lib/719359f4562934ae99f5443f20aa06c2ffff91fc?narHash=sha256-b0yj6kfvO8ApcSE%2BQmA6mUfu8IYG6/uU28OFn4PaC8M%3D' (2025-10-29) • Updated input 'home-manager': 'github:nix-community/home-manager/4ac96eb21c101a3e5b77ba105febc5641a8959aa?narHash=sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5%2BxU%3D' (2025-10-31) → 'github:nix-community/home-manager/2907788315a73d3292140b4d59b5d95796565625?narHash=sha256-BFhoqL231hyTZ7piR%2B8FgDJby48oWRN8%2Bg3b1uvvtX8%3D' (2025-11-06) • Updated input 'import-tree': 'github:vic/import-tree/a037ed2a58fc0ebed9e93b9ef79b0646e648f719?narHash=sha256-TEbh9zISiQcU82VwVoEbmXHnSGlUxTwvjJA9g9ErSDA%3D' (2025-10-22) → 'github:vic/import-tree/90fa129798be99cde036b78658e89475710966a1?narHash=sha256-AJ96FNj50DU0bTyIzAPkPOjCZTHqjURVjok8qoXvmqM%3D' (2025-11-05) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/ed6b293161b378a7368cda38659eb8d3d9a0dac4?narHash=sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo%3D' (2025-10-26) → 'github:nix-community/nix-index-database/359ff6333a7b0b60819d4c20ed05a3a1f726771f?narHash=sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo%3D' (2025-11-02) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/7467f155fcba189eb088a7601f44fbef7688669b?narHash=sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM%3D' (2025-10-31) → 'github:NixOS/nixos-hardware/24084931d8098fce300fabea9e48fa96292228d7?narHash=sha256-sQJuoiqsaIvKiIOmF/3FDV5dM2TGL2jBv1PeQSt83YE%3D' (2025-11-06) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15?narHash=sha256-kJ8lIZsiPOmbkJypG%2BB5sReDXSD1KGu2VEPNqhRa/ew%3D' (2025-10-31) → 'github:nixos/nixpkgs/b3d51a0365f6695e7dd5cdf3e180604530ed33b4?narHash=sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw%3D' (2025-11-02) • Updated input 'nixvim': 'github:nix-community/nixvim/fedd0e287081c0e20a45fdf3bc0e1ecc6e9a0225?narHash=sha256-yutWdFO7EkJGdQOquwHvyWZ%2B3KpPowzy%2Bv1xb8IA/K4%3D' (2025-10-31) → 'github:nix-community/nixvim/d01e1c17e2690c10d3aa6abea28838befa1fd449?narHash=sha256-qEI9AkUwOHtM5A2yDBy0K%2BUHGLfYir81dFiTN0DXBeU%3D' (2025-11-06) • Updated input 'nur': 'github:nix-community/NUR/64d040646b791571b0e3658bb934c7ce78c482bb?narHash=sha256-bdC2Y1/wTa6VbOUyCDsHbL0UAi8M/nZUEEf6Omyko88%3D' (2025-11-01) → 'github:nix-community/NUR/8207b2a2d9f644dfb4fd9e87a1dd49e9d79dd0af?narHash=sha256-Pl7z0IhHpo48P75ViLfz638P68fbQ6EUwCmB4wIegF0%3D' (2025-11-06) • Updated input 'z': 'git+https://code.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=c2ee61e54afabacd1571ad23fcdffaef195a8df7' (2025-11-03) → 'git+https://code.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=798bfdd5ca7f7107217aa101b9cb6a205f551e12' (2025-11-06) --- flake.lock | 74 +++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 2f05ce6c..befe1952 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "bop-scripts": { "flake": false, "locked": { - "lastModified": 1760234399, - "narHash": "sha256-SpQ4TMOsYCr9EoCdUZ1GeX5cOoPHfxEYyRakYznc91w=", + "lastModified": 1762264847, + "narHash": "sha256-Gdv0vWULnVnX2JVFU7Cu/g0+c+DYMsRy4JjTAuRc8sA=", "owner": "breadonpenguins", "repo": "scripts", - "rev": "1396a09a206dbd6f9a08ffa7a5603e6d55ae5f00", + "rev": "7c01cb65b5f5e06b1e80adb2d397fb972d9f9783", "type": "github" }, "original": { @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1761899396, - "narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=", + "lastModified": 1762276996, + "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", "owner": "nix-community", "repo": "disko", - "rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998", + "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1762440070, + "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", "type": "github" }, "original": { @@ -232,11 +232,11 @@ ] }, "locked": { - "lastModified": 1761878381, - "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=", + "lastModified": 1762447448, + "narHash": "sha256-BFhoqL231hyTZ7piR+8FgDJby48oWRN8+g3b1uvvtX8=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa", + "rev": "2907788315a73d3292140b4d59b5d95796565625", "type": "github" }, "original": { @@ -248,11 +248,11 @@ }, "import-tree": { "locked": { - "lastModified": 1761120675, - "narHash": "sha256-TEbh9zISiQcU82VwVoEbmXHnSGlUxTwvjJA9g9ErSDA=", + "lastModified": 1762327901, + "narHash": "sha256-AJ96FNj50DU0bTyIzAPkPOjCZTHqjURVjok8qoXvmqM=", "owner": "vic", "repo": "import-tree", - "rev": "a037ed2a58fc0ebed9e93b9ef79b0646e648f719", + "rev": "90fa129798be99cde036b78658e89475710966a1", "type": "github" }, "original": { @@ -296,11 +296,11 @@ ] }, "locked": { - "lastModified": 1761451000, - "narHash": "sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo=", + "lastModified": 1762055842, + "narHash": "sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ed6b293161b378a7368cda38659eb8d3d9a0dac4", + "rev": "359ff6333a7b0b60819d4c20ed05a3a1f726771f", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1761933221, - "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", + "lastModified": 1762427122, + "narHash": "sha256-sQJuoiqsaIvKiIOmF/3FDV5dM2TGL2jBv1PeQSt83YE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7467f155fcba189eb088a7601f44fbef7688669b", + "rev": "24084931d8098fce300fabea9e48fa96292228d7", "type": "github" }, "original": { @@ -327,11 +327,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761907660, - "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -343,11 +343,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "type": "github" }, "original": { @@ -400,11 +400,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1761947009, - "narHash": "sha256-yutWdFO7EkJGdQOquwHvyWZ+3KpPowzy+v1xb8IA/K4=", + "lastModified": 1762437234, + "narHash": "sha256-qEI9AkUwOHtM5A2yDBy0K+UHGLfYir81dFiTN0DXBeU=", "owner": "nix-community", "repo": "nixvim", - "rev": "fedd0e287081c0e20a45fdf3bc0e1ecc6e9a0225", + "rev": "d01e1c17e2690c10d3aa6abea28838befa1fd449", "type": "github" }, "original": { @@ -421,11 +421,11 @@ ] }, "locked": { - "lastModified": 1762024599, - "narHash": "sha256-bdC2Y1/wTa6VbOUyCDsHbL0UAi8M/nZUEEf6Omyko88=", + "lastModified": 1762452435, + "narHash": "sha256-Pl7z0IhHpo48P75ViLfz638P68fbQ6EUwCmB4wIegF0=", "owner": "nix-community", "repo": "NUR", - "rev": "64d040646b791571b0e3658bb934c7ce78c482bb", + "rev": "8207b2a2d9f644dfb4fd9e87a1dd49e9d79dd0af", "type": "github" }, "original": { @@ -582,11 +582,11 @@ ] }, "locked": { - "lastModified": 1762197997, - "narHash": "sha256-gbCTy6PqSLmCFDeLy9l5Vebzy2stbHY5V555p+jnpTQ=", + "lastModified": 1762452973, + "narHash": "sha256-rJmk//VjOfbqu1ZbD98Tc74G2M2awnsUf/X6TxvNols=", "ref": "refs/heads/main", - "rev": "c2ee61e54afabacd1571ad23fcdffaef195a8df7", - "revCount": 141, + "rev": "798bfdd5ca7f7107217aa101b9cb6a205f551e12", + "revCount": 142, "type": "git", "url": "https://code.oliverdavies.uk/opdavies/z" }, From 3aad074833c7d2171e7cfb461d5859cce75eb64b Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 6 Nov 2025 18:19:39 +0000 Subject: [PATCH 03/21] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'bop-scripts': 'github:breadonpenguins/scripts/1396a09a206dbd6f9a08ffa7a5603e6d55ae5f00?narHash=sha256-SpQ4TMOsYCr9EoCdUZ1GeX5cOoPHfxEYyRakYznc91w%3D' (2025-10-12) → 'github:breadonpenguins/scripts/7c01cb65b5f5e06b1e80adb2d397fb972d9f9783?narHash=sha256-Gdv0vWULnVnX2JVFU7Cu/g0%2Bc%2BDYMsRy4JjTAuRc8sA%3D' (2025-11-04) • Updated input 'disko': 'github:nix-community/disko/6f4cf5abbe318e4cd1e879506f6eeafd83f7b998?narHash=sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM%3D' (2025-10-31) → 'github:nix-community/disko/af087d076d3860760b3323f6b583f4d828c1ac17?narHash=sha256-TtcPgPmp2f0FAnc%2BDMEw4ardEgv1SGNR3/WFGH0N19M%3D' (2025-11-04) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/864599284fc7c0ba6357ed89ed5e2cd5040f0c04?narHash=sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4%3D' (2025-10-20) → 'github:hercules-ci/flake-parts/26d05891e14c88eb4a5d5bee659c0db5afb609d8?narHash=sha256-xxdepIcb39UJ94%2BYydGP221rjnpkDZUlykKuF54PsqI%3D' (2025-11-06) • Updated input 'flake-parts/nixpkgs-lib': 'github:nix-community/nixpkgs.lib/a73b9c743612e4244d865a2fdee11865283c04e6?narHash=sha256-x2rJ%2BOvzq0sCMpgfgGaaqgBSwY%2BLST%2BWbZ6TytnT9Rk%3D' (2025-08-10) → 'github:nix-community/nixpkgs.lib/719359f4562934ae99f5443f20aa06c2ffff91fc?narHash=sha256-b0yj6kfvO8ApcSE%2BQmA6mUfu8IYG6/uU28OFn4PaC8M%3D' (2025-10-29) • Updated input 'home-manager': 'github:nix-community/home-manager/4ac96eb21c101a3e5b77ba105febc5641a8959aa?narHash=sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5%2BxU%3D' (2025-10-31) → 'github:nix-community/home-manager/2907788315a73d3292140b4d59b5d95796565625?narHash=sha256-BFhoqL231hyTZ7piR%2B8FgDJby48oWRN8%2Bg3b1uvvtX8%3D' (2025-11-06) • Updated input 'import-tree': 'github:vic/import-tree/a037ed2a58fc0ebed9e93b9ef79b0646e648f719?narHash=sha256-TEbh9zISiQcU82VwVoEbmXHnSGlUxTwvjJA9g9ErSDA%3D' (2025-10-22) → 'github:vic/import-tree/90fa129798be99cde036b78658e89475710966a1?narHash=sha256-AJ96FNj50DU0bTyIzAPkPOjCZTHqjURVjok8qoXvmqM%3D' (2025-11-05) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/ed6b293161b378a7368cda38659eb8d3d9a0dac4?narHash=sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo%3D' (2025-10-26) → 'github:nix-community/nix-index-database/359ff6333a7b0b60819d4c20ed05a3a1f726771f?narHash=sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo%3D' (2025-11-02) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/7467f155fcba189eb088a7601f44fbef7688669b?narHash=sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM%3D' (2025-10-31) → 'github:NixOS/nixos-hardware/24084931d8098fce300fabea9e48fa96292228d7?narHash=sha256-sQJuoiqsaIvKiIOmF/3FDV5dM2TGL2jBv1PeQSt83YE%3D' (2025-11-06) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15?narHash=sha256-kJ8lIZsiPOmbkJypG%2BB5sReDXSD1KGu2VEPNqhRa/ew%3D' (2025-10-31) → 'github:nixos/nixpkgs/b3d51a0365f6695e7dd5cdf3e180604530ed33b4?narHash=sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw%3D' (2025-11-02) • Updated input 'nixvim': 'github:nix-community/nixvim/fedd0e287081c0e20a45fdf3bc0e1ecc6e9a0225?narHash=sha256-yutWdFO7EkJGdQOquwHvyWZ%2B3KpPowzy%2Bv1xb8IA/K4%3D' (2025-10-31) → 'github:nix-community/nixvim/d01e1c17e2690c10d3aa6abea28838befa1fd449?narHash=sha256-qEI9AkUwOHtM5A2yDBy0K%2BUHGLfYir81dFiTN0DXBeU%3D' (2025-11-06) • Updated input 'nur': 'github:nix-community/NUR/64d040646b791571b0e3658bb934c7ce78c482bb?narHash=sha256-bdC2Y1/wTa6VbOUyCDsHbL0UAi8M/nZUEEf6Omyko88%3D' (2025-11-01) → 'github:nix-community/NUR/8207b2a2d9f644dfb4fd9e87a1dd49e9d79dd0af?narHash=sha256-Pl7z0IhHpo48P75ViLfz638P68fbQ6EUwCmB4wIegF0%3D' (2025-11-06) • Updated input 'z': 'git+https://code.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=c2ee61e54afabacd1571ad23fcdffaef195a8df7' (2025-11-03) → 'git+https://code.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=798bfdd5ca7f7107217aa101b9cb6a205f551e12' (2025-11-06) --- flake.lock | 74 +++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 2f05ce6c..befe1952 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "bop-scripts": { "flake": false, "locked": { - "lastModified": 1760234399, - "narHash": "sha256-SpQ4TMOsYCr9EoCdUZ1GeX5cOoPHfxEYyRakYznc91w=", + "lastModified": 1762264847, + "narHash": "sha256-Gdv0vWULnVnX2JVFU7Cu/g0+c+DYMsRy4JjTAuRc8sA=", "owner": "breadonpenguins", "repo": "scripts", - "rev": "1396a09a206dbd6f9a08ffa7a5603e6d55ae5f00", + "rev": "7c01cb65b5f5e06b1e80adb2d397fb972d9f9783", "type": "github" }, "original": { @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1761899396, - "narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=", + "lastModified": 1762276996, + "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", "owner": "nix-community", "repo": "disko", - "rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998", + "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1762440070, + "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", "type": "github" }, "original": { @@ -232,11 +232,11 @@ ] }, "locked": { - "lastModified": 1761878381, - "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=", + "lastModified": 1762447448, + "narHash": "sha256-BFhoqL231hyTZ7piR+8FgDJby48oWRN8+g3b1uvvtX8=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa", + "rev": "2907788315a73d3292140b4d59b5d95796565625", "type": "github" }, "original": { @@ -248,11 +248,11 @@ }, "import-tree": { "locked": { - "lastModified": 1761120675, - "narHash": "sha256-TEbh9zISiQcU82VwVoEbmXHnSGlUxTwvjJA9g9ErSDA=", + "lastModified": 1762327901, + "narHash": "sha256-AJ96FNj50DU0bTyIzAPkPOjCZTHqjURVjok8qoXvmqM=", "owner": "vic", "repo": "import-tree", - "rev": "a037ed2a58fc0ebed9e93b9ef79b0646e648f719", + "rev": "90fa129798be99cde036b78658e89475710966a1", "type": "github" }, "original": { @@ -296,11 +296,11 @@ ] }, "locked": { - "lastModified": 1761451000, - "narHash": "sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo=", + "lastModified": 1762055842, + "narHash": "sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ed6b293161b378a7368cda38659eb8d3d9a0dac4", + "rev": "359ff6333a7b0b60819d4c20ed05a3a1f726771f", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1761933221, - "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", + "lastModified": 1762427122, + "narHash": "sha256-sQJuoiqsaIvKiIOmF/3FDV5dM2TGL2jBv1PeQSt83YE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7467f155fcba189eb088a7601f44fbef7688669b", + "rev": "24084931d8098fce300fabea9e48fa96292228d7", "type": "github" }, "original": { @@ -327,11 +327,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761907660, - "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -343,11 +343,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "type": "github" }, "original": { @@ -400,11 +400,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1761947009, - "narHash": "sha256-yutWdFO7EkJGdQOquwHvyWZ+3KpPowzy+v1xb8IA/K4=", + "lastModified": 1762437234, + "narHash": "sha256-qEI9AkUwOHtM5A2yDBy0K+UHGLfYir81dFiTN0DXBeU=", "owner": "nix-community", "repo": "nixvim", - "rev": "fedd0e287081c0e20a45fdf3bc0e1ecc6e9a0225", + "rev": "d01e1c17e2690c10d3aa6abea28838befa1fd449", "type": "github" }, "original": { @@ -421,11 +421,11 @@ ] }, "locked": { - "lastModified": 1762024599, - "narHash": "sha256-bdC2Y1/wTa6VbOUyCDsHbL0UAi8M/nZUEEf6Omyko88=", + "lastModified": 1762452435, + "narHash": "sha256-Pl7z0IhHpo48P75ViLfz638P68fbQ6EUwCmB4wIegF0=", "owner": "nix-community", "repo": "NUR", - "rev": "64d040646b791571b0e3658bb934c7ce78c482bb", + "rev": "8207b2a2d9f644dfb4fd9e87a1dd49e9d79dd0af", "type": "github" }, "original": { @@ -582,11 +582,11 @@ ] }, "locked": { - "lastModified": 1762197997, - "narHash": "sha256-gbCTy6PqSLmCFDeLy9l5Vebzy2stbHY5V555p+jnpTQ=", + "lastModified": 1762452973, + "narHash": "sha256-rJmk//VjOfbqu1ZbD98Tc74G2M2awnsUf/X6TxvNols=", "ref": "refs/heads/main", - "rev": "c2ee61e54afabacd1571ad23fcdffaef195a8df7", - "revCount": 141, + "rev": "798bfdd5ca7f7107217aa101b9cb6a205f551e12", + "revCount": 142, "type": "git", "url": "https://code.oliverdavies.uk/opdavies/z" }, From d28cc183427e4dab41a5cad5ac3aa86f2ed0c95e Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 6 Nov 2025 21:56:15 +0000 Subject: [PATCH 04/21] Re-add oil.nvim Signed-off-by: Oliver Davies --- modules/nixvim/oil.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 modules/nixvim/oil.nix diff --git a/modules/nixvim/oil.nix b/modules/nixvim/oil.nix new file mode 100644 index 00000000..80a83874 --- /dev/null +++ b/modules/nixvim/oil.nix @@ -0,0 +1,24 @@ +{ + flake.modules.nixvim.custom = { + plugins.oil = { + enable = true; + + settings = { + delete_to_trash = true; + + keymaps."-" = "actions.parent"; + + skip_confirm_for_simple_edits = true; + view_options.show_hidden = true; + }; + }; + + keymaps = [ + { + action = "Oil"; + key = "-"; + } + ]; + }; +} + From 9afe0e9271aaa7d28b12fafa769b6cc024357921 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 6 Nov 2025 22:14:26 +0000 Subject: [PATCH 05/21] Enable qmk.nvim plugin Add the qmk.nvim plugin to automatically format and update ZMK and QMK keyboard layouts in their configuration files. GitHub repo: https://github.com/codethread/qmk.nvim YouTube video by linkarzu: https://www.youtube.com/watch?v=menWdCt3Go0 Commit after formatting: https://code.oliverdavies.uk/opdavies/glove80-zmk-config/commit/fb674 Signed-off-by: Oliver Davies --- modules/nixvim/qmk.nix | 18 ++++++++++++++++++ modules/nixvim/treesitter.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 modules/nixvim/qmk.nix diff --git a/modules/nixvim/qmk.nix b/modules/nixvim/qmk.nix new file mode 100644 index 00000000..54997959 --- /dev/null +++ b/modules/nixvim/qmk.nix @@ -0,0 +1,18 @@ +{ + flake.modules.nixvim.custom.plugins.qmk = { + enable = true; + + settings = { + layout = [ + "x x x x x _ _ _ _ _ _ _ _ _ x x x x x" + "x x x x x x _ _ _ _ _ _ _ x x x x x x" + "x x x x x x _ _ _ _ _ _ _ x x x x x x" + "x x x x x x _ _ _ _ _ _ _ x x x x x x" + "x x x x x x x x x _ x x x x x x x x x" + "x x x x x _ x x x _ x x x _ x x x x x" + ]; + name = "LAYOUT_glove80"; + variant = "zmk"; + }; + }; +} diff --git a/modules/nixvim/treesitter.nix b/modules/nixvim/treesitter.nix index 02de1492..05ffc537 100644 --- a/modules/nixvim/treesitter.nix +++ b/modules/nixvim/treesitter.nix @@ -11,6 +11,7 @@ comment css csv + devicetree dockerfile gitattributes gitignore From 9c748220f439d9a67b3358ec93d5b04ff56e7716 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 7 Nov 2025 21:34:16 +0000 Subject: [PATCH 06/21] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'bop-scripts': 'github:breadonpenguins/scripts/7c01cb65b5f5e06b1e80adb2d397fb972d9f9783?narHash=sha256-Gdv0vWULnVnX2JVFU7Cu/g0%2Bc%2BDYMsRy4JjTAuRc8sA%3D' (2025-11-04) → 'github:breadonpenguins/scripts/c1c94c3f4b89076dc8f788fae12f639dda663ddb?narHash=sha256-kvhro91rmPgSX8LYLTsesLJlOlKp1YJsIg9e%2BCb9u6o%3D' (2025-11-06) • Updated input 'home-manager': 'github:nix-community/home-manager/2907788315a73d3292140b4d59b5d95796565625?narHash=sha256-BFhoqL231hyTZ7piR%2B8FgDJby48oWRN8%2Bg3b1uvvtX8%3D' (2025-11-06) → 'github:nix-community/home-manager/0562fef070a1027325dd4ea10813d64d2c967b39?narHash=sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU%3D' (2025-11-06) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/24084931d8098fce300fabea9e48fa96292228d7?narHash=sha256-sQJuoiqsaIvKiIOmF/3FDV5dM2TGL2jBv1PeQSt83YE%3D' (2025-11-06) → 'github:NixOS/nixos-hardware/52113c4f5cfd1e823001310e56d9c8d0699a6226?narHash=sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7%2B/YE%3D' (2025-11-06) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/b3d51a0365f6695e7dd5cdf3e180604530ed33b4?narHash=sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw%3D' (2025-11-02) → 'github:nixos/nixpkgs/ae814fd3904b621d8ab97418f1d0f2eb0d3716f4?narHash=sha256-YRqMDEtSMbitIMj%2BJLpheSz0pwEr0Rmy5mC7myl17xs%3D' (2025-11-05) • Updated input 'nixvim': 'github:nix-community/nixvim/d01e1c17e2690c10d3aa6abea28838befa1fd449?narHash=sha256-qEI9AkUwOHtM5A2yDBy0K%2BUHGLfYir81dFiTN0DXBeU%3D' (2025-11-06) → 'github:nix-community/nixvim/3031d4ab616323f6d41704dfb46f2b801f29973d?narHash=sha256-VH4%2BfAB85irWuzxfWPfEEwDOE%2BeQsB/pljNApM0onuU%3D' (2025-11-07) • Updated input 'nur': 'github:nix-community/NUR/8207b2a2d9f644dfb4fd9e87a1dd49e9d79dd0af?narHash=sha256-Pl7z0IhHpo48P75ViLfz638P68fbQ6EUwCmB4wIegF0%3D' (2025-11-06) → 'github:nix-community/NUR/ea81f1a7fb100927f3608a1f33b21c64bfa0cdfc?narHash=sha256-65HoNBEFjLDyD%2B%2BNEUYIWvN6FVjeTiJnX/NFGwUCuH4%3D' (2025-11-07) • Updated input 'z': 'git+https://code.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=798bfdd5ca7f7107217aa101b9cb6a205f551e12' (2025-11-06) → 'git+https://code.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=3e69cec58d545d9a277f7a9119de08cd92c9a525' (2025-11-07) --- flake.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index befe1952..5afda335 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "bop-scripts": { "flake": false, "locked": { - "lastModified": 1762264847, - "narHash": "sha256-Gdv0vWULnVnX2JVFU7Cu/g0+c+DYMsRy4JjTAuRc8sA=", + "lastModified": 1762468291, + "narHash": "sha256-kvhro91rmPgSX8LYLTsesLJlOlKp1YJsIg9e+Cb9u6o=", "owner": "breadonpenguins", "repo": "scripts", - "rev": "7c01cb65b5f5e06b1e80adb2d397fb972d9f9783", + "rev": "c1c94c3f4b89076dc8f788fae12f639dda663ddb", "type": "github" }, "original": { @@ -232,11 +232,11 @@ ] }, "locked": { - "lastModified": 1762447448, - "narHash": "sha256-BFhoqL231hyTZ7piR+8FgDJby48oWRN8+g3b1uvvtX8=", + "lastModified": 1762463325, + "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", "owner": "nix-community", "repo": "home-manager", - "rev": "2907788315a73d3292140b4d59b5d95796565625", + "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762427122, - "narHash": "sha256-sQJuoiqsaIvKiIOmF/3FDV5dM2TGL2jBv1PeQSt83YE=", + "lastModified": 1762463231, + "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "24084931d8098fce300fabea9e48fa96292228d7", + "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", "type": "github" }, "original": { @@ -327,11 +327,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "type": "github" }, "original": { @@ -400,11 +400,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1762437234, - "narHash": "sha256-qEI9AkUwOHtM5A2yDBy0K+UHGLfYir81dFiTN0DXBeU=", + "lastModified": 1762523528, + "narHash": "sha256-VH4+fAB85irWuzxfWPfEEwDOE+eQsB/pljNApM0onuU=", "owner": "nix-community", "repo": "nixvim", - "rev": "d01e1c17e2690c10d3aa6abea28838befa1fd449", + "rev": "3031d4ab616323f6d41704dfb46f2b801f29973d", "type": "github" }, "original": { @@ -421,11 +421,11 @@ ] }, "locked": { - "lastModified": 1762452435, - "narHash": "sha256-Pl7z0IhHpo48P75ViLfz638P68fbQ6EUwCmB4wIegF0=", + "lastModified": 1762548305, + "narHash": "sha256-65HoNBEFjLDyD++NEUYIWvN6FVjeTiJnX/NFGwUCuH4=", "owner": "nix-community", "repo": "NUR", - "rev": "8207b2a2d9f644dfb4fd9e87a1dd49e9d79dd0af", + "rev": "ea81f1a7fb100927f3608a1f33b21c64bfa0cdfc", "type": "github" }, "original": { @@ -582,11 +582,11 @@ ] }, "locked": { - "lastModified": 1762452973, - "narHash": "sha256-rJmk//VjOfbqu1ZbD98Tc74G2M2awnsUf/X6TxvNols=", + "lastModified": 1762549732, + "narHash": "sha256-pNCw/IiZ5Z2SuN1GgBR0oMbETpulk5vj/Set8b9p6No=", "ref": "refs/heads/main", - "rev": "798bfdd5ca7f7107217aa101b9cb6a205f551e12", - "revCount": 142, + "rev": "3e69cec58d545d9a277f7a9119de08cd92c9a525", + "revCount": 144, "type": "git", "url": "https://code.oliverdavies.uk/opdavies/z" }, From 6a2e5413eebd16a22e2ac430fb2d86a2c791f762 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 7 Nov 2025 23:14:23 +0000 Subject: [PATCH 07/21] Remove sudo-rs --- hosts/nixedo/configuration.nix | 2 -- modules/sudo.nix | 2 -- 2 files changed, 4 deletions(-) diff --git a/hosts/nixedo/configuration.nix b/hosts/nixedo/configuration.nix index abf3ab99..f59020f5 100644 --- a/hosts/nixedo/configuration.nix +++ b/hosts/nixedo/configuration.nix @@ -48,6 +48,4 @@ tree vim ]; - - security.sudo-rs.enable = lib.mkForce false; } diff --git a/modules/sudo.nix b/modules/sudo.nix index 7f70c7c6..933b9963 100644 --- a/modules/sudo.nix +++ b/modules/sudo.nix @@ -2,8 +2,6 @@ { flake.modules.nixos.pc = { - security.sudo-rs.enable = true; - users.users.${config.flake.meta.owner.username}.extraGroups = [ "wheel" ]; }; } From 361f47a2baf4e9a2137e5ce0537b87dfd296ac09 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 7 Nov 2025 23:14:56 +0000 Subject: [PATCH 08/21] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nur': 'github:nix-community/NUR/ea81f1a7fb100927f3608a1f33b21c64bfa0cdfc?narHash=sha256-65HoNBEFjLDyD%2B%2BNEUYIWvN6FVjeTiJnX/NFGwUCuH4%3D' (2025-11-07) → 'github:nix-community/NUR/68b01383f627a75b23633abcc72f71dde622f50f?narHash=sha256-85gEriuyJY4fOVKS54rxxbrD%2BPtf1gA303mXZpV9hcM%3D' (2025-11-07) • Updated input 'z': 'git+https://code.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=3e69cec58d545d9a277f7a9119de08cd92c9a525' (2025-11-07) → 'git+https://code.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=e43690474566c91257bf7106ec1fedb77bf73475' (2025-11-07) --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 5afda335..aa3e86d2 100644 --- a/flake.lock +++ b/flake.lock @@ -421,11 +421,11 @@ ] }, "locked": { - "lastModified": 1762548305, - "narHash": "sha256-65HoNBEFjLDyD++NEUYIWvN6FVjeTiJnX/NFGwUCuH4=", + "lastModified": 1762554789, + "narHash": "sha256-85gEriuyJY4fOVKS54rxxbrD+Ptf1gA303mXZpV9hcM=", "owner": "nix-community", "repo": "NUR", - "rev": "ea81f1a7fb100927f3608a1f33b21c64bfa0cdfc", + "rev": "68b01383f627a75b23633abcc72f71dde622f50f", "type": "github" }, "original": { @@ -582,11 +582,11 @@ ] }, "locked": { - "lastModified": 1762549732, - "narHash": "sha256-pNCw/IiZ5Z2SuN1GgBR0oMbETpulk5vj/Set8b9p6No=", + "lastModified": 1762555695, + "narHash": "sha256-yoH8OZPXsTh3tJuD7N1oxKaOaIdZRKhsfXhfDdMLDDE=", "ref": "refs/heads/main", - "rev": "3e69cec58d545d9a277f7a9119de08cd92c9a525", - "revCount": 144, + "rev": "e43690474566c91257bf7106ec1fedb77bf73475", + "revCount": 147, "type": "git", "url": "https://code.oliverdavies.uk/opdavies/z" }, From ba4f355193464f82791ce2f749ff25c93956ed47 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 8 Nov 2025 03:20:20 +0000 Subject: [PATCH 09/21] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'z': 'git+https://code.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=e43690474566c91257bf7106ec1fedb77bf73475' (2025-11-07) → 'git+https://code.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=50661b0ef8f2f3fd79c30729edf7009dd8220840' (2025-11-08) --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index aa3e86d2..23a935b1 100644 --- a/flake.lock +++ b/flake.lock @@ -582,11 +582,11 @@ ] }, "locked": { - "lastModified": 1762555695, - "narHash": "sha256-yoH8OZPXsTh3tJuD7N1oxKaOaIdZRKhsfXhfDdMLDDE=", + "lastModified": 1762571902, + "narHash": "sha256-C8euv0RufZDi0LGg2dyx3uz80PNLqaSaMwpokQa3Y50=", "ref": "refs/heads/main", - "rev": "e43690474566c91257bf7106ec1fedb77bf73475", - "revCount": 147, + "rev": "50661b0ef8f2f3fd79c30729edf7009dd8220840", + "revCount": 153, "type": "git", "url": "https://code.oliverdavies.uk/opdavies/z" }, From 1c1862e5826ab7b1aaec05d7246e8666cee26bb3 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 8 Nov 2025 12:45:31 +0000 Subject: [PATCH 10/21] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixvim': 'github:nix-community/nixvim/3031d4ab616323f6d41704dfb46f2b801f29973d?narHash=sha256-VH4%2BfAB85irWuzxfWPfEEwDOE%2BeQsB/pljNApM0onuU%3D' (2025-11-07) → 'github:nix-community/nixvim/d4b798a469248aa2b0bba4508bd8f97837566885?narHash=sha256-TUYm7Ihtl8472GPTbj/cQWUJeDNQ4a9kuz93wkEIE8M%3D' (2025-11-08) • Updated input 'nur': 'github:nix-community/NUR/68b01383f627a75b23633abcc72f71dde622f50f?narHash=sha256-85gEriuyJY4fOVKS54rxxbrD%2BPtf1gA303mXZpV9hcM%3D' (2025-11-07) → 'github:nix-community/NUR/84a04dd267f040a3be5a9a6cc8f1518cdb55b7c4?narHash=sha256-1%2Bs2HhAdoM72R91O3dxoLAvVeld2kINeI4EakAkIKD8%3D' (2025-11-08) • Updated input 'z': 'git+https://code.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=50661b0ef8f2f3fd79c30729edf7009dd8220840' (2025-11-08) → 'git+https://code.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=2e92d07eb740acce9ebadacd0507bda33521e04b' (2025-11-08) --- flake.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 23a935b1..f7242e4b 100644 --- a/flake.lock +++ b/flake.lock @@ -400,11 +400,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1762523528, - "narHash": "sha256-VH4+fAB85irWuzxfWPfEEwDOE+eQsB/pljNApM0onuU=", + "lastModified": 1762604519, + "narHash": "sha256-TUYm7Ihtl8472GPTbj/cQWUJeDNQ4a9kuz93wkEIE8M=", "owner": "nix-community", "repo": "nixvim", - "rev": "3031d4ab616323f6d41704dfb46f2b801f29973d", + "rev": "d4b798a469248aa2b0bba4508bd8f97837566885", "type": "github" }, "original": { @@ -421,11 +421,11 @@ ] }, "locked": { - "lastModified": 1762554789, - "narHash": "sha256-85gEriuyJY4fOVKS54rxxbrD+Ptf1gA303mXZpV9hcM=", + "lastModified": 1762604108, + "narHash": "sha256-1+s2HhAdoM72R91O3dxoLAvVeld2kINeI4EakAkIKD8=", "owner": "nix-community", "repo": "NUR", - "rev": "68b01383f627a75b23633abcc72f71dde622f50f", + "rev": "84a04dd267f040a3be5a9a6cc8f1518cdb55b7c4", "type": "github" }, "original": { @@ -582,11 +582,11 @@ ] }, "locked": { - "lastModified": 1762571902, - "narHash": "sha256-C8euv0RufZDi0LGg2dyx3uz80PNLqaSaMwpokQa3Y50=", + "lastModified": 1762605671, + "narHash": "sha256-MD0nb2JyMJK+o9e6k7H2ZvsceBUrLJx4pH8s2Wtf4jg=", "ref": "refs/heads/main", - "rev": "50661b0ef8f2f3fd79c30729edf7009dd8220840", - "revCount": 153, + "rev": "2e92d07eb740acce9ebadacd0507bda33521e04b", + "revCount": 156, "type": "git", "url": "https://code.oliverdavies.uk/opdavies/z" }, From aae4bdcda99bc1e157ec836f895af7249317598a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 8 Nov 2025 13:07:10 +0000 Subject: [PATCH 11/21] Change `code` subdomain to `git` Signed-off-by: Oliver Davies --- flake.lock | 8 ++++---- flake.nix | 4 ++-- hosts/nixedo/modules/acme.nix | 1 + hosts/nixedo/modules/forgejo.nix | 2 +- hosts/t480/cron.nix | 2 +- modules/scripts/clone.nix | 2 +- modules/scripts/open-repo-url.nix | 2 +- notes.txt | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index f7242e4b..1f973d4e 100644 --- a/flake.lock +++ b/flake.lock @@ -197,11 +197,11 @@ "rev": "19591ad8e1f3c261e84b487307c8534dd67a3707", "revCount": 37, "type": "git", - "url": "https://code.oliverdavies.uk/opdavies/git-repo-updater" + "url": "https://git.oliverdavies.uk/opdavies/git-repo-updater" }, "original": { "type": "git", - "url": "https://code.oliverdavies.uk/opdavies/git-repo-updater" + "url": "https://git.oliverdavies.uk/opdavies/git-repo-updater" } }, "home-manager": { @@ -588,11 +588,11 @@ "rev": "2e92d07eb740acce9ebadacd0507bda33521e04b", "revCount": 156, "type": "git", - "url": "https://code.oliverdavies.uk/opdavies/z" + "url": "https://git.oliverdavies.uk/opdavies/z" }, "original": { "type": "git", - "url": "https://code.oliverdavies.uk/opdavies/z" + "url": "https://git.oliverdavies.uk/opdavies/z" } } }, diff --git a/flake.nix b/flake.nix index 80dd608e..01149a04 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ inputs.flake-parts.follows = "flake-parts"; inputs.import-tree.follows = "import-tree"; inputs.nixpkgs.follows = "nixpkgs"; - url = "git+https://code.oliverdavies.uk/opdavies/git-repo-updater"; + url = "git+https://git.oliverdavies.uk/opdavies/git-repo-updater"; }; home-manager = { @@ -71,7 +71,7 @@ z = { inputs.flake-parts.follows = "flake-parts"; inputs.nixpkgs.follows = "nixpkgs"; - url = "git+https://code.oliverdavies.uk/opdavies/z"; + url = "git+https://git.oliverdavies.uk/opdavies/z"; }; }; diff --git a/hosts/nixedo/modules/acme.nix b/hosts/nixedo/modules/acme.nix index f1ffa533..64a226f1 100644 --- a/hosts/nixedo/modules/acme.nix +++ b/hosts/nixedo/modules/acme.nix @@ -27,6 +27,7 @@ "eric" "florida-drupalcamp-tailwind-css" "freshrss" + "git" "home" "jellyfin" "luke" diff --git a/hosts/nixedo/modules/forgejo.nix b/hosts/nixedo/modules/forgejo.nix index 91a228d6..7a8b4f18 100644 --- a/hosts/nixedo/modules/forgejo.nix +++ b/hosts/nixedo/modules/forgejo.nix @@ -7,7 +7,7 @@ settings = { server = { - DOMAIN = "code.oliverdavies.uk"; + DOMAIN = "git.oliverdavies.uk"; LANDING_PAGE = "explore"; ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}"; SSH_DOMAIN = "ssh.oliverdavies.uk"; diff --git a/hosts/t480/cron.nix b/hosts/t480/cron.nix index 27b9e811..cb3c405c 100644 --- a/hosts/t480/cron.nix +++ b/hosts/t480/cron.nix @@ -5,7 +5,7 @@ enable = true; systemCronJobs = [ - "*/15 * * * * opdavies ${pkgs.imapfilter}/bin/imapfilter -c ~/Repos/code.oliverdavies.uk/opdavies/email-filters/config.lua" + "*/15 * * * * opdavies ${pkgs.imapfilter}/bin/imapfilter -c ~/Repos/git.oliverdavies.uk/opdavies/email-filters/config.lua" "0 8,20 * * * opdavies ${pkgs.isync}/bin/mbsync -a" ]; }; diff --git a/modules/scripts/clone.nix b/modules/scripts/clone.nix index 814c93cc..dc655e91 100644 --- a/modules/scripts/clone.nix +++ b/modules/scripts/clone.nix @@ -20,7 +20,7 @@ domain="''${BASH_REMATCH[2]}" if [[ "$domain" == "ssh.oliverdavies.uk" ]]; then - domain="code.oliverdavies.uk" + domain="git.oliverdavies.uk" fi user="''${BASH_REMATCH[3]}" diff --git a/modules/scripts/open-repo-url.nix b/modules/scripts/open-repo-url.nix index 85348f2e..4726a167 100644 --- a/modules/scripts/open-repo-url.nix +++ b/modules/scripts/open-repo-url.nix @@ -15,7 +15,7 @@ in text = '' repo_url=$(git remote get-url origin | sed -E 's#(git|forgejo)@([A-Za-z0-9.-]+):#https://\2/#;s#.git$##') - repo_url="''${repo_url//ssh.oliverdavies.uk/code.oliverdavies.uk}" + repo_url="''${repo_url//ssh.oliverdavies.uk/git.oliverdavies.uk}" xdg-open "$repo_url" ''; diff --git a/notes.txt b/notes.txt index e01d0f67..fe128232 100644 --- a/notes.txt +++ b/notes.txt @@ -1,6 +1,6 @@ Running Neovim as a package: nix run .#neovim -nix run git+https://code.oliverdavies.uk/opdavies/nix-config#neovim +nix run git+https://git.oliverdavies.uk/opdavies/nix-config#neovim nixos-rebuild --flake .#nixedo --target-host 192.168.1.116 --sudo test From d5cfcf2059d9d1934f609fa1abd4dbe21c3d7df8 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 8 Nov 2025 18:54:09 +0000 Subject: [PATCH 12/21] Always run `--clear` with `watchexec` Signed-off-by: Oliver Davies --- modules/zsh/init.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/zsh/init.nix b/modules/zsh/init.nix index 4b3cbf10..eece5a0b 100644 --- a/modules/zsh/init.nix +++ b/modules/zsh/init.nix @@ -1,3 +1,5 @@ +{ lib, ... }: + { flake.modules.homeManager.base = { config, pkgs, ... }: @@ -47,6 +49,10 @@ command ${pkgs.ttyper}/bin/ttyper --language english1000 --words 50 "''${@}" } + watchexec() { + ${lib.getExe pkgs.watchexec} --clear "$@" + } + weather() { curl "https://wttr.in/''$1" } From 1c01838f8fecc83b01fed8c2e94f3ef131b76cdd Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 9 Nov 2025 00:47:28 +0000 Subject: [PATCH 13/21] Disable kanata for now Signed-off-by: Oliver Davies --- modules/hosts/t480/kanata/enable.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hosts/t480/kanata/enable.nix b/modules/hosts/t480/kanata/enable.nix index 6bb8c1e5..83441bb2 100644 --- a/modules/hosts/t480/kanata/enable.nix +++ b/modules/hosts/t480/kanata/enable.nix @@ -1,3 +1,3 @@ { - flake.modules.nixos.pc.services.kanata.enable = true; + flake.modules.nixos.pc.services.kanata.enable = false; } From c22495a834b23df15a694dc313b8bd4eb71a7629 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 9 Nov 2025 00:48:02 +0000 Subject: [PATCH 14/21] Add abbreviations --- modules/zsh/abbreviations/abbreviations.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/zsh/abbreviations/abbreviations.nix b/modules/zsh/abbreviations/abbreviations.nix index 95022561..5598a87e 100644 --- a/modules/zsh/abbreviations/abbreviations.nix +++ b/modules/zsh/abbreviations/abbreviations.nix @@ -131,6 +131,7 @@ rduli = "run drush uli"; rdup = "run drush updatedb -y"; rpub = "run publish"; + rs = "run switch"; rt = "run test"; nah = "git reset --hard; git clean -fd"; @@ -168,5 +169,8 @@ sgsp = "vendor/bin/sculpin generate --server --port"; sgsw = "vendor/bin/sculpin generate --server --watch"; sgswp = "vendor/bin/sculpin generate --server --watch --port"; + + mnf = "man fzf"; + mnt = "man tmux"; }; } From a59daa9ae21800edd438718dd9461f237086b0b5 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 9 Nov 2025 00:53:33 +0000 Subject: [PATCH 15/21] This reverts commit c22495a834b23df15a694dc313b8bd4eb71a7629. --- modules/zsh/abbreviations/abbreviations.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/zsh/abbreviations/abbreviations.nix b/modules/zsh/abbreviations/abbreviations.nix index 5598a87e..95022561 100644 --- a/modules/zsh/abbreviations/abbreviations.nix +++ b/modules/zsh/abbreviations/abbreviations.nix @@ -131,7 +131,6 @@ rduli = "run drush uli"; rdup = "run drush updatedb -y"; rpub = "run publish"; - rs = "run switch"; rt = "run test"; nah = "git reset --hard; git clean -fd"; @@ -169,8 +168,5 @@ sgsp = "vendor/bin/sculpin generate --server --port"; sgsw = "vendor/bin/sculpin generate --server --watch"; sgswp = "vendor/bin/sculpin generate --server --watch --port"; - - mnf = "man fzf"; - mnt = "man tmux"; }; } From e999f40b6bc1af254817f61922094a2e9118c323 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 9 Nov 2025 00:54:11 +0000 Subject: [PATCH 16/21] Revert "This reverts commit c22495a834b23df15a694dc313b8bd4eb71a7629." This reverts commit a59daa9ae21800edd438718dd9461f237086b0b5. --- modules/zsh/abbreviations/abbreviations.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/zsh/abbreviations/abbreviations.nix b/modules/zsh/abbreviations/abbreviations.nix index 95022561..5598a87e 100644 --- a/modules/zsh/abbreviations/abbreviations.nix +++ b/modules/zsh/abbreviations/abbreviations.nix @@ -131,6 +131,7 @@ rduli = "run drush uli"; rdup = "run drush updatedb -y"; rpub = "run publish"; + rs = "run switch"; rt = "run test"; nah = "git reset --hard; git clean -fd"; @@ -168,5 +169,8 @@ sgsp = "vendor/bin/sculpin generate --server --port"; sgsw = "vendor/bin/sculpin generate --server --watch"; sgswp = "vendor/bin/sculpin generate --server --watch --port"; + + mnf = "man fzf"; + mnt = "man tmux"; }; } From 127b8a84ea83c17e2d9bd565b35bdb8348587a69 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 9 Nov 2025 00:54:56 +0000 Subject: [PATCH 17/21] Revert "Disable kanata for now" This reverts commit 1c01838f8fecc83b01fed8c2e94f3ef131b76cdd. --- modules/hosts/t480/kanata/enable.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hosts/t480/kanata/enable.nix b/modules/hosts/t480/kanata/enable.nix index 83441bb2..6bb8c1e5 100644 --- a/modules/hosts/t480/kanata/enable.nix +++ b/modules/hosts/t480/kanata/enable.nix @@ -1,3 +1,3 @@ { - flake.modules.nixos.pc.services.kanata.enable = false; + flake.modules.nixos.pc.services.kanata.enable = true; } From d03ce5ecf7cfa2d217f4d0c885dc98dac26a693a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 9 Nov 2025 23:32:17 +0000 Subject: [PATCH 18/21] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/9ba0d85de3eaa7afeab493fed622008b6e4924f5?narHash=sha256-lsNWuj4Z%2BpE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94%3D' (2025-10-28) → 'github:ryantm/agenix/fcdea223397448d35d9b31f798479227e80183f6?narHash=sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L%2BVSybPfiIgzU8lbQ%3D' (2025-11-08) • Updated input 'home-manager': 'github:nix-community/home-manager/0562fef070a1027325dd4ea10813d64d2c967b39?narHash=sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU%3D' (2025-11-06) → 'github:nix-community/home-manager/b8645b18b0f5374127bbade6de7381ef0b3d5720?narHash=sha256-E428EuouA4nFTNlLuqlL4lVR78X%2BEbBIqDqsBFnB79w%3D' (2025-11-09) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/359ff6333a7b0b60819d4c20ed05a3a1f726771f?narHash=sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo%3D' (2025-11-02) → 'github:nix-community/nix-index-database/15c5451c63f4c612874a43846bfe3fa828b03eee?narHash=sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08%3D' (2025-11-09) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/ae814fd3904b621d8ab97418f1d0f2eb0d3716f4?narHash=sha256-YRqMDEtSMbitIMj%2BJLpheSz0pwEr0Rmy5mC7myl17xs%3D' (2025-11-05) → 'github:nixos/nixpkgs/b6a8526db03f735b89dd5ff348f53f752e7ddc8e?narHash=sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV%2B3DSADBX7/9YQ%3D' (2025-11-08) • Updated input 'nixvim': 'github:nix-community/nixvim/d4b798a469248aa2b0bba4508bd8f97837566885?narHash=sha256-TUYm7Ihtl8472GPTbj/cQWUJeDNQ4a9kuz93wkEIE8M%3D' (2025-11-08) → 'github:nix-community/nixvim/faf1fb4b7cd069ce44469e45c3259b7bcf106f81?narHash=sha256-dyYnqvYrgViB22inBqNern/XSWtOiweP8NTfJQJeTis%3D' (2025-11-09) • Updated input 'nur': 'github:nix-community/NUR/84a04dd267f040a3be5a9a6cc8f1518cdb55b7c4?narHash=sha256-1%2Bs2HhAdoM72R91O3dxoLAvVeld2kINeI4EakAkIKD8%3D' (2025-11-08) → 'github:nix-community/NUR/efc27c839b15d0ff15d58fb09035a93dea7f85f5?narHash=sha256-B24ywaTUd9BYkK3qHfl0MubCLnO4Bk8cRSQmIvfofco%3D' (2025-11-09) • Updated input 'z': 'git+https://git.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=2e92d07eb740acce9ebadacd0507bda33521e04b' (2025-11-08) → 'git+https://git.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=93936fadc7a462161d5930257b71bbc318538598' (2025-11-09) --- flake.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 1f973d4e..5ca93724 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761656077, - "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", + "lastModified": 1762618334, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", + "rev": "fcdea223397448d35d9b31f798479227e80183f6", "type": "github" }, "original": { @@ -232,11 +232,11 @@ ] }, "locked": { - "lastModified": 1762463325, - "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", + "lastModified": 1762721397, + "narHash": "sha256-E428EuouA4nFTNlLuqlL4lVR78X+EbBIqDqsBFnB79w=", "owner": "nix-community", "repo": "home-manager", - "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", + "rev": "b8645b18b0f5374127bbade6de7381ef0b3d5720", "type": "github" }, "original": { @@ -296,11 +296,11 @@ ] }, "locked": { - "lastModified": 1762055842, - "narHash": "sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo=", + "lastModified": 1762660502, + "narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "359ff6333a7b0b60819d4c20ed05a3a1f726771f", + "rev": "15c5451c63f4c612874a43846bfe3fa828b03eee", "type": "github" }, "original": { @@ -327,11 +327,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1762596750, + "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "type": "github" }, "original": { @@ -400,11 +400,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1762604519, - "narHash": "sha256-TUYm7Ihtl8472GPTbj/cQWUJeDNQ4a9kuz93wkEIE8M=", + "lastModified": 1762691346, + "narHash": "sha256-dyYnqvYrgViB22inBqNern/XSWtOiweP8NTfJQJeTis=", "owner": "nix-community", "repo": "nixvim", - "rev": "d4b798a469248aa2b0bba4508bd8f97837566885", + "rev": "faf1fb4b7cd069ce44469e45c3259b7bcf106f81", "type": "github" }, "original": { @@ -421,11 +421,11 @@ ] }, "locked": { - "lastModified": 1762604108, - "narHash": "sha256-1+s2HhAdoM72R91O3dxoLAvVeld2kINeI4EakAkIKD8=", + "lastModified": 1762724684, + "narHash": "sha256-B24ywaTUd9BYkK3qHfl0MubCLnO4Bk8cRSQmIvfofco=", "owner": "nix-community", "repo": "NUR", - "rev": "84a04dd267f040a3be5a9a6cc8f1518cdb55b7c4", + "rev": "efc27c839b15d0ff15d58fb09035a93dea7f85f5", "type": "github" }, "original": { @@ -582,11 +582,11 @@ ] }, "locked": { - "lastModified": 1762605671, - "narHash": "sha256-MD0nb2JyMJK+o9e6k7H2ZvsceBUrLJx4pH8s2Wtf4jg=", + "lastModified": 1762731040, + "narHash": "sha256-jfLhyYQsLk7/dLaVafTfU4bbKXfEfHJ/4pLf/WA1iqc=", "ref": "refs/heads/main", - "rev": "2e92d07eb740acce9ebadacd0507bda33521e04b", - "revCount": 156, + "rev": "93936fadc7a462161d5930257b71bbc318538598", + "revCount": 164, "type": "git", "url": "https://git.oliverdavies.uk/opdavies/z" }, From ba65884ae2402bd2606cdc28404fc6a3f3b71c1e Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 9 Nov 2025 23:40:43 +0000 Subject: [PATCH 19/21] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'z': 'git+https://git.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=93936fadc7a462161d5930257b71bbc318538598' (2025-11-09) → 'git+https://git.oliverdavies.uk/opdavies/z?ref=refs/heads/main&rev=184accfd1fadb9580f2af8873ce0f2a70eeb8b49' (2025-11-09) --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 5ca93724..68beed58 100644 --- a/flake.lock +++ b/flake.lock @@ -582,11 +582,11 @@ ] }, "locked": { - "lastModified": 1762731040, - "narHash": "sha256-jfLhyYQsLk7/dLaVafTfU4bbKXfEfHJ/4pLf/WA1iqc=", + "lastModified": 1762731584, + "narHash": "sha256-qSN44lGSceoqkUeksXbEAcGPeTf9yJBGQMWafh8cZuw=", "ref": "refs/heads/main", - "rev": "93936fadc7a462161d5930257b71bbc318538598", - "revCount": 164, + "rev": "184accfd1fadb9580f2af8873ce0f2a70eeb8b49", + "revCount": 165, "type": "git", "url": "https://git.oliverdavies.uk/opdavies/z" }, From 0c40dc6cff8d3cd5a3b560f8a3a9df95057c4914 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 10 Nov 2025 00:14:09 +0000 Subject: [PATCH 20/21] Remove ollama and Open WebUI files --- modules/hosts/t480/ollama.nix | 3 --- modules/hosts/t480/open-webui.nix | 5 ----- 2 files changed, 8 deletions(-) delete mode 100644 modules/hosts/t480/ollama.nix delete mode 100644 modules/hosts/t480/open-webui.nix diff --git a/modules/hosts/t480/ollama.nix b/modules/hosts/t480/ollama.nix deleted file mode 100644 index 4ec6407a..00000000 --- a/modules/hosts/t480/ollama.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - flake.modules.nixos.desktop.services.ollama.enable = false; -} diff --git a/modules/hosts/t480/open-webui.nix b/modules/hosts/t480/open-webui.nix deleted file mode 100644 index ae6421f8..00000000 --- a/modules/hosts/t480/open-webui.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - nixpkgs.allowedUnfreePackages = [ "open-webui" ]; - - flake.modules.nixos.desktop.services.open-webui.enable = false; -} From b42daccb992de5619bc32e97948ec2577b2a71fe Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 10 Nov 2025 14:57:20 +0000 Subject: [PATCH 21/21] Enable TreeSitter indentation Signed-off-by: Oliver Davies --- modules/nixvim/treesitter.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/nixvim/treesitter.nix b/modules/nixvim/treesitter.nix index 05ffc537..d2e85c12 100644 --- a/modules/nixvim/treesitter.nix +++ b/modules/nixvim/treesitter.nix @@ -42,7 +42,10 @@ yaml ]; - settings.highlight.enable = true; + settings = { + highlight.enable = true; + indent.enable = true; + }; }; treesitter-textobjects.enable = true;