Update nixpkgs, home-manager

Remove pass-audit for now as it's failing to build, to add back later

Move jupyter config into separate file since I don't need it on my
personal PC

Move home/config directory contents to home/prog since it's (currently
at least) all programming related things, attach to relevant files
This commit is contained in:
Evie Litherland-Smith 2024-03-28 07:30:50 +00:00
parent 9aea6a9b2c
commit 8312e0d328
10 changed files with 34 additions and 33 deletions

View file

@ -203,11 +203,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710532761, "lastModified": 1711604890,
"narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", "narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "206f457fffdb9a73596a4cb2211a471bd305243d", "rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -273,11 +273,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1710631334, "lastModified": 1711523803,
"narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -314,11 +314,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710420453, "lastModified": 1711224130,
"narHash": "sha256-F/JfpPRpIkFqvYEtt55lZyaFd+/vhn9SrcQrXIZCkOU=", "narHash": "sha256-RyOvyQASi5lvKLH5ISiGGkdX1eJxYF25aQALGfN9U0k=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "eb64377e66122de7a36ca7a611aa97ddf4c8e5e8", "rev": "53d3e5d5b36a5227b906e00d7e884dcfb7852403",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,8 +0,0 @@
{...}: {
xdg.configFile = {
"pypoetry/config.toml".source = ./poetry-config.toml;
"jupyter/jupyter_server_config.py".source = ./jupyter_server_config.py;
"jupyter/jupyter_nbconvert_config.py".source =
./jupyter_nbconvert_config.py;
};
}

View file

@ -1,6 +1,5 @@
{ {
config, config,
lib,
pkgs, pkgs,
... ...
}: { }: {
@ -11,7 +10,6 @@
./zsh/default.nix ./zsh/default.nix
./starship/default.nix ./starship/default.nix
./bottom/default.nix ./bottom/default.nix
./config/default.nix
./scripts/default.nix ./scripts/default.nix
]; ];
stylix.targets = { stylix.targets = {

View file

@ -12,7 +12,7 @@
enable = true; enable = true;
package = package =
pkgs.pass-nodmenu.withExtensions pkgs.pass-nodmenu.withExtensions
(exts: with exts; [pass-otp pass-update pass-audit pass-import]); (exts: with exts; [pass-otp pass-update pass-import]); # pass-audit
settings = { settings = {
PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store"; PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store";
PASSWORD_STORE_ENABLE_EXTENSIONS = "true"; PASSWORD_STORE_ENABLE_EXTENSIONS = "true";

View file

@ -1,5 +1,9 @@
{pkgs, ...}: { {pkgs, ...}: {
xdg.configFile."ruff/pyproject.toml".source = ./ruff.toml; xdg.configFile = {
"ruff/pyproject.toml".source = ./ruff.toml;
"pypoetry/config.toml".source = ./pypoetry.toml;
"ipython/profile_default/ipython_config.json".source = ./ipython_config.json;
};
home.packages = with pkgs; [ home.packages = with pkgs; [
# Nix # Nix
nil nil
@ -15,20 +19,11 @@
lua-language-server lua-language-server
stylua stylua
# Fortran
gfortran
fortls
# Python # Python
ruff ruff
## Python - JupyterLab # Fortran
(python3.withPackages gfortran
(ps: fortls
with ps; [
jupyterlab
jupyterlab-git
(callPackage ./catppuccin_jupyterlab/default.nix {})
]))
]; ];
} }

View file

@ -0,0 +1,16 @@
{pkgs, ...}: {
xdg.configFile = {
"jupyter/jupyter_server_config.py".source = ./jupyter_server_config.py;
"jupyter/jupyter_nbconvert_config.py".source =
./jupyter_nbconvert_config.py;
};
home.packages = with pkgs; [
(python3.withPackages
(ps:
with ps; [
jupyterlab
jupyterlab-git
(callPackage ./catppuccin_jupyterlab/default.nix {})
]))
];
}