From 0afac5eed1763841fa6fb2aa95ba45a1649182a4 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 19 Feb 2024 10:54:37 -0600 Subject: [PATCH] formatting --- flake.lock | 4 ++-- flake.nix | 5 ++++- hosts/othalan/system.nix | 6 +++--- modules/langs/python.nix | 30 +++++++++++++++--------------- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index d982040..6b5aced 100644 --- a/flake.lock +++ b/flake.lock @@ -187,11 +187,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-f1iK37gKrRA5Ampke23EzstEFHuKAwEdQnFi2kp4Gi4=", - "path": "/nix/store/zawcw9ffqblsfj2943zlkhdiilg9k2vg-source/inputs", + "path": "/nix/store/6mqi9hqplan2ylc4ajk4w4jfjnqasb2b-source/inputs", "type": "path" }, "original": { - "path": "/nix/store/zawcw9ffqblsfj2943zlkhdiilg9k2vg-source/inputs", + "path": "/nix/store/6mqi9hqplan2ylc4ajk4w4jfjnqasb2b-source/inputs", "type": "path" } }, diff --git a/flake.nix b/flake.nix index abce592..d16bc8d 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,10 @@ # }; # outputs = {inputs, ...}: let - lib = import ./lib {nixpkgs = inputs.inputs.nixpkgs; inputs = inputs;}; + lib = import ./lib { + nixpkgs = inputs.inputs.nixpkgs; + inputs = inputs; + }; inherit (lib) findModules buildHosts buildOizys; in { nixosModules = findModules ./modules; diff --git a/hosts/othalan/system.nix b/hosts/othalan/system.nix index 5205e3f..1a1766b 100644 --- a/hosts/othalan/system.nix +++ b/hosts/othalan/system.nix @@ -29,9 +29,9 @@ ]; services.getty.greetingLine = mkRune { - rune = "othalan"; - runeKind = "ascii"; - }; + rune = "othalan"; + runeKind = "ascii"; + }; # + inputs.self.nixosModules.runes.othalan.ascii; # catppuccin/tty move to "module" diff --git a/modules/langs/python.nix b/modules/langs/python.nix index b00c1f3..22c8b87 100644 --- a/modules/langs/python.nix +++ b/modules/langs/python.nix @@ -9,23 +9,23 @@ in { options.languages.python = mkEnableOption "python"; config = mkIf cfg.python { - environment.systemPackages = - let python = pkgs.python3.withPackages(ps: with ps; [pip]); + environment.systemPackages = let + python = pkgs.python3.withPackages (ps: with ps; [pip]); in - with pkgs; [ - # https://github.com/Mic92/nix-ld?tab=readme-ov-file#my-pythonnodejsrubyinterpreter-libraries-do-not-find-the-libraries-configured-by-nix-ld - (pkgs.writeShellScriptBin "python" '' - export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH - exec ${python}/bin/python "$@" - '') + with pkgs; [ + # https://github.com/Mic92/nix-ld?tab=readme-ov-file#my-pythonnodejsrubyinterpreter-libraries-do-not-find-the-libraries-configured-by-nix-ld + (pkgs.writeShellScriptBin "python" '' + export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH + exec ${python}/bin/python "$@" + '') - (pkgs.writeShellScriptBin "python3" '' - export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH - exec ${python}/bin/python "$@" - '') + (pkgs.writeShellScriptBin "python3" '' + export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH + exec ${python}/bin/python "$@" + '') - # (python3.withPackages (ps: with ps; [pip])) - micromamba - ]; + # (python3.withPackages (ps: with ps; [pip])) + micromamba + ]; }; }