diff --git a/flake.lock b/flake.lock index 6150d406..085beed5 100644 --- a/flake.lock +++ b/flake.lock @@ -203,11 +203,11 @@ ] }, "locked": { - "lastModified": 1710532761, - "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", + "lastModified": 1711604890, + "narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=", "owner": "nix-community", "repo": "home-manager", - "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", + "rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df", "type": "github" }, "original": { @@ -273,11 +273,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "lastModified": 1711523803, + "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "type": "github" }, "original": { @@ -314,11 +314,11 @@ ] }, "locked": { - "lastModified": 1710420453, - "narHash": "sha256-F/JfpPRpIkFqvYEtt55lZyaFd+/vhn9SrcQrXIZCkOU=", + "lastModified": 1711224130, + "narHash": "sha256-RyOvyQASi5lvKLH5ISiGGkdX1eJxYF25aQALGfN9U0k=", "owner": "danth", "repo": "stylix", - "rev": "eb64377e66122de7a36ca7a611aa97ddf4c8e5e8", + "rev": "53d3e5d5b36a5227b906e00d7e884dcfb7852403", "type": "github" }, "original": { diff --git a/home/config/default.nix b/home/config/default.nix deleted file mode 100644 index 57fba56f..00000000 --- a/home/config/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/home/default.nix b/home/default.nix index e7d4e03e..80fa76ab 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,6 +1,5 @@ { config, - lib, pkgs, ... }: { @@ -11,7 +10,6 @@ ./zsh/default.nix ./starship/default.nix ./bottom/default.nix - ./config/default.nix ./scripts/default.nix ]; stylix.targets = { diff --git a/home/password-store/default.nix b/home/password-store/default.nix index b760d55e..fa4db619 100644 --- a/home/password-store/default.nix +++ b/home/password-store/default.nix @@ -12,7 +12,7 @@ enable = true; package = 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 = { PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store"; PASSWORD_STORE_ENABLE_EXTENSIONS = "true"; diff --git a/home/prog/default.nix b/home/prog/default.nix index 943fc506..6b3437b0 100644 --- a/home/prog/default.nix +++ b/home/prog/default.nix @@ -1,5 +1,9 @@ {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; [ # Nix nil @@ -15,20 +19,11 @@ lua-language-server stylua - # Fortran - gfortran - fortls - # Python ruff - ## Python - JupyterLab - (python3.withPackages - (ps: - with ps; [ - jupyterlab - jupyterlab-git - (callPackage ./catppuccin_jupyterlab/default.nix {}) - ])) + # Fortran + gfortran + fortls ]; } diff --git a/home/config/ipython_config.json b/home/prog/ipython_config.json similarity index 100% rename from home/config/ipython_config.json rename to home/prog/ipython_config.json diff --git a/home/prog/jupyter/default.nix b/home/prog/jupyter/default.nix new file mode 100644 index 00000000..ef0bffa3 --- /dev/null +++ b/home/prog/jupyter/default.nix @@ -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 {}) + ])) + ]; +} diff --git a/home/config/jupyter_nbconvert_config.py b/home/prog/jupyter/jupyter_nbconvert_config.py similarity index 100% rename from home/config/jupyter_nbconvert_config.py rename to home/prog/jupyter/jupyter_nbconvert_config.py diff --git a/home/config/jupyter_server_config.py b/home/prog/jupyter/jupyter_server_config.py similarity index 100% rename from home/config/jupyter_server_config.py rename to home/prog/jupyter/jupyter_server_config.py diff --git a/home/config/poetry-config.toml b/home/prog/pypoetry.toml similarity index 100% rename from home/config/poetry-config.toml rename to home/prog/pypoetry.toml