Compare commits

..

No commits in common. "804e83a45647b72b979f5445ef16f25486ec9c96" and "4842e15d965ddc230c781d0ba9c4582e7d74f5d1" have entirely different histories.

6 changed files with 30 additions and 40 deletions

View file

@ -218,11 +218,11 @@
]
},
"locked": {
"lastModified": 1711625603,
"narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
"lastModified": 1711554349,
"narHash": "sha256-RypwcWEIFePBI0Hubfj4chanbM/G2yzJzC6wgz+dmS4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
"rev": "179f6acaf7c068c7870542cdae72afec9427a5b0",
"type": "github"
},
"original": {
@ -239,11 +239,11 @@
]
},
"locked": {
"lastModified": 1711604890,
"narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=",
"lastModified": 1711133180,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
"type": "github"
},
"original": {
@ -260,11 +260,11 @@
]
},
"locked": {
"lastModified": 1711591334,
"narHash": "sha256-9d5ilxxq4CXw44eFw8VFrRneAKex7D8xjn95mwZjgf4=",
"lastModified": 1710717205,
"narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "f0dd0838c3558b59dc3b726d8ab89f5b5e35c297",
"rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
"type": "github"
},
"original": {
@ -281,11 +281,11 @@
]
},
"locked": {
"lastModified": 1711724506,
"narHash": "sha256-c+Rieg88Wmr1eh0TxkD9u82VOEe71VBFLmwyKYmhHWI=",
"lastModified": 1711551697,
"narHash": "sha256-ZtsenZ4QtQICXtt24W87Bg8qYY2Ixx9bfHGLDyhVISY=",
"owner": "doronbehar",
"repo": "nix-matlab",
"rev": "38da0ef06fa5edee1ced5fb3c22f86ef1ecb4146",
"rev": "f0ad3b2e2e3b099a4361bc21baeb47c3eaf50788",
"type": "gitlab"
},
"original": {
@ -328,11 +328,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1711523803,
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
"lastModified": 1711333969,
"narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
"rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b",
"type": "github"
},
"original": {
@ -355,11 +355,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1711630555,
"narHash": "sha256-jslStwDlRwVZLwcFkExWegOGYv/Dn9q7yoocUX7AsIg=",
"lastModified": 1711572924,
"narHash": "sha256-JLDnh9TJXJ8iLRd3dNtS48pqU6LraWUntK8Z7M0W184=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "acb917fbf2bc9ce9c556516d8a1f257709b3cf1e",
"rev": "5fb9f0bb86edf08043ebf1cc3d16388469390c0a",
"type": "github"
},
"original": {
@ -370,11 +370,11 @@
},
"nur": {
"locked": {
"lastModified": 1711743910,
"narHash": "sha256-XEBT1xEfTalw1OUKEHMN+LyIyZZrtu4WvzcLu34eFy0=",
"lastModified": 1711581287,
"narHash": "sha256-168mSQ0RvuLDa8CeVfjZpfT6GE/Yh309jD4UnvpaGUY=",
"owner": "nix-community",
"repo": "nur",
"rev": "7e6f9ce704b7362eb5b0f8a8e72b25b750170289",
"rev": "439132433acf7a45c24ed30bf0578a6da4a8808e",
"type": "github"
},
"original": {
@ -398,11 +398,11 @@
]
},
"locked": {
"lastModified": 1711519547,
"narHash": "sha256-Q7YmSCUJmDl71fJv/zD9lrOCJ1/SE/okZ2DsrmRjzhY=",
"lastModified": 1711409088,
"narHash": "sha256-+rTCra8TY4vuSNTtQ0tcex1syCRPoKyb8vyHmoxkga4=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a",
"rev": "db656fc3e34907000df26e8bc5cc3c94fb27f353",
"type": "github"
},
"original": {

View file

@ -33,10 +33,7 @@
keyMap = "us";
};
networking.networkmanager = {
enable = true;
dns = "none";
};
networking.networkmanager.enable = true;
networking.resolvconf.extraConfig = ''
name_servers="1.1.1.1 1.0.0.1 2606:4700:4700::1111 2606:4700:4700::1001"
name_server_blacklist="129.21.3.17 129.21.4.18 2620:8d:8000:0:aba:ca:daba:ec"
@ -59,7 +56,7 @@
services.geoclue2.enable = true;
services.fwupd.enable = true;
security.rtkit.enable = true;
# services.resolved.enable = true;
services.resolved.enable = true;
services.udisks2.enable = true;
services.pcscd.enable = true;
services.openssh = {

View file

@ -25,7 +25,6 @@
packages = with pkgs; [
fd
swayimg
virtualenv
whipper
unzip
mpc-cli
@ -62,9 +61,10 @@
fira-code
mononoki
inter
(nerdfonts.override {fonts = ["FiraCode" "Mononoki"];})
(nerdfonts.override {fonts = ["FiraCode"];})
pandoc
pdftk
git
lua
python3
pamixer

View file

@ -55,12 +55,6 @@
options = {
spell = true;
};
keymaps = [
{
action = "<cmd>TexlabBuild<CR>";
key = "<C-,>";
}
];
};
};
keymaps = [

View file

@ -1,7 +1,6 @@
{pkgs, ...}: {
{
programs.git = {
enable = true;
package = pkgs.gitAndTools.gitFull;
userEmail = "aria@chytrid.org";
userName = "Aria Nolan";
extraConfig = {

View file

@ -4,7 +4,7 @@
settings = {
main = {
shell = "/usr/bin/env fish";
font = "Mononoki Nerd Font:size=14";
font = "Mononoki:size=14,FiraCode Nerd Font:size=14";
};
colors = {
background = "232136";