From ba1684c8d4b16101d3a601ece65cb3ac8b2e1798 Mon Sep 17 00:00:00 2001 From: atagen Date: Fri, 21 Apr 2023 01:50:05 +1000 Subject: [PATCH] use helix flake --- flake.lock | 36 ++++++++++++++++++------------------ home/home.nix | 12 +++++++----- system/configuration.nix | 25 +++++++++++++++---------- 3 files changed, 40 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 982e16e..fb1e68c 100644 --- a/flake.lock +++ b/flake.lock @@ -258,11 +258,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1681679220, - "narHash": "sha256-3LOLVHommFXYjqtEhmCpB9vX0OraHyE/m06ikDPjqBY=", + "lastModified": 1681970018, + "narHash": "sha256-V/OeOVRJGOqQHKSG1RgZuLOMGclRgxfoYBN8zCzKxCE=", "owner": "helix-editor", "repo": "helix", - "rev": "1b016a89d546fb84d3c737d7c4bacb9e26c8b893", + "rev": "b336cd76a740eea6ea41baa1028233ccf6e12ee5", "type": "github" }, "original": { @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1681688069, - "narHash": "sha256-1w6zBfwxwMbyewUyqzSnZs8nwNqj6ZBVcP0rkCueyIo=", + "lastModified": 1681971090, + "narHash": "sha256-3j0M63GkG6GGny9e+C//GyuDCx1IwrurD27S0YI+GQY=", "owner": "nix-community", "repo": "home-manager", - "rev": "68eaf4b577cfa8024fb910a1ce7d60385044f798", + "rev": "5160039edca28a7e66bad0cfc72a07c91d6768ad", "type": "github" }, "original": { @@ -299,11 +299,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1681677208, - "narHash": "sha256-R9b2/SZfkxuv54YDo4FUp65wgLREQ4gfYxfJ9mSMTno=", + "lastModified": 1681948002, + "narHash": "sha256-rVBkoL5zSXqB+Uc4156gCP9VoxokZ8g1OC3YOhcpUWY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c62ab1bee72cc4bda16a0574a8c9de7d71da314a", + "rev": "b15803510c67b7b89090c99f03781d9052c959f5", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1681648924, - "narHash": "sha256-pzi3HISK8+7mpEtv08Yr80wswyHKsz+RP1CROG1Qf6s=", + "lastModified": 1681828457, + "narHash": "sha256-o4Zvs309HOhrNeVloPKqangcKHobsggVt6GFbnEPZlQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f294325aed382b66c7a188482101b0f336d1d7db", + "rev": "555daa9d339b3df75e58ee558a4fec98ea92521e", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nur": { "locked": { - "lastModified": 1681877316, - "narHash": "sha256-BaAkjNeD0MSTI1fRmnN3xOstXfjB3UiuzMNZLJpYgng=", + "lastModified": 1681994115, + "narHash": "sha256-O/7AVL1iKq4G4Zyf0k71Ki5OOP3U4gH5ms1ZLMPuG1I=", "owner": "nix-community", "repo": "NUR", - "rev": "8a625f2ab530f40c6fe50a33ccb760a85d772c70", + "rev": "5ea4cf7eafb21011352a3cf857edc2d7c5ccdf70", "type": "github" }, "original": { @@ -507,11 +507,11 @@ ] }, "locked": { - "lastModified": 1681611682, - "narHash": "sha256-gT4wfOdVyxtB3NV5U914uAOqzFYMdNK8ObPmtqHxlUg=", + "lastModified": 1681957132, + "narHash": "sha256-52GaHyeLyyiT0u4OL3uGbo0vsUMKm33Z3zLkPyK/ZRY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "18cdcb7b4017f266117a4d164f9d71c0535ef5ec", + "rev": "4771640d46c214d702512a8ece591f582ae507fa", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index 6a9f544..1e67f00 100644 --- a/home/home.nix +++ b/home/home.nix @@ -166,17 +166,19 @@ in darkreader localcdn ublock-origin - plasma-integration keepassxc-browser user-agent-string-switcher ]; }; }; - programs.helix.enable = true; - programs.helix.settings = { - theme = "gruvbox_dark_hard"; - editor.lsp.display-messages = true; + programs.helix = { + enable = true; + # package = inputs.helix.packages.${pkgs.hostPlatform.system}.default; + settings = { + theme = "gruvbox_dark_hard"; + editor.lsp.display-messages = true; + }; }; programs.kitty = { diff --git a/system/configuration.nix b/system/configuration.nix index b3d25ff..676c4e5 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -22,9 +22,8 @@ }; # imports = [ - - # # (import (builtins.fetchTarball "https://github.com/jonascarpay/declarative-cachix/archive/master.tar.gz")) - + # inputs.declarative-cachix + # inputs.helix # ]; # cachix = [ @@ -37,7 +36,7 @@ ''; - systemd.services.NetworkManager-wait-online.enable = false; + systemd.services.NetworkManager-wait-online.enable = true; environment.pathsToLink = [ "/share/zsh" ]; @@ -113,6 +112,7 @@ services.tailscale.enable = true; + environment.systemPackages = with pkgs; [ rnix-lsp @@ -122,7 +122,7 @@ home-manager cachix - helix + # helix ark curl @@ -135,18 +135,23 @@ comma cachix + + alejandra + ]; + # services.mullvad-vpn.enable = true; + networking.wg-quick.interfaces = { mullvad = { - address = [ "10.66.224.186/32" ]; + address = [ "10.67.227.64/32" ]; dns = [ "10.64.0.1" ]; - privateKey = "WD0CNYazB8D19SJvwz/TdPqoWgWCGfTwA7mim16q7UM="; + privateKey = "OOPAlePjy7x2DVpg6d7BoBqpST3lDJSYght185tSUl8="; peers = [ { - publicKey = "pu22RCPeJCeiDIE7a1XtWvmv3BdgPp8ugF6AyntW8xU="; + publicKey = "LXuRwa9JRTt2/UtldklKGlj/IVLORITqgET4II4DRkU="; allowedIPs = [ "0.0.0.0/0" ]; - endpoint = "89.44.10.114:51820"; + endpoint = "146.70.200.194:51820"; persistentKeepalive = 25; } ]; @@ -161,7 +166,7 @@ systemd.services.fixNetworkingForTailscale = { wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "wg-quick-mullvad.service" ]; + after = [ "network.target" "mullvad-daemon.service" ]; description = "fix the damn routing table"; serviceConfig = { Type = "oneshot";