Compare commits

..

2 commits
main ... lemp11

Author SHA1 Message Date
24c5fb5ec0 flake.lock: Update
All checks were successful
/ check (push) Successful in 1m5s
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)
2025-11-06 18:19:39 +00:00
3d9519a934 Copy initial configuration files from lemp11 2025-11-06 00:36:57 +00:00
19 changed files with 225 additions and 97 deletions

64
flake.lock generated
View file

@ -10,11 +10,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1762618334, "lastModified": 1761656077,
"narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "fcdea223397448d35d9b31f798479227e80183f6", "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -26,11 +26,11 @@
"bop-scripts": { "bop-scripts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1762468291, "lastModified": 1762264847,
"narHash": "sha256-kvhro91rmPgSX8LYLTsesLJlOlKp1YJsIg9e+Cb9u6o=", "narHash": "sha256-Gdv0vWULnVnX2JVFU7Cu/g0+c+DYMsRy4JjTAuRc8sA=",
"owner": "breadonpenguins", "owner": "breadonpenguins",
"repo": "scripts", "repo": "scripts",
"rev": "c1c94c3f4b89076dc8f788fae12f639dda663ddb", "rev": "7c01cb65b5f5e06b1e80adb2d397fb972d9f9783",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -197,11 +197,11 @@
"rev": "19591ad8e1f3c261e84b487307c8534dd67a3707", "rev": "19591ad8e1f3c261e84b487307c8534dd67a3707",
"revCount": 37, "revCount": 37,
"type": "git", "type": "git",
"url": "https://git.oliverdavies.uk/opdavies/git-repo-updater" "url": "https://code.oliverdavies.uk/opdavies/git-repo-updater"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://git.oliverdavies.uk/opdavies/git-repo-updater" "url": "https://code.oliverdavies.uk/opdavies/git-repo-updater"
} }
}, },
"home-manager": { "home-manager": {
@ -232,11 +232,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762721397, "lastModified": 1762447448,
"narHash": "sha256-E428EuouA4nFTNlLuqlL4lVR78X+EbBIqDqsBFnB79w=", "narHash": "sha256-BFhoqL231hyTZ7piR+8FgDJby48oWRN8+g3b1uvvtX8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b8645b18b0f5374127bbade6de7381ef0b3d5720", "rev": "2907788315a73d3292140b4d59b5d95796565625",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -296,11 +296,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762660502, "lastModified": 1762055842,
"narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=", "narHash": "sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "15c5451c63f4c612874a43846bfe3fa828b03eee", "rev": "359ff6333a7b0b60819d4c20ed05a3a1f726771f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -311,11 +311,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1762463231, "lastModified": 1762427122,
"narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", "narHash": "sha256-sQJuoiqsaIvKiIOmF/3FDV5dM2TGL2jBv1PeQSt83YE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", "rev": "24084931d8098fce300fabea9e48fa96292228d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -327,11 +327,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1762596750, "lastModified": 1762111121,
"narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -400,11 +400,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1762691346, "lastModified": 1762437234,
"narHash": "sha256-dyYnqvYrgViB22inBqNern/XSWtOiweP8NTfJQJeTis=", "narHash": "sha256-qEI9AkUwOHtM5A2yDBy0K+UHGLfYir81dFiTN0DXBeU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "faf1fb4b7cd069ce44469e45c3259b7bcf106f81", "rev": "d01e1c17e2690c10d3aa6abea28838befa1fd449",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -421,11 +421,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762724684, "lastModified": 1762452435,
"narHash": "sha256-B24ywaTUd9BYkK3qHfl0MubCLnO4Bk8cRSQmIvfofco=", "narHash": "sha256-Pl7z0IhHpo48P75ViLfz638P68fbQ6EUwCmB4wIegF0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "efc27c839b15d0ff15d58fb09035a93dea7f85f5", "rev": "8207b2a2d9f644dfb4fd9e87a1dd49e9d79dd0af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -582,17 +582,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762731584, "lastModified": 1762452973,
"narHash": "sha256-qSN44lGSceoqkUeksXbEAcGPeTf9yJBGQMWafh8cZuw=", "narHash": "sha256-rJmk//VjOfbqu1ZbD98Tc74G2M2awnsUf/X6TxvNols=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "184accfd1fadb9580f2af8873ce0f2a70eeb8b49", "rev": "798bfdd5ca7f7107217aa101b9cb6a205f551e12",
"revCount": 165, "revCount": 142,
"type": "git", "type": "git",
"url": "https://git.oliverdavies.uk/opdavies/z" "url": "https://code.oliverdavies.uk/opdavies/z"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://git.oliverdavies.uk/opdavies/z" "url": "https://code.oliverdavies.uk/opdavies/z"
} }
} }
}, },

View file

@ -21,7 +21,7 @@
inputs.flake-parts.follows = "flake-parts"; inputs.flake-parts.follows = "flake-parts";
inputs.import-tree.follows = "import-tree"; inputs.import-tree.follows = "import-tree";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
url = "git+https://git.oliverdavies.uk/opdavies/git-repo-updater"; url = "git+https://code.oliverdavies.uk/opdavies/git-repo-updater";
}; };
home-manager = { home-manager = {
@ -71,7 +71,7 @@
z = { z = {
inputs.flake-parts.follows = "flake-parts"; inputs.flake-parts.follows = "flake-parts";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
url = "git+https://git.oliverdavies.uk/opdavies/z"; url = "git+https://code.oliverdavies.uk/opdavies/z";
}; };
}; };

View file

@ -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. Its 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?
}

View file

@ -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.<interface>.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;
}

View file

@ -48,4 +48,6 @@
tree tree
vim vim
]; ];
security.sudo-rs.enable = lib.mkForce false;
} }

View file

@ -27,7 +27,6 @@
"eric" "eric"
"florida-drupalcamp-tailwind-css" "florida-drupalcamp-tailwind-css"
"freshrss" "freshrss"
"git"
"home" "home"
"jellyfin" "jellyfin"
"luke" "luke"

View file

@ -7,7 +7,7 @@
settings = { settings = {
server = { server = {
DOMAIN = "git.oliverdavies.uk"; DOMAIN = "code.oliverdavies.uk";
LANDING_PAGE = "explore"; LANDING_PAGE = "explore";
ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}"; ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}";
SSH_DOMAIN = "ssh.oliverdavies.uk"; SSH_DOMAIN = "ssh.oliverdavies.uk";

View file

@ -5,7 +5,7 @@
enable = true; enable = true;
systemCronJobs = [ systemCronJobs = [
"*/15 * * * * opdavies ${pkgs.imapfilter}/bin/imapfilter -c ~/Repos/git.oliverdavies.uk/opdavies/email-filters/config.lua" "*/15 * * * * opdavies ${pkgs.imapfilter}/bin/imapfilter -c ~/Repos/code.oliverdavies.uk/opdavies/email-filters/config.lua"
"0 8,20 * * * opdavies ${pkgs.isync}/bin/mbsync -a" "0 8,20 * * * opdavies ${pkgs.isync}/bin/mbsync -a"
]; ];
}; };

View file

@ -0,0 +1,3 @@
{
flake.modules.nixos.desktop.services.ollama.enable = false;
}

View file

@ -0,0 +1,5 @@
{
nixpkgs.allowedUnfreePackages = [ "open-webui" ];
flake.modules.nixos.desktop.services.open-webui.enable = false;
}

View file

@ -1,24 +0,0 @@
{
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 = "<cmd>Oil<CR>";
key = "-";
}
];
};
}

View file

@ -1,18 +0,0 @@
{
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";
};
};
}

View file

@ -11,7 +11,6 @@
comment comment
css css
csv csv
devicetree
dockerfile dockerfile
gitattributes gitattributes
gitignore gitignore
@ -42,10 +41,7 @@
yaml yaml
]; ];
settings = { settings.highlight.enable = true;
highlight.enable = true;
indent.enable = true;
};
}; };
treesitter-textobjects.enable = true; treesitter-textobjects.enable = true;

View file

@ -20,7 +20,7 @@
domain="''${BASH_REMATCH[2]}" domain="''${BASH_REMATCH[2]}"
if [[ "$domain" == "ssh.oliverdavies.uk" ]]; then if [[ "$domain" == "ssh.oliverdavies.uk" ]]; then
domain="git.oliverdavies.uk" domain="code.oliverdavies.uk"
fi fi
user="''${BASH_REMATCH[3]}" user="''${BASH_REMATCH[3]}"

View file

@ -15,7 +15,7 @@ in
text = '' text = ''
repo_url=$(git remote get-url origin | sed -E 's#(git|forgejo)@([A-Za-z0-9.-]+):#https://\2/#;s#.git$##') 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/git.oliverdavies.uk}" repo_url="''${repo_url//ssh.oliverdavies.uk/code.oliverdavies.uk}"
xdg-open "$repo_url" xdg-open "$repo_url"
''; '';

View file

@ -2,6 +2,8 @@
{ {
flake.modules.nixos.pc = { flake.modules.nixos.pc = {
security.sudo-rs.enable = true;
users.users.${config.flake.meta.owner.username}.extraGroups = [ "wheel" ]; users.users.${config.flake.meta.owner.username}.extraGroups = [ "wheel" ];
}; };
} }

View file

@ -131,7 +131,6 @@
rduli = "run drush uli"; rduli = "run drush uli";
rdup = "run drush updatedb -y"; rdup = "run drush updatedb -y";
rpub = "run publish"; rpub = "run publish";
rs = "run switch";
rt = "run test"; rt = "run test";
nah = "git reset --hard; git clean -fd"; nah = "git reset --hard; git clean -fd";
@ -169,8 +168,5 @@
sgsp = "vendor/bin/sculpin generate --server --port"; sgsp = "vendor/bin/sculpin generate --server --port";
sgsw = "vendor/bin/sculpin generate --server --watch"; sgsw = "vendor/bin/sculpin generate --server --watch";
sgswp = "vendor/bin/sculpin generate --server --watch --port"; sgswp = "vendor/bin/sculpin generate --server --watch --port";
mnf = "man fzf";
mnt = "man tmux";
}; };
} }

View file

@ -1,5 +1,3 @@
{ lib, ... }:
{ {
flake.modules.homeManager.base = flake.modules.homeManager.base =
{ config, pkgs, ... }: { config, pkgs, ... }:
@ -49,10 +47,6 @@
command ${pkgs.ttyper}/bin/ttyper --language english1000 --words 50 "''${@}" command ${pkgs.ttyper}/bin/ttyper --language english1000 --words 50 "''${@}"
} }
watchexec() {
${lib.getExe pkgs.watchexec} --clear "$@"
}
weather() { weather() {
curl "https://wttr.in/''$1" curl "https://wttr.in/''$1"
} }

View file

@ -1,6 +1,6 @@
Running Neovim as a package: Running Neovim as a package:
nix run .#neovim nix run .#neovim
nix run git+https://git.oliverdavies.uk/opdavies/nix-config#neovim nix run git+https://code.oliverdavies.uk/opdavies/nix-config#neovim
nixos-rebuild --flake .#nixedo --target-host 192.168.1.116 --sudo test nixos-rebuild --flake .#nixedo --target-host 192.168.1.116 --sudo test