many updates

This commit is contained in:
RingOfStorms (Joshua Bell) 2024-11-14 13:46:34 -06:00
parent 63ebc70f8f
commit 11b440f993
7 changed files with 135 additions and 24 deletions

112
flake.lock generated
View file

@ -32,11 +32,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1730079405,
"narHash": "sha256-kvq8Iq1P7Ut/cu0VWn8h+gnHTPWVdPhnaAiIKHY4vJs=",
"lastModified": 1731381599,
"narHash": "sha256-W+FuVxCdCiw7IaAWPajq9iOuM57zITFnbkw2ZQXfW9I=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "965b4d7b838dd4f37293c3b8160c64c2edcfb226",
"rev": "23976d5dac8b0f07187bc3c95e3812304519e5e3",
"type": "github"
},
"original": {
@ -273,11 +273,11 @@
},
"lio_nixpkgs": {
"locked": {
"lastModified": 1729973466,
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
"lastModified": 1731239293,
"narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
"rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
"type": "github"
},
"original": {
@ -304,11 +304,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1729880355,
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
"lastModified": 1731139594,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github"
},
"original": {
@ -320,11 +320,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1729973466,
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
"lastModified": 1731239293,
"narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
"rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
"type": "github"
},
"original": {
@ -384,11 +384,11 @@
},
"nixpkgs_stable": {
"locked": {
"lastModified": 1729973466,
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
"lastModified": 1731239293,
"narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
"rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
"type": "github"
},
"original": {
@ -414,6 +414,22 @@
"type": "github"
}
},
"nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": {
"flake": false,
"locked": {
"lastModified": 1730902338,
"narHash": "sha256-kM9PtMEKyMkJjSsnwSELx52Dx6Va1id92Svv7w6nVtc=",
"owner": "CopilotC-Nvim",
"repo": "CopilotChat.nvim",
"rev": "18d51754e9dc87d6b85f1e331c1fca0825384517",
"type": "github"
},
"original": {
"owner": "CopilotC-Nvim",
"repo": "CopilotChat.nvim",
"type": "github"
}
},
"nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": {
"flake": false,
"locked": {
@ -878,6 +894,22 @@
"type": "github"
}
},
"nvim_plugin-nosduco/remote-sshfs.nvim": {
"flake": false,
"locked": {
"lastModified": 1724901856,
"narHash": "sha256-vFEIISxhTIGSl9LzDYHuEIkjLGkU0y5XhfWI/i5DgN4=",
"owner": "nosduco",
"repo": "remote-sshfs.nvim",
"rev": "03f6c40c4032eeb1ab91368e06db9c3f3a97a75d",
"type": "github"
},
"original": {
"owner": "nosduco",
"repo": "remote-sshfs.nvim",
"type": "github"
}
},
"nvim_plugin-nvim-lua/plenary.nvim": {
"flake": false,
"locked": {
@ -1150,6 +1182,22 @@
"type": "github"
}
},
"nvim_plugin-stevearc/dressing.nvim": {
"flake": false,
"locked": {
"lastModified": 1731521499,
"narHash": "sha256-O0sdxU+ZQnclnnC5IfBpgqlMxjsJKlmPYQYPP+S3cn8=",
"owner": "stevearc",
"repo": "dressing.nvim",
"rev": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b",
"type": "github"
},
"original": {
"owner": "stevearc",
"repo": "dressing.nvim",
"type": "github"
}
},
"nvim_plugin-tpope/vim-sleuth": {
"flake": false,
"locked": {
@ -1214,6 +1262,22 @@
"type": "github"
}
},
"nvim_plugin-yetone/avante.nvim": {
"flake": false,
"locked": {
"lastModified": 1731602098,
"narHash": "sha256-pWgJO4v6nUjO9rkTzPKO8pXNwAC372LE6cqv7P9Wfxg=",
"owner": "yetone",
"repo": "avante.nvim",
"rev": "839a8ee25a84f813545440c4c798edd25bfd68a9",
"type": "github"
},
"original": {
"owner": "yetone",
"repo": "avante.nvim",
"type": "github"
}
},
"nvim_plugin-zbirenbaum/copilot-cmp": {
"flake": false,
"locked": {
@ -1295,6 +1359,7 @@
"nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable_2",
"nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim",
"nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim",
"nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring",
"nvim_plugin-L3MON4D3/LuaSnip": "nvim_plugin-L3MON4D3/LuaSnip",
"nvim_plugin-MeanderingProgrammer/render-markdown.nvim": "nvim_plugin-MeanderingProgrammer/render-markdown.nvim",
@ -1324,6 +1389,7 @@
"nvim_plugin-mfussenegger/nvim-lint": "nvim_plugin-mfussenegger/nvim-lint",
"nvim_plugin-mrcjkb/rustaceanvim": "nvim_plugin-mrcjkb/rustaceanvim",
"nvim_plugin-neovim/nvim-lspconfig": "nvim_plugin-neovim/nvim-lspconfig",
"nvim_plugin-nosduco/remote-sshfs.nvim": "nvim_plugin-nosduco/remote-sshfs.nvim",
"nvim_plugin-nvim-lua/plenary.nvim": "nvim_plugin-nvim-lua/plenary.nvim",
"nvim_plugin-nvim-lualine/lualine.nvim": "nvim_plugin-nvim-lualine/lualine.nvim",
"nvim_plugin-nvim-telescope/telescope-file-browser.nvim": "nvim_plugin-nvim-telescope/telescope-file-browser.nvim",
@ -1341,20 +1407,22 @@
"nvim_plugin-saadparwaiz1/cmp_luasnip": "nvim_plugin-saadparwaiz1/cmp_luasnip",
"nvim_plugin-sindrets/diffview.nvim": "nvim_plugin-sindrets/diffview.nvim",
"nvim_plugin-stevearc/conform.nvim": "nvim_plugin-stevearc/conform.nvim",
"nvim_plugin-stevearc/dressing.nvim": "nvim_plugin-stevearc/dressing.nvim",
"nvim_plugin-tpope/vim-sleuth": "nvim_plugin-tpope/vim-sleuth",
"nvim_plugin-tpope/vim-surround": "nvim_plugin-tpope/vim-surround",
"nvim_plugin-uga-rosa/ccc.nvim": "nvim_plugin-uga-rosa/ccc.nvim",
"nvim_plugin-windwp/nvim-ts-autotag": "nvim_plugin-windwp/nvim-ts-autotag",
"nvim_plugin-yetone/avante.nvim": "nvim_plugin-yetone/avante.nvim",
"nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp",
"nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua",
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1731426133,
"narHash": "sha256-u4XwZd1voL5pKJQKmHKuepycdM8SfDaGmQhGGVkVQK0=",
"lastModified": 1731613228,
"narHash": "sha256-EOCXBpzqo+VMAXRVeFum2Ju83VxihSPNkMkoWq+IVCU=",
"ref": "refs/heads/master",
"rev": "31244ea8a805065f2596d8ed476a9547444c80c5",
"revCount": 227,
"rev": "615c53c8fb982b85988ea3aa52772ba6c9c71650",
"revCount": 230,
"type": "git",
"url": "https://git.joshuabell.xyz/nvim"
},
@ -1409,11 +1477,11 @@
]
},
"locked": {
"lastModified": 1729996302,
"narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=",
"lastModified": 1731292155,
"narHash": "sha256-fYVoUUtSadbOrH0z0epVQDsStBDS/S/fAK//0ECQAAI=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a1b337569f334ff0a01b57627f17b201d746d24c",
"rev": "7c4cd99ed7604b79e8cb721099ac99c66f656b3a",
"type": "github"
},
"original": {

View file

@ -1,5 +1,6 @@
{
settings,
config,
...
}:
let
@ -42,6 +43,11 @@ in
# TODO should I have this set for my user...
nix.settings.trusted-users = [ "root" "${settings.user.username}" ];
# rate limiting for github
nix.extraOptions = ''
!include ${config.age.secrets.github_read_token.path}
'';
# nix helper
programs.nh = {
enable = true;

View file

@ -14,9 +14,9 @@
boot_systemd.enable = true;
shell_common.enable = true;
# de_cosmic.enable = true;
audio_pulse.enable = true;
de_gnome_xorg.enable = true;
# de_gnome_wayland.enable = true;
audio_pulse.enable = true;
neovim.enable = true;
tty_caps_esc.enable = true;
docker.enable = true;

View file

@ -65,6 +65,10 @@
file = /${settings.secretsDir}/nix2lio.age;
owner = settings.user.username;
};
github_read_token = {
file = /${settings.secretsDir}/github_read_token.age;
owner = settings.user.username;
};
};
};
}

View file

@ -0,0 +1,30 @@
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USAzQm1h
SHIrUEswcS9KckVZbHQ0aC9CQXoxOFZJME95R3JqNlhTR3E3K2pjCm9nMmx6TlRh
UUVMamg5ejkzQk0yVGRFakF3OXoxRVB5SGlXZDhSZmpGbncKLT4gc3NoLWVkMjU1
MTkgSmh2TCtRIE9SL2xpYzNmQTg3cnNPSlRMN0I2R0VhWDNITFlsdXRoTmdKZXNJ
SDJVd0UKUlpqSm4zU0lVUjRoc1plQ1lRcGRtVVBuM3pNcldMVjZUcEdLRUlOZFZ6
WQotPiBzc2gtZWQyNTUxOSBTcENqQlEgZnhlemxpT3VKYXVsdDAvTVFKSFE1Y0pU
UXRVeVdicXhFNHRKa05kaUxEZwpQZ0s1cUUwTHhEVFgyZE0rYjFBOHFHL3ZCcVdR
ZVA3VzdURXFuSkJ2VFE0Ci0+IHNzaC1lZDI1NTE5IEJZS0crdyBUR2FRU3NYd29R
WGFmb0FDaVh0WjRTWjA0UzBqaFcwSVFBQXBodWwyKzFzClhJcDJPbU9VTXh1cUgv
dlYyd1NTQ0dBTUhsZ2Z3Z2l1ekprTXdwRWlaTWMKLT4gc3NoLWVkMjU1MTkgWHpm
bWFRIFUwTmZ6M0RvWGlkOEtvYWprL1UvVTN4bEhDZ05WU3FsZmtiOFFIOVNpa2cK
YjJ3V0FKWEZ2UjJNakk0UDZ4eEJvNGFVbkliZDEyWFpPSkdNYi82SzR5UQotPiBz
c2gtZWQyNTUxOSBSNSt4ZncgRE1KZ0s3dVlFTUt2T0dSRDRqdTNmL2Mva0VhU0k4
Uk1kZ2VLTnpLczRrQQpGcWREUDZ1WTA5eHE1Uy9PaHJkeTFHbDV2ekFNOHZKSUx6
WVBTQ3ZsTzZFCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBBck9xaE1EVFBWZldNTDlw
MmRBQ3d4MjZnRHdqdDVyQ0tkVzZqWUpobUZ3CkJ0eThFbHVaNmNPTnlyK0R3WEow
VEU1b2FYVDRWY1c2SUhLYm9sYUxXWncKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIDRp
WXRrWkh6NFBsSzZTdjZSZ0lXVWpBL2lYTUt4R0FlYmw5aFBld2lqU3cKd0g4N2g4
M0FvWmhnaUprOUk2dHA1TTBBNEtkUDQxOG9UekpQYXlhZnhiUQotPiBzc2gtZWQy
NTUxOSB3ZHJaSkEgbGdLYXByb29ra2RpaForcWQ5eHVqaElsMjMwdE9UNmpZYnNW
aGozU2wyRQpNZUM5MzVQUHN6UVBLL2NyODVuSGVJSktvYXVpQzZuYytFTG5GNGx3
NlpzCi0+IDE1WHl6VH0tZ3JlYXNlCko1bGR3MXV6bW5seTU1QS8yU3h0cUJJWXoy
MDVtRVpqMWtjZlV2ZzlHdmJUUXlMNGV4S3FxNyt4VjN3a2xET1oKSUdpcWRYdUx2
MmVsWDgwCi0tLSBUWEF3V0JoUnYyMjdVWFFLWE92UGQzSFdGdHdTaU5ZTlkrUFcr
bmlQa0xzCqMN8orKU7bQkIeyWSgr+CD98rzbdSBWQnLV8JLOtKyM3GJoS3oT76ri
Ih5i3SQdAUx4vmwil2XDOZVg7i3kf2uCBpE9nXJtlmIkPpb2C48KG+JiqMU7TzvU
pkITPJm5uaoqYD40Pe0wrRcMFDyOzAR0gOleLRBMj/xy7671lxZL62WD3BRbxllp
W/e2ezaU1GBKbDWX2kpfqw==
-----END AGE ENCRYPTED FILE-----

View file

@ -62,4 +62,7 @@ in
"nix2lio.age" = {
inherit publicKeys;
};
"github_read_token.age" = {
inherit publicKeys;
};
}

View file

@ -1,5 +1,5 @@
{ pkgs, ... }:
{
home.packages = [ pkgs.ladybird ];
# home.packages = [ pkgs.ladybird ];
}