Compare commits
18 Commits
f57b9c4c8e
...
06326d63c6
Author | SHA1 | Date | |
---|---|---|---|
06326d63c6 | |||
73b8f44117 | |||
0306bedb5b | |||
8cb9263e9e | |||
eebf8c8bb6 | |||
b15d1e38c5 | |||
3156d0d494 | |||
b1fb018db5 | |||
309ae4cb17 | |||
e158434595 | |||
3656d11b13 | |||
99a1557151 | |||
efb6b0e151 | |||
a7643e200c | |||
9726ac05c7 | |||
5f7e9ee69c | |||
382cf71f87 | |||
e2008bec3e |
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -24,4 +24,4 @@
|
||||
url = https://github.com/romkatv/powerlevel10k.git
|
||||
[submodule "secrets"]
|
||||
path = secrets
|
||||
url = ssh://gitea@git.orion-technologies.io:2220/Price/Secrets.git
|
||||
url = ssh://gitea@git.price-hiller.com:2220/Price/Secrets.git
|
||||
|
@ -1,5 +1,5 @@
|
||||
* Price Hiller's Dots
|
||||
This is a mirror from my Git server over [[https://git.orion-technologies.io/Price/dots][here]].
|
||||
This is a mirror from my Git server over [[https://git.price-hiller.com/Price/dots][here]].
|
||||
|
||||
These are my dot files. All the actual dots can be found under ~users/price/dots/~.
|
||||
|
||||
|
122
flake.lock
122
flake.lock
@ -62,11 +62,11 @@
|
||||
"rev": "a805e823d8006b9597af871f7ba1a18d9daaedad",
|
||||
"revCount": 101,
|
||||
"type": "git",
|
||||
"url": "https://git.orion-technologies.io/blog/blog"
|
||||
"url": "https://git.price-hiller.com/blog/blog"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.orion-technologies.io/blog/blog"
|
||||
"url": "https://git.price-hiller.com/blog/blog"
|
||||
}
|
||||
},
|
||||
"bob": {
|
||||
@ -101,18 +101,12 @@
|
||||
}
|
||||
},
|
||||
"crane_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"lanzaboote",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721842668,
|
||||
"narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=",
|
||||
"lastModified": 1728776144,
|
||||
"narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf",
|
||||
"rev": "f876e3d905b922502f031aeec1a84490122254b7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -171,11 +165,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728334376,
|
||||
"narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=",
|
||||
"lastModified": 1729281548,
|
||||
"narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe",
|
||||
"rev": "a6a3179ddf396dfc28a078e2f169354d0c137125",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -195,11 +189,11 @@
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728465432,
|
||||
"narHash": "sha256-E+wQEaXiGMN9hLStkPw0T3Wqxj05ZqHiE8B2mOA2kmI=",
|
||||
"lastModified": 1729390258,
|
||||
"narHash": "sha256-z4Hg8k6iXIV55lA8HUntfJBdBzxOuG8M4ftWoJhrVqU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "c73112e15bc9c784b4c6f4855ae4acb0a6cc480f",
|
||||
"rev": "89860b1c343648e8d71b6820e9311b98353ff14e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -264,11 +258,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719994518,
|
||||
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
|
||||
"lastModified": 1727826117,
|
||||
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
|
||||
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -486,11 +480,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728337164,
|
||||
"narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
|
||||
"lastModified": 1729321331,
|
||||
"narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
|
||||
"rev": "122f70545b29ccb922e655b08acfe05bfb44ec68",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -501,11 +495,11 @@
|
||||
},
|
||||
"impermanence": {
|
||||
"locked": {
|
||||
"lastModified": 1727649413,
|
||||
"narHash": "sha256-FA53of86DjFdeQzRDVtvgWF9o52rWK70VHGx0Y8fElQ=",
|
||||
"lastModified": 1729068498,
|
||||
"narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "impermanence",
|
||||
"rev": "d0b38e550039a72aff896ee65b0918e975e6d48e",
|
||||
"rev": "e337457502571b23e449bf42153d7faa10c0a562",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -526,11 +520,11 @@
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728199407,
|
||||
"narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=",
|
||||
"lastModified": 1729064530,
|
||||
"narHash": "sha256-oSr/w/5dvf/8ll6NvQlL7+rrK8wzjIcEMP1LvI4Ag08=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lanzaboote",
|
||||
"rev": "0bc127c631999c9555cae2b0cdad2128ff058259",
|
||||
"rev": "2fa1368f938b50e35ca87334b5aeba38a3402165",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -584,11 +578,11 @@
|
||||
"nixpkgs-regression": "nixpkgs-regression"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728489157,
|
||||
"narHash": "sha256-JA8Y61hqrSk8q2JOdV6llBgF1/jvMpQ7crgSIHyDO1c=",
|
||||
"lastModified": 1729196134,
|
||||
"narHash": "sha256-OPH39+maAtcsxt23lacJJICLdccYaHbn+WmHSeav1dw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nix",
|
||||
"rev": "8b2ffbae3adc2418a6221c24619d9bca51852d05",
|
||||
"rev": "694c378d14f7cd1c5d882277b9747c5c1ac30023",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -631,11 +625,11 @@
|
||||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1728489680,
|
||||
"narHash": "sha256-hJs4k9lB1X4gTbGb3KiGbq1mfrEZl7FyYzy4Jrip8E0=",
|
||||
"lastModified": 1729393885,
|
||||
"narHash": "sha256-Zr1iFyeEDENgg5tYUnXY2wms5o/1c1wdblTuTQhiTmo=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "97b33aa6f1f5b30f3281e9ee5a1cb8b8669ae0ce",
|
||||
"rev": "6a2b062742e35994b49f75c49f80c7893acaf35a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -662,11 +656,11 @@
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1728328465,
|
||||
"narHash": "sha256-a0a0M1TmXMK34y3M0cugsmpJ4FJPT/xsblhpiiX1CXo=",
|
||||
"lastModified": 1729181673,
|
||||
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c",
|
||||
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -710,11 +704,11 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1728241625,
|
||||
"narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
|
||||
"lastModified": 1729256560,
|
||||
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
|
||||
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -724,6 +718,22 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1726238386,
|
||||
"narHash": "sha256-3//V84fYaGVncFImitM6lSAliRdrGayZLdxWlpcuGk0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "01f064c99c792715054dc7a70e4c1626dbbec0c3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks-nix": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
@ -738,11 +748,11 @@
|
||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721042469,
|
||||
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
|
||||
"lastModified": 1728778939,
|
||||
"narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
|
||||
"rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -799,11 +809,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722219664,
|
||||
"narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=",
|
||||
"lastModified": 1728959392,
|
||||
"narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4",
|
||||
"rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -836,10 +846,10 @@
|
||||
"secrets": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1728014094,
|
||||
"narHash": "sha256-k+g/qU767PCU8L/DeJ3cXPUNZgU1GikDXXqjKTVz8uY=",
|
||||
"rev": "189defc835b2d1eb303299bc264e1ebb0d805740",
|
||||
"revCount": 2,
|
||||
"lastModified": 1729394070,
|
||||
"narHash": "sha256-tUIsAcAI+oYdsLhuoN+pFRR46j7cDI6ltZW88fb5a7Y=",
|
||||
"rev": "26a7346d97b19d44e3f07d912e64cc4e8fd38ec9",
|
||||
"revCount": 5,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "file:secrets"
|
||||
@ -964,19 +974,17 @@
|
||||
"freetype2": "freetype2",
|
||||
"harfbuzz": "harfbuzz",
|
||||
"libpng": "libpng",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"rust-overlay": "rust-overlay_3",
|
||||
"zlib": "zlib"
|
||||
},
|
||||
"locked": {
|
||||
"dir": "nix",
|
||||
"lastModified": 1728322634,
|
||||
"narHash": "sha256-cUnwLCSc59Sx3E+meVlVUMfyROr0aToWPID7UA6PZvg=",
|
||||
"lastModified": 1729006311,
|
||||
"narHash": "sha256-1xtKJHu6CFnOhp4snof+WSTwcdPgwIaD6mBODP/cv3w=",
|
||||
"owner": "wez",
|
||||
"repo": "wezterm",
|
||||
"rev": "ed430415ee69279ea692358525196ad7d4c965b8",
|
||||
"rev": "9ddca7bde92090792dbcdc65c1e9897c362196d7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -19,10 +19,7 @@
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
wezterm = {
|
||||
url = "github:wez/wezterm?dir=nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
wezterm.url = "github:wez/wezterm?dir=nix";
|
||||
agenix = {
|
||||
url = "github:yaxitech/ragenix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
@ -35,7 +32,7 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
blog = {
|
||||
url = "git+https://git.orion-technologies.io/blog/blog";
|
||||
url = "git+https://git.price-hiller.com/blog/blog";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
emacs-overlay = {
|
||||
@ -252,7 +249,7 @@
|
||||
in
|
||||
{
|
||||
luna = {
|
||||
hostname = "luna.hosts.orion-technologies.io";
|
||||
hostname = "luna.hosts.price-hiller.com";
|
||||
fastConnection = true;
|
||||
profiles.system = {
|
||||
sshUser = "price";
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ config, ... }:
|
||||
let
|
||||
grafana_host = "grafana.orion-technologies.io";
|
||||
grafana_host = "grafana.${config.networking.domain}";
|
||||
in
|
||||
{
|
||||
services = {
|
||||
@ -23,4 +23,4 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
{ config, pkgs, ... }:
|
||||
let
|
||||
prometheus_host = "prometheus.orion-technologies.io";
|
||||
prometheus_host = "prometheus.${config.networking.domain}";
|
||||
in
|
||||
{
|
||||
services = {
|
||||
@ -89,4 +89,4 @@ in
|
||||
group = "prometheus";
|
||||
}
|
||||
];
|
||||
}
|
||||
}
|
@ -1,105 +1,22 @@
|
||||
{ hostname, ... }:
|
||||
{ hostname, config, ... }:
|
||||
|
||||
let
|
||||
networks_dhcp_use_dns = "no";
|
||||
networks_dhcp = "ipv4";
|
||||
networks_multicast_dns = "no";
|
||||
networks_ipv6_privacy = "yes";
|
||||
networks_ipv6_accept_ra = "yes";
|
||||
networks_network_config = {
|
||||
DHCP = networks_dhcp;
|
||||
MulticastDNS = networks_multicast_dns;
|
||||
IPv6PrivacyExtensions = networks_ipv6_privacy;
|
||||
IPv6AcceptRA = networks_ipv6_accept_ra;
|
||||
};
|
||||
resolved_nameservers = [
|
||||
"1.1.1.1#cloudflare-dns.com"
|
||||
"9.9.9.9#dns.quad9.net"
|
||||
"8.8.8.8#dns.google"
|
||||
"2606:4700:4700::1111#cloudflare-dns.com"
|
||||
"2620:fe::9#dns.quad9.net"
|
||||
"2001:4860:4860::8888#dns.google"
|
||||
];
|
||||
resolved_fallback_nameservers = [
|
||||
"1.1.1.1#one.one.one.one"
|
||||
"1.0.0.1#one.one.one.one"
|
||||
];
|
||||
in
|
||||
{
|
||||
systemd.network = {
|
||||
enable = true;
|
||||
# HACK: Disable wait-online, check in on https://github.com/NixOS/nixpkgs/pull/258680 &
|
||||
# https://github.com/NixOS/nixpkgs/issues/247608
|
||||
wait-online.enable = false;
|
||||
networks = {
|
||||
"10-wlan" = {
|
||||
matchConfig.Name = [ "wl*" ];
|
||||
networkConfig = networks_network_config;
|
||||
dhcpV4Config = {
|
||||
RouteMetric = 600;
|
||||
UseDNS = networks_dhcp_use_dns;
|
||||
};
|
||||
ipv6AcceptRAConfig = {
|
||||
RouteMetric = 600;
|
||||
UseDNS = networks_dhcp_use_dns;
|
||||
};
|
||||
};
|
||||
"10-ethernet" = {
|
||||
matchConfig.Name = [
|
||||
"en*"
|
||||
"eth*"
|
||||
];
|
||||
networkConfig = networks_network_config;
|
||||
dhcpV4Config = {
|
||||
RouteMetric = 100;
|
||||
UseDNS = networks_dhcp_use_dns;
|
||||
};
|
||||
ipv6AcceptRAConfig = {
|
||||
RouteMetric = 100;
|
||||
UseDNS = networks_dhcp_use_dns;
|
||||
};
|
||||
};
|
||||
"10-wwan" = {
|
||||
matchConfig.Name = [ "ww*" ];
|
||||
networkConfig = networks_network_config;
|
||||
dhcpV4Config = {
|
||||
RouteMetric = 700;
|
||||
UseDNS = networks_dhcp_use_dns;
|
||||
};
|
||||
ipv6AcceptRAConfig = {
|
||||
RouteMetric = 700;
|
||||
UseDNS = networks_dhcp_use_dns;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.resolved = {
|
||||
enable = true;
|
||||
dnssec = "allow-downgrade";
|
||||
domains = [ "~." ];
|
||||
fallbackDns = resolved_fallback_nameservers;
|
||||
llmnr = "resolve";
|
||||
extraConfig = ''
|
||||
MulticastDNS=yes
|
||||
DNSOverTLS=yes
|
||||
CacheFromLocalhost=no
|
||||
Cache=yes
|
||||
'';
|
||||
dnsovertls = "true";
|
||||
dnssec = "false";
|
||||
};
|
||||
networking = {
|
||||
hostName = hostname;
|
||||
domain = "price-hiller.com";
|
||||
fqdn = "${config.networking.hostname}.hosts.${config.networking.domain}";
|
||||
nameservers = [
|
||||
"194.242.2.2#dns.mullvad.net"
|
||||
"2a07:e340::2#dns.mullvad.net"
|
||||
"91.239.100.100#anycast.uncensoreddns.org"
|
||||
"2001:67c:28a4::#anycast.uncensoreddns.org"
|
||||
];
|
||||
useNetworkd = true;
|
||||
enableIPv6 = true;
|
||||
nameservers = resolved_nameservers;
|
||||
nftables.enable = true;
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [
|
||||
80
|
||||
443
|
||||
2200
|
||||
];
|
||||
};
|
||||
hostName = "${hostname}";
|
||||
};
|
||||
}
|
||||
}
|
@ -6,7 +6,7 @@
|
||||
...
|
||||
}:
|
||||
let
|
||||
gitea_host = "git.orion-technologies.io";
|
||||
gitea_host = "git.${config.networking.domain}";
|
||||
# TODO: Move this docker image out to a separate package and NixOS Module
|
||||
# Huge thank you to https://icewind.nl/entry/gitea-actions-nix/ -- wouldn't have figured this out
|
||||
# without that post 🙂
|
||||
@ -157,4 +157,4 @@ in
|
||||
group = config.services.gitea.group;
|
||||
}
|
||||
];
|
||||
}
|
||||
}
|
@ -10,15 +10,11 @@
|
||||
|
||||
security.acme = {
|
||||
acceptTerms = true;
|
||||
defaults.email = "price@orion-technologies.io";
|
||||
defaults.email = "price@price-hiller.com";
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
||||
services.nginx.virtualHosts = {
|
||||
"blog.orion-technologies.io" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
globalRedirect = "price-hiller.com";
|
||||
};
|
||||
"price-hiller.com" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
@ -32,4 +28,4 @@
|
||||
locations."/".index = "home.html";
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
@ -19,5 +19,9 @@
|
||||
package = pkgs.wireshark;
|
||||
};
|
||||
steam.enable = true;
|
||||
appimage = {
|
||||
enable = true;
|
||||
binfmt = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
2
secrets
2
secrets
@ -1 +1 @@
|
||||
Subproject commit 189defc835b2d1eb303299bc264e1ebb0d805740
|
||||
Subproject commit 26a7346d97b19d44e3f07d912e64cc4e8fd38ec9
|
91
users/price/conf/git/default.nix
Normal file
91
users/price/conf/git/default.nix
Normal file
@ -0,0 +1,91 @@
|
||||
{ ... }:
|
||||
{
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "Price Hiller";
|
||||
# TODO: Migrate GPG to price@price-hiller.com
|
||||
userEmail = "price@orion-technologies.io";
|
||||
aliases = {
|
||||
unstage = "reset HEAD --";
|
||||
};
|
||||
extraConfig = {
|
||||
init.defaultBranch = "main";
|
||||
merge.conflictstyle = "zdiff3";
|
||||
branch.autosetupmerge = "always";
|
||||
remote.pushDefault = "origin";
|
||||
am.threeWay = true;
|
||||
apply.ignoreWhitespace = "change";
|
||||
# SEC: Integrate https://github.com/git-ecosystem/git-credential-manager with GPG to improve
|
||||
# security stance around the credential store
|
||||
credential.helper = "store";
|
||||
pull.rebase = true;
|
||||
commit.gpgsign = true;
|
||||
transfer.fsckObjects = true;
|
||||
receive.fsckObjects = true;
|
||||
status.submoduleSummary = true;
|
||||
submodule.recurse = true;
|
||||
fetch = {
|
||||
fsckObjects = true;
|
||||
prune = true;
|
||||
prunetags = true;
|
||||
};
|
||||
rebase = {
|
||||
autosquash = true;
|
||||
autostash = true;
|
||||
updateRefs = true;
|
||||
};
|
||||
log = {
|
||||
abbrevCommit = true;
|
||||
decorate = "short";
|
||||
date = "iso";
|
||||
};
|
||||
rerere = {
|
||||
enabled = true;
|
||||
autoUpdate = true;
|
||||
};
|
||||
core = {
|
||||
ignorecase = false;
|
||||
quotePath = false;
|
||||
};
|
||||
diff = {
|
||||
colorMoved = "default";
|
||||
submodule = "log";
|
||||
tool = "nvimdiff";
|
||||
};
|
||||
push = {
|
||||
autoSetupRemote = true;
|
||||
default = "current";
|
||||
};
|
||||
};
|
||||
signing = {
|
||||
signByDefault = true;
|
||||
key = null;
|
||||
};
|
||||
delta = {
|
||||
enable = true;
|
||||
options = {
|
||||
navigate = true;
|
||||
features = "interactive decorations";
|
||||
interactive = {
|
||||
keep-plus-minus-markers = false;
|
||||
};
|
||||
decorations = {
|
||||
commit-decoration-style = "bold box ul";
|
||||
dark = true;
|
||||
file-style = "omit";
|
||||
hunk-header-decoration-style = ''"#022b45" box ul'';
|
||||
hunk-header-file-style = ''"#999999"'';
|
||||
hunk-header-style = "file line-number syntax";
|
||||
line-numbers = true;
|
||||
line-numbers-left-style = ''"#022b45"'';
|
||||
minus-emph-style = ''normal "#80002a"'';
|
||||
minus-style = ''normal "#330011"'';
|
||||
plus-emph-style = ''syntax "#003300"'';
|
||||
plus-style = ''syntax "#001a00"'';
|
||||
syntax-theme = "Solarized (dark)";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
@ -19,7 +19,7 @@
|
||||
enable = true;
|
||||
enableSshSupport = true;
|
||||
enableZshIntegration = true;
|
||||
pinentryPackage = pkgs.pinentry-qt;
|
||||
pinentryPackage = pkgs.pinentry-gtk2;
|
||||
maxCacheTtl = 14400;
|
||||
maxCacheTtlSsh = 14400;
|
||||
sshKeys = [ "530D3EC95C32AB9EC33714AAF865738D6E77680A" ];
|
||||
|
@ -5,11 +5,11 @@
|
||||
matchBlocks =
|
||||
rec {
|
||||
luna = {
|
||||
hostname = "luna.hosts.orion-technologies.io";
|
||||
hostname = "luna.hosts.price-hiller.com";
|
||||
user = "price";
|
||||
port = 2200;
|
||||
};
|
||||
"luna.hosts.orion-technologies.io" = luna;
|
||||
"luna.hosts.price-hiller.com" = luna;
|
||||
asgard = {
|
||||
hostname = "asgard-eternal.com";
|
||||
user = "asgard";
|
||||
|
3
users/price/dots/.config/hypr/xdph.conf
Normal file
3
users/price/dots/.config/hypr/xdph.conf
Normal file
@ -0,0 +1,3 @@
|
||||
screencopy {
|
||||
allow_token_by_default = true
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
vim.opt_local.tabstop = 2
|
||||
vim.opt_local.shiftwidth = 2
|
||||
vim.opt_local.textwidth = 120
|
||||
vim.opt_local.textwidth = 0
|
||||
|
||||
vim.keymap.set("n", "<leader>fr", "<cmd>MarkdownPreview<CR>", {
|
||||
buffer = true,
|
||||
|
@ -2,12 +2,17 @@
|
||||
(
|
||||
([
|
||||
(list_marker_star)
|
||||
(list_marker_plus)
|
||||
(list_marker_minus)
|
||||
]) @markup.list
|
||||
(#offset! @markup.list 0 0 0 -1)
|
||||
(#set! conceal "•")
|
||||
)
|
||||
(
|
||||
([
|
||||
(list_marker_plus)
|
||||
(list_marker_dot)
|
||||
]) @markup.list.number
|
||||
)
|
||||
|
||||
; checkboxes
|
||||
((task_list_marker_unchecked) @markup.list.unchecked (#set! conceal ""))
|
||||
|
@ -19,7 +19,7 @@
|
||||
"cmp-npm": { "branch": "main", "commit": "2337f109f51a09297596dd6b538b70ccba92b4e4" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
|
||||
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
|
||||
"cmp-rg": { "branch": "master", "commit": "677a7874ee8f1afc648c2e7d63a97bc21a7663c5" },
|
||||
"cmp-rg": { "branch": "master", "commit": "d6cea15ad504369ec98f3de73b9631dfdd23a671" },
|
||||
"cmp-zsh": { "branch": "main", "commit": "c24db8e58fac9006ec23d93f236749288d00dec9" },
|
||||
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
||||
"crates.nvim": { "branch": "main", "commit": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785" },
|
||||
@ -31,14 +31,14 @@
|
||||
"fuzzy.nvim": { "branch": "master", "commit": "68608f6a232f7e73ccf81437bf12108128f15bd4" },
|
||||
"gitlinker.nvim": { "branch": "master", "commit": "a221c13fc3c7f5b8799933f4966ee8e618287292" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" },
|
||||
"go.nvim": { "branch": "master", "commit": "0d099822d56db4f611f0b9b7c74c75dbedcf8318" },
|
||||
"go.nvim": { "branch": "master", "commit": "51676b430fc9288073769319ba0ccb2a3bcd79c9" },
|
||||
"guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" },
|
||||
"gx.nvim": { "branch": "main", "commit": "cc70d112b14d18dd7b123a5d5288266a60e8189e" },
|
||||
"headlines.nvim": { "branch": "master", "commit": "bf17c96a836ea27c0a7a2650ba385a7783ed322e" },
|
||||
"heirline.nvim": { "branch": "master", "commit": "7a79753c1a42c3f52e89a6c42429e7f871e560cd" },
|
||||
"highlight-undo.nvim": { "branch": "main", "commit": "ee2f6355e08719fea902e7c478aa7351934f2bb6" },
|
||||
"hlargs.nvim": { "branch": "main", "commit": "53ec5d8ca6ed012de5545ba83ea1eb3d636b09fb" },
|
||||
"hop.nvim": { "branch": "master", "commit": "8f51ef02700bb3cdcce94e92eff16170a6343c4f" },
|
||||
"hop.nvim": { "branch": "master", "commit": "08ddca799089ab96a6d1763db0b8adc5320bf050" },
|
||||
"hurl.nvim": { "branch": "main", "commit": "807b6ff480626d91ec46ca86092b530082c7400c" },
|
||||
"hydra.nvim": { "branch": "main", "commit": "7f5341643107d05a8d7d4fdea00b29af28517380" },
|
||||
"img-clip.nvim": { "branch": "main", "commit": "28a32d811d69042f4fa5c3d5fa35571df2bc1623" },
|
||||
@ -56,25 +56,25 @@
|
||||
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
|
||||
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
||||
"mini.nvim": { "branch": "main", "commit": "a535342b6105a684f16114f598d44318e6a1d20f" },
|
||||
"mini.nvim": { "branch": "main", "commit": "9618cf56e76cc0caab54ad60116a8d72f99d7b3b" },
|
||||
"mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
|
||||
"neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
|
||||
"neoformat": { "branch": "master", "commit": "d9d3311097eacdba9bd7a425b267d304b509e7ea" },
|
||||
"neogen": { "branch": "main", "commit": "e932ba918b56723436b77aa3efb844a11b2851ab" },
|
||||
"neogit": { "branch": "master", "commit": "a8dd1509a7fc6bf92ca60f21e33393f685ab70aa" },
|
||||
"neogit": { "branch": "master", "commit": "c41a654d6148e1858d98e37cea371993eac0b126" },
|
||||
"neotest": { "branch": "master", "commit": "6d3d22cdad49999ef774ebe1bc250a4994038964" },
|
||||
"neotest-go": { "branch": "main", "commit": "92950ad7be2ca02a41abca5c6600ff6ffaf5b5d6" },
|
||||
"neotest-plenary": { "branch": "master", "commit": "3523adcf9ffaad1911960c5813b0136c1b63a2ec" },
|
||||
"netman.nvim": { "branch": "main", "commit": "68eecb29d913d4f35efa9bd0e8636046f70f998f" },
|
||||
"nibbler": { "branch": "main", "commit": "a69331d6af60dda6ae6459522134a5e365fb43b1" },
|
||||
"noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" },
|
||||
"none-ls.nvim": { "branch": "main", "commit": "0e0a940477cc08fa7b1799384a1d668058ed4e61" },
|
||||
"none-ls.nvim": { "branch": "main", "commit": "dcc8cd4efdcb29275681a3c95786a816330dbca6" },
|
||||
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "4aec249cdcef9b269e962bf73ef976181ee7fdd9" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "63d7acd686da35be0227af8ccf709bc3a7f54d90" },
|
||||
"nvim-cmp-lua-latex-symbols": { "branch": "master", "commit": "89345d6e333c700d13748e8a7ee6fe57279b7f88" },
|
||||
"nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
|
||||
"nvim-dap-python": { "branch": "master", "commit": "db72bf6ab9f75fe841e8e11e772ee7fef6f484f1" },
|
||||
"nvim-dap-python": { "branch": "master", "commit": "03fe9592409236b9121c03b66a682dfca15a5cac" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
|
||||
"nvim-dap-virtual-text": { "branch": "master", "commit": "52638640ae309cacdaff785fdbb854437bd1ee5c" },
|
||||
"nvim-fundo": { "branch": "main", "commit": "ac9c9372c4bf677721e24f144ef29d3a05c2b589" },
|
||||
@ -84,24 +84,24 @@
|
||||
"nvim-java-refactor": { "branch": "main", "commit": "ea1420fed5463c9cc976c2b4175f434b3646f0f7" },
|
||||
"nvim-java-test": { "branch": "main", "commit": "7f0f40e9c5b7eab5096d8bec6ac04251c6e81468" },
|
||||
"nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
|
||||
"nvim-lightbulb": { "branch": "master", "commit": "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "d3f169f436e1b44538bfe7e13b4721eec48dbc59" },
|
||||
"nvim-lightbulb": { "branch": "master", "commit": "33d4c95e0e853956bc9468b70b3064c87d5abaca" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "fd49d5863e873891be37afac79b1f56fb34bb5d3" },
|
||||
"nvim-neoclip.lua": { "branch": "main", "commit": "32e05f2d23dc5b6a284a688c0535a83d1bfc633f" },
|
||||
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
|
||||
"nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
|
||||
"nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "9d2acd49976e2a9da72949008df03436f781fd23" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "a3ca2e60563064cea008555d0b7d031430305b09" },
|
||||
"nvim-treesitter-endwise": { "branch": "fix/iter-matches", "commit": "a210e4c96e7b4b872be6026293a8f6e6bea05175" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "b91c98afa6c42819aea6cbc1ba38272f5456a5cf" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "0d79d169fcd45a8da464727ac893044728f121d4" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
|
||||
"nvim-ufo": { "branch": "main", "commit": "203c9f434feec57909ab4b1e028abeb3349b7847" },
|
||||
"nvim-various-textobjs": { "branch": "main", "commit": "cc33e0a6681bbe913de515ac1a68492d50cbf949" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" },
|
||||
"octo.nvim": { "branch": "master", "commit": "0adcc6d37a3cd2dae014fa5e48bee6147100c357" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
|
||||
"octo.nvim": { "branch": "master", "commit": "a83ca8bcee6cf4a9288bbfd1b97a51ba32068c21" },
|
||||
"omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "aad7bf06b4ca0de816b919d475a75b30f5f62b61" },
|
||||
"open-browser.vim": { "branch": "master", "commit": "7d4c1d8198e889d513a030b5a83faa07606bac27" },
|
||||
"orgmode": { "branch": "master", "commit": "a5aeb14663ef08e0bb4bb847f8d79f9c253094a0" },
|
||||
"overseer.nvim": { "branch": "master", "commit": "965f8159408cee5970421ad36c4523333b798502" },
|
||||
"orgmode": { "branch": "master", "commit": "05d69831e57996d09d9c6d9b135d141d6c051035" },
|
||||
"overseer.nvim": { "branch": "master", "commit": "6f8bc37eb729a00e185cdf38b1ed3309a05bfeef" },
|
||||
"plantuml-previewer.vim": { "branch": "master", "commit": "555347700382c97b347bace57b7a9f764ed556b1" },
|
||||
"plantuml-syntax": { "branch": "master", "commit": "9d4900aa16674bf5bb8296a72b975317d573b547" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
||||
@ -109,11 +109,11 @@
|
||||
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
|
||||
"rainbow-delimiters.nvim": { "branch": "master", "commit": "d227e6c9879bb50af35cd733461198666981d482" },
|
||||
"rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" },
|
||||
"rustaceanvim": { "branch": "master", "commit": "d1f56672638508a7bc971cde31a29df4018579a9" },
|
||||
"schemastore.nvim": { "branch": "main", "commit": "dd374887d6e1de38e9d7041da824a8dc10cae401" },
|
||||
"rustaceanvim": { "branch": "master", "commit": "6eb1c41463a0ad02a4fe799321cc7f651b87e576" },
|
||||
"schemastore.nvim": { "branch": "main", "commit": "30eacb81f0202c0d5718fb27e3ec0b03945a03c7" },
|
||||
"spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" },
|
||||
"sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" },
|
||||
"statuscol.nvim": { "branch": "main", "commit": "ecc04176e364dd7f614edfc4325e3a8521905ad6" },
|
||||
"statuscol.nvim": { "branch": "main", "commit": "5998d16044159ad3779f62c45e756c555e3051f0" },
|
||||
"symbol-usage.nvim": { "branch": "main", "commit": "0f9b3da014b7e41559b643e7461fcabb2a7dc83a" },
|
||||
"telescope-frecency.nvim": { "branch": "master", "commit": "f67baca08423a6fd00167801a54db38e0b878063" },
|
||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
|
||||
@ -121,14 +121,14 @@
|
||||
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
|
||||
"telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" },
|
||||
"telescope-z.nvim": { "branch": "main", "commit": "3a31d9741fe4353e5c8b59cfc4eda5420dc7f938" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "dc6fc321a5ba076697cca89c9d7ea43153276d81" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" },
|
||||
"tint.nvim": { "branch": "master", "commit": "02bd0527a315a80e4e25bb2dd7b6994fb0daae01" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
|
||||
"toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" },
|
||||
"venn.nvim": { "branch": "main", "commit": "b09c2f36ddf70b498281845109bedcf08a7e0de0" },
|
||||
"venv-selector.nvim": { "branch": "regexp", "commit": "e82594274bf7b54387f9a2abe65f74909ac66e97" },
|
||||
"vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" },
|
||||
"vim-dadbod": { "branch": "master", "commit": "fe5a55e92b2dded7c404006147ef97fb073d8b1b" },
|
||||
"vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" },
|
||||
"vim-dadbod-ui": { "branch": "master", "commit": "f29c85ab42861c6ef683289b0c6a51e0d436dcf6" },
|
||||
"vim-move": { "branch": "master", "commit": "3c4195de0748da9bba25c54d78d959d349e93c55" },
|
||||
@ -136,8 +136,8 @@
|
||||
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
|
||||
"vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" },
|
||||
"vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" },
|
||||
"vimtex": { "branch": "master", "commit": "fcbaf66887bd19f5d973406848cf2a5ac46bd65e" },
|
||||
"visual-whitespace.nvim": { "branch": "main", "commit": "e22d8508a0236f274dde39775ee127c85d30c0c0" },
|
||||
"vimtex": { "branch": "master", "commit": "4dd3be5cc4e8f6ee7401e303a8211efb4d91bcf6" },
|
||||
"visual-whitespace.nvim": { "branch": "main", "commit": "b936692ad77f042c318b0d8fba0f9248819b23a4" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" },
|
||||
"window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
|
||||
"z.nvim": { "branch": "main", "commit": "3e3a83e544925d938779366a11c65d11febf3f72" }
|
||||
|
@ -240,8 +240,8 @@ return {
|
||||
end,
|
||||
},
|
||||
mapping = {
|
||||
["<C-s>"] = cmp.mapping(cmp.mapping.scroll_docs(-4), { "i", "c" }),
|
||||
["<C-d>"] = cmp.mapping(cmp.mapping.scroll_docs(4), { "i", "c" }),
|
||||
["<C-k>"] = cmp.mapping(cmp.mapping.scroll_docs(-4), { "i", "c" }),
|
||||
["<C-j>"] = cmp.mapping(cmp.mapping.scroll_docs(4), { "i", "c" }),
|
||||
["<C-Space>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }),
|
||||
["<C-y>"] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
|
||||
["<C-e>"] = cmp.mapping({
|
||||
|
@ -2,7 +2,7 @@ return {
|
||||
{
|
||||
"lukas-reineke/headlines.nvim",
|
||||
dependencies = "nvim-treesitter/nvim-treesitter",
|
||||
opts = function()
|
||||
config = function()
|
||||
local bullets = {
|
||||
"",
|
||||
"",
|
||||
@ -21,7 +21,8 @@ return {
|
||||
"@markup.heading.7.marker",
|
||||
"@markup.heading.8.marker",
|
||||
}
|
||||
return {
|
||||
local headlines = require("headlines")
|
||||
headlines.setup({
|
||||
markdown = {
|
||||
bullets = bullets,
|
||||
bullet_highlights = bullet_highlights,
|
||||
@ -65,9 +66,12 @@ return {
|
||||
bullet_highlights = bullet_highlights,
|
||||
fat_headline_lower_string = "▀",
|
||||
},
|
||||
}
|
||||
})
|
||||
-- TODO: Upstream this fix to headlines.nvim
|
||||
vim.api.nvim_create_autocmd("VimResized", {
|
||||
callback = headlines.refresh,
|
||||
})
|
||||
end,
|
||||
config = true,
|
||||
ft = { "markdown", "norg", "rmd", "org" },
|
||||
},
|
||||
}
|
||||
|
@ -255,7 +255,7 @@ return {
|
||||
{ "@lsp.typemod.variable.global", { fg = colors.lightBlue } },
|
||||
|
||||
-- Markup specific
|
||||
{ "@markup.raw", { fg = colors.oniViolet2, bg = colors.sumiInk1 } },
|
||||
{ "@markup.raw", { fg = colors.springViolet2, bg = colors.sumiInk1 } },
|
||||
{ "@markup.raw.block", select_hl("@markup.raw", { "fg" }) },
|
||||
{ "@markup.raw.delimiter", { link = "@punctuation.delimiter" } },
|
||||
{
|
||||
@ -266,6 +266,7 @@ return {
|
||||
},
|
||||
{ "Headline", { bg = colors.sumiInk0 } },
|
||||
{ "@markup.list", { fg = colors.crystalBlue } },
|
||||
{ "@markup.list.number", { fg = colors.surimiOrange } },
|
||||
{ "@markup.list.checked", { fg = colors.springGreen } },
|
||||
{ "@markup.list.indeterminate", { fg = colors.carpYellow } },
|
||||
{ "@markup.verbatim", { fg = colors.springGreen, bg = colors.sumiInk0 } },
|
||||
@ -363,7 +364,7 @@ return {
|
||||
{ "@markup.heading.6.marker", { link = "@markup.heading.6" } },
|
||||
{ "@markup.heading.7.marker", { link = "@markup.heading.7" } },
|
||||
{ "@markup.heading.8.marker", { link = "@markup.heading.8" } },
|
||||
{ "@markup.quote.org", get_hl("@markup.quote", { bg = colors.sumiInk5 }) },
|
||||
{ "@markup.quote", { fg = colors.oldWhite }},
|
||||
|
||||
-- For Visual Whitespace plugin
|
||||
{ "visual-whitespace", get_hl("Visual", { fg = colors.fujiGray }) },
|
||||
|
@ -11,9 +11,9 @@ return {
|
||||
},
|
||||
keys = {
|
||||
{ "<localleader>n", desc = "> Neotest" },
|
||||
{ "<localleader>nrr", "<cmd>Neotest run<CR>", desc = "Neotest: Run Test" },
|
||||
{ "<localleader>nrl", "<cmd>Neotest run file<CR>", desc = "Neotest: Run Tests in File" },
|
||||
{ "<localleader>nrl", "<cmd>Neotest run last<CR>", desc = "Neotest: Run Last Tests" },
|
||||
{ "<localleader>nr", "<cmd>Neotest run<CR>", desc = "Neotest: Run Test" },
|
||||
{ "<localleader>nf", "<cmd>Neotest run file<CR>", desc = "Neotest: Run Test(s) in File" },
|
||||
{ "<localleader>nl", "<cmd>Neotest run last<CR>", desc = "Neotest: Run Last Test(s)" },
|
||||
{ "<localleader>np", "<cmd>Neotest output-panel<CR>", desc = "Neotest: Output Panel" },
|
||||
{ "<localleader>no", "<cmd>Neotest output<CR>", desc = "Neotest: Output" },
|
||||
{ "<localleader>nn", "<cmd>Neotest summary toggle<CR>", desc = "Neotest: Summary Toggle" },
|
||||
|
@ -32,6 +32,8 @@ in
|
||||
packages =
|
||||
with pkgs;
|
||||
[
|
||||
dig
|
||||
nethogs
|
||||
lsof
|
||||
strace
|
||||
ltrace
|
||||
@ -200,92 +202,6 @@ in
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
};
|
||||
git = {
|
||||
enable = true;
|
||||
userName = "Price Hiller";
|
||||
userEmail = "price@orion-technologies.io";
|
||||
aliases = {
|
||||
unstage = "reset HEAD --";
|
||||
};
|
||||
extraConfig = {
|
||||
init.defaultBranch = "main";
|
||||
merge.conflictstyle = "zdiff3";
|
||||
branch.autosetupmerge = "always";
|
||||
remote.pushDefault = "origin";
|
||||
am.threeWay = true;
|
||||
apply.ignoreWhitespace = "change";
|
||||
# SEC: Integrate https://github.com/git-ecosystem/git-credential-manager with GPG to improve
|
||||
# security stance around the credential store
|
||||
credential.helper = "store";
|
||||
pull.rebase = true;
|
||||
commit.gpgsign = true;
|
||||
transfer.fsckObjects = true;
|
||||
receive.fsckObjects = true;
|
||||
status.submoduleSummary = true;
|
||||
submodule.recurse = true;
|
||||
fetch = {
|
||||
fsckObjects = true;
|
||||
prune = true;
|
||||
prunetags = true;
|
||||
};
|
||||
rebase = {
|
||||
autosquash = true;
|
||||
autostash = true;
|
||||
updateRefs = true;
|
||||
};
|
||||
log = {
|
||||
abbrevCommit = true;
|
||||
decorate = "short";
|
||||
date = "iso";
|
||||
};
|
||||
rerere = {
|
||||
enabled = true;
|
||||
autoUpdate = true;
|
||||
};
|
||||
core = {
|
||||
ignorecase = false;
|
||||
quotePath = false;
|
||||
};
|
||||
diff = {
|
||||
colorMoved = "default";
|
||||
submodule = "log";
|
||||
tool = "nvimdiff";
|
||||
};
|
||||
push = {
|
||||
autoSetupRemote = true;
|
||||
default = "current";
|
||||
};
|
||||
};
|
||||
signing = {
|
||||
signByDefault = true;
|
||||
key = null;
|
||||
};
|
||||
delta = {
|
||||
enable = true;
|
||||
options = {
|
||||
navigate = true;
|
||||
features = "interactive decorations";
|
||||
interactive = {
|
||||
keep-plus-minus-markers = false;
|
||||
};
|
||||
decorations = {
|
||||
commit-decoration-style = "bold box ul";
|
||||
dark = true;
|
||||
file-style = "omit";
|
||||
hunk-header-decoration-style = ''"#022b45" box ul'';
|
||||
hunk-header-file-style = ''"#999999"'';
|
||||
hunk-header-style = "file line-number syntax";
|
||||
line-numbers = true;
|
||||
line-numbers-left-style = ''"#022b45"'';
|
||||
minus-emph-style = ''normal "#80002a"'';
|
||||
minus-style = ''normal "#330011"'';
|
||||
plus-emph-style = ''syntax "#003300"'';
|
||||
plus-style = ''syntax "#001a00"'';
|
||||
syntax-theme = "Solarized (dark)";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
qt = {
|
||||
|
Loading…
Reference in New Issue
Block a user