this repo has no description
ft: update Flakes
+139
-91
+59
-10
flake.lock
+59
-10
flake.lock
···
30
30
]
31
31
},
32
32
"locked": {
33
-
"lastModified": 1665392861,
34
-
"narHash": "sha256-bCd8fYJMAb0LzabsiXl4nxECDoz483bJOCa2hjox7N0=",
33
+
"lastModified": 1672753581,
34
+
"narHash": "sha256-EIi2tqHoje5cE9WqH23ZghW28NOOWSUM7tcxKE1U9KI=",
35
35
"owner": "lnl7",
36
36
"repo": "nix-darwin",
37
-
"rev": "ef56fd8979b5f4e800c4716f62076e00600b1172",
37
+
"rev": "3db1d870b04b13411f56ab1a50cd32b001f56433",
38
38
"type": "github"
39
39
},
40
40
"original": {
···
45
45
},
46
46
"flake-utils": {
47
47
"locked": {
48
-
"lastModified": 1659877975,
49
-
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
48
+
"lastModified": 1667395993,
49
+
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
50
50
"owner": "numtide",
51
51
"repo": "flake-utils",
52
-
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
52
+
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
53
53
"type": "github"
54
54
},
55
55
"original": {
···
57
57
"type": "indirect"
58
58
}
59
59
},
60
+
"flake-utils_2": {
61
+
"locked": {
62
+
"lastModified": 1667395993,
63
+
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
64
+
"owner": "numtide",
65
+
"repo": "flake-utils",
66
+
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
67
+
"type": "github"
68
+
},
69
+
"original": {
70
+
"owner": "numtide",
71
+
"repo": "flake-utils",
72
+
"type": "github"
73
+
}
74
+
},
75
+
"nix-elixir": {
76
+
"inputs": {
77
+
"flake-utils": "flake-utils_2",
78
+
"nixpkgs": "nixpkgs"
79
+
},
80
+
"locked": {
81
+
"lastModified": 1672929845,
82
+
"narHash": "sha256-wLd7006LmsVZJcok8QMzeHjFFS7bOivsKP52QNeR5UU=",
83
+
"owner": "hauleth",
84
+
"repo": "nix-elixir",
85
+
"rev": "b461d4d95a8797efc96c375bc82e88d849efabe6",
86
+
"type": "github"
87
+
},
88
+
"original": {
89
+
"owner": "hauleth",
90
+
"repo": "nix-elixir",
91
+
"type": "github"
92
+
}
93
+
},
60
94
"nixpkgs": {
61
95
"locked": {
62
-
"lastModified": 1666244578,
63
-
"narHash": "sha256-OO0F2b83isMVHYtcvxiExig28zPE7Weo7r1fHtQTZzU=",
96
+
"lastModified": 1669867399,
97
+
"narHash": "sha256-Z8RXSFYOsIsTG96ROKtV0eZ8Q7u4irFWm6ELqfw7mT8=",
64
98
"owner": "NixOS",
65
99
"repo": "nixpkgs",
66
-
"rev": "260eb420a2e55e3a0411e731b933c3a8bf6b778e",
100
+
"rev": "38e591dd05ffc8bdf79dc752ba78b05e370416fa",
101
+
"type": "github"
102
+
},
103
+
"original": {
104
+
"id": "nixpkgs",
105
+
"type": "indirect"
106
+
}
107
+
},
108
+
"nixpkgs_2": {
109
+
"locked": {
110
+
"lastModified": 1673180965,
111
+
"narHash": "sha256-gMhL6w9RVluvPs+irJ9n0Q1BphZm+Ek4XGn5Ow7YQ3k=",
112
+
"owner": "NixOS",
113
+
"repo": "nixpkgs",
114
+
"rev": "0c9aadc8eff6daaa5149d2df9e6c49baaf44161c",
67
115
"type": "github"
68
116
},
69
117
"original": {
···
76
124
"agnoster": "agnoster",
77
125
"darwin": "darwin",
78
126
"flake-utils": "flake-utils",
79
-
"nixpkgs": "nixpkgs"
127
+
"nix-elixir": "nix-elixir",
128
+
"nixpkgs": "nixpkgs_2"
80
129
}
81
130
}
82
131
},
+43
-53
flake.nix
+43
-53
flake.nix
···
9
9
inputs.nixpkgs.follows = "nixpkgs";
10
10
inputs.flake-utils.follows = "flake-utils";
11
11
};
12
+
nix-elixir.url = "github:hauleth/nix-elixir";
13
+
# nix-elixir.url = "flake:nix-elixir";
12
14
darwin = {
13
15
url = "github:lnl7/nix-darwin";
14
16
inputs.nixpkgs.follows = "nixpkgs";
15
17
};
16
18
};
17
19
18
-
outputs = {
19
-
self,
20
-
darwin,
21
-
nixpkgs,
22
-
agnoster,
23
-
flake-utils,
24
-
}:
25
-
flake-utils.lib.eachDefaultSystem (system: let
26
-
pkgs = nixpkgs.legacyPackages.${system};
27
-
in {
28
-
formatter = pkgs.alejandra;
29
-
30
-
devShells.default = pkgs.mkShell {
31
-
nativeBuildInputs = [
32
-
pkgs.fnlfmt
33
-
pkgs.alejandra
34
-
# TODO: Remove it and manage all configuration from Nix
35
-
pkgs.stow
36
-
];
37
-
};
38
-
39
-
devShells.erlang = let
40
-
erlang = pkgs.beam.packages.erlangR25;
20
+
outputs =
21
+
{ self
22
+
, darwin
23
+
, nixpkgs
24
+
, agnoster
25
+
, flake-utils
26
+
, nix-elixir
27
+
}:
28
+
let
29
+
overlays = [
30
+
agnoster.overlay
31
+
nix-elixir.overlay
32
+
(import ./pkgs)
33
+
];
34
+
in
35
+
flake-utils.lib.eachDefaultSystem
36
+
(system:
37
+
let
38
+
pkgs = import nixpkgs { inherit system overlays; };
41
39
in
42
-
pkgs.mkShell {
43
-
nativeBuildInputs = [
44
-
erlang.erlang
45
-
erlang.rebar3
46
-
erlang.erlang-ls
47
-
];
48
-
};
40
+
{
41
+
formatter = pkgs.alejandra;
49
42
50
-
devShells.elixir = let
51
-
erlang = pkgs.beam.packages.erlangR25;
52
-
in
53
-
pkgs.mkShell {
54
-
nativeBuildInputs = [
55
-
erlang.elixir
56
-
erlang.elixir_ls
57
-
];
58
-
};
43
+
legacyPackages = pkgs;
59
44
60
-
devShells.rust = pkgs.mkShell {
61
-
nativeBuildInputs = [
62
-
pkgs.cargo
63
-
pkgs.rustc
64
-
pkgs.rust-analyzer
65
-
];
66
-
};
67
-
})
45
+
devShells = (pkgs.callPackage ./devShells.nix { }) // {
46
+
default = pkgs.mkShell {
47
+
nativeBuildInputs = [
48
+
pkgs.fnlfmt
49
+
pkgs.alejandra
50
+
# TODO: Remove it and manage all configuration from Nix
51
+
pkgs.stow
52
+
];
53
+
};
54
+
};
55
+
})
68
56
// {
69
57
darwinConfigurations."NiunioBook" = darwin.lib.darwinSystem {
70
58
system = "x86_64-darwin";
71
59
modules = [
60
+
{ nixpkgs = { inherit overlays; }; }
72
61
./nix/nix.nix
73
62
./nix/system.nix
74
63
./nix/services.nix
75
64
./nix/fonts.nix
76
65
./nix/environment.nix
77
-
{system.stateVersion = 4;}
78
-
{documentation.enable = false;}
66
+
./nix/security.nix
67
+
./modules/nvim.nix
68
+
{
69
+
system.stateVersion = 4;
70
+
documentation.enable = false;
71
+
}
79
72
];
80
-
inputs = {
81
-
flake = self;
82
-
inherit agnoster;
83
-
};
84
73
};
85
74
86
75
# for convenience
87
76
darwinPackages = self.darwinConfigurations."NiunioBook".pkgs;
77
+
88
78
templates = {
89
79
elixir = {
90
80
path = ./templates/elixir;
+2
-1
git/.config/git/config
+2
-1
git/.config/git/config
+15
-22
nix/environment.nix
+15
-22
nix/environment.nix
···
1
1
{ config
2
2
, pkgs
3
-
, inputs
4
3
, ...
5
4
}: {
6
-
nixpkgs.overlays =
7
-
let
8
-
flaked-nix-direnv = final: prev: {
9
-
nix-direnv = prev.nix-direnv.override { enableFlakes = true; };
10
-
};
11
-
in
12
-
[
13
-
inputs.agnoster.overlay
14
-
flaked-nix-direnv
15
-
];
16
-
17
5
documentation.enable = false;
18
6
19
7
# List packages installed in system profile. To search by name, run:
···
36
24
packages.vimPackages = with pkgs.vimPlugins; {
37
25
start = [
38
26
packer-nvim
39
-
(nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars))
27
+
nvim-treesitter.withAllGrammars
40
28
];
41
29
42
30
opt = [ ];
···
45
33
};
46
34
in
47
35
[
48
-
_1password
36
+
# _1password
49
37
age
50
38
alejandra
51
39
asciinema
···
60
48
fishPlugins.agnoster
61
49
fswatch
62
50
fzy
51
+
gh
52
+
git
63
53
git-gone
64
54
git-lfs
65
55
git-revise
66
56
gitAndTools.diff-so-fancy
57
+
gitAndTools.git-chglog
67
58
gitAndTools.git-imerge
68
59
gitAndTools.git-test
69
-
nix-direnv
70
-
gitAndTools.git-chglog
71
60
gitAndTools.tig
72
-
git
73
-
gh
74
61
glab
75
62
# git-riff
76
63
gnupg
77
64
imagemagick
78
65
jq
66
+
lima
79
67
lnav
80
-
lima
81
-
nvim
82
68
neovim-remote
69
+
nix-direnv-flakes
83
70
noti
71
+
nvim
84
72
pinentry_mac
85
73
# qmk
86
74
ripgrep
···
89
77
# w3m
90
78
# watchman
91
79
weechat
92
-
93
80
];
94
81
95
82
environment.shells = [ pkgs.fish pkgs.zsh ];
···
109
96
g = "git";
110
97
};
111
98
112
-
loginShellInit = "fish_add_path --move --prepend --path $HOME/.nix-profile/bin /run/wrappers/bin /etc/profiles/per-user/$USER/bin /nix/var/nix/profiles/default/bin /run/current-system/sw/bin";
99
+
loginShellInit = ''
100
+
fish_add_path --move --prepend --path $HOME/.nix-profile/bin /run/wrappers/bin /etc/profiles/per-user/$USER/bin /nix/var/nix/profiles/default/bin /run/current-system/sw/bin
101
+
'';
113
102
114
103
shellInit = ''
115
104
set -gx XDG_RUNTIME_DIR (getconf DARWIN_USER_TEMP_DIR)
···
126
115
# use fish in nix run and nix-shell
127
116
${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
128
117
118
+
set -gx SSH_AUTH_SOCK ~/.local/share/1password/auth.sock
119
+
129
120
source (${pkgs.direnv}/bin/direnv hook fish | psub)
130
121
source (${pkgs.lima}/bin/limactl completion fish | psub)
122
+
123
+
if which op > /dev/null; source (op completion fish | psub); end
131
124
132
125
test -e $HOME/.iterm2_shell_integration.fish ; and source $HOME/.iterm2_shell_integration.fish
133
126
'';
+4
-4
nix/services.nix
+4
-4
nix/services.nix
···
12
12
};
13
13
};
14
14
15
-
programs.gnupg.agent = {
16
-
enable = true;
17
-
enableSSHSupport = true;
18
-
};
15
+
# programs.gnupg.agent = {
16
+
# enable = true;
17
+
# enableSSHSupport = true;
18
+
# };
19
19
20
20
# Automatically watch `~/.plan` and update https://plan.cat/~hauleth on change
21
21
launchd.user.agents.plan-sync.serviceConfig = {
+16
pkgs/default.nix
+16
pkgs/default.nix
···
1
+
final: prev: {
2
+
beam = prev.beam // {
3
+
defaultVersion = "erlangR25";
4
+
5
+
packages = prev.beam.packages // {
6
+
erlangR25 = prev.beam.packages.erlangR25.extend (efinal: eprev: {
7
+
elixir = eprev.elixir_1_14;
8
+
rebar3 = eprev.rebar3.overrideAttrs (_: { doCheck = false; });
9
+
});
10
+
};
11
+
12
+
packagesWith = erlang: (prev.beam.packagesWith erlang).extend (efinal: eprev: {
13
+
livebook = eprev.livebook.override { elixir = efinal.elixir_1_14; };
14
+
});
15
+
};
16
+
}