diff --git a/flake.lock b/flake.lock index 007ca10..038f4da 100644 --- a/flake.lock +++ b/flake.lock @@ -389,6 +389,24 @@ "inputs": { "systems": "systems_10" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { + "inputs": { + "systems": "systems_11" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -403,9 +421,9 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_9": { "inputs": { - "systems": "systems_11" + "systems": "systems_12" }, "locked": { "lastModified": 1710146030, @@ -837,6 +855,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1722062969, "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", @@ -852,7 +886,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1710377395, "narHash": "sha256-KMubsUWtVr7L55pXMBibBDBdmk3xrjbBPduc0E8z28c=", @@ -967,6 +1001,25 @@ "type": "github" } }, + "pipethon": { + "inputs": { + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1767620081, + "narHash": "sha256-dUV88Imqgv0qsLbHUoDinzm+JAfSNKxfkozwBO8BqsQ=", + "ref": "refs/heads/main", + "rev": "290582a3463260181697a1e9f7cf9e490f8e8ed6", + "revCount": 2, + "type": "git", + "url": "ssh://forgejo@git.donsz.nl/jana/pipethon.git" + }, + "original": { + "type": "git", + "url": "ssh://forgejo@git.donsz.nl/jana/pipethon.git" + } + }, "ragenix": { "inputs": { "agenix": "agenix", @@ -1030,12 +1083,12 @@ "inputs": { "agenix": "agenix_2", "darwin": "darwin_2", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_8", "home-manager": "home-manager_4", "impermanence": "impermanence", "nix-index-database": "nix-index-database_2", "nixos-hardware": "nixos-hardware_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "ragenix": "ragenix_2" }, "locked": { @@ -1064,6 +1117,7 @@ "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", "p1n3appl3": "p1n3appl3", + "pipethon": "pipethon", "rahul-config": "rahul-config", "t": "t" } @@ -1211,6 +1265,21 @@ "type": "github" } }, + "systems_12": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1333,8 +1402,8 @@ }, "t": { "inputs": { - "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_6" + "flake-utils": "flake-utils_9", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1710410762, diff --git a/flake.nix b/flake.nix index a1fb8ed..35d671f 100644 --- a/flake.nix +++ b/flake.nix @@ -42,19 +42,22 @@ }; nixgl.url = "github:nix-community/nixGL"; + pipethon.url = "git+ssh://forgejo@git.donsz.nl/jana/pipethon.git"; }; outputs = - { home-manager - , nixpkgs - , flake-utils - , nixvim - , t - , dumpasm - , jujutsu - , nixgl - , cosmic-manager - , ... + { + home-manager, + nixpkgs, + flake-utils, + nixvim, + t, + dumpasm, + jujutsu, + nixgl, + cosmic-manager, + pipethon, + ... }@inputs: let homeManagerModules = [ nixvim.homeManagerModules.nixvim ]; @@ -71,6 +74,7 @@ t = t.packages.${system}.default; inherit (dumpasm.packages.${system}) dumpasm; inherit (jujutsu.packages.${system}) jujutsu; + pipethon = pipethon.packages.${system}.python; }; p1n3appl3 = inputs.p1n3appl3.packages.${system}; }) @@ -80,13 +84,12 @@ root: args: home-manager.lib.homeManagerConfiguration ( { - modules = - [ - cosmic-manager.homeManagerModules.cosmic-manager - root - ] - ++ homeManagerModules - ++ (args.modules or [ ]); + modules = [ + cosmic-manager.homeManagerModules.cosmic-manager + root + ] + ++ homeManagerModules + ++ (args.modules or [ ]); pkgs = pkgsForSystem (args.system or "x86_64-linux"); } // { @@ -94,29 +97,28 @@ } ); in - flake-utils.lib.eachDefaultSystem - (system: rec { - formatter = legacyPackages.nixfmt-classic; - legacyPackages = pkgsForSystem system; - pkgs = legacyPackages; - devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ - (pkgs.writeShellScriptBin "fast-repl" '' - source /etc/set-environment - nix repl --file "${./.}/repl.nix" $@ - '') + flake-utils.lib.eachDefaultSystem (system: rec { + formatter = legacyPackages.nixfmt-classic; + legacyPackages = pkgsForSystem system; + pkgs = legacyPackages; + devShells.default = pkgs.mkShell { + buildInputs = with pkgs; [ + (pkgs.writeShellScriptBin "fast-repl" '' + source /etc/set-environment + nix repl --file "${./.}/repl.nix" $@ + '') - (pkgs.writeShellScriptBin "apply-home" '' - export NIX_BUILD_CORES=$(($(nproc) * 2)) - nix run .#home-manager -- switch --flake .#$@ -j $(nproc) --cores $(nproc) - '') + (pkgs.writeShellScriptBin "apply-home" '' + export NIX_BUILD_CORES=$(($(nproc) * 2)) + nix run .#home-manager -- switch --flake .#$@ -j $(nproc) --cores $(nproc) + '') - (pkgs.writeShellScriptBin "apply" '' - apply-home $(hostname -f) - '') - ]; - }; - }) + (pkgs.writeShellScriptBin "apply" '' + apply-home $(hostname -f) + '') + ]; + }; + }) // { homeConfigurations = { diff --git a/programs/fish/scripts.nix b/programs/fish/scripts.nix index c0d94f5..5f00c07 100644 --- a/programs/fish/scripts.nix +++ b/programs/fish/scripts.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - calc = "${pkgs.python313}/bin/python -i ${pkgs.writeText "init.py" '' + calc = "${pkgs.custom.pipethon}/bin/python -i ${pkgs.writeText "init.py" '' import sys sys.path.append("${../../scriptlib}") sys.path.append("${pkgs.python313Packages.numpy}/lib/python3.13/site-packages/")