formatting

This commit is contained in:
Daylin Morgan 2024-02-19 10:54:37 -06:00
parent fa0c1cb877
commit 0afac5eed1
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
4 changed files with 24 additions and 21 deletions

View file

@ -187,11 +187,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-f1iK37gKrRA5Ampke23EzstEFHuKAwEdQnFi2kp4Gi4=", "narHash": "sha256-f1iK37gKrRA5Ampke23EzstEFHuKAwEdQnFi2kp4Gi4=",
"path": "/nix/store/zawcw9ffqblsfj2943zlkhdiilg9k2vg-source/inputs", "path": "/nix/store/6mqi9hqplan2ylc4ajk4w4jfjnqasb2b-source/inputs",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/zawcw9ffqblsfj2943zlkhdiilg9k2vg-source/inputs", "path": "/nix/store/6mqi9hqplan2ylc4ajk4w4jfjnqasb2b-source/inputs",
"type": "path" "type": "path"
} }
}, },

View file

@ -17,7 +17,10 @@
# }; # };
# #
outputs = {inputs, ...}: let 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; inherit (lib) findModules buildHosts buildOizys;
in { in {
nixosModules = findModules ./modules; nixosModules = findModules ./modules;

View file

@ -29,9 +29,9 @@
]; ];
services.getty.greetingLine = mkRune { services.getty.greetingLine = mkRune {
rune = "othalan"; rune = "othalan";
runeKind = "ascii"; runeKind = "ascii";
}; };
# + inputs.self.nixosModules.runes.othalan.ascii; # + inputs.self.nixosModules.runes.othalan.ascii;
# catppuccin/tty move to "module" # catppuccin/tty move to "module"

View file

@ -9,23 +9,23 @@
in { in {
options.languages.python = mkEnableOption "python"; options.languages.python = mkEnableOption "python";
config = mkIf cfg.python { config = mkIf cfg.python {
environment.systemPackages = environment.systemPackages = let
let python = pkgs.python3.withPackages(ps: with ps; [pip]); python = pkgs.python3.withPackages (ps: with ps; [pip]);
in in
with pkgs; [ with pkgs; [
# https://github.com/Mic92/nix-ld?tab=readme-ov-file#my-pythonnodejsrubyinterpreter-libraries-do-not-find-the-libraries-configured-by-nix-ld # 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" '' (pkgs.writeShellScriptBin "python" ''
export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH
exec ${python}/bin/python "$@" exec ${python}/bin/python "$@"
'') '')
(pkgs.writeShellScriptBin "python3" '' (pkgs.writeShellScriptBin "python3" ''
export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH
exec ${python}/bin/python "$@" exec ${python}/bin/python "$@"
'') '')
# (python3.withPackages (ps: with ps; [pip])) # (python3.withPackages (ps: with ps; [pip]))
micromamba micromamba
]; ];
}; };
} }