this repo has no description
Replace Alejandra with official formatter
+390
-245
+9
-7
dev_shells.nix
+9
-7
dev_shells.nix
···
6
6
stdenv,
7
7
darwin,
8
8
livebook,
9
-
}: {
9
+
}:
10
+
{
10
11
livebook = pkgs.mkShell {
11
12
packages = [
12
13
livebook
···
15
16
LIVEBOOK_TOKEN_ENABLED = "false";
16
17
};
17
18
18
-
erlang = with beam.packages.erlang;
19
+
erlang =
20
+
with beam.packages.erlang;
19
21
mkShell {
20
22
packages = [
21
23
erlang
···
23
25
];
24
26
};
25
27
26
-
elixir = with beam.packages.erlang;
28
+
elixir =
29
+
with beam.packages.erlang;
27
30
mkShell {
28
-
packages =
29
-
[
30
-
elixir
31
-
];
31
+
packages = [
32
+
elixir
33
+
];
32
34
};
33
35
34
36
rust = mkShell {
+45
-42
flake.nix
+45
-42
flake.nix
···
44
44
];
45
45
};
46
46
47
-
outputs = {
48
-
self,
49
-
flake-parts,
50
-
...
51
-
} @ inputs:
52
-
flake-parts.lib.mkFlake {inherit inputs;} {
47
+
outputs =
48
+
{
49
+
self,
50
+
flake-parts,
51
+
...
52
+
}@inputs:
53
+
flake-parts.lib.mkFlake { inherit inputs; } {
53
54
flake = {
54
55
lib = import ./lib.nix inputs;
55
56
56
57
# TODO: Automatically discover and build that
57
-
darwinConfigurations."Niuniobook" =
58
-
(import ./hosts/niuniobook.nix {inherit inputs;})
59
-
.system;
58
+
darwinConfigurations."Niuniobook" = (import ./hosts/niuniobook.nix { inherit inputs; }).system;
60
59
61
-
darwinConfigurations."Supadupa" =
62
-
(import ./hosts/supadupa.nix {inherit inputs;})
63
-
.system;
60
+
darwinConfigurations."Supadupa" = (import ./hosts/supadupa.nix { inherit inputs; }).system;
64
61
65
62
templates = {
66
63
elixir = {
···
70
67
};
71
68
};
72
69
73
-
systems = ["x86_64-darwin" "aarch64-darwin"];
70
+
systems = [
71
+
"x86_64-darwin"
72
+
"aarch64-darwin"
73
+
];
74
74
75
-
perSystem = {
76
-
self',
77
-
pkgs,
78
-
inputs',
79
-
...
80
-
}: {
81
-
formatter = pkgs.alejandra;
75
+
perSystem =
76
+
{
77
+
self',
78
+
pkgs,
79
+
inputs',
80
+
...
81
+
}:
82
+
{
83
+
formatter = pkgs.nixfmt-tree;
82
84
83
-
legacyPackages = inputs'.darwin-stable.legacyPackages.callPackage ./pkgs {};
85
+
legacyPackages = inputs'.darwin-stable.legacyPackages.callPackage ./pkgs { };
84
86
85
-
packages =
86
-
(pkgs.callPackage ./pkgs {})
87
-
// {
87
+
packages = (pkgs.callPackage ./pkgs { }) // {
88
88
default = pkgs.writeScriptBin "activate" ''
89
89
#!/bin/sh
90
90
${pkgs.lib.getExe self'.packages.system} switch
91
91
'';
92
92
93
-
system = let
94
-
builder =
95
-
if pkgs.stdenv.isDarwin
96
-
then pkgs.lib.getExe' inputs'.darwin.packages.darwin-rebuild "darwin-rebuild"
97
-
else pkgs.lib.getExe pkgs.nixos-rebuild;
98
-
in
93
+
system =
94
+
let
95
+
builder =
96
+
if pkgs.stdenv.isDarwin then
97
+
pkgs.lib.getExe' inputs'.darwin.packages.darwin-rebuild "darwin-rebuild"
98
+
else
99
+
pkgs.lib.getExe pkgs.nixos-rebuild;
100
+
in
99
101
pkgs.writeScriptBin "activate-system" ''
100
102
#!/bin/sh
101
103
exec ${builder} --flake "${self}" "$@"
102
104
'';
103
105
};
104
106
105
-
devShells = let
106
-
globalShells = pkgs.callPackage ./dev_shells.nix {};
107
-
default = pkgs.mkShell {
108
-
packages = [
109
-
pkgs.fnlfmt
110
-
# TODO: Remove it and manage all configuration from Nix
111
-
pkgs.stow
112
-
];
113
-
};
114
-
in
115
-
globalShells // {inherit default;};
116
-
};
107
+
devShells =
108
+
let
109
+
globalShells = pkgs.callPackage ./dev_shells.nix { };
110
+
default = pkgs.mkShell {
111
+
packages = [
112
+
pkgs.fnlfmt
113
+
# TODO: Remove it and manage all configuration from Nix
114
+
pkgs.stow
115
+
];
116
+
};
117
+
in
118
+
globalShells // { inherit default; };
119
+
};
117
120
};
118
121
}
+4
-2
hosts/modules/builders.nix
+4
-2
hosts/modules/builders.nix
+6
-2
hosts/modules/environment.nix
+6
-2
hosts/modules/environment.nix
···
2
2
config,
3
3
pkgs,
4
4
...
5
-
}: {
5
+
}:
6
+
{
6
7
# List packages installed in system profile. To search by name, run:
7
8
# $ nix search nixpkgs wget
8
9
environment.systemPackages = with pkgs; [
···
25
26
ripgrep
26
27
];
27
28
28
-
environment.shells = [pkgs.fish pkgs.zsh];
29
+
environment.shells = [
30
+
pkgs.fish
31
+
pkgs.zsh
32
+
];
29
33
30
34
programs.nix-index.enable = true;
31
35
programs.fish.enable = true;
+3
-2
hosts/niuniobook.nix
+3
-2
hosts/niuniobook.nix
···
1
-
{inputs, ...}: {
1
+
{ inputs, ... }:
2
+
{
2
3
type = "darwin";
3
4
4
5
hostname = "NiunioBook";
···
26
27
users.users.hauleth.home = "/Users/hauleth";
27
28
home-manager.useUserPackages = true;
28
29
home-manager.users.hauleth = import ../users/hauleth.nix;
29
-
home-manager.extraSpecialArgs = {inherit inputs;};
30
+
home-manager.extraSpecialArgs = { inherit inputs; };
30
31
}
31
32
];
32
33
+2
-1
hosts/supadupa.nix
+2
-1
hosts/supadupa.nix
+11
-7
lib.nix
+11
-7
lib.nix
···
1
-
{nixpkgs, ...}: let
1
+
{ nixpkgs, ... }:
2
+
let
2
3
inherit (nixpkgs) lib;
3
4
4
-
readFileWithComments = path: let
5
-
content = lib.strings.fileContents path;
6
-
notComment = line: !lib.strings.hasPrefix "#" line;
7
-
in
5
+
readFileWithComments =
6
+
path:
7
+
let
8
+
content = lib.strings.fileContents path;
9
+
notComment = line: !lib.strings.hasPrefix "#" line;
10
+
in
8
11
builtins.filter notComment (lib.strings.splitString "\n" content);
9
12
10
-
dontCheck = drv: drv.overrideAttrs {doCheck = false;};
11
-
in {
13
+
dontCheck = drv: drv.overrideAttrs { doCheck = false; };
14
+
in
15
+
{
12
16
inherit readFileWithComments dontCheck;
13
17
}
+9
-6
modules/ai.nix
+9
-6
modules/ai.nix
+3
-2
modules/common.nix
+3
-2
modules/common.nix
+2
-1
modules/curl.nix
+2
-1
modules/curl.nix
+7
-2
modules/darwin.nix
+7
-2
modules/darwin.nix
···
2
2
pkgs,
3
3
inputs,
4
4
...
5
-
}: {
5
+
}:
6
+
{
6
7
nix.settings.extra-sandbox-paths = [
7
8
"/System/Library/Frameworks"
8
9
"/System/Library/PrivateFrameworks"
···
12
13
"/usr/bin/env"
13
14
];
14
15
15
-
nix.settings.allowed-users = ["@admin" "@builder" "hauleth"];
16
+
nix.settings.allowed-users = [
17
+
"@admin"
18
+
"@builder"
19
+
"hauleth"
20
+
];
16
21
17
22
# Simulate the systemd-resolved .localhost resolution
18
23
services.dnsmasq = {
+2
-1
modules/direnv.nix
+2
-1
modules/direnv.nix
+8
-5
modules/email.nix
+8
-5
modules/email.nix
···
3
3
config,
4
4
lib,
5
5
...
6
-
}: {
6
+
}:
7
+
{
7
8
targets.darwin.defaults = {
8
9
# Remember the fallen
9
10
"com.apple.mail" = {
···
52
53
default = "INBOX";
53
54
copy-to = "INBOX";
54
55
folders-sort = "INBOX,Draft";
55
-
signature-file = toString (pkgs.writeTextFile {
56
-
name = "hauleth-signature";
57
-
text = config.accounts.email.accounts.hauleth.signature.text;
58
-
});
56
+
signature-file = toString (
57
+
pkgs.writeTextFile {
58
+
name = "hauleth-signature";
59
+
text = config.accounts.email.accounts.hauleth.signature.text;
60
+
}
61
+
);
59
62
};
60
63
};
61
64
himalaya = {
+3
-2
modules/fish.nix
+3
-2
modules/fish.nix
+4
-2
modules/fonts.nix
+4
-2
modules/fonts.nix
+18
-13
modules/ghostty.nix
+18
-13
modules/ghostty.nix
···
3
3
lib,
4
4
pkgs,
5
5
...
6
-
}: let
7
-
in {
6
+
}:
7
+
let
8
+
in
9
+
{
8
10
programs.ghostty = {
9
11
enable = true;
10
12
package = null;
···
15
17
font-family = "Hosevka Term";
16
18
window-title-font-family = "Hosevka Term";
17
19
font-size = 14;
18
-
font-feature = ["-dlig" "-liga"];
20
+
font-feature = [
21
+
"-dlig"
22
+
"-liga"
23
+
];
19
24
20
25
working-directory = "home";
21
26
window-inherit-working-directory = false;
···
41
46
foreground = "#c1c9d4";
42
47
43
48
palette = [
44
-
"0=#384254"
45
-
"1=#bc284f"
46
-
"2=#7caca5"
47
-
"3=#fcffcd"
48
-
"4=#5c8097"
49
-
"5=#7d6ba3"
50
-
"6=#008097"
51
-
"7=#8c98a7"
52
-
"8=#4a5265"
53
-
"9=#d43760"
49
+
"0=#384254"
50
+
"1=#bc284f"
51
+
"2=#7caca5"
52
+
"3=#fcffcd"
53
+
"4=#5c8097"
54
+
"5=#7d6ba3"
55
+
"6=#008097"
56
+
"7=#8c98a7"
57
+
"8=#4a5265"
58
+
"9=#d43760"
54
59
"10=#88b4ad"
55
60
"11=#fdffe1"
56
61
"12=#a2b8c6"
+11
-3
modules/git.nix
+11
-3
modules/git.nix
···
3
3
inputs,
4
4
config,
5
5
...
6
-
}: {
6
+
}:
7
+
{
7
8
programs.gh = {
8
9
enable = true;
9
10
···
144
145
sort = "version:refname";
145
146
};
146
147
147
-
versionsort.suffix = ["" "-rc" "-pre"];
148
+
versionsort.suffix = [
149
+
""
150
+
"-rc"
151
+
"-pre"
152
+
];
148
153
149
154
push = {
150
155
default = "simple";
···
164
169
updateRefs = true;
165
170
};
166
171
167
-
url."git@github.com:".pushInsteadOf = ["https://github.com/" "git://github.com/"];
172
+
url."git@github.com:".pushInsteadOf = [
173
+
"https://github.com/"
174
+
"git://github.com/"
175
+
];
168
176
169
177
sendemail = {
170
178
smtpserver = "${config.programs.msmtp.package}/bin/msmtp";
+2
-1
modules/irc.nix
+2
-1
modules/irc.nix
+62
-13
modules/jj.nix
+62
-13
modules/jj.nix
···
1
-
{pkgs, ...}: {
1
+
{ pkgs, ... }:
2
+
{
2
3
programs.jujutsu = {
3
4
enable = true;
4
5
···
7
8
user.name = "Łukasz Niemier";
8
9
9
10
ui = {
10
-
default-command = ["log" "--template=log_compact"];
11
+
default-command = [
12
+
"log"
13
+
"--template=log_compact"
14
+
];
11
15
12
16
conflict-marker-style = "git";
13
17
14
-
pager = ["sh" "-c" "${pkgs.diff-so-fancy}/bin/diff-so-fancy | less '--tabs=4' -RFX"];
18
+
pager = [
19
+
"sh"
20
+
"-c"
21
+
"${pkgs.diff-so-fancy}/bin/diff-so-fancy | less '--tabs=4' -RFX"
22
+
];
15
23
diff-formatter = ":git";
16
24
};
17
25
···
35
43
36
44
fix.tools = {
37
45
mix-format = {
38
-
command = ["mix" "format" "--stdin-filename" "$path"];
39
-
patterns = ["glob:**/*.ex" "glob:**/*.exs"];
46
+
command = [
47
+
"mix"
48
+
"format"
49
+
"--stdin-filename"
50
+
"$path"
51
+
];
52
+
patterns = [
53
+
"glob:**/*.ex"
54
+
"glob:**/*.exs"
55
+
];
40
56
};
41
57
42
58
nix-fmt = {
43
-
command = ["nix" "fmt"];
44
-
patterns = ["glob:**/*.nix"];
59
+
command = [
60
+
"nix"
61
+
"fmt"
62
+
];
63
+
patterns = [ "glob:**/*.nix" ];
45
64
};
46
65
};
47
66
48
67
aliases = {
49
-
tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];
50
-
pull = ["git" "fetch"];
51
-
push = ["git" "push"];
68
+
tug = [
69
+
"bookmark"
70
+
"move"
71
+
"--from"
72
+
"closest_bookmark(@-)"
73
+
"--to"
74
+
"@-"
75
+
];
76
+
pull = [
77
+
"git"
78
+
"fetch"
79
+
];
80
+
push = [
81
+
"git"
82
+
"push"
83
+
];
52
84
sync = [
53
85
"rebase"
54
86
"--source"
···
59
91
60
92
# Put changes from `@` into another change
61
93
# Inverse of `extract`
62
-
inject = ["squash" "--from" "@" "--into"];
94
+
inject = [
95
+
"squash"
96
+
"--from"
97
+
"@"
98
+
"--into"
99
+
];
63
100
64
101
# Fetch changes from change into `@`
65
102
# Inverse of `inject`
66
-
extract = ["squash" "--into" "@" "--form"];
103
+
extract = [
104
+
"squash"
105
+
"--into"
106
+
"@"
107
+
"--form"
108
+
];
67
109
68
110
# 'jj sandwich xyz' to move xyz into the megamerge in parallel to everything
69
111
# else. See notes on 'megamerge()' above for how it's resolved.
70
-
sandwich = ["rebase" "-B" "megamerge()" "-A" "trunk()" "-r"];
112
+
sandwich = [
113
+
"rebase"
114
+
"-B"
115
+
"megamerge()"
116
+
"-A"
117
+
"trunk()"
118
+
"-r"
119
+
];
71
120
};
72
121
73
122
revset-aliases = {
+38
-32
modules/nvim.nix
+38
-32
modules/nvim.nix
···
3
3
pkgs,
4
4
inputs,
5
5
...
6
-
}: let
6
+
}:
7
+
let
7
8
nvim = pkgs.neovim.override {
8
9
configure = {
9
10
# Add Fennel to Lua path and require basic implementation
10
11
#
11
12
# runtimepath editing is not yet perfect, but works good enough so far
12
-
customRC = let
13
-
expert = inputs.expert.packages.${pkgs.stdenv.hostPlatform.system}.expert;
14
-
in ''
15
-
set runtimepath+=${./nvim}/after
16
-
set runtimepath^=${./nvim}
17
-
lua << EOF
18
-
vim.g.lsp_paths = {
19
-
['rust_analyzer'] = "${pkgs.rust-analyzer}/bin/rust-analyzer",
20
-
['expert'] = "${expert}/bin/expert",
21
-
['elp'] = "${pkgs.erlang-language-platform}/bin/elp",
22
-
['typos_lsp'] = "${pkgs.typos-lsp}/bin/typos-lsp"
23
-
}
24
-
package.path = package.path .. ";${pkgs.luajitPackages.fennel}/share/lua/5.1/?.lua"
25
-
require('basic')
26
-
EOF
27
-
'';
28
-
packages.global = let
29
-
plugins = pkgs.vimPlugins;
30
-
in {
31
-
start = [
32
-
plugins.packer-nvim
33
-
plugins.vim-nickel
34
-
# plugins.lua-utils-nvim
35
-
# plugins.neorg
36
-
# plugins.neorg-telescope
37
-
plugins.nvim-treesitter.withAllGrammars
38
-
];
13
+
customRC =
14
+
let
15
+
expert = inputs.expert.packages.${pkgs.stdenv.hostPlatform.system}.expert;
16
+
in
17
+
''
18
+
set runtimepath+=${./nvim}/after
19
+
set runtimepath^=${./nvim}
20
+
lua << EOF
21
+
vim.g.lsp_paths = {
22
+
['rust_analyzer'] = "${pkgs.rust-analyzer}/bin/rust-analyzer",
23
+
['expert'] = "${expert}/bin/expert",
24
+
['elp'] = "${pkgs.erlang-language-platform}/bin/elp",
25
+
['typos_lsp'] = "${pkgs.typos-lsp}/bin/typos-lsp"
26
+
}
27
+
package.path = package.path .. ";${pkgs.luajitPackages.fennel}/share/lua/5.1/?.lua"
28
+
require('basic')
29
+
EOF
30
+
'';
31
+
packages.global =
32
+
let
33
+
plugins = pkgs.vimPlugins;
34
+
in
35
+
{
36
+
start = [
37
+
plugins.packer-nvim
38
+
plugins.vim-nickel
39
+
# plugins.lua-utils-nvim
40
+
# plugins.neorg
41
+
# plugins.neorg-telescope
42
+
plugins.nvim-treesitter.withAllGrammars
43
+
];
39
44
40
-
opt = [];
41
-
};
45
+
opt = [ ];
46
+
};
42
47
};
43
48
};
44
-
in {
49
+
in
50
+
{
45
51
nixpkgs.overlays = [
46
52
# inputs.neorg-overlay.overlays.default
47
53
];
48
54
49
55
home.sessionVariables.EDITOR = "nvim";
50
-
home.packages = [nvim];
56
+
home.packages = [ nvim ];
51
57
}
+2
-1
modules/pijul.nix
+2
-1
modules/pijul.nix
+2
-1
modules/plan.nix
+2
-1
modules/plan.nix
+26
-21
modules/swiftbar.nix
+26
-21
modules/swiftbar.nix
···
2
2
pkgs,
3
3
lib,
4
4
...
5
-
}: {
5
+
}:
6
+
{
6
7
# WIP
7
-
options.swiftbar = let
8
-
inherit (lib) mkOption types;
9
-
in {
10
-
enable = lib.mkEnableOption "swiftbar";
8
+
options.swiftbar =
9
+
let
10
+
inherit (lib) mkOption types;
11
+
in
12
+
{
13
+
enable = lib.mkEnableOption "swiftbar";
11
14
12
-
package = lib.mkPackageOption pkgs "swiftbar" {};
15
+
package = lib.mkPackageOption pkgs "swiftbar" { };
13
16
14
-
plugins = mkOption {
15
-
type = types.attrsOf (types.submodule {
16
-
enable = lib.mkEnableOption "current SwiftBar plugin";
17
+
plugins = mkOption {
18
+
type = types.attrsOf (
19
+
types.submodule {
20
+
enable = lib.mkEnableOption "current SwiftBar plugin";
17
21
18
-
frequency = mkOption {
19
-
type = types.string;
20
-
example = "1m";
21
-
description = ''
22
-
How often should SwiftBar run script in the background.
23
-
'';
24
-
};
22
+
frequency = mkOption {
23
+
type = types.string;
24
+
example = "1m";
25
+
description = ''
26
+
How often should SwiftBar run script in the background.
27
+
'';
28
+
};
25
29
26
-
script = mkOption {
27
-
type = types.string;
28
-
};
29
-
});
30
+
script = mkOption {
31
+
type = types.string;
32
+
};
33
+
}
34
+
);
35
+
};
30
36
};
31
-
};
32
37
33
38
config = {
34
39
home.packages = [
+5
-3
modules/tools.nix
+5
-3
modules/tools.nix
···
2
2
pkgs,
3
3
inputs,
4
4
...
5
-
}: let
5
+
}:
6
+
let
6
7
pkgs-self = inputs.self.packages.${pkgs.stdenv.hostPlatform.system};
7
-
jaq-as-jq = pkgs.runCommand "jaq-as-jq" {} ''
8
+
jaq-as-jq = pkgs.runCommand "jaq-as-jq" { } ''
8
9
mkdir -p $out/bin
9
10
ln -s ${pkgs.jaq}/bin/jaq $out/bin/jq
10
11
'';
11
-
in {
12
+
in
13
+
{
12
14
home.packages = [
13
15
# bfs
14
16
# pkgs-self.ubin-client
+16
-16
overlays/fix-curl.nix
+16
-16
overlays/fix-curl.nix
···
1
1
# Hot fix for curl in nix breaking with netrc
2
2
# https://github.com/NixOS/nixpkgs/pull/356133
3
-
final: prev: let
3
+
final: prev:
4
+
let
4
5
patched-curl = prev.curl.overrideAttrs (oldAttrs: {
5
-
patches =
6
-
(oldAttrs.patches or [])
7
-
++ [
8
-
# https://github.com/curl/curl/issues/15496
9
-
(prev.fetchpatch {
10
-
url = "https://github.com/curl/curl/commit/f5c616930b5cf148b1b2632da4f5963ff48bdf88.patch";
11
-
hash = "sha256-FlsAlBxAzCmHBSP+opJVrZG8XxWJ+VP2ro4RAl3g0pQ=";
12
-
})
13
-
# https://github.com/curl/curl/issues/15513
14
-
(prev.fetchpatch {
15
-
url = "https://github.com/curl/curl/commit/0cdde0fdfbeb8c35420f6d03fa4b77ed73497694.patch";
16
-
hash = "sha256-WP0zahMQIx9PtLmIDyNSJICeIJvN60VzJGN2IhiEYv0=";
17
-
})
18
-
];
6
+
patches = (oldAttrs.patches or [ ]) ++ [
7
+
# https://github.com/curl/curl/issues/15496
8
+
(prev.fetchpatch {
9
+
url = "https://github.com/curl/curl/commit/f5c616930b5cf148b1b2632da4f5963ff48bdf88.patch";
10
+
hash = "sha256-FlsAlBxAzCmHBSP+opJVrZG8XxWJ+VP2ro4RAl3g0pQ=";
11
+
})
12
+
# https://github.com/curl/curl/issues/15513
13
+
(prev.fetchpatch {
14
+
url = "https://github.com/curl/curl/commit/0cdde0fdfbeb8c35420f6d03fa4b77ed73497694.patch";
15
+
hash = "sha256-WP0zahMQIx9PtLmIDyNSJICeIJvN60VzJGN2IhiEYv0=";
16
+
})
17
+
];
19
18
});
20
-
in {
19
+
in
20
+
{
21
21
nix = prev.nix.override (old: {
22
22
curl = patched-curl;
23
23
});
+10
-6
pkgs/default.nix
+10
-6
pkgs/default.nix
···
3
3
entr,
4
4
ripgrep,
5
5
writeShellApplication,
6
-
}: {
7
-
imbox = callPackage ./imbox.nix {};
8
-
ubin-client = callPackage ./ubin-client.nix {};
9
-
hosevka = callPackage ./hosevka.nix {};
10
-
mac-mole = callPackage ./mac-mole.nix {};
6
+
}:
7
+
{
8
+
imbox = callPackage ./imbox.nix { };
9
+
ubin-client = callPackage ./ubin-client.nix { };
10
+
hosevka = callPackage ./hosevka.nix { };
11
+
mac-mole = callPackage ./mac-mole.nix { };
11
12
12
13
fswatch = writeShellApplication {
13
14
name = "fswatch";
14
15
15
-
runtimeInputs = [entr ripgrep];
16
+
runtimeInputs = [
17
+
entr
18
+
ripgrep
19
+
];
16
20
17
21
text = ''
18
22
rg -l -t "$1" "" | entr -p echo /_
+26
-11
pkgs/hosevka.nix
+26
-11
pkgs/hosevka.nix
···
1
-
{iosevka, ...}: let
1
+
{ iosevka, ... }:
2
+
let
2
3
variants = {
3
4
design = {
4
5
i = "hooky";
···
14
15
};
15
16
ligations = {
16
17
inherits = "default-calt";
17
-
enables = ["center-ops" "brst"];
18
-
disables = ["minus-minus" "eqeq" "exeq" "tildeeq" "slasheq"];
18
+
enables = [
19
+
"center-ops"
20
+
"brst"
21
+
];
22
+
disables = [
23
+
"minus-minus"
24
+
"eqeq"
25
+
"exeq"
26
+
"tildeeq"
27
+
"slasheq"
28
+
];
19
29
};
20
30
weights = {
21
31
extralight = {
···
51
61
};
52
62
buildIosevka = iosevka.override;
53
63
in
54
-
buildIosevka {
55
-
set = "ss09-term";
56
-
privateBuildPlan = {
57
-
family = "Hosevka Term";
58
-
spacing = "term";
64
+
buildIosevka {
65
+
set = "ss09-term";
66
+
privateBuildPlan = {
67
+
family = "Hosevka Term";
68
+
spacing = "term";
59
69
60
-
inherit variants weights slopes ligations;
61
-
};
62
-
}
70
+
inherit
71
+
variants
72
+
weights
73
+
slopes
74
+
ligations
75
+
;
76
+
};
77
+
}
+2
-2
pkgs/imbox.nix
+2
-2
pkgs/imbox.nix
+19
-14
pkgs/mac-mole.nix
+19
-14
pkgs/mac-mole.nix
···
19
19
inherit version src;
20
20
21
21
ldflags = [
22
-
"-s" "-w"
23
-
"-X main.Version=${version}"
22
+
"-s"
23
+
"-w"
24
+
"-X main.Version=${version}"
24
25
];
25
26
26
-
subPackages = [ "cmd/analyze" "cmd/status" ];
27
+
subPackages = [
28
+
"cmd/analyze"
29
+
"cmd/status"
30
+
];
27
31
28
32
vendorHash = "sha256-oepnMZcaTB9u3h6S0jcP4W0pqNkDDgETVqDdCL0jarM=";
29
33
};
30
34
31
-
in stdenv.mkDerivation (self: {
35
+
in
36
+
stdenv.mkDerivation (self: {
32
37
pname = "mac-mole";
33
38
inherit version src;
34
39
35
40
buildPhase = ''
36
-
script_dir="$out/libexec"
41
+
script_dir="$out/libexec"
37
42
38
-
mkdir -p $out/bin $script_dir
43
+
mkdir -p $out/bin $script_dir
39
44
40
-
cp -r ./bin $script_dir
41
-
cp -r ./lib $script_dir
45
+
cp -r ./bin $script_dir
46
+
cp -r ./lib $script_dir
42
47
43
-
ln -s ${goComponents}/bin/analyze $script_dir/bin/analyze-go
44
-
ln -s ${goComponents}/bin/status $script_dir/bin/status-go
48
+
ln -s ${goComponents}/bin/analyze $script_dir/bin/analyze-go
49
+
ln -s ${goComponents}/bin/status $script_dir/bin/status-go
45
50
46
-
cp mole $out/bin
47
-
ln -s $out/bin/mole $out/bin/mo
51
+
cp mole $out/bin
52
+
ln -s $out/bin/mole $out/bin/mo
48
53
49
-
substituteInPlace $out/bin/mole \
50
-
--replace 'SCRIPT_DIR="$(cd "$(dirname "''${BASH_SOURCE[0]}")" && pwd)"' "SCRIPT_DIR='$script_dir'"
54
+
substituteInPlace $out/bin/mole \
55
+
--replace 'SCRIPT_DIR="$(cd "$(dirname "''${BASH_SOURCE[0]}")" && pwd)"' "SCRIPT_DIR='$script_dir'"
51
56
'';
52
57
53
58
meta = {
+1
-1
pkgs/ubin-client.nix
+1
-1
pkgs/ubin-client.nix
+18
-15
templates/elixir/flake.nix
+18
-15
templates/elixir/flake.nix
···
9
9
inputs.nixpkgs.follows = "nixpkgs";
10
10
};
11
11
12
-
outputs = {
13
-
self,
14
-
flake-parts,
15
-
...
16
-
} @ inputs:
17
-
flake-parts.lib.mkFlake {inherit inputs;} {
12
+
outputs =
13
+
{
14
+
self,
15
+
flake-parts,
16
+
...
17
+
}@inputs:
18
+
flake-parts.lib.mkFlake { inherit inputs; } {
18
19
imports = [
19
20
inputs.devenv.flakeModule
20
21
];
···
26
27
"aarch64-darwin"
27
28
];
28
29
29
-
perSystem = {
30
-
self',
31
-
inputs',
32
-
pkgs,
33
-
...
34
-
}: {
35
-
devenv.shells.default = {
36
-
language.elixir.enable = true;
30
+
perSystem =
31
+
{
32
+
self',
33
+
inputs',
34
+
pkgs,
35
+
...
36
+
}:
37
+
{
38
+
devenv.shells.default = {
39
+
language.elixir.enable = true;
40
+
};
37
41
};
38
-
};
39
42
};
40
43
}
+3
-2
users/hauleth.nix
+3
-2
users/hauleth.nix