Compare commits

...

35 Commits
bare ... master

Author SHA1 Message Date
e62e724c4d Merge pull request 'std works for now' (#18) from std into master
Reviewed-on: #18
2023-06-18 09:17:42 +00:00
ca73e77561 Merge branch 'master' into std 2023-06-18 09:17:21 +00:00
htran
f454e55e80 std actually works now 2023-06-18 02:06:08 -07:00
Hung
3f1f1c8f6f wip: fix some more boneheads; stuck at starshpi not accepting nested list 2023-06-18 00:52:08 -07:00
Hung
820736fc8c wip: more migrations, mostly adding nix-index, kpcli-py, and nix-boost integration 2023-06-17 23:31:47 -07:00
Hung
d5d4415d5c ts-ql is useless :) 2023-06-17 20:33:06 -07:00
Hung
6352f821c3 add some more hints on the default settings for neovim; just go with alejandra formatter; add more docs on qa 2023-06-17 20:32:15 -07:00
Hung
e7efe1a965 format with alejandra and other things 2023-06-17 17:46:31 -07:00
Hung
1537fea0bd wip: interface-like structure but im sadge on development with no type-safety 2023-06-16 16:12:54 -07:00
Hung
e67a18e465 fix: darwin spotlight patch; extra: debugging neovim-cmp type 2023-06-15 12:46:01 -07:00
Hung
f04388f562 many neovim changes and vimplugins nightly overlay 2023-06-12 23:58:03 -07:00
Hung
7f0611d186 docs 2023-06-12 12:14:59 -07:00
Hung
a6c979c659 feat: add couple more vim plugins via nixpkgs 2023-06-11 23:51:47 -07:00
Hung
a5186b204c feat: idempotent installation with WPlug 2023-06-11 21:21:01 -07:00
Hung
63900e1117 docs 2023-06-07 22:04:50 -07:00
Hung
fbb8477c19 feat: more ssh targets; darwin spotlight home-manager is broken :( 2023-06-07 21:53:56 -07:00
Hung
f546cb6b32 fix: fidget and home-manager should remove existing darwin spotlight if already existed 2023-06-07 08:30:46 -07:00
Hung
aef09a32c5 feat(nvim): fidget.nvim 2023-06-06 21:19:13 -07:00
Hung
ba993d16f5 feat(nvim): tablines and potential for job management 2023-06-05 09:04:08 -07:00
Hung
d58acd7bc2 feat(nvim): add '<leader>fug' for unrestricted live grep (no .gitignore) 2023-06-04 21:40:47 -07:00
Hung
9cd012f2e2 feat: less init.lua, more neovim.nix along with docs on shell setup 2023-06-04 20:17:13 -07:00
Hung
84a69f8638 feat: vi-copy mode now consistent with vim: use 'v' for select mode and 'y' to copy 2023-06-03 20:23:42 -07:00
Hung
9a8ddc42d5 tsql 2023-06-01 08:26:10 -07:00
Hung
632104be69 fix(flakes): minimum to work correctly, along with user shell integration 2023-05-16 09:31:51 -07:00
Hung
8b4cb660c8 fix(neovim): Just pin neovim correctly to its latest working nightly 2023-05-16 09:26:57 -07:00
Hung
b50bd9964c feat(nvim): optimize for rust 2023-05-02 10:26:53 -07:00
Hung
3c483aeb89 feat(hm): cpu usage now works on tmux 2023-05-02 09:28:34 -07:00
Hung
1f511b052c nixGL/fetch: single-thread beats future 2023-04-02 11:49:46 -07:00
Hung
17937c2146 nixGL/fetch: cleanup 2023-04-02 01:35:36 -07:00
Hung
335efeb2d9 nixGL: simplify, update, and use builtins only 2023-04-02 01:10:47 -07:00
Hung
b7c3707213 ^deps and allow htran home to be built 2023-04-01 23:35:11 -07:00
98e8c003e6 Merge pull request 'top-level configuration is still broken. Maybe merging configurations is not really a good idea.' (#10) from top-level-wip into master
Reviewed-on: #10
2023-01-20 22:47:23 +00:00
2796a3720e Merge pull request 'templates: built with Nix' (#8) from top-level-wip into master
Reviewed-on: #8
2023-01-20 18:46:47 +00:00
4f13c01728 Merge pull request 'py-poetry template + pyright instead of pylsp' (#7) from top-level-wip into master
Reviewed-on: #7
2023-01-19 22:23:46 +00:00
6eb4af3491 Merge pull request 'nixops, nix-index-database, out-of-tree flake-compat' (#6) from top-level-wip into master
Reviewed-on: #6
2023-01-15 17:24:07 +00:00
122 changed files with 8024 additions and 3688 deletions

20
.envrc
View File

@ -1,6 +1,16 @@
# If nix-shell available, then nix is installed. We're going to use nix-direnv. #! /bin/sh
if command -v nix-shell &> /dev/null
then source "$(
use flake nix eval \
fi --no-update-lock-file \
--no-write-lock-file \
--no-warn-dirty \
--accept-flake-config \
.#__std.direnv_lib 2>/dev/null \
|| nix eval .#__std.direnv_lib # show the errors
)"
# FIXME: This should check if $USER is in userShells, if not,
# fall back to `use nix`
use std nix "//repo/userShells:${USER}"

1
.gitignore vendored
View File

@ -1 +1,2 @@
result result
.direnv

View File

@ -5,6 +5,10 @@ Contains my configurations for the software I use.
I'm looking to move forward to configuration with NixOS, but until I get I'm looking to move forward to configuration with NixOS, but until I get
a bit more experiment on NixOS, I'll keep this repository as simple as possible. a bit more experiment on NixOS, I'll keep this repository as simple as possible.
- As of 2023-06-07, I have little interest in keeping configurations
([`init.lua`](./native_configs/neovim/init.lua), [`sshconfig`](./native_configs/ssh/config),...)
to be idempotent for Nix and non-Nix targets.
## Nix ## Nix
Monorepo that contains my commonly used personal environments. Monorepo that contains my commonly used personal environments.
@ -13,8 +17,7 @@ onto this repo for quick env setup (especially devel) on new machines.
## How do I apply these config ## How do I apply these config
- I will always first clone this repository, preferably from local source before - Clone and nixify
going from the github. `git clone https://github.com/pegasust/dotfiles`
### neovim ### neovim
@ -26,7 +29,6 @@ My main text editor. It's based on `vim`, but stays loyal to `lua` ecosystem
#### Notes #### Notes
- Ensure that neovim is installed and invocable by `nvim`. - Ensure that neovim is installed and invocable by `nvim`.
- My config based on rather experimental version of`nvim` (>=0.7.2)
- For information on installing neovim, visit their [github page](https://github.com/neovim/neovim/wiki/Installing-Neovim) - For information on installing neovim, visit their [github page](https://github.com/neovim/neovim/wiki/Installing-Neovim)
### tmux ### tmux
@ -40,7 +42,7 @@ from one terminal.
#### Notes #### Notes
- Unsure if the minimum version of tmux. I have had an ancient HPC server - Unsure of the minimum version of tmux. I have had an ancient HPC server
that does not respond well to one of the config lines. that does not respond well to one of the config lines.
### zk ### zk
@ -57,6 +59,9 @@ text-editor agnostically.
- Templates: `zk/templates/` - Templates: `zk/templates/`
- Command: `ln -s $PWD/zk/templates ~/.config/zk/templates` - Command: `ln -s $PWD/zk/templates ~/.config/zk/templates`
Note (2023-06-07): I'm now using a mix of nvim-zk with Notion. I'm still figuring out
a centralize place to put my notes and use it to do some knowledge graph magic
## Troubleshoots ## Troubleshoots
### My MacOS just updated, `nix` is no-longer here ### My MacOS just updated, `nix` is no-longer here
@ -64,12 +69,13 @@ text-editor agnostically.
- An easy fix is to add the following to the **bottom** of `/etc/zshrc` - An easy fix is to add the following to the **bottom** of `/etc/zshrc`
```sh ```sh
# Nix # Nix {{{
if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then
. '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
fi fi
# End Nix # }}}
``` ```
- Otherwise, consult [`gh-gist:meeech/a_help-osx-borked-my-nix.md`](https://gist.github.com/meeech/0b97a86f235d10bc4e2a1116eec38e7e) - Otherwise, consult [`gh-gist:meeech/a_help-osx-borked-my-nix.md`](https://gist.github.com/meeech/0b97a86f235d10bc4e2a1116eec38e7e)

111
c_.nix
View File

@ -1,111 +0,0 @@
# a small helper that only builds on top of builtins functions
_: (builtins // (
let
formatSecondsSinceEpoch = t:
let
rem = x: y: x - x / y * y;
days = t / 86400;
secondsInDay = rem t 86400;
hours = secondsInDay / 3600;
minutes = (rem secondsInDay 3600) / 60;
seconds = rem t 60;
# Courtesy of https://stackoverflow.com/a/32158604.
z = days + 719468;
era = (if z >= 0 then z else z - 146096) / 146097;
doe = z - era * 146097;
yoe = (doe - doe / 1460 + doe / 36524 - doe / 146096) / 365;
y = yoe + era * 400;
doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
mp = (5 * doy + 2) / 153;
d = doy - (153 * mp + 2) / 5 + 1;
m = mp + (if mp < 10 then 3 else -9);
y' = y + (if m <= 2 then 1 else 0);
pad = s: if builtins.stringLength s < 2 then "0" + s else s;
in
"${toString y'}${pad (toString m)}${pad (toString d)}${pad (toString hours)}"
+ "${pad (toString minutes)}${pad (toString seconds)}";
fetchTree =
# this is the value of flake.lock#lock.nodes.${input_name}.locked
{ type
, host ? ""
, owner ? ""
, repo ? ""
, rev ? ""
, submodules ? ""
, path ? ""
, narHash ? null
, lastModified ? 0
, src ? ./.
}@info:
if info.type == "github" then
{
outPath =
fetchTarball
({
url = "https://api.${info.host or "github.com"}/repos/"
+ "${info.owner}/${info.repo}/tarball/${info.rev}";
}
// (if info ? narHash then { sha256 = info.narHash; } else { })
);
rev = info.rev;
shortRev = builtins.substring 0 7 info.rev;
lastModified = info.lastModified;
lastModifiedDate = formatSecondsSinceEpoch info.lastModified;
narHash = info.narHash;
}
else if info.type == "git" then
{
outPath =
builtins.fetchGit
({ url = info.url; }
// (if info ? rev then { inherit (info) rev; } else { })
// (if info ? ref then { inherit (info) ref; } else { })
// (if info ? submodules then { inherit (info) submodules; } else { })
);
lastModified = info.lastModified;
lastModifiedDate = formatSecondsSinceEpoch info.lastModified;
narHash = info.narHash;
} // (if info ? rev then {
rev = info.rev;
shortRev = builtins.substring 0 7 info.rev;
} else { })
else if info.type == "path" then
{
outPath = builtins.path {
path =
if builtins.substring 0 1 info.path != "/"
then src + ("/" + info.path) # make this absolute path by prepending ./
else info.path; # it's already an absolute path
};
narHash = info.narHash;
}
else if info.type == "tarball" then
{
outPath =
fetchTarball
({ inherit (info) url; }
// (if info ? narHash then { sha256 = info.narHash; } else { })
);
}
else if info.type == "gitlab" then
{
inherit (info) rev narHash lastModified;
outPath =
fetchTarball
({ url = "https://${info.host or "gitlab.com"}/api/v4/projects/${info.owner}%2F${info.repo}/repository/archive.tar.gz?sha=${info.rev}"; }
// (if info ? narHash then { sha256 = info.narHash; } else { })
);
shortRev = builtins.substring 0 7 info.rev;
}
else
# FIXME: add Mercurial, tarball inputs.
throw "flake input has unsupported input type '${info.type}'";
in
{
inherit fetchTree;
}
)) nil

View File

@ -1,11 +1,13 @@
# We use top-level nix-flake, so default.nix is basically just a wrapper around ./flake.nix # We use top-level nix-flake, so default.nix is basically just a wrapper around ./flake.nix
(import (
import
( (
let let
lock = builtins.fromJSON (builtins.readFile ./flake.lock); lock = builtins.fromJSON (builtins.readFile ./flake.lock);
c_ = import ./c_.nix; c_ = import ./c_.nix;
in in
c_.fetchTree lock.nodes.flake-compat.locked c_.fetchTree lock.nodes.flake-compat.locked
) )
{ src = ./.; } {src = ./.;}
).defaultNix )
.defaultNix

View File

@ -4,10 +4,12 @@
# Should also incorporate shortcuts like scripts/{hm-switch,conf-sysnix}.sh in here instead # Should also incorporate shortcuts like scripts/{hm-switch,conf-sysnix}.sh in here instead
# #
# It should not contain PDE # It should not contain PDE
{ pkgs ? import <nixpkgs> { } {
, lib pkgs ? import <nixpkgs> {},
, ... lib,
}: pkgs.mkShell { ...
}:
pkgs.mkShell {
# mkShell doesn't care about the differences across nativeBuildInputs, # mkShell doesn't care about the differences across nativeBuildInputs,
# buildInputs, or packages # buildInputs, or packages
buildInputs = [ buildInputs = [
@ -15,13 +17,14 @@
pkgs.rust4cargo pkgs.rust4cargo
pkgs.sops pkgs.sops
pkgs.ssh-to-age pkgs.ssh-to-age
pkgs.go
pkgs.gopls
]; ];
shellHook = '' shellHook = ''
# Since we need late dispatch of ~, we have to put this in shellHook. # Since we need late dispatch of ~, we have to put this in shellHook.
export SOPS_AGE_KEY_FILE=~/.config/sops/age/keys.txt export SOPS_AGE_KEY_FILE=~/.config/sops/age/keys.txt
''; '';
# env vars # env vars
lol = "hello world"; lol = "hello world";
} }

View File

@ -28,7 +28,7 @@ documentations and defaults
- `nativeBuildInputs` is supposed to be built by a deployment machine (not target) - `nativeBuildInputs` is supposed to be built by a deployment machine (not target)
- `buildInputs` gives you access during runtime - `buildInputs` gives you access during runtime (if the package goes path build filter)
- `nativeBulidInputs` gives you access to packages during build time - `nativeBulidInputs` gives you access to packages during build time

View File

@ -0,0 +1,12 @@
# Neovim: Testing cmp for color with Tailwind
- [ ] It should detect a project uses tailwind, maybe via some kind of config file
(`tailwind.config.{cjs,mjs,js,ts,json,tsx,toml,yaml}`), or just based on the
string content or via tree-stiter. Check this by `:LspInfo` and `tailwindcss-lsp`
should attach to the current buffer that has tailwind-css string
- [ ] Type in a classname `text-red-500`, just stop at somewhere and start
browsing the cmp-lsp window. It should show a color in place of `lspkind`.
This validates `tailwindcss-colorizer-cmp.nvim` is good
- [ ] Hit that autocomplete, the string should show the color red. This validates
`nvim-colorizer.lua` is properly setup.

169
docs/vim-plugins.md Normal file
View File

@ -0,0 +1,169 @@
# Offset Vim Plugins onto nix packer
The current [`scripts/vim.dsl`](../scripts/vim.dsl) grabs the upstream supported vim plugins
onto a sqlite database to be stored in memory. We could perform some data exploration via this database
## Explore which plugins should be added to `neovim.nix`
Gather list of plugins need to be added. This can be done simply by adding
a print statement on `WPlug` in `../native_configs/neovim/init.lua` then run neovim
to collect it.
```lua
-- as of git://./dotfiles.git#a6c979c6
local function WPlug(plugin_path, ...)
local plugin_name = string.lower(plugin_path:match("/([^/]+)$"))
if not installed_plugins[plugin_name] then
-- NOTE: Add print statement to get which plugin is still being
-- plugged at runtime
print("Plugging "..plugin_path)
Plug(plugin_path, ...)
end
end
```
We can then use `vim_dsl.py`
```py
vp = VimPlugins(UPSTREAM_CSV)
need_install_plugins = """
tjdevries/nlua.nvim
yioneko/nvim-yati
nathanalderson/yang.vim
numToStr/Comment.nvim
lewis6991/gitsigns.nvim
tpope/vim-fugitive
williamboman/mason.nvim
williamboman/mason-lspconfig.nvim
TimUntersberger/neogit
folke/trouble.nvim
tpope/vim-dispatch
clojure-vim/vim-jack-in
radenling/vim-dispatch-neovim
gennaro-tedesco/nvim-jqx
kylechui/nvim-surround
simrat39/inlay-hints.nvim
gruvbox-community/gruvbox
nvim-lualine/lualine.nvim
lukas-reineke/indent-blankline.nvim
kyazdani42/nvim-web-devicons
m-demare/hlargs.nvim
folke/todo-comments.nvim
nvim-treesitter/playground
saadparwaiz1/cmp_luasnip
L3MON4D3/LuaSnip
arthurxavierx/vim-caser
~/local_repos/ts-ql
""".split()
need_install_plugins = [plugin.strip() for plugin in plugins_raw if plugin.strip()]
# Create the GitHub URL list
need_install_plugins_gh = [
f"https://github.com/{plugin}/".lower() for plugin in need_install_plugins if not plugin.startswith(("~", "."))]
# Get the values from the database
values = vp.query(f"SELECT LOWER(repo), alias from {vp.table_name()}")
# Check if the repo is in the list of plugins
need_install = [
vim_plugin_slug(alias) if alias else name_from_repo(repo) for repo, alias in values if repo in need_install_plugins_gh]
print("need_install", "\n".join(need_install))
# Check if the repo is not in the list
repos = [repo for repo, _ in values]
not_in_repo = [name_from_repo(gh) for gh in need_install_plugins_gh if gh not in repos]
print("not in repo", not_in_repo) # nvim-yati, yang-vim, Comment-nvim, inlay-hints-nvim, hlargs-nvim, vim-caser, gruvbox-community
```
This should print out
```
need_install
cmp_luasnip
comment-nvim
gitsigns-nvim
gruvbox-community
indent-blankline-nvim
lualine-nvim
luasnip
mason-lspconfig-nvim
mason-nvim
neogit
nlua-nvim
nvim-jqx
nvim-surround
nvim-web-devicons
playground
todo-comments-nvim
trouble-nvim
vim-dispatch
vim-dispatch-neovim
vim-fugitive
vim-jack-in
not in repo ['nvim-yati', 'yang-vim', 'inlay-hints-nvim', 'hlargs-nvim', 'vim-caser']
```
Given this list, we could safely add to `neovim.nix`
```nix
programs.neovim.plugins =
let inherit (pkgs.vimPlugins)
need_install
cmp_luasnip
comment-nvim
gitsigns-nvim
gruvbox-community
indent-blankline-nvim
lualine-nvim
luasnip
mason-lspconfig-nvim
mason-nvim
neogit
nlua-nvim
nvim-jqx
nvim-surround
nvim-web-devicons
playground
todo-comments-nvim
trouble-nvim
vim-dispatch
vim-dispatch-neovim
vim-fugitive
vim-jack-in
;in [
need_install
cmp_luasnip
comment-nvim
gitsigns-nvim
gruvbox-community
indent-blankline-nvim
lualine-nvim
luasnip
mason-lspconfig-nvim
mason-nvim
neogit
nlua-nvim
nvim-jqx
nvim-surround
nvim-web-devicons
playground
todo-comments-nvim
trouble-nvim
vim-dispatch
vim-dispatch-neovim
vim-fugitive
vim-jack-in
];
```
TODO:
- [ ] Source the plugins directly
- [ ] Add 'frozen' to each of these plugin
- [ ] Pin plugins separately from `neovim.nix`
- [ ] Find a better way to `inherit` with list comprehension
- [ ] Create alert & notification channel for this, ideally via Discord channel
- [ ] Even better, just put it in email with some labels
- [ ] Better end-to-end design that take even deeper account to gruvbox-community and such

1658
flake.lock

File diff suppressed because it is too large Load Diff

146
flake.nix
View File

@ -6,123 +6,65 @@
}; };
description = "My personal configuration in Nix (and some native configurations)"; description = "My personal configuration in Nix (and some native configurations)";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# continously merged & rebased lightweight .lib. Basically a huge extension to c_. nixpkgs-latest.url = "github:nixos/nixpkgs";
nixlib.url = "github:nix-community/nixpkgs.lib"; deploy-rs.url = "github:serokell/deploy-rs";
agenix = { std.url = "github:divnix/std";
url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-utils.url = "github:numtide/flake-utils"; neovim-nightly-overlay = {
nixgl.url = "path:out-of-tree/nixGL"; # need to pin this until darwin build is successful again.
rust-overlay.url = "github:oxalica/rust-overlay"; url = "github:nix-community/neovim-nightly-overlay?rev=88a6c749a7d126c49f3374f9f28ca452ea9419b8";
# Allows default.nix to call onto flake.nix. Useful for nix eval and automations inputs.nixpkgs.follows = "nixpkgs";
flake-compat = { };
url = "path:out-of-tree/flake-compat"; nix-boost = {
flake = false; url = "git+https://git.pegasust.com/pegasust/nix-boost?ref=bleed";
}; };
kpcli-py = { kpcli-py = {
url = "github:rebkwok/kpcli"; url = "github:rebkwok/kpcli";
flake = false; flake = false;
}; };
neovim-nightly-overlay = {
url = "github:nix-community/neovim-nightly-overlay";
inputs.nixpkgs.url = "github:nixos/nixpkgs?rev=fad51abd42ca17a60fc1d4cb9382e2d79ae31836";
};
nix-index-database = { nix-index-database = {
url = "github:mic92/nix-index-database"; url = "github:mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs"; # Should show the latest nixpkgs whenever possible
inputs.nixpkgs.follows = "nixpkgs-latest";
}; };
nickel.url = "github:tweag/nickel";
nix-boost.url = "git+https://git.pegasust.com/pegasust/nix-boost.git";
}; };
outputs = outputs = {self, std, ...} @ inputs:
{ nixpkgs std.growOn
, agenix
, home-manager
, flake-utils
, nixgl
, rust-overlay
, flake-compat
, neovim-nightly-overlay
, nix-index-database
, nixlib
, nickel
, ...
}@_inputs:
let
# config_fn:: system -> config
# this function should take simple exports of homeConfigurations.${profile},
# nixosConfigurations.${profile}, devShells.${profile}, packages.${profile}
# and correctly produce
supported_systems = flake-utils.lib.defaultSystems;
forEachSystem = nixpkgs.lib.genAttrs supported_systems;
in
let
proj_root =
let
path = builtins.toString ./.;
in
{
inherit path;
configs.path = "${path}/native_configs";
scripts.path = "${path}/scripts";
secrets.path = "${path}/secrets";
testdata.path = "${path}/tests";
modules.path = "${path}/modules";
hosts.path = "${path}/hosts";
users.path = "${path}/users";
};
overlays = forEachSystem (system: import ./overlays.nix (_inputs // { inherit system; }));
pkgs = forEachSystem (system: (import nixpkgs {
inherit system;
overlays = overlays.${system};
config = {
allowUnfree = true;
};
}));
lib = (builtins.foldl' (lhs: rhs: (nixpkgs.lib.recursiveUpdate lhs rhs)) { } [
nixpkgs.lib
nixlib.lib
]);
inputs_w_lib = forEachSystem (
system: lib.recursiveUpdate _inputs {
inherit system lib;
pkgs = pkgs.${system};
}
);
modules = (import ./modules inputs_w_lib);
hosts = (import ./hosts inputs_w_lib);
users = (import ./users inputs_w_lib);
# {nixpkgs, agenix, home-manager, flake-utils, nixgl, rust-overlay, flake-compat
# ,pkgs, lib (extended), proj_root}
final_inputs = inputs_w_lib;
in
{ {
inherit (hosts) nixosConfigurations; # boilerplate
inherit (users) homeConfigurations; inherit inputs;
inherit lib proj_root; # All cell blocks are under ./nix/cells/<cell>/<cellblock> as `<cellblock>.nix`
devShells = forEachSystem (system: # or `<cellblock/default.nix`
{default = (import ./dev-shell.nix final_inputs.${system});} cellsFrom = ./nix/cells;
); # modules = ./nix/modules;
templates = forEachSystem (system: import ./templates final_inputs.${system});
secrets = {
pubKeys = {
hosts = hosts.pubKeys;
users = users.pubKeys;
};
};
debug = { cellBlocks = let
inherit final_inputs hosts users modules lib inputs_w_lib pkgs nixpkgs nixlib; inherit (std.blockTypes) devshells functions anything installables;
}; in [
# formatter."${system}" = pkgs.nixpkgs-fmt; (devshells "devshells")
(devshells "userShells")
(functions "home-profiles")
(functions "home-modules")
(anything "home-configs")
(installables "packages")
(anything "lib")
];
}
{
devShells = std.harvest self [["dotfiles" "devshells"]];
# nixosConfigurations = std.pick [ [ "dotfiles" "nixos" ] ];
# homeConfigurations = std.pick [ [ "dotfiles" "home" ] ];
homeModules = std.pick self [["repo" "home-modules"]];
packages = std.harvest self [["repo" "packages"]];
legacyPackages = std.harvest self [["repo" "home-configs"]];
lib = std.pick self [["repo" "lib"]];
# TODO: Debug only
homeProfiles = std.pick self [["repo" "home-profiles"]];
}; };
} }

View File

@ -1,15 +1,19 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = [ ]; config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [];
boot.initrd.availableKernelModules = [ ]; boot.initrd.availableKernelModules = [];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
## NOTE: These filesystems are mounted by a wrapper script from nix-wsl ## NOTE: These filesystems are mounted by a wrapper script from nix-wsl
@ -43,25 +47,22 @@
# fsType = "drvfs"; # fsType = "drvfs";
# }; # };
fileSystems."/mnt/c" = fileSystems."/mnt/c" = {
{ device = "C:";
device = "C:"; fsType = "drvfs";
fsType = "drvfs"; };
};
fileSystems."/mnt/d" = fileSystems."/mnt/d" = {
{ device = "D:";
device = "D:"; fsType = "drvfs";
fsType = "drvfs"; };
};
fileSystems."/mnt/f" = fileSystems."/mnt/f" = {
{ device = "F:";
device = "F:"; fsType = "drvfs";
fsType = "drvfs"; };
};
swapDevices = [ ]; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -1,12 +1,12 @@
{ nixpkgs {
, agenix nixpkgs,
, home-manager agenix,
, flake-utils home-manager,
, nixgl flake-utils,
, rust-overlay nixgl,
, flake-compat rust-overlay,
, pkgs flake-compat,
, lib pkgs,
, proj_root lib,
}: { } proj_root,
}: {}

View File

@ -1,20 +1,23 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ lib,
(modulesPath + "/installer/scan/not-detected.nix") pkgs,
]; modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
# boot.initrd.kernelModules = [ "amdgpu" ]; # boot.initrd.kernelModules = [ "amdgpu" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-amd" "coretemp" ]; boot.kernelModules = ["kvm-amd" "coretemp"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" =
# Might be wise to use /dev/nvme0p1 instead # Might be wise to use /dev/nvme0p1 instead
@ -30,7 +33,7 @@
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ ]; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -1,18 +1,18 @@
{ nixpkgs {
, agenix nixpkgs,
, home-manager agenix,
, flake-utils home-manager,
, nixgl flake-utils,
, rust-overlay nixgl,
, flake-compat rust-overlay,
, pkgs flake-compat,
, lib pkgs,
, proj_root lib,
, nixosDefaultVersion ? "22.05" proj_root,
, defaultSystem ? "x86_64-linux" nixosDefaultVersion ? "22.05",
, ... defaultSystem ? "x86_64-linux",
}@finalInputs: ...
let } @ finalInputs: let
config = { config = {
bao.metadata = { bao.metadata = {
# req # req
@ -33,54 +33,58 @@ let
]; ];
}; };
}; };
propagate = hostConfig@{ metadata, nixosConfig }: propagate = hostConfig @ {
let metadata,
# req nixosConfig,
inherit (metadata) hostName; }: let
# opts # req
ssh_pubkey = lib.attrByPath [ "ssh_pubkey" ] null metadata; # metadata.ssh_pubkey??undefined inherit (metadata) hostName;
users = lib.attrByPath [ "users" ] { } metadata; # opts
nixosVersion = lib.attrByPath [ "nixosVersion" ] nixosDefaultVersion metadata; ssh_pubkey = lib.attrByPath ["ssh_pubkey"] null metadata; # metadata.ssh_pubkey??undefined
system = lib.attrByPath [ "system" ] defaultSystem metadata; users = lib.attrByPath ["users"] {} metadata;
preset = lib.attrByPath [ "preset" ] "base" metadata; nixosVersion = lib.attrByPath ["nixosVersion"] nixosDefaultVersion metadata;
# infer system = lib.attrByPath ["system"] defaultSystem metadata;
hardwareConfig = import "${proj_root.hosts.path}/${hostName}/hardware-configuration.nix"; preset = lib.attrByPath ["preset"] "base" metadata;
# alias to prevent infinite recursion # infer
_nixosConfig = nixosConfig; hardwareConfig = import "${proj_root.hosts.path}/${hostName}/hardware-configuration.nix";
in # alias to prevent infinite recursion
{ _nixosConfig = nixosConfig;
inherit hostName ssh_pubkey users nixosVersion system preset hardwareConfig; in {
nixosConfig = _nixosConfig // { inherit hostName ssh_pubkey users nixosVersion system preset hardwareConfig;
nixosConfig =
_nixosConfig
// {
inherit system; inherit system;
modules = [ modules =
{ [
config._module.args = { {
inherit proj_root; config._module.args = {
my-lib = finalInputs.lib; inherit proj_root;
}; my-lib = finalInputs.lib;
} };
hardwareConfig }
{ hardwareConfig
system.stateVersion = nixosVersion; {
networking.hostName = hostName; system.stateVersion = nixosVersion;
users.users = users; networking.hostName = hostName;
} users.users = users;
{ }
imports = [ agenix.nixosModule ]; {
environment.systemPackages = [ agenix.defaultPackage.x86_64-linux ]; imports = [agenix.nixosModule];
} environment.systemPackages = [agenix.defaultPackage.x86_64-linux];
(import "${proj_root.modules.path}/secrets.nix") }
(import "${proj_root.modules.path}/${preset}.sys.nix") (import "${proj_root.modules.path}/secrets.nix")
] ++ _nixosConfig.modules; (import "${proj_root.modules.path}/${preset}.sys.nix")
]
++ _nixosConfig.modules;
}; };
}; };
# we are blessed by the fact that we engulfed nixpkgs.lib.* at top level # we are blessed by the fact that we engulfed nixpkgs.lib.* at top level
mkHostFromPropagated = propagatedHostConfig@{ nixosConfig, ... }: nixpkgs.lib.nixosSystem nixosConfig; mkHostFromPropagated = propagatedHostConfig @ {nixosConfig, ...}: nixpkgs.lib.nixosSystem nixosConfig;
mkHost = hostConfig: (lib.pipe [ propagate mkHostFromPropagated ] hostConfig); mkHost = hostConfig: (lib.pipe [propagate mkHostFromPropagated] hostConfig);
trimNull = lib.filterAttrsRecursive (name: value: value != null); trimNull = lib.filterAttrsRecursive (name: value: value != null);
flattenPubkey = lib.mapAttrs (hostName: meta_config: meta_config.metadata.ssh_pubkey); flattenPubkey = lib.mapAttrs (hostName: meta_config: meta_config.metadata.ssh_pubkey);
in in {
{
nixosConfigurations = lib.mapAttrs (name: hostConfig: mkHost hostConfig) config; nixosConfigurations = lib.mapAttrs (name: hostConfig: mkHost hostConfig) config;
# {bao = "ssh-ed25519 ..."; another_host = "ssh-rsa ...";} # {bao = "ssh-ed25519 ..."; another_host = "ssh-rsa ...";}
pubKeys = lib.getPubkey config; pubKeys = lib.getPubkey config;

View File

@ -1,17 +1,20 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ lib,
(modulesPath + "/profiles/qemu-guest.nix") pkgs,
]; modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ]; boot.initrd.availableKernelModules = ["virtio_pci" "virtio_scsi" "ahci" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelParams = [ "console=ttyS0,19200n8" ]; boot.kernelParams = ["console=ttyS0,19200n8"];
boot.loader.grub.extraConfig = '' boot.loader.grub.extraConfig = ''
serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1 serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1
terminal_input serial; terminal_input serial;
@ -20,17 +23,15 @@
boot.loader.grub.forceInstall = true; boot.loader.grub.forceInstall = true;
boot.loader.grub.device = "nodev"; boot.loader.grub.device = "nodev";
boot.loader.timeout = 10; boot.loader.timeout = 10;
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/sda";
device = "/dev/sda"; fsType = "ext4";
fsType = "ext4"; };
};
swapDevices = swapDevices = [{device = "/dev/sdb";}];
[{ device = "/dev/sdb"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -1,17 +1,20 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ lib,
(modulesPath + "/profiles/qemu-guest.nix") pkgs,
]; modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ]; boot.initrd.availableKernelModules = ["virtio_pci" "virtio_scsi" "ahci" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelParams = [ "console=ttyS0,19200n8" ]; boot.kernelParams = ["console=ttyS0,19200n8"];
boot.loader.grub.extraConfig = '' boot.loader.grub.extraConfig = ''
serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1 serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1
terminal_input serial; terminal_input serial;
@ -20,17 +23,15 @@
boot.loader.grub.forceInstall = true; boot.loader.grub.forceInstall = true;
boot.loader.grub.device = "nodev"; boot.loader.grub.device = "nodev";
boot.loader.timeout = 10; boot.loader.timeout = 10;
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/sda";
device = "/dev/sda"; fsType = "ext4";
fsType = "ext4"; };
};
swapDevices = swapDevices = [{device = "/dev/sdb";}];
[{ device = "/dev/sdb"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -1,11 +1,12 @@
{ nixpkgs {
, agenix nixpkgs,
, home-manager agenix,
, flake-utils home-manager,
, nixgl flake-utils,
, rust-overlay nixgl,
, flake-compat rust-overlay,
, pkgs flake-compat,
, lib pkgs,
, proj_root lib,
}: { } proj_root,
}: {}

View File

@ -1,17 +1,20 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ lib,
(modulesPath + "/profiles/qemu-guest.nix") pkgs,
]; modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ]; boot.initrd.availableKernelModules = ["virtio_pci" "virtio_scsi" "ahci" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelParams = [ "console=ttyS0,19200n8" ]; boot.kernelParams = ["console=ttyS0,19200n8"];
boot.loader.grub.extraConfig = '' boot.loader.grub.extraConfig = ''
serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1 serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1
terminal_input serial; terminal_input serial;
@ -20,8 +23,8 @@
boot.loader.grub.forceInstall = true; boot.loader.grub.forceInstall = true;
boot.loader.grub.device = "nodev"; boot.loader.grub.device = "nodev";
boot.loader.timeout = 10; boot.loader.timeout = 10;
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems = { fileSystems = {
"/" = { "/" = {
@ -35,8 +38,7 @@
}; };
}; };
swapDevices = swapDevices = [{device = "/dev/sdb";}];
[{ device = "/dev/sdb"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -1,20 +1,23 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ lib,
(modulesPath + "/profiles/qemu-guest.nix") pkgs,
]; modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ]; boot.initrd.availableKernelModules = ["virtio_pci" "virtio_scsi" "ahci" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
boot.kernelParams = [ "console=ttyS0,19200n8" ]; boot.kernelParams = ["console=ttyS0,19200n8"];
boot.loader.grub.extraConfig = '' boot.loader.grub.extraConfig = ''
serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1 serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1
terminal_input serial; terminal_input serial;
@ -23,14 +26,12 @@
boot.loader.grub.forceInstall = true; boot.loader.grub.forceInstall = true;
boot.loader.grub.device = "nodev"; boot.loader.grub.device = "nodev";
boot.loader.timeout = 10; boot.loader.timeout = 10;
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/sda";
device = "/dev/sda"; fsType = "ext4";
fsType = "ext4"; };
};
swapDevices = swapDevices = [{device = "/dev/sdb";}];
[{ device = "/dev/sdb"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -1,6 +1,6 @@
{ {
imports = [ ./gpu.sys.nix ]; imports = [./gpu.sys.nix];
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = ["amdgpu"];
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.videoDrivers = [ "amdgpu" ]; services.xserver.videoDrivers = ["amdgpu"];
} }

View File

@ -1,7 +1,8 @@
{ pkgs {
, lib pkgs,
, proj_root lib,
, ... proj_root,
...
}: { }: {
imports = [ imports = [
./minimal.sys.nix ./minimal.sys.nix
@ -9,7 +10,6 @@
./tailscale.sys.nix ./tailscale.sys.nix
./ssh.sys.nix ./ssh.sys.nix
]; ];
environment.systemPackages = [ pkgs.lm_sensors ]; environment.systemPackages = [pkgs.lm_sensors];
time.timeZone = "America/Phoenix"; time.timeZone = "America/Phoenix";
} }

View File

@ -1 +1 @@
inputs: { } inputs: {}

View File

@ -1,8 +1,8 @@
{ pkgs, ... }: { {pkgs, ...}: {
environment.systemPackages = [ pkgs.clinfo pkgs.lshw pkgs.glxinfo pkgs.pciutils pkgs.vulkan-tools ]; environment.systemPackages = [pkgs.clinfo pkgs.lshw pkgs.glxinfo pkgs.pciutils pkgs.vulkan-tools];
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
extraPackages = [ pkgs.rocm-opencl-icd pkgs.rocm-opencl-runtime ]; extraPackages = [pkgs.rocm-opencl-icd pkgs.rocm-opencl-runtime];
# Vulkan # Vulkan
driSupport = true; driSupport = true;
driSupport32Bit = true; driSupport32Bit = true;

View File

@ -1,6 +1,7 @@
{ pkgs {
, my-lib pkgs,
, ... my-lib,
...
}: { }: {
environment.noXlibs = my-lib.mkForce false; environment.noXlibs = my-lib.mkForce false;
# TODO: wireless networking # TODO: wireless networking
@ -11,15 +12,16 @@
services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5 = { services.xserver.desktopManager.plasma5 = {
enable = true; enable = true;
excludePackages = let plasma5 = pkgs.libsForQt5; in excludePackages = let
[ plasma5 = pkgs.libsForQt5;
plasma5.elisa # audio viewer in [
plasma5.konsole # I use alacritty instaed plasma5.elisa # audio viewer
plasma5.plasma-browser-integration plasma5.konsole # I use alacritty instaed
plasma5.print-manager # will enable if I need plasma5.plasma-browser-integration
plasma5.khelpcenter # why not just write manpages instead :( plasma5.print-manager # will enable if I need
# plasma5.ksshaskpass # pls just put prompts on my dear terminal plasma5.khelpcenter # why not just write manpages instead :(
]; # plasma5.ksshaskpass # pls just put prompts on my dear terminal
];
}; };
# disables KDE's setting of askpassword # disables KDE's setting of askpassword

View File

@ -1,10 +1,11 @@
{ pkgs {
, lib pkgs,
, proj_root lib,
, modulesPath proj_root,
, ... modulesPath,
...
}: { }: {
imports = [ "${modulesPath}/profiles/minimal.nix" ]; imports = ["${modulesPath}/profiles/minimal.nix"];
# prune old builds after a while # prune old builds after a while
nix.settings.auto-optimise-store = true; nix.settings.auto-optimise-store = true;
nix.package = pkgs.nixFlakes; # nix flakes nix.package = pkgs.nixFlakes; # nix flakes

View File

@ -1,10 +1,11 @@
{ pkgs
, lib
, config
, ...
}:
let cfg = config.mod.mosh; in
{ {
pkgs,
lib,
config,
...
}: let
cfg = config.mod.mosh;
in {
options.mod.mosh = { options.mod.mosh = {
enable = lib.mkOption { enable = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
@ -14,12 +15,14 @@ let cfg = config.mod.mosh; in
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.mosh ]; environment.systemPackages = [pkgs.mosh];
networking.firewall = lib.mkIf config.networking.firewall.enable { networking.firewall = lib.mkIf config.networking.firewall.enable {
allowedUDPPortRanges = [ allowedUDPPortRanges = [
{ from = 60000; to = 61000; } # mosh {
from = 60000;
to = 61000;
} # mosh
]; ];
}; };
}; };
} }

View File

@ -1,7 +1,7 @@
{ config, ... }: { {config, ...}: {
imports = [ ./gpu.sys.nix ]; imports = [./gpu.sys.nix];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = ["nvidia"];
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
} }

View File

@ -1,15 +1,16 @@
{ config, pkgs, lib }: {
let config,
gpu_pkgs = [ pkgs.clinfo pkgs.lshw pkgs.glxinfo pkgs.pciutils pkgs.vulkan-tools ]; pkgs,
lib,
}: let
gpu_pkgs = [pkgs.clinfo pkgs.lshw pkgs.glxinfo pkgs.pciutils pkgs.vulkan-tools];
gpu_conf = { gpu_conf = {
# openCL # openCL
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
extraPackages = extraPackages = let
let inherit (pkgs) rocm-opencl-icd rocm-opencl-runtime;
inherit (pkgs) rocm-opencl-icd rocm-opencl-runtime; in [rocm-opencl-icd rocm-opencl-runtime];
in
[ rocm-opencl-icd rocm-opencl-runtime ];
# Vulkan # Vulkan
driSupport = true; driSupport = true;
driSupport32Bit = true; driSupport32Bit = true;
@ -18,4 +19,5 @@ let
}; };
environment.systemPackages = gpu_pkgs; environment.systemPackages = gpu_pkgs;
}; };
in gpu_conf in
gpu_conf

View File

@ -1,6 +1,4 @@
{ proj_root {proj_root, ...}: {
, ...
}: {
age.secrets.s3fs = { age.secrets.s3fs = {
file = "${proj_root.secrets.path}/s3fs.age"; file = "${proj_root.secrets.path}/s3fs.age";
# mode = "600"; # owner + group only # mode = "600"; # owner + group only

View File

@ -1,5 +1,10 @@
# Personal configuration on storage solution # Personal configuration on storage solution
{ pkgs, config, lib, ... }: { {
pkgs,
config,
lib,
...
}: {
environment.systemPackages = [ environment.systemPackages = [
pkgs.s3fs pkgs.s3fs
pkgs.cifs-utils pkgs.cifs-utils
@ -9,87 +14,81 @@
# HACK: need to store secret somewhere so that root can access this # HACK: need to store secret somewhere so that root can access this
# because autofs may run as root for now, we enforce putting the secret in this monorepo # because autofs may run as root for now, we enforce putting the secret in this monorepo
# TODO: make this configuration nix-less to show that it's 100% data # TODO: make this configuration nix-less to show that it's 100% data
services.autofs = services.autofs = let
let # confToBackendArg {lol="what"; empty=""; name_only=null;} -> "lol=what,empty=,name_only"
# confToBackendArg {lol="what"; empty=""; name_only=null;} -> "lol=what,empty=,name_only" # TODO: change null -> true/false. This allows overriding & better self-documentation
# TODO: change null -> true/false. This allows overriding & better self-documentation confToBackendArg = conf: (lib.concatStringsSep ","
confToBackendArg = conf: (lib.concatStringsSep "," (lib.mapAttrsToList (name: value: "${name}${lib.optionalString (value != null) "=${value}"}") conf));
(lib.mapAttrsToList (name: value: "${name}${lib.optionalString (value != null) "=${value}"}") conf));
# mount_dest: path ("wow") # mount_dest: path ("wow")
# backend_args: nix attrs representing the arguments to be passed to s3fs # backend_args: nix attrs representing the arguments to be passed to s3fs
# ({"-fstype" = "fuse"; "use_cache" = "/tmp";}) # ({"-fstype" = "fuse"; "use_cache" = "/tmp";})
# bucket: bucket name (hungtr-hot) # bucket: bucket name (hungtr-hot)
# NOTE: s3 custom provider will be provided inside # NOTE: s3 custom provider will be provided inside
# backend_args, so just put the bucket name here # backend_args, so just put the bucket name here
# #
#-> "${mount_dest} ${formatted_args} ${s3fs-bin}#${bucket}" #-> "${mount_dest} ${formatted_args} ${s3fs-bin}#${bucket}"
autofs-s3fs_entry = autofs-s3fs_entry = {
{ mount_dest mount_dest,
, backend_args ? { "-fstype" = "fuse"; } backend_args ? {"-fstype" = "fuse";},
, bucket bucket,
}@inputs: } @ inputs: let
s3fs-exec = "${pkgs.s3fs}/bin/s3fs";
in "${mount_dest} ${confToBackendArg backend_args} :${s3fs-exec}\#${bucket}";
personalStorage = [
(autofs-s3fs_entry {
mount_dest = "garden";
backend_args = {
"-fstype" = "fuse";
use_cache = "/tmp";
del_cache = null;
allow_other = null;
url = "https://v5h5.la11.idrivee2-14.com";
passwd_file = config.age.secrets."s3fs.digital-garden".path;
dbglevel = "debug"; # enable this for better debugging info in journalctl
uid = "1000"; # default user
gid = "100"; # users
umask = "003"; # others read only, fully shared for users group
};
bucket = "digital-garden";
})
(
let let
s3fs-exec = "${pkgs.s3fs}/bin/s3fs"; args = {
in "-fstype" = "cifs";
"${mount_dest} ${confToBackendArg backend_args} :${s3fs-exec}\#${bucket}"; credentials = config.age.secrets._nhitrl_cred.path;
personalStorage = [ user = null;
(autofs-s3fs_entry { uid = "1001";
mount_dest = "garden"; gid = "100";
backend_args = { dir_mode = "0777";
"-fstype" = "fuse"; file_mode = "0777";
use_cache = "/tmp";
del_cache = null;
allow_other = null;
url = "https://v5h5.la11.idrivee2-14.com";
passwd_file = config.age.secrets."s3fs.digital-garden".path;
dbglevel = "debug"; # enable this for better debugging info in journalctl
uid = "1000"; # default user
gid = "100"; # users
umask = "003"; # others read only, fully shared for users group
}; };
bucket = "digital-garden"; in "felia_d ${confToBackendArg args} ://felia.coati-celsius.ts.net/d"
}) )
( (
let let
args = { args = {
"-fstype" = "cifs"; "-fstype" = "cifs";
credentials = config.age.secrets._nhitrl_cred.path; credentials = config.age.secrets._nhitrl_cred.path;
user = null; user = null;
uid = "1001"; uid = "1001";
gid = "100"; gid = "100";
dir_mode = "0777"; dir_mode = "0777";
file_mode = "0777"; file_mode = "0777";
}; };
in in "felia_f ${confToBackendArg args} ://felia.coati-celsius.ts.net/f"
"felia_d ${confToBackendArg args} ://felia.coati-celsius.ts.net/d" )
) ];
( persoConf = pkgs.writeText "auto.personal" (builtins.concatStringsSep "\n" personalStorage);
let in {
args = { enable = true;
"-fstype" = "cifs"; # Creates /perso directory with every subdirectory declared by ${personalStorage}
credentials = config.age.secrets._nhitrl_cred.path; # as of now (might be stale), /perso/hot is the only mount accessible
user = null; # that is also managed by s3fs
uid = "1001"; autoMaster = ''
gid = "100"; /perso file:${persoConf}
dir_mode = "0777"; '';
file_mode = "0777"; timeout = 30; # default: 600, 600 seconds (10 mins) of inactivity => unmount
}; # debug = true; # writes to more to journalctl
in };
"felia_f ${confToBackendArg args} ://felia.coati-celsius.ts.net/f"
)
];
persoConf = pkgs.writeText "auto.personal" (builtins.concatStringsSep "\n" personalStorage);
in
{
enable = true;
# Creates /perso directory with every subdirectory declared by ${personalStorage}
# as of now (might be stale), /perso/hot is the only mount accessible
# that is also managed by s3fs
autoMaster = ''
/perso file:${persoConf}
'';
timeout = 30; # default: 600, 600 seconds (10 mins) of inactivity => unmount
# debug = true; # writes to more to journalctl
};
} }

View File

@ -1,22 +1,25 @@
{ pkgs {
, config pkgs,
, lib config,
, ... lib,
}: let cfg = config.mod.tailscale; in { ...
}: let
cfg = config.mod.tailscale;
in {
options.mod.tailscale = { options.mod.tailscale = {
enable = lib.mkEnableOption "tailscale"; enable = lib.mkEnableOption "tailscale";
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.tailscale ]; environment.systemPackages = [pkgs.tailscale];
services.tailscale.enable = true; services.tailscale.enable = true;
systemd.services.tailscale-autoconnect = { systemd.services.tailscale-autoconnect = {
description = "Automatically connects to Tailscale"; description = "Automatically connects to Tailscale";
# make sure tailscale is running before trying to connect to tailscale # make sure tailscale is running before trying to connect to tailscale
after = [ "network-pre.target" "tailscale.service" ]; after = ["network-pre.target" "tailscale.service"];
wants = [ "network-pre.target" "tailscale.service" ]; wants = ["network-pre.target" "tailscale.service"];
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
# set this service as a oneshot job # set this service as a oneshot job
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";

View File

@ -1,4 +1,4 @@
{ config, ... }: { {config, ...}: {
networking.wireless.enable = true; networking.wireless.enable = true;
networking.wireless.environmentFile = config.age.secrets."wifi.env"; networking.wireless.environmentFile = config.age.secrets."wifi.env";
networking.wireless.networks = { networking.wireless.networks = {

View File

@ -1,3 +1,17 @@
# Native configs # Native configs
Contains all configurations that are written in their native language Contains all configurations that are written in their native configuration language.
## Why native language?
- Easier portability
- Syntax highlighting and robust checking without needing to realize derivation
- Nix can read from [JSON](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-fromJSON),
[TOML](https://nixos.org/manual/nix/stable/release-notes/rl-2.6.html#release-26-2022-01-24).
- We have also managed to hack together a [fromYaml](./../nix-conf/lib/serde/default.nix),
though it will not work for strictly pure builds or bootstrapping builds.
## When to use Nix to generate config?
- Original configuraiton language requires too much duplication that can be solved with Nix

View File

@ -0,0 +1,721 @@
(vim.cmd "let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
let plug_path = data_dir . '/autoload/plug.vim'
if empty(glob(plug_path))
execute '!curl -fLo '.plug_path.' --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
execute 'so '.plug_path
endif
")
(local Plug (. vim.fn "plug#"))
(local installed-plugins {})
(each [_ path (ipairs (vim.api.nvim_list_runtime_paths))]
(local last-folder-start (path:find "/[^/]*$"))
(when last-folder-start
(local plugin-name (path:sub (+ last-folder-start 1)))
(tset installed-plugins plugin-name true)))
(fn WPlug [plugin-path ...]
(let [plugin-name (string.lower (plugin-path:match "/([^/]+)$"))]
(when (not (. installed-plugins plugin-name)) (Plug plugin-path ...))))
(vim.call "plug#begin")
(WPlug :tjdevries/nlua.nvim)
(WPlug :nvim-treesitter/nvim-treesitter)
(WPlug :nvim-treesitter/nvim-treesitter-textobjects)
(WPlug :nvim-telescope/telescope.nvim {:branch :0.1.x})
(WPlug :nvim-telescope/telescope-fzf-native.nvim {:do "make >> /tmp/log 2>&1"})
(WPlug :nvim-telescope/telescope-file-browser.nvim)
(WPlug :neovim/nvim-lspconfig)
(WPlug :hrsh7th/cmp-nvim-lsp)
(WPlug :hrsh7th/cmp-path)
(WPlug :hrsh7th/cmp-buffer)
(WPlug :hrsh7th/cmp-cmdline)
(WPlug :hrsh7th/nvim-cmp)
(WPlug :onsails/lspkind-nvim)
(WPlug :yioneko/nvim-yati {:tag "*"})
(WPlug :nathanalderson/yang.vim)
(WPlug :windwp/nvim-autopairs)
(WPlug :windwp/nvim-ts-autotag)
(WPlug :NMAC427/guess-indent.nvim)
(WPlug :j-hui/fidget.nvim)
(WPlug :numToStr/Comment.nvim)
(WPlug :lewis6991/gitsigns.nvim)
(WPlug :tpope/vim-fugitive)
(WPlug :williamboman/mason.nvim)
(WPlug :williamboman/mason-lspconfig.nvim)
(WPlug :ThePrimeagen/harpoon)
(WPlug :TimUntersberger/neogit)
(WPlug :folke/trouble.nvim)
(WPlug :tpope/vim-dispatch)
(WPlug :clojure-vim/vim-jack-in)
(WPlug :radenling/vim-dispatch-neovim)
(WPlug :gennaro-tedesco/nvim-jqx)
(WPlug :kylechui/nvim-surround)
(WPlug :simrat39/rust-tools.nvim)
(WPlug :simrat39/inlay-hints.nvim)
(WPlug :gruvbox-community/gruvbox)
(WPlug :nvim-lualine/lualine.nvim)
(WPlug :lukas-reineke/indent-blankline.nvim)
(WPlug :kyazdani42/nvim-web-devicons)
(WPlug :m-demare/hlargs.nvim)
(WPlug :folke/todo-comments.nvim)
(WPlug :nvim-treesitter/nvim-treesitter-context)
(WPlug :nvim-treesitter/playground)
(WPlug :saadparwaiz1/cmp_luasnip)
(WPlug :L3MON4D3/LuaSnip)
(WPlug :mickael-menu/zk-nvim)
(WPlug :arthurxavierx/vim-caser)
(WPlug "~/local_repos/ts-ql")
(vim.call "plug#end")
(vim.cmd "if len(filter(values(g:plugs), '!isdirectory(v:val.dir)'))
PlugInstall --sync | autocmd VimEnter * so $MYVIMRC
endif
")
(vim.api.nvim_create_autocmd [:VimEnter]
{:callback (fn []
(fn named-term [term-idx term-name]
((. (require :harpoon.term)
:gotoTerminal) term-idx)
(vim.cmd (.. ":exe \":file "
term-name
"\" | :bfirst")))
(named-term 4 "term:ctl")
(named-term 5 "term:dev")
(named-term 7 "term:repl")
(named-term 6 "term:repl2"))})
(set vim.g.gruvbox_contrast_dark :soft)
(set vim.g.gruvbox_contrast_light :soft)
(set vim.opt.ignorecase true)
(set vim.opt.smartcase true)
(set vim.opt.incsearch true)
(set vim.opt.number true)
(set vim.opt.relativenumber true)
(set vim.opt.autoindent true)
(set vim.opt.smartindent true)
(set vim.opt.expandtab true)
(set vim.opt.exrc true)
(set vim.opt.tabstop 4)
(set vim.opt.softtabstop 4)
(set vim.opt.shiftwidth 4)
(set vim.opt.scrolloff 30)
(set vim.opt.signcolumn :yes)
(set vim.opt.colorcolumn :80)
(set vim.opt.background :dark)
(vim.api.nvim_create_user_command :Dark
(fn [opts]
(let [contrast (or (and (and opts.args
(> (string.len opts.args)
0))
opts.args)
vim.g.gruvbox_contrast_dark)]
(set vim.g.gruvbox_contrast_dark contrast)
(set vim.opt.background :dark)))
{:nargs "?"})
(vim.api.nvim_create_user_command :Light
(fn [opts]
(let [contrast (or (and (and opts.args
(> (string.len opts.args)
0))
opts.args)
vim.g.gruvbox_contrast_light)]
(set vim.g.gruvbox_contrast_light
contrast)
(set vim.opt.background :light)))
{:nargs "?"})
(set vim.opt.lazyredraw true)
(set vim.opt.termguicolors true)
(set vim.opt.cursorline true)
(set vim.opt.swapfile false)
(set vim.opt.backup false)
(set vim.opt.undodir (.. (vim.fn.stdpath :state) :/.vim/undodir))
(set vim.opt.undofile true)
(set vim.opt.completeopt "menuone,noselect")
(set vim.opt.updatetime 50)
(set vim.g.mapleader " ")
(set vim.g.maplocalleader ",")
(vim.keymap.set [:n :v] :<Space> :<Nop> {:silent true})
(vim.keymap.set :t :<Esc> "<C-\\><C-n>)")
(vim.keymap.set [:n :i :v] :<c-l> :<Cmd>mode<Cr> {:desc ""})
(vim.keymap.set :n "[d" vim.diagnostic.goto_prev)
(vim.keymap.set :n "]d" vim.diagnostic.goto_next)
(vim.keymap.set :n :<leader>e vim.diagnostic.open_float)
(vim.keymap.set :n :<leader>q "<cmd>TroubleToggle loclist<cr>")
(vim.keymap.set :n :<leader>wq "<cmd>TroubleToggle workspace_diagnostics<cr>")
(vim.keymap.set :n :<leader>gg :<cmd>GuessIndent<cr>)
(vim.cmd "colorscheme gruvbox\n")
((. (require :hlargs) :setup))
((. (require :nvim-web-devicons) :setup))
((. (require :trouble) :setup))
((. (require :todo-comments) :setup))
(fn remap [mode key-cmd binded-fn opts]
(set-forcibly! opts (or opts {:remap true}))
(vim.keymap.set mode key-cmd binded-fn opts))
((. (require :Comment) :setup))
(set vim.opt.list true)
(vim.opt.listchars:append "space:⋅")
(vim.opt.listchars:append "eol:↴")
((. (require :indent_blankline) :setup) {:show_end_of_line true
:space_char_blankline " "})
(vim.api.nvim_create_user_command :HalfSpaces
(fn [opts]
(vim.api.nvim_command "set ts=2 sts=2 noet")
(vim.api.nvim_command :retab!)
(vim.api.nvim_command "set ts=1 sts=1 et")
(vim.api.nvim_command :retab)
(vim.api.nvim_command :GuessIndent))
{:nargs 0})
(vim.api.nvim_create_user_command :DoubleSpaces
(fn [opts]
(vim.api.nvim_command "set ts=2 sts=2 noet")
(vim.api.nvim_command :retab!)
(vim.api.nvim_command "set ts=4 sts=4 et")
(vim.api.nvim_command :retab)
(vim.api.nvim_command :GuessIndent))
{:nargs 0})
(local fb-actions (. (. (. (require :telescope) :extensions) :file_browser)
:actions))
((. (require :telescope) :setup) {:defaults {:mappings {:i {:<C-d> false
:<C-u> false}}}
:extensions {:file_browser {:hiject_netrw true
:mappings {:i {}
:n {:c fb-actions.create
:d fb-actions.remove
:e fb-actions.goto_home_dir
:f fb-actions.toggle_browser
:g fb-actions.goto_parent_dir
:h fb-actions.toggle_hidden
:m fb-actions.move
:o fb-actions.open
:r fb-actions.rename
:s fb-actions.toggle_all
:t fb-actions.change_cwd
:w fb-actions.goto_cwd
:y fb-actions.copy}}
:theme (. ((. (require :telescope.themes)
:get_ivy))
:theme)}
:fzf {:case_mode :smart_case
:fuzzy true
:override_file_sorter true
:override_generic_sorter true}}})
(pcall (. (require :telescope) :load_extension) :fzf)
(pcall (. (require :telescope) :load_extension) :file_browser)
(remap :n :<C-p> :<cmd>Telescope<cr> {:desc "Open Telescope general search"})
(remap :n :<leader>fm (fn []
((. (. (. (require :telescope) :extensions)
:file_browser)
:file_browser) {}))
{:desc "[F]ile [M]utation"})
(remap :n :<leader>ff
(fn []
((. (require :telescope.builtin) :find_files) {:follow false
:hidden false
:no_ignore false}))
{:desc "[F]ind [F]ile"})
(remap :n :<leader>fa
(fn []
((. (require :telescope.builtin) :find_files) {:follow true
:hidden true
:no_ignore true}))
{:desc "[F]ind [A]ll files"})
(remap :n :<leader>fg
(fn []
((. (require :telescope.builtin) :live_grep)))
{:desc "[F]ind by [G]rep"})
(remap :n :<leader>fug
(fn []
((. (require :telescope.builtin) :live_grep) {:glob_pattern "**/*"}))
{:desc "[F]ind by [u]nrestricted [G]rep"})
(remap :n :<leader>fb
(fn []
((. (require :telescope.builtin) :buffers)))
{:desc "[F]ind existing [B]uffers"})
(remap :n :<leader>fh
(fn []
((. (require :telescope.builtin) :help_tags)))
{:desc "[F]ind [H]elp"})
(remap :n :<leader>fd
(fn []
((. (require :telescope.builtin) :diagnostics)))
{:desc "[F]ind [D]iagnostics"})
(remap :n :<leader>zf
(fn []
((. (require :zk) :edit) {} {:multi_select false}))
{:desc "[Z]ettelkasten [F]iles"})
(remap :n :<leader>zg (fn [] (vim.cmd ":ZkGrep"))
{:desc "[Z]ettelkasten [G]rep"})
(for [i 1 9]
(vim.api.nvim_set_keymap :n (.. :<C-t> i) (.. ":tabn " i :<CR>)
{:noremap true :silent true}))
(set vim.o.showtabline 1)
(set vim.o.tabline "%!v:lua.my_tabline()")
(fn _G.my_tabline []
(var s "")
(for [i 1 (vim.fn.tabpagenr "$")]
(if (= i (vim.fn.tabpagenr)) (set s (.. s "%" i "T%#TabLineSel#"))
(set s (.. s "%" i "T%#TabLine#")))
(local tab (. (vim.fn.gettabinfo i) 1))
(local tabbuf tab.variables.buffers)
(var bufname :<unknown>)
(when tabbuf
(set bufname (. (. tabbuf tab.curwin) :name)))
(set s (.. s " " i " " (vim.fn.fnamemodify bufname ":t")))
(when (not= i (vim.fn.tabpagenr "$"))
(set s (.. s "%#TabLine#|%#TabLine#"))))
(.. s "%T%#TabLineFill#%="))
(vim.api.nvim_set_keymap :n :<C-t>x
":tabdo if tabpagenr() > 1 | tabclose | endif<CR>"
{:noremap true :silent true})
(require :treesitter-context)
((. (require :nvim-treesitter.configs) :setup) {:autotag {:enable true}
:highlight {:enable true
:enable_vim_regex_highlighting true}
:incremental_selection {:enable true
:keymaps {:init_selection :<C-space>
:node_decremental :<C-backspace>
:node_incremental :<C-space>
:pscope_incremental :<C-S>}}
:indent {:enable false}
:playground {:disable {}
:enable true}
:textobjects {:select {:enable true
:keymaps {:ac "@class.outer"
:af "@function.outer"
:ic "@class.inner"
:if "@function.inner"}
:lookahead true}}
:yati {:default_fallback :auto
:default_lazy true
:disable [:nix]
:enable true}})
((. (require :nvim-autopairs) :setup) {:check_ts true})
(local parser-config
((. (require :nvim-treesitter.parsers) :get_parser_configs)))
(set parser-config.tsx.filetype_to_parsername [:javascript :typescript.tsx])
(set parser-config.astro.filetype_to_parsername
[:javascript :typescript.tsx :astro])
((. (require :guess-indent) :setup) {:auto_cmd true
:filetype_exclude [:netrw :tutor]})
(remap :n :<leader>m
(fn []
((. (require :harpoon.mark) :add_file)))
{:desc "[H]arpoon [M]ark"})
(fn harpoon-nav [key nav-file-index lead-keybind]
(set-forcibly! lead-keybind (or lead-keybind :<leader>h))
(assert (= (type key) :string) "expect key to be string(keybind)")
(assert (and (= (type nav-file-index) :number) (>= nav-file-index 1))
"expect 1-indexed number for file index")
(remap :n (.. lead-keybind key)
(fn []
((. (require :harpoon.ui) :nav_file) nav-file-index))
{:desc (.. "[H]arpoon navigate " (tostring nav-file-index))}))
(harpoon-nav :f 1)
(harpoon-nav :j 2)
(harpoon-nav :d 3)
(harpoon-nav :k 4)
(remap :n :<leader>hh
(fn []
((. (require :harpoon.ui) :toggle_quick_menu))))
(for [i 1 10]
(harpoon-nav (tostring (% i 10)) i)
(remap :n (.. :<leader>t (tostring (% i 10)))
(fn []
((. (require :harpoon.term) :gotoTerminal) i))))
((. (require :neogit) :setup) {})
(remap :n :<leader>gs (fn []
((. (require :neogit) :open) {}))
{:desc "[G]it [S]tatus"})
((. (require :inlay-hints) :setup) {:eol {:right_align false}
:only_current_line false})
(fn on-attach [client bufnr]
(fn nmap [keys func desc]
(when desc (set-forcibly! desc (.. "LSP: " desc)))
(vim.keymap.set :n keys func {:buffer bufnr : desc :noremap true}))
(nmap :<leader>rn vim.lsp.buf.rename "[R]e[n]ame")
(nmap :<leader>ca vim.lsp.buf.code_action "[C]ode [A]ction")
(vim.api.nvim_buf_set_option bufnr :omnifunc "v:lua.vim.lsp.omnifunc")
(nmap :<leader>df (fn [] (vim.lsp.buf.format {:async true}))
"[D]ocument [F]ormat")
(nmap :gd vim.lsp.buf.definition "[G]oto [D]efinition")
(nmap :gi vim.lsp.buf.implementation "[G]oto [I]mplementation")
(nmap :gr (. (require :telescope.builtin) :lsp_references))
(nmap :<leader>ds (. (require :telescope.builtin) :lsp_document_symbols)
"[D]ocument [S]ymbols")
(nmap :<leader>ws (. (require :telescope.builtin)
:lsp_dynamic_workspace_symbols)
"[W]orkspace [S]ymbols")
(nmap :K vim.lsp.buf.hover "Hover Documentation")
(nmap :<C-k> vim.lsp.buf.signature_help "Signature Documentation")
(nmap :gD vim.lsp.buf.declaration "[G]oto [D]eclaration")
(nmap :gtd vim.lsp.buf.type_definition "[G]oto [T]ype [D]efinition")
(nmap :<leader>D vim.lsp.buf.type_definition "Type [D]efinition")
(nmap :<leader>wa vim.lsp.buf.add_workspace_folder "[W]orkspace [A]dd Folder")
(nmap :<leader>wr vim.lsp.buf.remove_workspace_folder
"[W]orkspace [R]emove Folder")
(nmap :<leader>wl
(fn []
(print (vim.inspect (vim.lsp.buf.list_workspace_folders))))
"[W]orkspace [L]ist Folders")
((. (require :inlay-hints) :on_attach) client bufnr))
(local cmp (require :cmp))
(local luasnip (require :luasnip))
(local lspkind (require :lspkind))
(local source-mapping {:buffer "[Buffer]"
:nvim_lsp "[LSP]"
:nvim_lua "[Lua]"
:path "[Path]"})
(cmp.event:on :confirm_done ((. (require :nvim-autopairs.completion.cmp)
:on_confirm_done)))
(cmp.setup {:formatting {:format (fn [entry vim-item]
(set vim-item.kind
(lspkind.symbolic vim-item.kind
{:mode :symbol}))
(set vim-item.menu
(. source-mapping entry.source_name))
(local maxwidth 80)
(set vim-item.abbr
(string.sub vim-item.abbr 1 maxwidth))
vim-item)}
:mapping (cmp.mapping.preset.insert {:<C-d> (cmp.mapping.scroll_docs 4)
:<C-space> (cmp.mapping.complete)
:<C-u> (cmp.mapping.scroll_docs (- 4))
:<CR> (cmp.mapping.confirm {:behavior cmp.ConfirmBehavior.Replace
:select true})
:<S-Tab> (cmp.mapping (fn [fallback]
(if (cmp.visible)
(cmp.select_prev_item)
(luasnip.jumpable (- 1))
(luasnip.jump (- 1))
(fallback)))
[:i :s])
:<Tab> (cmp.mapping (fn [fallback]
(if (cmp.visible)
(cmp.select_next_item)
(luasnip.expand_or_jumpable)
(luasnip.expand_or_jump)
(fallback)))
[:i :s])})
:snippet {:expand (fn [args] (luasnip.lsp_expand args.body))}
:sources (cmp.config.sources [{:name :nvim_lsp}
{:name :luasnip}
{:name :buffer}
{:name :path}])})
(local capabilities ((. (require :cmp_nvim_lsp) :default_capabilities)))
(local servers [:clangd
:rust_analyzer
:pyright
:tsserver
:lua_ls
:cmake
:tailwindcss
:prismals
:rnix
:eslint
:terraformls
:tflint
:svelte
:astro
:clojure_lsp
:bashls
:yamlls
:ansiblels
:jsonls
:denols
:gopls
:nickel_ls
:pylsp])
((. (require :mason) :setup) {:PATH :append
:ui {:check_outdated_packages_on_open true
:icons {:package_installed "✓"
:package_pending "➜"
:package_uninstalled "✗"}}})
((. (require :mason-lspconfig) :setup) {:automatic_installation false})
(local inlay-hint-tsjs
{:includeInlayEnumMemberValueHints true
:includeInlayFunctionLikeReturnTypeHints true
:includeInlayFunctionParameterTypeHints true
:includeInlayParameterNameHints :all
:includeInlayPropertyDeclarationTypeHints true
:includeInlayVariableTypeHints true
:inlcudeInlayParameterNameHintsWhenArgumentMatchesName false})
((. (require :mason-lspconfig) :setup_handlers) {1 (fn [server-name]
((. (. (require :lspconfig)
server-name)
:setup) {: capabilities
:on_attach on-attach}))
:denols (fn []
((. (. (require :lspconfig)
:denols)
:setup) {: capabilities
:on_attach on-attach
:root_dir ((. (require :lspconfig.util)
:root_pattern) :deno.json
:deno.jsonc)}))
:lua_ls (fn []
((. (. (require :lspconfig)
:lua_ls)
:setup) {: capabilities
:on_attach on-attach
:settings {:Lua {:diagnostics {:globals [:vim]}
:format {:defaultConfig {:indent_size 4
:indent_style :space}
:enable true}
:hint {:enable true}
:runtime {:path (vim.split package.path
";")
:version :LuaJIT}
:telemetry {:enable false}
:workspace {:library (vim.api.nvim_get_runtime_file ""
true)}}}}))
:pyright (fn []
((. (. (require :lspconfig)
:pyright)
:setup) {: capabilities
:on_attach on-attach
:settings {:pyright {:disableLanguageServices false
:disableOrganizeImports false}
:python {:analysis {:autoImportCompletions true
:autoSearchPaths true
:diagnosticMode :openFilesOnly
:extraPaths {}
:logLevel :Information
:pythonPath :python
:stubPath :typings
:typeCheckingMode :basic
:typeshedPaths {}
:useLibraryCodeForTypes false
:venvPath ""}
:linting {:mypyEnabled true}}}}))
:tsserver (fn []
((. (. (require :lspconfig)
:tsserver)
:setup) {: capabilities
:on_attach on-attach
:root_dir ((. (require :lspconfig.util)
:root_pattern) :package.json)
:settings {:javascript inlay-hint-tsjs
:typescript inlay-hint-tsjs}}))
:yamlls (fn []
((. (. (require :lspconfig)
:yamlls)
:setup) {: capabilities
:on_attach on-attach
:settings {:yaml {:keyOrdering false}}}))})
((. (require :rust-tools) :setup) {:dap {:adapter {:command :lldb-vscode
:name :rt_lldb
:type :executable}}
:server {: capabilities
:cmd [:rust-analyzer]
:on_attach (fn [client bufnr]
(fn nmap [keys
func
desc]
(when desc
(set-forcibly! desc
(.. "LSP: "
desc)))
(vim.keymap.set :n
keys
func
{:buffer bufnr
: desc
:noremap true}))
(on-attach client
bufnr)
(nmap :K
(. (. (require :rust-tools)
:hover_actions)
:hover_actions)
"Hover Documentation"))
:settings {:rust-analyzer {:cargo {:loadOutDirsFromCheck true}
:checkOnSave {:command :clippy
:extraArgs [:--all
"--"
:-W
"clippy::all"]}
:procMacro {:enable true}
:rustfmt {:extraArgs [:+nightly]}}}
:standalone true}
:tools {:crate_graph {:backend :x11
:enabled_graphviz_backends [:bmp
:cgimage
:canon
:dot
:gv
:xdot
:xdot1.2
:xdot1.4
:eps
:exr
:fig
:gd
:gd2
:gif
:gtk
:ico
:cmap
:ismap
:imap
:cmapx
:imap_np
:cmapx_np
:jpg
:jpeg
:jpe
:jp2
:json
:json0
:dot_json
:xdot_json
:pdf
:pic
:pct
:pict
:plain
:plain-ext
:png
:pov
:ps
:ps2
:psd
:sgi
:svg
:svgz
:tga
:tiff
:tif
:tk
:vml
:vmlz
:wbmp
:webp
:xlib
:x11]
:full true
:output nil}
:executor (. (require :rust-tools/executors)
:termopen)
:hover_actions {:auto_focus false
:border [["╭"
:FloatBorder]
["─"
:FloatBorder]
["╮"
:FloatBorder]
["│"
:FloatBorder]
["╯"
:FloatBorder]
["─"
:FloatBorder]
["╰"
:FloatBorder]
["│"
:FloatBorder]]}
:inlay_hints {:auto false
:highlight :NonText
:max_len_align false
:max_len_align_padding 1
:only_current_line true
:other_hints_prefix "=> "
:parameter_hints_prefix "<- "
:right_align false
:right_align_padding 7
:show_parameter_hints true}
:on_initialized (fn []
((. (require :inlay-hints)
:set_all)))
:reload_workspace_from_cargo_toml true}})
((. (require :zk) :setup) {:lsp {:auto_attach {:enable true
:filetypes [:markdown]}
:config {:cmd [:zk :lsp]
:name :zk
:on_attach on-attach}}
:picker :telescope})
((. (require :zk.commands) :add) :ZkOrphans
(fn [options]
(set-forcibly! options
(vim.tbl_extend :force
{:orphan true}
(or options
{})))
((. (require :zk) :edit) options
{:title "Zk Orphans (unlinked notes)"})))
((. (require :zk.commands) :add) :ZkGrep
(fn [match-ctor]
(var grep-str match-ctor)
(var ___match___ nil)
(if (or (= match-ctor nil) (= match-ctor ""))
(do
(vim.fn.inputsave)
(set grep-str
(vim.fn.input "Grep string: >"))
(vim.fn.inputrestore)
(set ___match___ {:match grep-str}))
(= (type match-ctor) :string)
(set ___match___ {:match grep-str}))
((. (require :zk) :edit) ___match___
{:mutli_select false
:title (.. "Grep: '"
grep-str
"'")})))
((. (require :gitsigns) :setup) {:signs {:add {:text "+"}
:change {:text "~"}
:changedelete {:text "~"}
:delete {:text "_"}
:topdelete {:text "‾"}}})
((. (require :lualine) :setup) {:inactive_sections {:lualine_a {}
:lualine_b {}
:lualine_c [{1 :filename
:file_status true
:path 1}]
:lualine_x [:location]
:lualine_y {}
:lualine_z {}}
:options {:icons_enabled true}
:sections {:lualine_a [:mode]
:lualine_b [:branch
:diff
:diagnostics]
:lualine_c [{1 :filename
:file_status true
:newfile_status false
:path 1
:symbols {:modified "[+]"
:newfile "[New]"
:readonly "[-]"
:unnamed "[Unnamed]"}}]
:lualine_x [:encoding
:fileformat
:filetype]
:lualine_y [:progress]
:lualine_z [:location]}})
((. (require :nvim-surround) :setup) {})
((. (require :tsql) :setup))
((. (require :fidget) :setup) {:align {:bottom true :right true}
:debug {:logging false :strict false}
:fmt {:fidget (fn [fidget-name spinner]
(string.format "%s %s" spinner
fidget-name))
:leftpad true
:max_width 0
:stack_upwards true
:task (fn [task-name message percentage]
(string.format "%s%s [%s]" message
(or (and percentage
(string.format " (%s%%)"
percentage))
"")
task-name))}
:sources {:* {:ignore false}}
:text {:commenced :Started
:completed :Completed
:done "✔"
:spinner :moon}
:timer {:fidget_decay 2000
:spinner_rate 125
:task_decay 1000}
:window {:blend 100
:border :none
:relative :editor
:zindex nil}})

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,3 @@
Host *
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
Host 10.111.103.*
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
# felia mirror on windows # felia mirror on windows
Host felia-win Host felia-win
HostName felia.coati-celsius.ts.net HostName felia.coati-celsius.ts.net
@ -61,6 +53,7 @@ Host sr1
HostName 10.30.76.46 HostName 10.30.76.46
User htran User htran
Port 22 Port 22
StrictHostKeyChecking no
HostKeyAlgorithms=+ssh-dss,ssh-rsa HostKeyAlgorithms=+ssh-dss,ssh-rsa
KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1 KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1
@ -68,6 +61,7 @@ Host bgp1
HostName 10.111.100.113 HostName 10.111.100.113
User htran User htran
Port 22 Port 22
StrictHostKeyChecking no
HostKeyAlgorithms=+ssh-dss,ssh-rsa HostKeyAlgorithms=+ssh-dss,ssh-rsa
KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1 KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1
@ -75,19 +69,37 @@ Host bgp2
HostName 10.111.100.114 HostName 10.111.100.114
User htran User htran
Port 22 Port 22
StrictHostKeyChecking no
HostKeyAlgorithms=+ssh-dss,ssh-rsa HostKeyAlgorithms=+ssh-dss,ssh-rsa
KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1 KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1
Host d1-30 Host d1-30
HostName 10.111.103.60 HostName 10.111.103.60
User htran User htran
Port 22 Port 22
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
Host d3l-3
HostName 10.111.103.65
User htran
Port 22
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
Host dev0 Host dev0
HostName 10.100.200.230 HostName 10.100.200.230
User htran User htran
Port 22 Port 22
Host dev2
HostName 10.100.200.210
User htran
Port 22
Host dev1 Host dev1
HostName 10.100.200.220 HostName 10.100.200.220
User htran User htran
@ -99,11 +111,6 @@ Host ztp-egi
User root User root
Port 22 Port 22
Host d3l-3
HostName 10.111.103.65
User htran
Port 22
Host goat Host goat
HostName 10.133.32.100 HostName 10.133.32.100
User "EGN NOC" User "EGN NOC"
@ -125,4 +132,11 @@ Host gl-egi
Port 22 Port 22
IdentityFile ~/.ssh/id_ed25519 IdentityFile ~/.ssh/id_ed25519
Host 10.111.103.*
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
Host *
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa

View File

@ -3,6 +3,11 @@
[aws] [aws]
symbol = " " symbol = " "
[c]
disabled = false
# commands = [ [ 'cc', '--version' ], [ 'gcc', '--version' ], [ 'clang', '--version' ] ]
detect_extensions = ["c", "h", "cc", "cpp", "hh", "hpp"]
[conda] [conda]
symbol = " " symbol = " "

View File

@ -18,10 +18,14 @@ set-option -g renumber-windows on
# set -g status-interval 60 # set -g status-interval 60
# set -g status-right-style 'bg=#333333 fg=#5eacd3' # set -g status-right-style 'bg=#333333 fg=#5eacd3'
# set -g status-right-length 50 # set -g status-right-length 50
set -g status-right '#{cpu_bg_color} CPU: #{cpu_icon} #{cpu_percentage} | %a %h-%d %H:%M '
# set -g status-left " " # set -g status-left " "
# Keybinds # Keybinds
# Enter copy mode with 'v' in vi mode
bind-key -Tcopy-mode-vi v send-keys -X begin-selection
# Copy selection with 'y' in vi mode
bind-key -Tcopy-mode-vi y send-keys -X copy-selection-and-cancel
set-window-option -g mode-keys vi set-window-option -g mode-keys vi
# # Log # # Log

View File

@ -1,53 +1,51 @@
{ config {
, proj_root config,
, myLib proj_root,
, ... myLib,
}: ...
let }: let
inherit (myLib) fromYaml; inherit (myLib) fromYaml;
actualConfig = fromYaml (builtins.readFile "${proj_root.config.path}//alacritty/alacritty.yml"); actualConfig = fromYaml (builtins.readFile "${proj_root.config.path}//alacritty/alacritty.yml");
cfg = config.base.alacritty; cfg = config.base.alacritty;
in in {
{ options.base.alacritty = {
options.base.alacritty = font.family = myLib.mkOption {
{ type = myLib.types.singleLineStr;
font.family = myLib.mkOption { default = actualConfig.font.normal.family;
type = myLib.types.singleLineStr; description = ''
default = actualConfig.font.normal.family; The font family for Alacritty
description = '' '';
The font family for Alacritty example = "DroidSansMono NF";
'';
example = "DroidSansMono NF";
};
font.size = myLib.mkOption {
type = myLib.types.number;
default = actualConfig.font.size;
description = ''
The default font size for Alacritty. This is probably measured in px.
'';
example = 7.0;
};
enable = myLib.mkOption {
type = myLib.types.bool;
default = true;
description = ''
Enables alacritty
'';
example = true;
};
_actualConfig = myLib.mkOption {
type = myLib.types.attrs;
visible = false;
default = actualConfig;
description = "underlying default config";
};
additionalConfigPath = myLib.mkOption {
type = myLib.types.nullOr myLib.types.path;
visible = false;
default = null;
description = "impurely write our alacritty.yml to this path";
};
}; };
font.size = myLib.mkOption {
type = myLib.types.number;
default = actualConfig.font.size;
description = ''
The default font size for Alacritty. This is probably measured in px.
'';
example = 7.0;
};
enable = myLib.mkOption {
type = myLib.types.bool;
default = true;
description = ''
Enables alacritty
'';
example = true;
};
_actualConfig = myLib.mkOption {
type = myLib.types.attrs;
visible = false;
default = actualConfig;
description = "underlying default config";
};
additionalConfigPath = myLib.mkOption {
type = myLib.types.nullOr myLib.types.path;
visible = false;
default = null;
description = "impurely write our alacritty.yml to this path";
};
};
config.programs.alacritty = { config.programs.alacritty = {
enable = cfg.enable; enable = cfg.enable;

View File

@ -1,21 +1,35 @@
{ lib, pkgs, config, ... }:
{ {
lib,
pkgs,
config,
...
}: {
# This patch exists since Darwin's search bar requires solid apps and not
# symlinked
# TODO: QA
# - [x] works for base case
# - [x] works for repeated case
# - [ ] works after base case, then removed
# - [ ] works for repeated case, then removed
# Copy GUI apps to "~/Applications/Home Manager Apps" # Copy GUI apps to "~/Applications/Home Manager Apps"
# Based on this comment: https://github.com/nix-community/home-manager/issues/1341#issuecomment-778820334 # Based on this comment: https://github.com/nix-community/home-manager/issues/1341#issuecomment-778820334
home.activation.darwinApps = home.activation.patch-spotlight =
if pkgs.stdenv.isDarwin then if pkgs.stdenv.isDarwin
let then let
apps = pkgs.buildEnv { apps = pkgs.buildEnv {
name = "home-manager-applications"; name = "home-manager-applications";
paths = config.home.packages; paths = config.home.packages;
pathsToLink = "/Applications"; pathsToLink = "/Applications";
}; };
in in
lib.hm.dag.entryAfter [ "writeBoundary" ] '' lib.hm.dag.entryAfter ["linkGeneration"] ''
# Install MacOS applications to the user environment. # Install MacOS applications to the user environment.
HM_APPS="$HOME/Applications/Home Manager Apps" HM_APPS="$HOME/Applications/Home Manager Apps"
# Reset current state # Reset current state
[ -e "$HM_APPS" ] && $DRY_RUN_CMD rm -r "$HM_APPS" if [ -e "$HM_APPS" ]; then
$DRY_RUN_CMD mv "$HM_APPS" "$HM_APPS.$(date +%Y%m%d%H%M%S)"
fi
$DRY_RUN_CMD mkdir -p "$HM_APPS" $DRY_RUN_CMD mkdir -p "$HM_APPS"
# .app dirs need to be actual directories for Finder to detect them as Apps. # .app dirs need to be actual directories for Finder to detect them as Apps.
# In the env of Apps we build, the .apps are symlinks. We pass all of them as # In the env of Apps we build, the .apps are symlinks. We pass all of them as
@ -23,6 +37,18 @@
$DRY_RUN_CMD cp --archive -H --dereference ${apps}/Applications/* "$HM_APPS" $DRY_RUN_CMD cp --archive -H --dereference ${apps}/Applications/* "$HM_APPS"
$DRY_RUN_CMD chmod +w -R "$HM_APPS" $DRY_RUN_CMD chmod +w -R "$HM_APPS"
'' ''
else else "";
""; # We need this in case upstream home-manager changes the behavior of linking
# applications
home.activation.remove-patch-spotlight =
if pkgs.stdenv.isDarwin
then
lib.hm.dag.entryBefore ["checkLinkTargets"] ''
HM_APPS="$HOME/Applications/Home Manager Apps"
# Reset current state
if [ -e "$HM_APPS" ]; then
$DRY_RUN_CMD mv "$HM_APPS" "$HM_APPS.$(date +%Y%m%d%H%M%S)"
fi
''
else "";
} }

View File

@ -1,6 +1,4 @@
{nix-index-database {nix-index-database, ...} @ inputs: {
,...
}@inputs:{
mkModuleArgs = import ./mkModuleArgs.nix; mkModuleArgs = import ./mkModuleArgs.nix;
modules = [ modules = [
./alacritty.nix ./alacritty.nix

View File

@ -1,8 +1,8 @@
{ config {
, myLib config,
, ... myLib,
}: ...
let }: let
cfg = config.base.git; cfg = config.base.git;
baseAliases = { baseAliases = {
a = "add"; a = "add";
@ -15,12 +15,11 @@ let
co = "checkout"; co = "checkout";
b = "branch"; b = "branch";
}; };
in in {
{
options.base.git = { options.base.git = {
aliases = myLib.mkOption { aliases = myLib.mkOption {
type = myLib.types.attrs; type = myLib.types.attrs;
default = { }; default = {};
example = baseAliases; example = baseAliases;
description = '' description = ''
Additional git aliases. This settings comes with base configuration. Additional git aliases. This settings comes with base configuration.
@ -50,7 +49,7 @@ in
.gitignore patterns that are applied in every repository. .gitignore patterns that are applied in every repository.
This is useful for IDE-specific settings. This is useful for IDE-specific settings.
''; '';
example = [ ".direnv" "node_modules" ]; example = [".direnv" "node_modules"];
}; };
enable = myLib.mkOption { enable = myLib.mkOption {
type = myLib.types.bool; type = myLib.types.bool;

View File

@ -1,11 +1,14 @@
{ pkgs, config, lib, ... }: {
let pkgs,
config,
lib,
...
}: let
cfg = config.base.graphics; cfg = config.base.graphics;
cfgEnable = cfg.enable or (cfg.useNixGL.defaultPackage != null); cfgEnable = cfg.enable or (cfg.useNixGL.defaultPackage != null);
types = lib.types; types = lib.types;
in in {
{ imports = [./shells.nix];
imports = [ ./shells.nix ];
options.base.graphics = { options.base.graphics = {
enable = lib.mkEnableOption "graphics"; enable = lib.mkEnableOption "graphics";
_enable = lib.mkOption { _enable = lib.mkOption {
@ -23,14 +26,14 @@ in
]; ];
}; };
defaultPackage = lib.mkOption { defaultPackage = lib.mkOption {
type = types.nullOr (types.enum [ "nixGLIntel" "nixGLNvidia" "nixGLNvidiaBumblebee" ]); type = types.nullOr (types.enum ["nixGLIntel" "nixGLNvidia" "nixGLNvidiaBumblebee"]);
description = "Which nixGL package to be aliased as `nixGL` on the shell"; description = "Which nixGL package to be aliased as `nixGL` on the shell";
default = null; default = null;
example = "nixGLIntel"; example = "nixGLIntel";
}; };
}; };
}; };
# importing shells does not mean we're enabling everything, if we do mkDefault false # NOTE: importing shells does not mean we're enabling everything, if we do mkDefault false
# but the dilemma is, if the user import BOTH graphics.nix and shells.nix # but the dilemma is, if the user import BOTH graphics.nix and shells.nix
# they will also need to do `config.base.shells.enable` # they will also need to do `config.base.shells.enable`
# generally, we want the behavior: import means enable # generally, we want the behavior: import means enable
@ -41,6 +44,6 @@ in
nixGL = cfg.useNixGL.defaultPackage; nixGL = cfg.useNixGL.defaultPackage;
}; };
}; };
home.packages = [ cfg.useNixGL.package ]; home.packages = [cfg.useNixGL.package];
}; };
} }

View File

@ -1,10 +1,14 @@
{ config, proj_root, pkgs, lib, ... }: {
let config,
proj_root,
pkgs,
lib,
...
}: let
cfg = config.base.keepass; cfg = config.base.keepass;
trimNull = lib.filterAttrsRecursive (name: value: value != null); trimNull = lib.filterAttrsRecursive (name: value: value != null);
in in {
{ imports = [./graphics.nix];
imports = [ ./graphics.nix ];
options.base.keepass = { options.base.keepass = {
enable = lib.mkEnableOption "keepass"; enable = lib.mkEnableOption "keepass";
use_gui = lib.mkOption { use_gui = lib.mkOption {
@ -42,12 +46,18 @@ in
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home.packages = [ home.packages =
pkgs.kpcli-py # kp but is in cli [
] ++ (if cfg.use_gui or config.base.graphics._enable then [ pkgs.kpcli-py # kp but is in cli
pkgs.keepass # Personal secret management ]
] else [ ]); ++ (
home.file.".kp/config.ini".text = lib.generators.toINI { } (trimNull { if cfg.use_gui or config.base.graphics._enable
then [
pkgs.keepass # Personal secret management
]
else []
);
home.file.".kp/config.ini".text = lib.generators.toINI {} (trimNull {
default = { default = {
KEEPASSDB = cfg.path; KEEPASSDB = cfg.path;
KEEPASSDB_KEYFILE = cfg.keyfile_path; KEEPASSDB_KEYFILE = cfg.keyfile_path;

View File

@ -1,20 +1,20 @@
# Turns given inputs into the standardized shape of the inputs to configure # Turns given inputs into the standardized shape of the inputs to configure
# custom base modules in this directory. # custom base modules in this directory.
{ pkgs {
, lib ? pkgs.lib pkgs,
, ... lib ? pkgs.lib,
}@inputs: ...
let } @ inputs: let
recursiveUpdate = lib.recursiveUpdate; recursiveUpdate = lib.recursiveUpdate;
_lib = recursiveUpdate lib (import ../../lib { inherit pkgs lib; }); _lib = recursiveUpdate lib (import ../../lib {inherit pkgs lib;});
proj_root = builtins.toString ./../../..; proj_root = builtins.toString ./../../..;
in in
# TODO: Unpollute inputs # TODO: Unpollute inputs
recursiveUpdate inputs { recursiveUpdate inputs {
proj_root = { proj_root = {
path = proj_root; path = proj_root;
config.path = "${proj_root}/native_configs"; config.path = "${proj_root}/native_configs";
scripts.path = "${proj_root}/scripts"; scripts.path = "${proj_root}/scripts";
}; };
myLib = _lib; myLib = _lib;
} }

View File

@ -1,65 +1,87 @@
# TODO: vim-plug and Mason supports laziness. Probably worth it to explore # TODO: vim-plug and Mason supports laziness. Probably worth it to explore incremental dependencies based on the project TODO: just install these things, then symlink to mason's bin directory
# incremental dependencies based on the project
# TODO: just install these things, then symlink to mason's bin directory
# #
# One thing to consider, though, /nix/store of `nix-shell` or `nix-develop` # One thing to consider, though, /nix/store of `nix-shell` or `nix-develop`
# might be different from `home-manager`'s # might be different from `home-manager`'s (~/.nix_profile/bin/jq)
{ pkgs, lib, config, proj_root, ... }: {
let pkgs,
lib,
config,
proj_root,
...
}: let
# NOTE: Add packages to nvim_pkgs instead, so that it's available at userspace # NOTE: Add packages to nvim_pkgs instead, so that it's available at userspace
# and is added to the path after wrapping. # and is added to the path after wrapping.
# check: nix repl `homeConfigurations.hungtr.config.programs.neovim.finalPackage.buildCommand` # check: nix repl `homeConfigurations.hungtr.config.programs.neovim.finalPackage.buildCommand`
# see: :/--suffix.*PATH # see: :/--suffix.*PATH
# there should be mentions of additional packages # there should be mentions of additional packages
my_neovim = pkgs.neovim-unwrapped; my_neovim = pkgs.neovim-unwrapped;
rust_pkgs = (pkgs.rust-bin.selectLatestNightlyWith rust_pkgs =
pkgs.rust-bin.selectLatestNightlyWith
( (
toolchain: toolchain:
toolchain.default.override { toolchain.default.override {
extensions = [ "rust-src" ]; extensions = ["rust-src" "rust-analyzer" "rust-docs" "rustfmt" "clippy" "miri"];
} }
)); );
nvim_pkgs = [ nvim_pkgs =
# pkgs.gccStdenv [
pkgs.gcc # pkgs.gccStdenv
pkgs.tree-sitter pkgs.tree-sitter
pkgs.fzf # file name fuzzy search pkgs.fzf # file name fuzzy search
pkgs.ripgrep # content fuzzy search pkgs.ripgrep # content fuzzy search
pkgs.zk # Zettelkasten (limited support) pkgs.zk # Zettelkasten (limited support)
pkgs.fd # Required by a Telescope plugin (?) pkgs.fd # Required by a Telescope plugin (?)
pkgs.stdenv.cc.cc.lib pkgs.stdenv.cc.cc.lib
pkgs.rnix-lsp # doesn't work, Mason just installs it using cargo pkgs.rnix-lsp # doesn't work, Mason just installs it using cargo
pkgs.rust4cargo pkgs.rust4cargo
pkgs.nickel pkgs.nickel
pkgs.lsp-nls pkgs.nls
pkgs.go # doesn't work, Mason installs from runtime path pkgs.go # doesn't work, Mason installs from runtime path
# Language-specific stuffs
pkgs.sumneko-lua-language-server
# pkgs.python3Packages.python-lsp-server
pkgs.nodePackages.pyright
pkgs.python3Packages.pylint
pkgs.python3Packages.flake8
# FIXME: installing ansible from here just doesn't work :/
# pkgs.ansible-lint
# pkgs.python38Packages.ansible
# pkgs.ansible-language-server
# TODO: the devShell should provide rust-analyzer so that
# cargo test builds binaries compatible with rust-analyzer
# Language-specific stuffs # pkgs.rust-analyzer
pkgs.sumneko-lua-language-server # rust_pkgs
# pkgs.python3Packages.python-lsp-server # pkgs.evcxr # Rust REPL for Conjure!
pkgs.nodePackages.pyright ]
pkgs.python3Packages.pylint ++ lib.optionals (pkgs.stdenv.isDarwin) (
pkgs.python3Packages.flake8 let
# pkgs.ansible-lint inherit (pkgs.darwin.apple_sdk.frameworks) System CoreFoundation;
# pkgs.python38Packages.ansible in [
# pkgs.ansible-language-server System
# TODO: the devShell should provide rust-analyzer so that CoreFoundation
# cargo test builds binaries compatible with rust-analyzer ]
);
# pkgs.rust-analyzer in {
# rust_pkgs
# pkgs.evcxr # Rust REPL for Conjure!
];
in
{
options.base.neovim = { options.base.neovim = {
enable = lib.mkOption { enable = lib.mkOption {
default = true; default = true;
description = "enable personalized neovim as default editor"; description = "enable personalized neovim as default editor";
type = lib.types.bool; type = lib.types.bool;
example = false; example = false;
f = let
adder = {
__functor = self: arg:
if builtins.isInt arg
then self // {x = self.x + arg;}
else self.x;
x = 0;
};
in {
what = adder 1 2 3 {};
};
}; };
}; };
config = lib.mkIf config.base.neovim.enable { config = lib.mkIf config.base.neovim.enable {
@ -71,22 +93,99 @@ in
vimAlias = true; vimAlias = true;
withPython3 = true; withPython3 = true;
withNodeJs = true; withNodeJs = true;
# Attempt 4: Correct way to make neovim aware of packages
# homeConfigurations.config.programs.neovim takes UNWRAPPED neovim
# and wraps it.
# Ideally, we build our own neovim and add that to config.home.packages
# to share it with nixOS. But we don't really need to share
extraPackages = nvim_pkgs; extraPackages = nvim_pkgs;
# only for here for archive-documentation extraLuaConfig = builtins.readFile "${proj_root.config.path}//neovim/init.lua";
# extraPython3Packages = (pypkgs: [ plugins = let
# # pypkgs.python-lsp-server inherit
# pypkgs.ujson (pkgs.vimPlugins)
# ]); plenary-nvim
# I use vim-plug, so I probably don't require packaging nvim-treesitter
# extraConfig actually writes to init-home-manager.vim (not lua) nvim-treesitter-textobjects
# https://github.com/nix-community/home-manager/pull/3287 nvim-treesitter-context
# extraConfig = builtins.readFile "${proj_root}/neovim/init.lua"; telescope-fzf-native-nvim
extraLuaConfig = (builtins.readFile "${proj_root.config.path}//neovim/init.lua"); telescope-file-browser-nvim
telescope-nvim
nvim-lspconfig
gruvbox-community
neodev-nvim
cmp-nvim-lsp
cmp-path
cmp-buffer
cmp-cmdline
nvim-cmp
lspkind-nvim
nvim-autopairs
nvim-ts-autotag
guess-indent-nvim
harpoon
zk-nvim
luasnip
fidget-nvim
rust-tools-nvim
cmp_luasnip
gitsigns-nvim
indent-blankline-nvim
lualine-nvim
mason-lspconfig-nvim
mason-nvim
neogit
nlua-nvim
nvim-jqx
nvim-surround
nvim-web-devicons
playground
todo-comments-nvim
trouble-nvim
vim-dispatch
vim-dispatch-neovim
vim-fugitive
vim-jack-in
;
in [
plenary-nvim
nvim-treesitter.withAllGrammars
nvim-treesitter-textobjects
telescope-fzf-native-nvim
telescope-file-browser-nvim
telescope-nvim
nvim-lspconfig
gruvbox-community
neodev-nvim
cmp-nvim-lsp
cmp-path
cmp-buffer
cmp-cmdline
nvim-cmp
lspkind-nvim
nvim-autopairs
nvim-ts-autotag
guess-indent-nvim
harpoon
zk-nvim
luasnip
nvim-treesitter-context
fidget-nvim
rust-tools-nvim
cmp_luasnip
gitsigns-nvim
indent-blankline-nvim
lualine-nvim
mason-lspconfig-nvim
mason-nvim
neogit
nlua-nvim
nvim-jqx
nvim-surround
nvim-web-devicons
playground
todo-comments-nvim
trouble-nvim
vim-dispatch
vim-dispatch-neovim
vim-fugitive
vim-jack-in
];
}; };
# home.packages = nvim_pkgs; # home.packages = nvim_pkgs;
}; };

View File

@ -1,9 +1,13 @@
# TODO: maybe throw if base.graphics is not enabled? # TODO: maybe throw if base.graphics is not enabled?
# Though, headless chromium might be possible # Though, headless chromium might be possible
{ config, pkgs, lib, ... }:
let cfg = config.base.private_chromium;
in
{ {
config,
pkgs,
lib,
...
}: let
cfg = config.base.private_chromium;
in {
options.base.private_chromium = { options.base.private_chromium = {
enable = lib.mkOption { enable = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
@ -19,32 +23,36 @@ in
programs.chromium = { programs.chromium = {
enable = true; enable = true;
package = pkgs.ungoogled-chromium; package = pkgs.ungoogled-chromium;
extensions = extensions = let
let # TODO: how about a chrome extension registry?
mkChromiumExtForVersion = browserVersion: { id, sha256, extVersion, ... }: mkChromiumExtForVersion = browserVersion: {
{ id,
inherit id; sha256,
crxPath = builtins.fetchurl { extVersion,
url = "https://clients2.google.com/service/update2/crx" + ...
"?response=redirect" + }: {
"&acceptformat=crx2,crx3" + inherit id;
"&prodversion=${browserVersion}" + crxPath = builtins.fetchurl {
"&x=id%3D${id}%26installsource%3Dondemand%26uc"; url =
name = "${id}.crx"; "https://clients2.google.com/service/update2/crx"
inherit sha256; + "?response=redirect"
}; + "&acceptformat=crx2,crx3"
version = extVersion; + "&prodversion=${browserVersion}"
}; + "&x=id%3D${id}%26installsource%3Dondemand%26uc";
mkChromiumExt = mkChromiumExtForVersion (lib.versions.major pkgs.ungoogled-chromium.version); name = "${id}.crx";
in inherit sha256;
[ };
# vimium version = extVersion;
(mkChromiumExt { };
id = "dbepggeogbaibhgnhhndojpepiihcmeb"; mkChromiumExt = mkChromiumExtForVersion (lib.versions.major pkgs.ungoogled-chromium.version);
sha256 = "00qhbs41gx71q026xaflgwzzridfw1sx3i9yah45cyawv8q7ziic"; in [
extVersion = "1.67.4"; # vimium
}) (mkChromiumExt {
]; id = "dbepggeogbaibhgnhhndojpepiihcmeb";
sha256 = "00qhbs41gx71q026xaflgwzzridfw1sx3i9yah45cyawv8q7ziic";
extVersion = "1.67.4";
})
];
}; };
}; };
} }

View File

@ -1,8 +1,8 @@
# A module that takes care of a GUI-ful, productive desktop environment # A module that takes care of a GUI-ful, productive desktop environment
inputs@{ pkgs, ... }: { inputs @ {pkgs, ...}: {
imports = [ imports = [
# slack # slack
({ pkgs, ... }: { ({pkgs, ...}: {
home.packages = [ home.packages = [
pkgs.slack pkgs.slack
]; ];

View File

@ -1,14 +1,14 @@
# Configurations for shell stuffs. # Configurations for shell stuffs.
# Should probably be decoupled even more # Should probably be decoupled even more for each feature
{ config
, proj_root
, myLib
, pkgs
, ...
}:
let cfg = config.base.shells;
in
{ {
config,
proj_root,
myLib,
pkgs,
...
}: let
cfg = config.base.shells;
in {
options.base.shells = { options.base.shells = {
enable = myLib.mkOption { enable = myLib.mkOption {
type = myLib.types.bool; type = myLib.types.bool;
@ -30,14 +30,13 @@ in
shellAliases = myLib.mkOption { shellAliases = myLib.mkOption {
type = myLib.types.attrs; type = myLib.types.attrs;
description = "Shell command aliases"; description = "Shell command aliases";
default = { }; default = {};
example = { example = {
nixGL = "nixGLIntel"; nixGL = "nixGLIntel";
}; };
}; };
}; };
config = myLib.mkIf cfg.enable { config = myLib.mkIf cfg.enable {
xdg.configFile."starship.toml".source = "${proj_root.config.path}//starship/starship.toml";
# nix: Propagates the environment with packages and vars when enter (children of) # nix: Propagates the environment with packages and vars when enter (children of)
# a directory with shell.nix-compatible and .envrc # a directory with shell.nix-compatible and .envrc
programs.direnv = { programs.direnv = {
@ -52,19 +51,37 @@ in
}; };
programs.tmux = { programs.tmux = {
enable = true; enable = true;
configBeforePlugin = builtins.readFile "${proj_root.config.path}/tmux/tmux.conf"; # extraConfigBeforePlugin = builtins.readFile "${proj_root.config.path}/tmux/tmux.conf";
plugins = plugins = let inherit (pkgs.tmuxPlugins) cpu net-speed; in [cpu net-speed];
let inherit (pkgs.tmuxPlugins) cpu net-speed; extraConfig = builtins.readFile "${proj_root.config.path}/tmux/tmux.conf";
in [ cpu net-speed ];
}; };
xdg.configFile."tmux/tmux.conf".text = myLib.mkOrder 600 ''
set -g status-right '#{cpu_bg_color} CPU: #{cpu_icon} #{cpu_percentage} | %a %h-%d %H:%M '
'';
# Colored ls
programs.exa = { programs.exa = {
enable = true; enable = true;
enableAliases = true; enableAliases = true;
}; };
# Make the shell look beautiful
programs.starship = { programs.starship = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
settings = let
native = builtins.fromTOML (builtins.readFile "${proj_root.config.path}/starship/starship.toml");
patch-nix = pkgs.lib.recursiveUpdate native {
# WARNING: home-manager fails on here for some reason. Likely not at the
# validation phase (type-checking), but at evaluation phaase (stringify)
# c.commands = [
# ["nix" "run" "nixpkgs#clang" "--" "--version"]
# ["nix" "run" "nixpkgs#gcc" "--" "--version"]
# ];
c.commands = "fuk";
};
in
patch-nix;
}; };
# Fuzzy finder. `fzf` for TUI, `fzf -f '<fuzzy query>'` for UNIX piping
programs.fzf.enable = true; programs.fzf.enable = true;
programs.bash = { programs.bash = {
enable = true; enable = true;
@ -75,10 +92,12 @@ in
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
enableAutosuggestions = true; enableAutosuggestions = true;
shellAliases = { shellAliases =
nix-rebuild = "sudo nixos-rebuild switch"; {
hm-switch = "home-manager switch --flake"; nix-rebuild = "sudo nixos-rebuild switch";
} // (cfg.shellAliases or { }); hm-switch = "home-manager switch --flake";
}
// (cfg.shellAliases or {});
history = { history = {
size = 10000; size = 10000;
path = "${config.xdg.dataHome}/zsh/history"; path = "${config.xdg.dataHome}/zsh/history";
@ -97,6 +116,8 @@ in
]; ];
}; };
sessionVariables = { sessionVariables = {
# Vim mode on the terminal
# VI_MODE_RESET_PROMPT_ON_MODE_CHANGE = true; # VI_MODE_RESET_PROMPT_ON_MODE_CHANGE = true;
# VI_MODE_SET_CURSOR = true; # VI_MODE_SET_CURSOR = true;
# ZVM_VI_ESCAPE_BINDKEY = ""; # ZVM_VI_ESCAPE_BINDKEY = "";
@ -104,10 +125,11 @@ in
ZVM_KEYTIMEOUT = 0.004; # 40ms, or subtly around 25 FPS. I'm a gamer :) ZVM_KEYTIMEOUT = 0.004; # 40ms, or subtly around 25 FPS. I'm a gamer :)
ZVM_ESCAPE_KEYTIMEOUT = 0.004; # 40ms, or subtly around 25 FPS. I'm a gamer :) ZVM_ESCAPE_KEYTIMEOUT = 0.004; # 40ms, or subtly around 25 FPS. I'm a gamer :)
}; };
initExtra = (cfg.shellInitExtra or "") + '' initExtra =
source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh (cfg.shellInitExtra or "")
''; + ''
source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
'';
}; };
}; };
} }

View File

@ -1,11 +1,11 @@
{ config
, proj_root
, myLib
, ...
}:
let cfg = config.base.ssh;
in
{ {
config,
proj_root,
myLib,
...
}: let
cfg = config.base.ssh;
in {
options.base.ssh.enable = myLib.mkOption { options.base.ssh.enable = myLib.mkOption {
type = myLib.types.bool; type = myLib.types.bool;
default = true; default = true;
@ -17,7 +17,6 @@ in
config.programs.ssh = { config.programs.ssh = {
inherit (cfg) enable; inherit (cfg) enable;
forwardAgent = true; forwardAgent = true;
extraConfig = builtins.readFile "${proj_root.config.path}/ssh/config"; includes = ["${proj_root.config.path}/ssh/config"];
}; };
} }

View File

@ -1,11 +1,13 @@
# We use top-level nix-flake, so default.nix is basically just a wrapper around ./flake.nix # We use top-level nix-flake, so default.nix is basically just a wrapper around ./flake.nix
(import (
import
( (
let let
lock = builtins.fromJSON (builtins.readFile ./flake.lock); lock = builtins.fromJSON (builtins.readFile ./flake.lock);
c_ = import ./../../c_.nix; c_ = import ./../../c_.nix;
in in
c_.fetchTree lock.nodes.flake-compat.locked c_.fetchTree lock.nodes.flake-compat.locked
) )
{ src = ./.; } {src = ./.;}
).defaultNix )
.defaultNix

File diff suppressed because it is too large Load Diff

View File

@ -15,9 +15,11 @@
description = "simple home-manager config"; description = "simple home-manager config";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-latest.url = "github:nixos/nixpkgs";
home-manager = { home-manager = {
url = "github:Pegasust/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; # url = "github:pegasust/home-manager/starship-config-type";
follows = "nixpkgs";
}; };
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nixgl.url = "path:./../../out-of-tree/nixGL"; nixgl.url = "path:./../../out-of-tree/nixGL";
@ -33,94 +35,96 @@
flake = false; flake = false;
}; };
neovim-nightly-overlay = { neovim-nightly-overlay = {
url = "github:nix-community/neovim-nightly-overlay"; url = "github:nix-community/neovim-nightly-overlay?rev=88a6c749a7d126c49f3374f9f28ca452ea9419b8";
# Pin to a nixpkgs revision that doesn't have NixOS/nixpkgs#208103 yet
inputs.nixpkgs.url = "github:nixos/nixpkgs?rev=fad51abd42ca17a60fc1d4cb9382e2d79ae31836";
}; };
nix-index-database = { nix-index-database = {
url = "github:mic92/nix-index-database"; url = "github:mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nickel.url = "github:tweag/nickel";
}; };
outputs = outputs = flake_inputs @ {
flake_inputs@{ nixpkgs nixpkgs,
, home-manager home-manager,
, nixgl nixgl,
, rust-overlay rust-overlay,
, flake-utils flake-utils,
, kpcli-py kpcli-py,
, neovim-nightly-overlay neovim-nightly-overlay,
, nickel nix-boost,
, nix-boost nixpkgs-latest,
, ... ...
}: }: let
let # config_fn:: system -> config
# config_fn:: system -> config cross_platform = config_fn: {
cross_platform = config_fn: ({ packages =
packages = builtins.foldl' builtins.foldl'
(prev: system: prev // { (prev: system:
prev
// {
"${system}" = config_fn system; "${system}" = config_fn system;
}) })
{ } {}
flake-utils.lib.defaultSystems; flake-utils.lib.defaultSystems;
}); };
in in
cross_platform (system: cross_platform (system: let
let overlays = import ./overlays.nix (flake_inputs // {inherit system;});
overlays = import ./../../overlays.nix (flake_inputs // { inherit system; });
# pkgs = nixpkgs.legacyPackages.${system}.appendOverlays overlays; # pkgs = nixpkgs.legacyPackages.${system}.appendOverlays overlays;
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system overlays; inherit system overlays;
config = { allowUnfree = true; }; config = {allowUnfree = true;};
}; };
# lib = (import ../lib { inherit pkgs; lib = pkgs.lib; }); # lib = (import ../lib { inherit pkgs; lib = pkgs.lib; });
base = import ./base flake_inputs; base = import ./base flake_inputs;
inherit (base) mkModuleArgs; inherit (base) mkModuleArgs;
nerd_font_module = { config, pkgs, ... }: { nerd_font_module = {
config,
pkgs,
...
}: {
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home.packages = [ home.packages = [
(pkgs.nerdfonts.override { fonts = [ "DroidSansMono" ]; }) # list of fonts are available at https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/data/fonts/nerdfonts/shas.nix
(pkgs.nerdfonts.override {fonts = ["Hack"];})
]; ];
# For some reasons, Windows es in the font name as DroidSansMono NF base.alacritty.font.family = "Hack Nerd Font Mono";
# so we need to override this
base.alacritty.font.family = "DroidSansMono Nerd Font";
}; };
in in {
{
debug = { debug = {
inherit overlays pkgs base; inherit overlays pkgs base;
}; };
homeConfigurations = homeConfigurations = let
let x11_wsl = ''
x11_wsl = '' # x11 output for WSL
# x11 output for WSL export DISPLAY=$(ip route list default | awk '{print $3}'):0
export DISPLAY=$(ip route list default | awk '{print $3}'):0 export LIBGL_ALWAYS_INDIRECT=1
export LIBGL_ALWAYS_INDIRECT=1 '';
''; in {
in "hungtr" = home-manager.lib.homeManagerConfiguration {
{ inherit pkgs;
"hungtr" = home-manager.lib.homeManagerConfiguration { modules =
inherit pkgs; base.modules
modules = base.modules ++ [ ++ [
./home.nix ./home.nix
]; ];
# optionally pass inarguments to module # optionally pass inarguments to module
# we migrate this from in-place modules to allow flexibility # we migrate this from in-place modules to allow flexibility
# in this case, we can add "home" to input arglist of home.nix # in this case, we can add "home" to input arglist of home.nix
extraSpecialArgs = mkModuleArgs { extraSpecialArgs = mkModuleArgs {
inherit pkgs; inherit pkgs;
myHome = { myHome = {
username = "hungtr"; username = "hungtr";
homeDirectory = "/home/hungtr"; homeDirectory = "/home/hungtr";
};
}; };
}; };
"hungtr@bao" = home-manager.lib.homeManagerConfiguration { };
inherit pkgs; "hungtr@bao" = home-manager.lib.homeManagerConfiguration {
modules = base.modules ++ [ inherit pkgs;
modules =
base.modules
++ [
./home.nix ./home.nix
nerd_font_module nerd_font_module
./base/productive_desktop.nix ./base/productive_desktop.nix
@ -133,21 +137,23 @@
base.graphics.useNixGL.enable = true; base.graphics.useNixGL.enable = true;
} }
]; ];
# optionally pass inarguments to module # optionally pass inarguments to module
# we migrate this from in-place modules to allow flexibility # we migrate this from in-place modules to allow flexibility
# in this case, we can add "home" to input arglist of home.nix # in this case, we can add "home" to input arglist of home.nix
extraSpecialArgs = mkModuleArgs { extraSpecialArgs = mkModuleArgs {
inherit pkgs; inherit pkgs;
myHome = { myHome = {
username = "hungtr"; username = "hungtr";
homeDirectory = "/home/hungtr"; homeDirectory = "/home/hungtr";
};
}; };
}; };
# Personal darwin, effectively serves as the Darwin edge channel };
"hungtran" = home-manager.lib.homeManagerConfiguration { # Personal darwin, effectively serves as the Darwin edge channel
inherit pkgs; "hungtran" = home-manager.lib.homeManagerConfiguration {
modules = base.modules ++ [ inherit pkgs;
modules =
base.modules
++ [
./home.nix ./home.nix
{ {
base.graphics.enable = false; base.graphics.enable = false;
@ -168,30 +174,31 @@
]; ];
} }
]; ];
extraSpecialArgs = mkModuleArgs { extraSpecialArgs = mkModuleArgs {
inherit pkgs; inherit pkgs;
myHome = { myHome = {
username = "hungtran"; username = "hungtran";
homeDirectory = "/Users/hungtran"; homeDirectory = "/Users/hungtran";
};
}; };
}; };
# Work darwin };
"htran" = home-manager.lib.homeManagerConfiguration { # Work darwin
inherit pkgs; "htran" = home-manager.lib.homeManagerConfiguration {
modules = base.modules ++ [ inherit pkgs;
modules =
base.modules
++ [
./home.nix ./home.nix
./base/productive_desktop.nix ./base/productive_desktop.nix
./base/darwin-spotlight.nix ./base/darwin-spotlight.nix
{ {
base.private_chromium.enable = false; base.private_chromium.enable = false;
} }
nerd_font_module
{ {
base.graphics.enable = false; base.graphics.enable = false;
# don't want to deal with GL stuffs on mac yet :/ # don't want to deal with GL stuffs on mac yet :/
base.graphics.useNixGL.defaultPackage = null; base.graphics.useNixGL.defaultPackage = null;
# FIXME: this actually does not exist
base.keepass.path = "/Users/htran/keepass.kdbx";
base.alacritty.font.size = 11.0; base.alacritty.font.size = 11.0;
base.git.name = "Hung"; base.git.name = "Hung";
base.git.email = "htran@egihosting.com"; base.git.email = "htran@egihosting.com";
@ -201,59 +208,46 @@
pkgs.postman pkgs.postman
]; ];
} }
nerd_font_module {base.keepass.enable = pkgs.lib.mkForce false;}
]; ];
extraSpecialArgs = mkModuleArgs { extraSpecialArgs = mkModuleArgs {
inherit pkgs; inherit pkgs;
myHome = { myHome = {
username = "htran"; username = "htran";
homeDirectory = "/Users/htran"; homeDirectory = "/Users/htran";
};
}; };
}; };
"nixos@Felia" = home-manager.lib.homeManagerConfiguration { };
inherit pkgs; "nixos@Felia" = home-manager.lib.homeManagerConfiguration {
modules = [ inherit pkgs;
./home.nix modules = [
{ ./home.nix
base.shells = { {
shellInitExtra = '' base.shells = {
'' + x11_wsl; shellInitExtra =
}; ''
} ''
]; + x11_wsl;
# optionally pass inarguments to module
# we migrate this from in-place modules to allow flexibility
# in this case, we can add "home" to input arglist of home.nix
extraSpecialArgs = mkModuleArgs {
inherit pkgs;
myHome = {
username = "nixos";
homeDirectory = "/home/nixos";
}; };
}
];
# optionally pass inarguments to module
# we migrate this from in-place modules to allow flexibility
# in this case, we can add "home" to input arglist of home.nix
extraSpecialArgs = mkModuleArgs {
inherit pkgs;
myHome = {
username = "nixos";
homeDirectory = "/home/nixos";
}; };
}; };
# NOTE: This is never actually tested. This is for Ubuntu@Felia };
# "ubuntu_admin" = home-manager.lib.homeManagerConfiguration { # Personal laptop
# inherit pkgs; hwtr = home-manager.lib.homeManagerConfiguration {
# modules = [ inherit pkgs;
# ./home.nix modules =
# ]; base.modules
# extraSpecialArgs = { ++ [
# myLib = lib;
# myHome = {
# username = "ubuntu_admin";
# homeDirectory = "/home/ubuntu_admin";
# shellInitExtra = ''
# '' + x11_wsl;
# };
# };
# };
# Personal laptop
hwtr = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = base.modules ++ [
./home.nix ./home.nix
./base/graphics.nix ./base/graphics.nix
{ {
@ -264,17 +258,17 @@
./base/productive_desktop.nix ./base/productive_desktop.nix
]; ];
extraSpecialArgs = mkModuleArgs { extraSpecialArgs = mkModuleArgs {
inherit pkgs; inherit pkgs;
myHome = { myHome = {
username = "hwtr"; username = "hwtr";
homeDirectory = "/home/hwtr"; homeDirectory = "/home/hwtr";
packages = [ packages = [
pkgs.postman pkgs.postman
]; ];
};
}; };
}; };
}; };
};
}); });
} }

View File

@ -1,44 +0,0 @@
{
"nodes": {
"from-yaml": {
"flake": false,
"locked": {
"lastModified": 1667993008,
"narHash": "sha256-X5RWyebq+j56mUGGCmZTVcJBy6Y/QgFEMHklaz+GOt0=",
"owner": "pegasust",
"repo": "fromYaml",
"rev": "23d2616051f5a781dcfe2915a526925fd9cdd08c",
"type": "github"
},
"original": {
"owner": "pegasust",
"repo": "fromYaml",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1667811565,
"narHash": "sha256-HYml7RdQPQ7X13VNe2CoDMqmifsXbt4ACTKxHRKQE3Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "667e5581d16745bcda791300ae7e2d73f49fff25",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"from-yaml": "from-yaml",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

View File

@ -1,111 +0,0 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
from-yaml = {
url = "github:pegasust/fromYaml";
flake = false;
};
};
outputs = { nixpkgs, from-yaml, ... }:
let
system = "x86_64-linux";
pkgs = import nixpkgs { inherit system; };
lib = {
fromYaml = import "${from-yaml}/fromYaml.nix" { lib = pkgs.lib; };
};
in
{
inherit nixpkgs;
inherit from-yaml;
inherit lib;
inherit pkgs;
fromYamlFn = lib.fromYaml;
yamlCmd = str: (builtins.fromJSON (pkgs.runCommand "echo ${str} | yq"));
test_0 = ''
key_bindings:
- hello:
"N"
'';
key_bind = ''
key_bindings:
- { key: N, mods: Control, action: CreateNewWindow }
# - { key: Paste, action: Paste }
# - { key: Copy, action: Copy }
#- { key: L, mods: Control, action: ClearLogNotice }
#- { key: L, mods: Control, mode: ~Vi|~Search, chars: "\x0c" }
#- { key: PageUp, mods: Shift, mode: ~Alt, action: ScrollPageUp }
#- { key: PageDown, mods: Shift, mode: ~Alt, action: ScrollPageDown }
#- { key: Home, mods: Shift, mode: ~Alt, action: ScrollToTop }
#- { key: End, mods: Shift, mode: ~Alt, action: ScrollToBottom }
# Vi Mode
#- { key: Space, mods: Shift|Control, mode: ~Search, action: ToggleViMode }
- { key: Escape, mods: Shift, mode: ~Search, action: ToggleViMode }
#- { key: Space, mods: Shift|Control, mode: Vi|~Search, action: ScrollToBottom }
#- { key: Escape, mode: Vi|~Search, action: ClearSelection }
#- { key: I, mode: Vi|~Search, action: ToggleViMode }
#- { key: I, mode: Vi|~Search, action: ScrollToBottom }
#- { key: C, mods: Control, mode: Vi|~Search, action: ToggleViMode }
#- { key: Y, mods: Control, mode: Vi|~Search, action: ScrollLineUp }
#- { key: E, mods: Control, mode: Vi|~Search, action: ScrollLineDown }
#- { key: G, mode: Vi|~Search, action: ScrollToTop }
#- { key: G, mods: Shift, mode: Vi|~Search, action: ScrollToBottom }
#- { key: B, mods: Control, mode: Vi|~Search, action: ScrollPageUp }
#- { key: F, mods: Control, mode: Vi|~Search, action: ScrollPageDown }
#- { key: U, mods: Control, mode: Vi|~Search, action: ScrollHalfPageUp }
#- { key: D, mods: Control, mode: Vi|~Search, action: ScrollHalfPageDown }
#- { key: Y, mode: Vi|~Search, action: Copy }
#- { key: Y, mode: Vi|~Search, action: ClearSelection }
#- { key: Copy, mode: Vi|~Search, action: ClearSelection }
#- { key: V, mode: Vi|~Search, action: ToggleNormalSelection }
#- { key: V, mods: Shift, mode: Vi|~Search, action: ToggleLineSelection }
#- { key: V, mods: Control, mode: Vi|~Search, action: ToggleBlockSelection }
#- { key: V, mods: Alt, mode: Vi|~Search, action: ToggleSemanticSelection }
#- { key: Return, mode: Vi|~Search, action: Open }
#- { key: Z, mode: Vi|~Search, action: CenterAroundViCursor }
#- { key: K, mode: Vi|~Search, action: Up }
#- { key: J, mode: Vi|~Search, action: Down }
#- { key: H, mode: Vi|~Search, action: Left }
#- { key: L, mode: Vi|~Search, action: Right }
#- { key: Up, mode: Vi|~Search, action: Up }
#- { key: Down, mode: Vi|~Search, action: Down }
#- { key: Left, mode: Vi|~Search, action: Left }
#- { key: Right, mode: Vi|~Search, action: Right }
#- { key: Key0, mode: Vi|~Search, action: First }
#- { key: Key4, mods: Shift, mode: Vi|~Search, action: Last }
#- { key: Key6, mods: Shift, mode: Vi|~Search, action: FirstOccupied }
#- { key: H, mods: Shift, mode: Vi|~Search, action: High }
#- { key: M, mods: Shift, mode: Vi|~Search, action: Middle }
#- { key: L, mods: Shift, mode: Vi|~Search, action: Low }
#- { key: B, mode: Vi|~Search, action: SemanticLeft }
#- { key: W, mode: Vi|~Search, action: SemanticRight }
#- { key: E, mode: Vi|~Search, action: SemanticRightEnd }
#- { key: B, mods: Shift, mode: Vi|~Search, action: WordLeft }
#- { key: W, mods: Shift, mode: Vi|~Search, action: WordRight }
#- { key: E, mods: Shift, mode: Vi|~Search, action: WordRightEnd }
#- { key: Key5, mods: Shift, mode: Vi|~Search, action: Bracket }
#- { key: Slash, mode: Vi|~Search, action: SearchForward }
#- { key: Slash, mods: Shift, mode: Vi|~Search, action: SearchBackward }
#- { key: N, mode: Vi|~Search, action: SearchNext }
#- { key: N, mods: Shift, mode: Vi|~Search, action: SearchPrevious }
# Search Mode
#- { key: Return, mode: Search|Vi, action: SearchConfirm }
#- { key: Escape, mode: Search, action: SearchCancel }
#- { key: C, mods: Control, mode: Search, action: SearchCancel }
#- { key: U, mods: Control, mode: Search, action: SearchClear }
#- { key: W, mods: Control, mode: Search, action: SearchDeleteWord }
#- { key: P, mods: Control, mode: Search, action: SearchHistoryPrevious }
#- { key: N, mods: Control, mode: Search, action: SearchHistoryNext }
#- { key: Up, mode: Search, action: SearchHistoryPrevious }
#- { key: Down, mode: Search, action: SearchHistoryNext }
#- { key: Return, mode: Search|~Vi, action: SearchFocusNext }
#- { key: Return, mods: Shift, mode: Search|~Vi, action: SearchFocusPrevious }
# (Windows, Linux, and BSD only)
- { key: V, mods: Control|Shift, mode: ~Vi, action: Paste }
- { key: C, mods: Control|Shift, action: Copy }
'';
};
}

View File

@ -3,18 +3,20 @@
# This file represents the base settings for each machine # This file represents the base settings for each machine
# Additional configurations goes to profiles/<user> # Additional configurations goes to profiles/<user>
# or inlined in flake.nix # or inlined in flake.nix
{ config # Represents the realized final configuration
, pkgs # This is by default just ``= import <nixpkgs>{}`
, myHome
, myLib
, option # The options we're given, this might be useful for typesafety?
, proj_root
, ...
}:
let
inherit (myLib) fromYaml;
in
{ {
config,
# Represents the realized final configuration
pkgs,
# This is by default just ``= import <nixpkgs>{}`
myHome,
myLib,
option,
# The options we're given, this might be useful for typesafety?
proj_root,
...
}: let
inherit (myLib) fromYaml;
in {
imports = [ imports = [
./base/neovim.nix ./base/neovim.nix
./base/keepass.nix ./base/keepass.nix
@ -24,31 +26,38 @@ in
homeDirectory = myHome.homeDirectory; homeDirectory = myHome.homeDirectory;
stateVersion = myHome.stateVersion or "22.05"; stateVersion = myHome.stateVersion or "22.05";
}; };
home.packages = pkgs.lib.unique ([ home.packages = pkgs.lib.unique (
# pkgs.ncdu [
pkgs.rclone # cloud file operations # pkgs.ncdu
pkgs.htop # system diagnostics in CLI pkgs.rclone # cloud file operations
pkgs.ripgrep # content fuzzy search pkgs.htop # system diagnostics in CLI
pkgs.unzip # compression pkgs.ripgrep # content fuzzy search
pkgs.zip # compression pkgs.unzip # compression
pkgs.zip # compression
# cool utilities # cool utilities
pkgs.yq-go # Yaml adaptor for jq (only pretty print, little query) pkgs.yq-go # Yaml adaptor for jq (only pretty print, little query)
# pkgs.xorg.xclock # TODO: only include if have gui # For testing GL installation # pkgs.xorg.xclock # TODO: only include if have gui # For testing GL installation
# pkgs.logseq # TODO: only include if have GL # Obsidian alt # pkgs.logseq # TODO: only include if have GL # Obsidian alt
pkgs.mosh # Parsec for SSH pkgs.mosh # Parsec for SSH
pkgs.nixops_unstable # nixops v2 # insecure for now # pkgs.nixops_unstable # nixops v2 # insecure for now
pkgs.lynx # Web browser at your local terminal pkgs.lynx # Web browser at your local terminal
pkgs.zk pkgs.zk
# pkgs.tailscale # VPC;; This should be installed in system-nix # pkgs.tailscale # VPC;; This should be installed in system-nix
pkgs.python310 # dev packages should be in project pkgs.python310 # dev packages should be in project
# pkgs.python310.numpy # pkgs.python310.numpy
# pkgs.python310Packages.tensorflow # pkgs.python310Packages.tensorflow
# pkgs.python310Packages.scikit-learn # pkgs.python310Packages.scikit-learn
] ++ (myHome.packages or [ ]) ++ (if pkgs.system == "x86_64-linux" then [ ]
pkgs.logseq ++ (myHome.packages or [])
] else [ ]) ++ (
if pkgs.system == "x86_64-linux"
then [
pkgs.logseq
]
else []
)
); );
## Configs ## ## Configs ##
@ -58,9 +67,6 @@ in
programs.jq = { programs.jq = {
enable = true; enable = true;
}; };
# not exist in home-manager
# have to do it at system level
# services.ntp.enable = true; # automatic time
programs.nix-index = { programs.nix-index = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = true;

View File

@ -0,0 +1,6 @@
accept-flake-config = true
experimental-features = nix-command flakes
post-build-hook = /etc/nix/upload-to-cache.sh
trusted-users = root htran hungtran hwtr
max-jobs = 8
cores = 12

View File

@ -0,0 +1,4 @@
accept-flake-config = true
experimental-features = nix-command flakes
post-build-hook = /etc/nix/upload-to-cache.sh
trusted-users = root htran hungtran hwtr

View File

@ -0,0 +1,71 @@
flake_input @ {
kpcli-py,
nixgl,
rust-overlay,
neovim-nightly-overlay,
system,
nix-boost,
nixpkgs-latest,
...
}: let
kpcli-py = final: prev: {
# use python3.9, which works because of cython somehow?
kpcli-py = final.poetry2nix.mkPoetryApplication {
projectDir = flake_input.kpcli-py;
overrides = final.poetry2nix.defaultPoetryOverrides.extend (self: super: {
# tableformatter requires setuptools
tableformatter = super.tableformatter.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or []) ++ [self.setuptools self.cython_3];
src = old.src;
}
);
kpcli = super.kpcli.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or []) ++ [self.setuptools];
});
# ubersmith = super.ubersmith.overridePythonAttrs (old: {
# buildInputs = builtins.filter (x: ! builtins.elem x [ ]) ((old.buildInputs or [ ]) ++ [
# py-final.setuptools
# py-final.pip
# ]);
#
# src = final.fetchFromGitHub {
# owner = "jasonkeene";
# repo = "python-ubersmith";
# rev = "0c594e2eb41066d1fe7860e3a6f04b14c14f6e6a";
# sha256 = "sha256-Dystt7CBtjpLkgzCsAif8WkkYYeLyh7VMehAtwoDGuM=";
# };
# });
});
};
};
rust = final: prev: let
nightlyRustWithExts = exts:
final.rust-bin.selectLatestNightlyWith (
toolchain: (toolchain.minimal.override {
extensions = exts;
})
);
# https://rust-lang.github.io/rustup/concepts/profiles.html
rust-default-components = ["rust-docs" "rustfmt" "clippy"];
rust-dev-components = rust-default-components ++ ["rust-src" "rust-analyzer" "miri"];
in {
rust4devs = nightlyRustWithExts rust-dev-components;
rust4cargo = nightlyRustWithExts [];
rust4normi = nightlyRustWithExts rust-default-components;
};
vimPlugins = final: prev: {
inherit (nixpkgs-latest.legacyPackages.${system}) vimPlugins;
};
in [
nix-boost.overlays.default
nixgl.overlays.default
rust-overlay.overlays.default
neovim-nightly-overlay.overlay
rust
kpcli-py
vimPlugins
]

View File

@ -1,5 +1,8 @@
# main module exporter for different configuration profiles # main module exporter for different configuration profiles
{ pkgs, libs, ... } @ inputs:
{ {
pkgs,
libs,
...
} @ inputs: {
hwtr = import ./hwtr.nix; hwtr = import ./hwtr.nix;
} }

View File

@ -1,12 +1,12 @@
{ pkgs {
, lib ? pkgs.lib pkgs,
, ... lib ? pkgs.lib,
}@flake_import: ...
let } @ flake_import: let
serde = import ./serde { inherit pkgs lib; }; serde = import ./serde {inherit pkgs lib;};
recursiveUpdate = lib.recursiveUpdate; recursiveUpdate = lib.recursiveUpdate;
in in
recursiveUpdate (recursiveUpdate pkgs.lib lib) { recursiveUpdate (recursiveUpdate pkgs.lib lib) {
fromYaml = serde.fromYaml; fromYaml = serde.fromYaml;
fromYamlPath = serde.fromYamlPath; fromYamlPath = serde.fromYamlPath;
} }

View File

@ -1,30 +1,39 @@
# Takes care of serializing and deserializing to some formats # Takes care of serializing and deserializing to some formats
# Blame: Pegasust<pegasucksgg@gmail.com> # Blame: Pegasust<pegasucksgg@gmail.com>
# TODO: Add to* formats from pkgs.formats.* # TODO: Add to* formats from pkgs.formats.*
{ pkgs {
, lib pkgs,
} @ inputs: lib,
let } @ inputs: let
yamlToJsonDrv = yamlContent: outputPath: pkgs.callPackage yamlToJsonDrv = yamlContent: outputPath:
({ runCommand }: pkgs.callPackage
({runCommand}:
# runCommand source: https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/trivial-builders.nix#L33 # runCommand source: https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/trivial-builders.nix#L33
runCommand outputPath { inherit yamlContent; nativeBuildInputs = [ pkgs.yq ]; } runCommand outputPath
{
inherit yamlContent;
nativeBuildInputs = [pkgs.yq];
}
# run yq which outputs '.' (no filter) on file at yamlPath # run yq which outputs '.' (no filter) on file at yamlPath
# note that $out is passed onto the bash/sh script for execution # note that $out is passed onto the bash/sh script for execution
'' ''
echo "$yamlContent" | yq >$out echo "$yamlContent" | yq >$out
'') '')
{ }; {};
in in {
{
# Takes in a yaml string and produces a derivation with translated JSON at $outputPath # Takes in a yaml string and produces a derivation with translated JSON at $outputPath
# similar to builtins.fromJSON, turns a YAML string to nix attrset # similar to builtins.fromJSON, turns a YAML string to nix attrset
fromYaml = yamlContent: builtins.fromJSON (builtins.readFile (yamlToJsonDrv yamlContent "any_output.json")); fromYaml = yamlContent: builtins.fromJSON (builtins.readFile (yamlToJsonDrv yamlContent "any_output.json"));
fromYamlPath = yamlPath: builtins.fromJSON ( fromYamlPath = yamlPath:
builtins.readFile ( builtins.fromJSON (
yamlToJsonDrv builtins.readFile (
yamlToJsonDrv
( (
builtins.readFile yamlPath) builtins.readFile yamlPath
"any-output.json")); )
# TODO: fromToml? "any-output.json"
)
);
fromTOML = builtins.fromTOML;
fromJSON = builtins.fromJSON;
} }

View File

@ -1,10 +1,12 @@
# This module aims to be merge (not inject/override) with top-level pkgs to provide # This module aims to be merge (not inject/override) with top-level pkgs to provide
# personalized/custom packages # personalized/custom packages
{ pkgs {
, lib pkgs,
, naersk # rust packages lib,
, ... naersk,
}@pkgs_input: { # rust packages
...
} @ pkgs_input: {
# dot-hwtr = import "./dot-hwtr" pkgs_input; # dot-hwtr = import "./dot-hwtr" pkgs_input;
cargo-bacon = pkgs.rustPlatform.buildRustPackage rec { cargo-bacon = pkgs.rustPlatform.buildRustPackage rec {
pname = "bacon"; pname = "bacon";

View File

@ -4,10 +4,12 @@
rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.url = "github:oxalica/rust-overlay";
naersk.url = "gihub:nix-community/naersk"; naersk.url = "gihub:nix-community/naersk";
}; };
outputs = { nixpkgs, rust-overlay, naersk }: outputs = {
let nixpkgs,
pkgs = import nixpkgs { overlays = [ rust-overlay.overlays.default ]; }; rust-overlay,
lib = pkgs.lib; naersk,
in }: let
(import ./default.nix { inherit pkgs lib naersk; }); pkgs = import nixpkgs {overlays = [rust-overlay.overlays.default];};
lib = pkgs.lib;
in (import ./default.nix {inherit pkgs lib naersk;});
} }

View File

@ -10,10 +10,8 @@ let
all = users // systems; all = users // systems;
# stands for calculus # stands for calculus
c_ = builtins; c_ = builtins;
in in {
{ "system/secrets/s3fs.age".publicKeys = c_.attrValues all;
"system/secrets/s3fs.age".publicKeys = c_.attrValues (all); "system/secrets/s3fs.digital-garden.age".publicKeys = c_.attrValues all;
"system/secrets/s3fs.digital-garden.age".publicKeys = c_.attrValues (all); "system/secrets/_nhitrl.age".publicKeys = c_.attrValues all;
"system/secrets/_nhitrl.age".publicKeys = c_.attrValues (all);
} }

View File

@ -1,61 +1,71 @@
{ lib, pkgs, config, modulesPath, specialArgs, ... }: {
let lib,
pkgs,
config,
modulesPath,
specialArgs,
...
}: let
hostname = specialArgs.hostname; hostname = specialArgs.hostname;
enableSSH = specialArgs.enableSSH or true; enableSSH = specialArgs.enableSSH or true;
_networking = lib.recursiveUpdate { hostName = hostname; } (specialArgs._networking or { }); _networking = lib.recursiveUpdate {hostName = hostname;} (specialArgs._networking or {});
_boot = specialArgs._boot or { }; _boot = specialArgs._boot or {};
_services = specialArgs._services or { }; _services = specialArgs._services or {};
includeHardware = specialArgs.includeHardware or true; includeHardware = specialArgs.includeHardware or true;
proj_root = builtins.toString ./../..; proj_root = builtins.toString ./../..;
in in
with lib; with lib; {
{ imports =
imports = (if includeHardware then [ (
"${proj_root}/hosts/${hostname}/hardware-configuration.nix" if includeHardware
] else [ ]) ++ [ then [
"${modulesPath}/profiles/minimal.nix" "${proj_root}/hosts/${hostname}/hardware-configuration.nix"
"${proj_root}/modules/tailscale.sys.nix" ]
"${proj_root}/modules/mosh.sys.nix" else []
]; )
boot = _boot; ++ [
"${modulesPath}/profiles/minimal.nix"
"${proj_root}/modules/tailscale.sys.nix"
"${proj_root}/modules/mosh.sys.nix"
];
boot = _boot;
# prune old builds # prune old builds
nix.settings.auto-optimise-store = true; nix.settings.auto-optimise-store = true;
# Enable nix flakes # Enable nix flakes
nix.package = pkgs.nixFlakes; nix.package = pkgs.nixFlakes;
nix.extraOptions = '' nix.extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';
users.users.hungtr = { users.users.hungtr = {
isNormalUser = true; isNormalUser = true;
home = "/home/hungtr"; home = "/home/hungtr";
description = "pegasust/hungtr"; description = "pegasust/hungtr";
extraGroups = [ "wheel" "networkmanager" "audio" ]; extraGroups = ["wheel" "networkmanager" "audio"];
}; };
users.users.root = { users.users.root = {
# openssh runs in root, no? This is because port < 1024 requires root. # openssh runs in root, no? This is because port < 1024 requires root.
openssh.authorizedKeys.keys = lib.strings.splitString "\n" (builtins.readFile "${proj_root}/native_configs/ssh/authorized_keys"); openssh.authorizedKeys.keys = lib.strings.splitString "\n" (builtins.readFile "${proj_root}/native_configs/ssh/authorized_keys");
}; };
# Some basic programs # Some basic programs
programs.neovim = { programs.neovim = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
}; };
programs.git = { programs.git = {
enable = true; enable = true;
# more information should be configured under user level # more information should be configured under user level
# See other config at @/home-nix # See other config at @/home-nix
}; };
environment.systemPackages = [
pkgs.gnumake
pkgs.wget
pkgs.inetutils # network diag
pkgs.mtr # network diag
pkgs.sysstat # sys diag
];
}
environment.systemPackages = [
pkgs.gnumake
pkgs.wget
pkgs.inetutils # network diag
pkgs.mtr # network diag
pkgs.sysstat # sys diag
];
}

View File

@ -7,208 +7,227 @@
}; };
}; };
outputs = { self, nixpkgs, agenix, ... }: outputs = {
let self,
lib = nixpkgs.lib; nixpkgs,
proj_root = ./../..; agenix,
# TODO: Change respectively to the system or make a nix shell to alias `nix run github:ryantm/agenix -- ` ...
base_modules = [ }: let
agenix.nixosModule lib = nixpkgs.lib;
{ proj_root = ./../..;
age.secrets.s3fs = { # TODO: Change respectively to the system or make a nix shell to alias `nix run github:ryantm/agenix -- `
file = ../../secrets/s3fs.age; base_modules = [
# mode = "600"; # owner + group only agenix.nixosModule
# owner = "hungtr"; {
# group = "users"; age.secrets.s3fs = {
}; file = ../../secrets/s3fs.age;
age.secrets."s3fs.digital-garden" = { # mode = "600"; # owner + group only
file = ../../secrets/s3fs.digital-garden.age; # owner = "hungtr";
}; # group = "users";
age.secrets._nhitrl_cred = { };
file = ../../secrets/_nhitrl.age; age.secrets."s3fs.digital-garden" = {
}; file = ../../secrets/s3fs.digital-garden.age;
environment.systemPackages = [ agenix.defaultPackage.x86_64-linux ]; };
} age.secrets._nhitrl_cred = {
]; file = ../../secrets/_nhitrl.age;
in };
{ environment.systemPackages = [agenix.defaultPackage.x86_64-linux];
# Windows with NixOS WSL }
nixosConfigurations.Felia = nixpkgs.lib.nixosSystem { ];
system = "x86_64-linux"; in {
modules = base_modules ++ [ # Windows with NixOS WSL
nixosConfigurations.Felia = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules =
base_modules
++ [
./wsl-configuration.nix ./wsl-configuration.nix
{ {
system.stateVersion = "22.05"; system.stateVersion = "22.05";
} }
]; ];
specialArgs = { specialArgs = {
# includeHardware = false; # includeHardware = false;
hostname = "Felia"; hostname = "Felia";
_services.openssh = { _services.openssh = {
permitRootLogin = "no"; permitRootLogin = "no";
enable = true; enable = true;
};
}; };
}; };
nixosConfigurations.lizzi = nixpkgs.lib.nixosSystem { };
system = "x86_64-linux"; nixosConfigurations.lizzi = nixpkgs.lib.nixosSystem {
modules = base_modules ++ [ system = "x86_64-linux";
modules =
base_modules
++ [
./configuration.nix ./configuration.nix
{ {
system.stateVersion = "22.05"; system.stateVersion = "22.05";
mod.tailscale.enable = true; mod.tailscale.enable = true;
} }
]; ];
specialArgs = { specialArgs = {
hostname = "lizzi"; hostname = "lizzi";
_networking = { _networking = {
interfaces.eth1.ipv4.addresses = [{ interfaces.eth1.ipv4.addresses = [
{
address = "71.0.0.1"; address = "71.0.0.1";
prefixLength = 24; prefixLength = 24;
}]; }
firewall = { ];
enable = true; firewall = {
allowedTCPPorts = [ 80 443 22 ];
};
useDHCP = false;
# required so that we get IP address from linode
interfaces.eth0.useDHCP = true;
};
_boot.loader.grub.enable = true;
_boot.loader.grub.version = 2;
_services.openssh = {
permitRootLogin = "no";
enable = true; enable = true;
allowedTCPPorts = [80 443 22];
}; };
_services.gitea = { useDHCP = false;
enable = true; # required so that we get IP address from linode
stateDir = "/gitea"; interfaces.eth0.useDHCP = true;
rootUrl = "https://git.pegasust.com"; };
settings = { _boot.loader.grub.enable = true;
repository = { _boot.loader.grub.version = 2;
"ENABLE_PUSH_CREATE_USER" = true; _services.openssh = {
"ENABLE_PUSH_CREATE_ORG" = true; permitRootLogin = "no";
}; enable = true;
}; };
}; _services.gitea = {
# Highly suspect that thanks to nginx, ipv6 is disabled? enable = true;
_services.nginx = { stateDir = "/gitea";
enable = true; rootUrl = "https://git.pegasust.com";
clientMaxBodySize = "100m"; # Allow big file transfers over git :^) settings = {
recommendedGzipSettings = true; repository = {
recommendedOptimisation = true; "ENABLE_PUSH_CREATE_USER" = true;
recommendedProxySettings = true; "ENABLE_PUSH_CREATE_ORG" = true;
recommendedTlsSettings = true;
virtualHosts."git.pegasust.com" = {
# Gitea hostname
sslCertificate = "/var/lib/acme/git.pegasust.com/fullchain.pem";
sslCertificateKey = "/var/lib/acme/git.pegasust.com/key.pem";
forceSSL = true; # Runs on port 80 and 443
locations."/".proxyPass = "http://localhost:3000/"; # Proxy to Gitea
}; };
}; };
}; };
# Highly suspect that thanks to nginx, ipv6 is disabled?
_services.nginx = {
enable = true;
clientMaxBodySize = "100m"; # Allow big file transfers over git :^)
recommendedGzipSettings = true;
recommendedOptimisation = true;
recommendedProxySettings = true;
recommendedTlsSettings = true;
virtualHosts."git.pegasust.com" = {
# Gitea hostname
sslCertificate = "/var/lib/acme/git.pegasust.com/fullchain.pem";
sslCertificateKey = "/var/lib/acme/git.pegasust.com/key.pem";
forceSSL = true; # Runs on port 80 and 443
locations."/".proxyPass = "http://localhost:3000/"; # Proxy to Gitea
};
};
}; };
# Generic machine };
nixosConfigurations.pixi = nixpkgs.lib.nixosSystem { # Generic machine
system = "x86_64-linux"; nixosConfigurations.pixi = nixpkgs.lib.nixosSystem {
modules = base_modules ++ [ system = "x86_64-linux";
modules =
base_modules
++ [
./configuration.nix ./configuration.nix
{ {
system.stateVersion = "22.05"; system.stateVersion = "22.05";
} }
]; ];
specialArgs = { specialArgs = {
hostname = "pixi"; hostname = "pixi";
_networking = { _networking = {
# interfaces.eth1.ipv4.addresses = [{ # interfaces.eth1.ipv4.addresses = [{
# address = "71.0.0.1"; # address = "71.0.0.1";
# prefixLength = 24; # prefixLength = 24;
# }]; # }];
firewall = { firewall = {
enable = false; enable = false;
allowedTCPPorts = [ 80 443 22 ]; allowedTCPPorts = [80 443 22];
};
useDHCP = false;
# interfaces.eth0.useDHCP = true;
}; };
_boot.loader.grub.enable = true; useDHCP = false;
_boot.loader.grub.version = 2; # interfaces.eth0.useDHCP = true;
_services.openssh = { };
permitRootLogin = "no"; _boot.loader.grub.enable = true;
enable = true; _boot.loader.grub.version = 2;
}; _services.openssh = {
_services.gitea = { permitRootLogin = "no";
enable = true; enable = true;
stateDir = "/gitea"; };
rootUrl = "https://git.pegasust.com"; _services.gitea = {
settings = { enable = true;
repository = { stateDir = "/gitea";
"ENABLE_PUSH_CREATE_USER" = true; rootUrl = "https://git.pegasust.com";
"ENABLE_PUSH_CREATE_ORG" = true; settings = {
}; repository = {
}; "ENABLE_PUSH_CREATE_USER" = true;
}; "ENABLE_PUSH_CREATE_ORG" = true;
_services.nginx = {
enable = true;
clientMaxBodySize = "100m"; # Allow big file transfers over git :^)
recommendedGzipSettings = true;
recommendedOptimisation = true;
recommendedProxySettings = true;
recommendedTlsSettings = true;
virtualHosts."git.pegasust.com" = {
# Gitea hostname
sslCertificate = "/var/lib/acme/git.pegasust.com/fullchain.pem";
sslCertificateKey = "/var/lib/acme/git.pegasust.com/key.pem";
forceSSL = true; # Runs on port 80 and 443
locations."/".proxyPass = "http://localhost:3000/"; # Proxy to Gitea
}; };
}; };
}; };
_services.nginx = {
enable = true;
clientMaxBodySize = "100m"; # Allow big file transfers over git :^)
recommendedGzipSettings = true;
recommendedOptimisation = true;
recommendedProxySettings = true;
recommendedTlsSettings = true;
virtualHosts."git.pegasust.com" = {
# Gitea hostname
sslCertificate = "/var/lib/acme/git.pegasust.com/fullchain.pem";
sslCertificateKey = "/var/lib/acme/git.pegasust.com/key.pem";
forceSSL = true; # Runs on port 80 and 443
locations."/".proxyPass = "http://localhost:3000/"; # Proxy to Gitea
};
};
}; };
nixosConfigurations.nyx = nixpkgs.lib.nixosSystem { };
system = "x86_64-linux"; nixosConfigurations.nyx = nixpkgs.lib.nixosSystem {
modules = base_modules ++ [ system = "x86_64-linux";
modules =
base_modules
++ [
./configuration.nix ./configuration.nix
{ {
system.stateVersion = "22.05"; system.stateVersion = "22.05";
} }
]; ];
specialArgs = { specialArgs = {
hostname = "nyx"; hostname = "nyx";
_networking = { _networking = {
enableIPv6 = false; enableIPv6 = false;
interfaces.eth1.ipv4.addresses = [{ interfaces.eth1.ipv4.addresses = [
{
address = "71.0.0.2"; address = "71.0.0.2";
prefixLength = 24; prefixLength = 24;
}]; }
firewall.enable = true; ];
useDHCP = false; firewall.enable = true;
interfaces.eth0.useDHCP = true; useDHCP = false;
}; interfaces.eth0.useDHCP = true;
_boot.loader.grub.enable = true; };
_boot.loader.grub.version = 2; _boot.loader.grub.enable = true;
_services.openssh = { _boot.loader.grub.version = 2;
permitRootLogin = "no"; _services.openssh = {
enable = true; permitRootLogin = "no";
}; enable = true;
}; };
}; };
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { };
system = "x86_64-linux"; nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
modules = base_modules ++ [ system = "x86_64-linux";
modules =
base_modules
++ [
./configuration.nix ./configuration.nix
{ {
system.stateVersion = "22.05"; system.stateVersion = "22.05";
} }
]; ];
specialArgs = { specialArgs = {
hostname = "nixos"; hostname = "nixos";
};
}; };
nixosConfigurations.htran-dev = nixpkgs.lib.nixosSystem { };
system = "x86_64-linux"; nixosConfigurations.htran-dev = nixpkgs.lib.nixosSystem {
modules = base_modules ++ [ system = "x86_64-linux";
modules =
base_modules
++ [
./configuration.nix ./configuration.nix
{ {
system.stateVersion = "22.11"; system.stateVersion = "22.11";
@ -218,29 +237,34 @@
# interface = "ens32"; # interface = "ens32";
}; };
networking.interfaces.ens32.ipv4.addresses = [ networking.interfaces.ens32.ipv4.addresses = [
{ address = "10.100.200.230"; prefixLength = 24; } {
address = "10.100.200.230";
prefixLength = 24;
}
]; ];
} }
]; ];
specialArgs = { specialArgs = {
hostname = "htran-dev"; hostname = "htran-dev";
_networking = { _networking = {
firewall.enable = true; firewall.enable = true;
useDHCP = false; useDHCP = false;
interfaces.eth0.useDHCP = true; interfaces.eth0.useDHCP = true;
}; };
_boot.loader.grub.enable = true; _boot.loader.grub.enable = true;
_boot.loader.grub.version = 2; _boot.loader.grub.version = 2;
_services.openssh = { _services.openssh = {
permitRootLogin = "no"; permitRootLogin = "no";
enable = true; enable = true;
};
}; };
}; };
nixosConfigurations.bao = nixpkgs.lib.nixosSystem { };
system = "x86_64-linux"; nixosConfigurations.bao = nixpkgs.lib.nixosSystem {
specialArgs.hostname = "bao"; system = "x86_64-linux";
modules = base_modules ++ [ specialArgs.hostname = "bao";
modules =
base_modules
++ [
./configuration.nix ./configuration.nix
./../../modules/storage.perso.sys.nix ./../../modules/storage.perso.sys.nix
./../../modules/kde.sys.nix ./../../modules/kde.sys.nix
@ -248,59 +272,63 @@
./../../modules/pulseaudio.sys.nix ./../../modules/pulseaudio.sys.nix
./../../modules/opengl.sys.nix ./../../modules/opengl.sys.nix
./../../modules/nvgpu.sys.nix ./../../modules/nvgpu.sys.nix
({ config, pkgs, lib, ... }: ({
{ config,
mod.tailscale.enable = true; pkgs,
# Use UEFI lib,
boot.loader.systemd-boot.enable = true; ...
}: {
mod.tailscale.enable = true;
# Use UEFI
boot.loader.systemd-boot.enable = true;
networking.hostName = "bao"; # Define your hostname. networking.hostName = "bao"; # Define your hostname.
# Pick only one of the below networking options. # Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
time.timeZone = "America/Phoenix"; time.timeZone = "America/Phoenix";
# Configure keymap in X11 # Configure keymap in X11
services.xserver.layout = "us"; services.xserver.layout = "us";
# services.xserver.xkbOptions = { # services.xserver.xkbOptions = {
# "eurosign:e"; # "eurosign:e";
# "caps:escape" # map caps to escape. # "caps:escape" # map caps to escape.
# }; # };
# Enable CUPS to print documents. # Enable CUPS to print documents.
# services.printing.enable = true; # services.printing.enable = true;
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true; # services.xserver.libinput.enable = true;
# Just an initial user to get this started lol # Just an initial user to get this started lol
users.users.user = { users.users.user = {
initialPassword = "pw123"; initialPassword = "pw123";
extraGroups = [ "wheel" "networkmanager" "audio" ]; extraGroups = ["wheel" "networkmanager" "audio"];
isNormalUser = true; isNormalUser = true;
}; };
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
# started in user sessions. # started in user sessions.
# programs.mtr.enable = true; # programs.mtr.enable = true;
# programs.gnupg.agent = { # programs.gnupg.agent = {
# enable = true; # enable = true;
# enableSSHSupport = true; # enableSSHSupport = true;
# }; # };
# List services that you want to enable: # List services that you want to enable:
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
services.openssh.enable = true; services.openssh.enable = true;
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave # on your system were taken. Its perfectly fine and recommended to leave
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.11"; # Did you read the comment? system.stateVersion = "22.11"; # Did you read the comment?
}) })
]; ];
};
}; };
};
} }

View File

@ -1,17 +1,20 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ lib,
(modulesPath + "/profiles/qemu-guest.nix") pkgs,
]; modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ]; boot.initrd.availableKernelModules = ["virtio_pci" "virtio_scsi" "ahci" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelParams = [ "console=ttyS0,19200n8" ]; boot.kernelParams = ["console=ttyS0,19200n8"];
boot.loader.grub.extraConfig = '' boot.loader.grub.extraConfig = ''
serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1 serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1
terminal_input serial; terminal_input serial;
@ -20,17 +23,15 @@
boot.loader.grub.forceInstall = true; boot.loader.grub.forceInstall = true;
boot.loader.grub.device = "nodev"; boot.loader.grub.device = "nodev";
boot.loader.timeout = 10; boot.loader.timeout = 10;
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/sda";
device = "/dev/sda"; fsType = "ext4";
fsType = "ext4"; };
};
swapDevices = swapDevices = [{device = "/dev/sdb";}];
[{ device = "/dev/sdb"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -3,11 +3,12 @@
let let
lock = builtins.fromJSON (builtins.readFile ./flake.lock); lock = builtins.fromJSON (builtins.readFile ./flake.lock);
in in
fetchTarball { fetchTarball {
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
sha256 = lock.nodes.flake-compat.locked.narHash; sha256 = lock.nodes.flake-compat.locked.narHash;
} }
) )
{ {
src = ./.; src = ./.;
}).defaultNix })
.defaultNix

View File

@ -11,9 +11,13 @@
}; };
}; };
outputs = { self, nixpkgs, flake-utils, ... }: outputs = {
self,
nixpkgs,
flake-utils,
...
}:
{ {
nixosModules.wsl = { nixosModules.wsl = {
imports = [ imports = [
./modules/build-tarball.nix ./modules/build-tarball.nix
@ -31,26 +35,25 @@
./configuration.nix ./configuration.nix
]; ];
}; };
}
} // // flake-utils.lib.eachSystem
flake-utils.lib.eachSystem (with flake-utils.lib.system; ["x86_64-linux" "aarch64-linux"])
(with flake-utils.lib.system; [ "x86_64-linux" "aarch64-linux" ]) (
(system: system: let
let pkgs = import nixpkgs {inherit system;};
pkgs = import nixpkgs { inherit system; }; in {
in checks.check-format =
{ pkgs.runCommand "check-format"
checks.check-format = pkgs.runCommand "check-format" {
{ buildInputs = with pkgs; [nixpkgs-fmt];
buildInputs = with pkgs; [ nixpkgs-fmt ]; } ''
} ''
nixpkgs-fmt --check ${./.} nixpkgs-fmt --check ${./.}
mkdir $out # success mkdir $out # success
''; '';
devShell = pkgs.mkShell { devShell = pkgs.mkShell {
nativeBuildInputs = with pkgs; [ nixpkgs-fmt ]; nativeBuildInputs = with pkgs; [nixpkgs-fmt];
}; };
} }
); );
} }

View File

@ -1,12 +1,24 @@
{ config, pkgs, lib, ... }: {
with builtins; with lib; config,
let pkgs,
pkgs2storeContents = l: map (x: { object = x; symlink = "none"; }) l; lib,
...
}:
with builtins;
with lib; let
pkgs2storeContents = l:
map
(x: {
object = x;
symlink = "none";
})
l;
nixpkgs = lib.cleanSource pkgs.path; nixpkgs = lib.cleanSource pkgs.path;
channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}" channelSources =
{ preferLocalBuild = true; } pkgs.runCommand "nixos-${config.system.nixos.version}"
{preferLocalBuild = true;}
'' ''
mkdir -p $out mkdir -p $out
cp -prd ${nixpkgs.outPath} $out/nixos cp -prd ${nixpkgs.outPath} $out/nixos
@ -58,10 +70,7 @@ let
sed -i 's|import \./default\.nix|import \./nixos-wsl|' ./etc/nixos/configuration.nix sed -i 's|import \./default\.nix|import \./nixos-wsl|' ./etc/nixos/configuration.nix
''} ''}
''; '';
in {
in
{
options.wsl.tarball = { options.wsl.tarball = {
includeConfig = mkOption { includeConfig = mkOption {
type = types.bool; type = types.bool;
@ -70,13 +79,12 @@ in
}; };
}; };
config = mkIf config.wsl.enable { config = mkIf config.wsl.enable {
# These options make no sense without the wsl-distro module anyway # These options make no sense without the wsl-distro module anyway
system.build.tarball = pkgs.callPackage "${nixpkgs}/nixos/lib/make-system-tarball.nix" { system.build.tarball = pkgs.callPackage "${nixpkgs}/nixos/lib/make-system-tarball.nix" {
# No contents, structure will be added by prepare script # No contents, structure will be added by prepare script
contents = [ ]; contents = [];
fileName = "nixos-wsl-${pkgs.hostPlatform.system}"; fileName = "nixos-wsl-${pkgs.hostPlatform.system}";
@ -92,6 +100,5 @@ in
compressCommand = "gzip"; compressCommand = "gzip";
compressionExtension = ".gz"; compressionExtension = ".gz";
}; };
}; };
} }

View File

@ -1,20 +1,23 @@
{ config, lib, pkgs, ... }: {
with builtins; with lib; { config,
lib,
pkgs,
...
}:
with builtins;
with lib; {
imports = [ imports = [
(mkRenamedOptionModule [ "wsl" "docker" ] [ "wsl" "docker-desktop" ]) (mkRenamedOptionModule ["wsl" "docker"] ["wsl" "docker-desktop"])
]; ];
options.wsl.docker-desktop = with types; { options.wsl.docker-desktop = with types; {
enable = mkEnableOption "Docker Desktop integration"; enable = mkEnableOption "Docker Desktop integration";
}; };
config = config = let
let cfg = config.wsl.docker-desktop;
cfg = config.wsl.docker-desktop; in
in
mkIf (config.wsl.enable && cfg.enable) { mkIf (config.wsl.enable && cfg.enable) {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
docker docker
docker-compose docker-compose
@ -25,7 +28,7 @@ with builtins; with lib; {
script = '' script = ''
${config.wsl.automountPath}/wsl/docker-desktop/docker-desktop-user-distro proxy --docker-desktop-root ${config.wsl.automountPath}/wsl/docker-desktop ${config.wsl.automountPath}/wsl/docker-desktop/docker-desktop-user-distro proxy --docker-desktop-root ${config.wsl.automountPath}/wsl/docker-desktop
''; '';
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
serviceConfig = { serviceConfig = {
Restart = "on-failure"; Restart = "on-failure";
RestartSec = "30s"; RestartSec = "30s";
@ -35,7 +38,5 @@ with builtins; with lib; {
users.groups.docker.members = [ users.groups.docker.members = [
config.wsl.defaultUser config.wsl.defaultUser
]; ];
}; };
} }

View File

@ -1,6 +1,11 @@
{ config, lib, pkgs, ... }: {
with builtins; with lib; { config,
lib,
pkgs,
...
}:
with builtins;
with lib; {
options.wsl.docker-native = with types; { options.wsl.docker-native = with types; {
enable = mkEnableOption "Native Docker integration in NixOS."; enable = mkEnableOption "Native Docker integration in NixOS.";
@ -15,14 +20,13 @@ with builtins; with lib; {
}; };
}; };
config = config = let
let cfg = config.wsl.docker-native;
cfg = config.wsl.docker-native; in
in
mkIf (config.wsl.enable && cfg.enable) { mkIf (config.wsl.enable && cfg.enable) {
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
docker = super.docker.override { iptables = pkgs.iptables-legacy; }; docker = super.docker.override {iptables = pkgs.iptables-legacy;};
}) })
]; ];

View File

@ -1,11 +1,19 @@
{ config, lib, pkgs, ... }: {
with builtins; with lib; { config,
lib,
pkgs,
...
}:
with builtins;
with lib; {
config = mkIf config.wsl.enable ( config = mkIf config.wsl.enable (
let let
mkTarball = pkgs.callPackage "${lib.cleanSource pkgs.path}/nixos/lib/make-system-tarball.nix"; mkTarball = pkgs.callPackage "${lib.cleanSource pkgs.path}/nixos/lib/make-system-tarball.nix";
pkgs2storeContents = map (x: { object = x; symlink = "none"; }); pkgs2storeContents = map (x: {
object = x;
symlink = "none";
});
rootfs = let tarball = config.system.build.tarball; in "${tarball}/tarball/${tarball.fileName}.tar${tarball.extension}"; rootfs = let tarball = config.system.build.tarball; in "${tarball}/tarball/${tarball.fileName}.tar${tarball.extension}";
@ -39,25 +47,39 @@ with builtins; with lib; {
passwd = pkgs.writeText "passwd" '' passwd = pkgs.writeText "passwd" ''
root:x:0:0:System administrator:/root:${installer} root:x:0:0:System administrator:/root:${installer}
''; '';
in in {
{
system.build.installer = mkTarball { system.build.installer = mkTarball {
fileName = "nixos-wsl-installer"; fileName = "nixos-wsl-installer";
compressCommand = "gzip"; compressCommand = "gzip";
compressionExtension = ".gz"; compressionExtension = ".gz";
extraArgs = "--hard-dereference"; extraArgs = "--hard-dereference";
storeContents = with pkgs; pkgs2storeContents [ storeContents = with pkgs;
installer pkgs2storeContents [
]; installer
];
contents = [ contents = [
{ source = config.environment.etc."wsl.conf".source; target = "/etc/wsl.conf"; } {
{ source = config.environment.etc."fstab".source; target = "/etc/fstab"; } source = config.environment.etc."wsl.conf".source;
{ source = passwd; target = "/etc/passwd"; } target = "/etc/wsl.conf";
{ source = "${pkgs.busybox}/bin/busybox"; target = "/bin/sh"; } }
{ source = "${pkgs.busybox}/bin/busybox"; target = "/bin/mount"; } {
source = config.environment.etc."fstab".source;
target = "/etc/fstab";
}
{
source = passwd;
target = "/etc/passwd";
}
{
source = "${pkgs.busybox}/bin/busybox";
target = "/bin/sh";
}
{
source = "${pkgs.busybox}/bin/busybox";
target = "/bin/mount";
}
]; ];
extraCommands = pkgs.writeShellScript "prepare" '' extraCommands = pkgs.writeShellScript "prepare" ''
@ -66,8 +88,6 @@ with builtins; with lib; {
ln -s /init bin/wslpath ln -s /init bin/wslpath
''; '';
}; };
} }
); );
} }

View File

@ -1,9 +1,13 @@
{ lib, pkgs, config, ... }:
with builtins; with lib;
{ {
lib,
pkgs,
config,
...
}:
with builtins;
with lib; {
imports = [ imports = [
(mkRenamedOptionModule [ "wsl" "compatibility" "interopPreserveArgvZero" ] [ "wsl" "interop" "preserveArgvZero" ]) (mkRenamedOptionModule ["wsl" "compatibility" "interopPreserveArgvZero"] ["wsl" "interop" "preserveArgvZero"])
]; ];
options.wsl.interop = with types; { options.wsl.interop = with types; {
@ -32,57 +36,56 @@ with builtins; with lib;
}; };
}; };
config = config = let
let cfg = config.wsl.interop;
cfg = config.wsl.interop; in
in
mkIf config.wsl.enable { mkIf config.wsl.enable {
boot.binfmt.registrations = mkIf cfg.register { boot.binfmt.registrations = mkIf cfg.register {
WSLInterop = WSLInterop = let
let compat = cfg.preserveArgvZero;
compat = cfg.preserveArgvZero;
# WSL Preview 0.58 and up registers the /init binfmt interp for Windows executable # WSL Preview 0.58 and up registers the /init binfmt interp for Windows executable
# with the "preserve argv[0]" flag, so if you run `./foo.exe`, the interp gets invoked # with the "preserve argv[0]" flag, so if you run `./foo.exe`, the interp gets invoked
# as `/init foo.exe ./foo.exe`. # as `/init foo.exe ./foo.exe`.
# argv[0] --^ ^-- actual path # argv[0] --^ ^-- actual path
# #
# Older versions expect to be called without the argv[0] bit, simply as `/init ./foo.exe`. # Older versions expect to be called without the argv[0] bit, simply as `/init ./foo.exe`.
# #
# We detect that by running `/init /known-not-existing-path.exe` and checking the exit code: # We detect that by running `/init /known-not-existing-path.exe` and checking the exit code:
# the new style interp expects at least two arguments, so exits with exit code 1, # the new style interp expects at least two arguments, so exits with exit code 1,
# presumably meaning "parsing error"; the old style interp attempts to actually run # presumably meaning "parsing error"; the old style interp attempts to actually run
# the executable, fails to find it, and exits with 255. # the executable, fails to find it, and exits with 255.
compatWrapper = pkgs.writeShellScript "nixos-wsl-binfmt-hack" '' compatWrapper = pkgs.writeShellScript "nixos-wsl-binfmt-hack" ''
/init /nixos-wsl-does-not-exist.exe /init /nixos-wsl-does-not-exist.exe
[ $? -eq 255 ] && shift [ $? -eq 255 ] && shift
exec /init "$@" exec /init "$@"
''; '';
# use the autodetect hack if unset, otherwise call /init directly # use the autodetect hack if unset, otherwise call /init directly
interpreter = if compat == null then compatWrapper else "/init"; interpreter =
if compat == null
then compatWrapper
else "/init";
# enable for the wrapper and autodetect hack # enable for the wrapper and autodetect hack
preserveArgvZero = if compat == false then false else true; preserveArgvZero =
in if compat == false
{ then false
magicOrExtension = "MZ"; else true;
fixBinary = true; in {
wrapInterpreterInShell = false; magicOrExtension = "MZ";
inherit interpreter preserveArgvZero; fixBinary = true;
}; wrapInterpreterInShell = false;
inherit interpreter preserveArgvZero;
};
}; };
# Include Windows %PATH% in Linux $PATH. # Include Windows %PATH% in Linux $PATH.
environment.extraInit = mkIf cfg.includePath ''PATH="$PATH:$WSLPATH"''; environment.extraInit = mkIf cfg.includePath ''PATH="$PATH:$WSLPATH"'';
warnings = warnings = let
let registrations = config.boot.binfmt.registrations;
registrations = config.boot.binfmt.registrations; in
in
optional (!(registrations ? WSLInterop) && (length (attrNames config.boot.binfmt.registrations)) != 0) "Having any binfmt registrations without re-registering WSLInterop (wsl.interop.register) will break running .exe files from WSL2"; optional (!(registrations ? WSLInterop) && (length (attrNames config.boot.binfmt.registrations)) != 0) "Having any binfmt registrations without re-registering WSLInterop (wsl.interop.register) will break running .exe files from WSL2";
}; };
} }

View File

@ -1,42 +1,46 @@
{ lib, pkgs, config, ... }:
with builtins; with lib;
{ {
options.wsl = with types; lib,
let pkgs,
coercedToStr = coercedTo (oneOf [ bool path int ]) (toString) str; config,
in ...
{ }:
enable = mkEnableOption "support for running NixOS as a WSL distribution"; with builtins;
automountPath = mkOption { with lib; {
type = str; options.wsl = with types; let
default = "/mnt"; coercedToStr = coercedTo (oneOf [bool path int]) toString str;
description = "The path where windows drives are mounted (e.g. /mnt/c)"; in {
}; enable = mkEnableOption "support for running NixOS as a WSL distribution";
automountOptions = mkOption { automountPath = mkOption {
type = str; type = str;
default = "metadata,uid=1000,gid=100"; default = "/mnt";
description = "Options to use when mounting windows drives"; description = "The path where windows drives are mounted (e.g. /mnt/c)";
};
defaultUser = mkOption {
type = str;
default = "nixos";
description = "The name of the default user";
};
startMenuLaunchers = mkEnableOption "shortcuts for GUI applications in the windows start menu";
wslConf = mkOption {
type = attrsOf (attrsOf (oneOf [ string int bool ]));
description = "Entries that are added to /etc/wsl.conf";
};
}; };
automountOptions = mkOption {
type = str;
default = "metadata,uid=1000,gid=100";
description = "Options to use when mounting windows drives";
};
defaultUser = mkOption {
type = str;
default = "nixos";
description = "The name of the default user";
};
startMenuLaunchers = mkEnableOption "shortcuts for GUI applications in the windows start menu";
wslConf = mkOption {
type = attrsOf (attrsOf (oneOf [string int bool]));
description = "Entries that are added to /etc/wsl.conf";
};
};
config = config = let
let cfg = config.wsl;
cfg = config.wsl; syschdemd = import ../syschdemd.nix {
syschdemd = import ../syschdemd.nix { inherit lib pkgs config; inherit (cfg) automountPath defaultUser; defaultUserHome = config.users.users.${cfg.defaultUser}.home; }; inherit lib pkgs config;
in inherit (cfg) automountPath defaultUser;
defaultUserHome = config.users.users.${cfg.defaultUser}.home;
};
in
mkIf cfg.enable { mkIf cfg.enable {
wsl.wslConf = { wsl.wslConf = {
automount = { automount = {
enabled = true; enabled = true;
@ -57,9 +61,8 @@ with builtins; with lib;
hardware.opengl.enable = true; # Enable GPU acceleration hardware.opengl.enable = true; # Enable GPU acceleration
environment = { environment = {
etc = { etc = {
"wsl.conf".text = generators.toINI { } cfg.wslConf; "wsl.conf".text = generators.toINI {} cfg.wslConf;
# DNS settings are managed by WSL # DNS settings are managed by WSL
hosts.enable = !config.wsl.wslConf.network.generateHosts; hosts.enable = !config.wsl.wslConf.network.generateHosts;
@ -67,7 +70,7 @@ with builtins; with lib;
}; };
systemPackages = [ systemPackages = [
(pkgs.runCommand "wslpath" { } '' (pkgs.runCommand "wslpath" {} ''
mkdir -p $out/bin mkdir -p $out/bin
ln -s /init $out/bin/wslpath ln -s /init $out/bin/wslpath
'') '')
@ -79,13 +82,13 @@ with builtins; with lib;
users.users.${cfg.defaultUser} = { users.users.${cfg.defaultUser} = {
isNormalUser = true; isNormalUser = true;
uid = 1000; uid = 1000;
extraGroups = [ "wheel" ]; # Allow the default user to use sudo extraGroups = ["wheel"]; # Allow the default user to use sudo
}; };
users.users.root = { users.users.root = {
shell = "${syschdemd}/bin/syschdemd"; shell = "${syschdemd}/bin/syschdemd";
# Otherwise WSL fails to login as root with "initgroups failed 5" # Otherwise WSL fails to login as root with "initgroups failed 5"
extraGroups = [ "root" ]; extraGroups = ["root"];
}; };
security.sudo = { security.sudo = {
@ -97,7 +100,7 @@ with builtins; with lib;
system.activationScripts = { system.activationScripts = {
copy-launchers = mkIf cfg.startMenuLaunchers ( copy-launchers = mkIf cfg.startMenuLaunchers (
stringAfter [ ] '' stringAfter [] ''
for x in applications icons; do for x in applications icons; do
echo "Copying /usr/share/$x" echo "Copying /usr/share/$x"
mkdir -p /usr/share/$x mkdir -p /usr/share/$x
@ -105,7 +108,7 @@ with builtins; with lib;
done done
'' ''
); );
populateBin = stringAfter [ ] '' populateBin = stringAfter [] ''
echo "setting up /bin..." echo "setting up /bin..."
ln -sf /init /bin/wslpath ln -sf /init /bin/wslpath
ln -sf ${pkgs.bashInteractive}/bin/bash /bin/sh ln -sf ${pkgs.bashInteractive}/bin/bash /bin/sh
@ -134,6 +137,6 @@ with builtins; with lib;
enableEmergencyMode = false; enableEmergencyMode = false;
}; };
warnings = (optional (config.systemd.services.systemd-resolved.enable && config.wsl.wslConf.network.generateResolvConf) "systemd-resolved is enabled, but resolv.conf is managed by WSL"); warnings = optional (config.systemd.services.systemd-resolved.enable && config.wsl.wslConf.network.generateResolvConf) "systemd-resolved is enabled, but resolv.conf is managed by WSL";
}; };
} }

View File

@ -1,19 +1,19 @@
{ lib {
, pkgs lib,
, config pkgs,
, automountPath config,
, defaultUser automountPath,
, defaultUserHome ? "/home/${defaultUser}" defaultUser,
, ... defaultUserHome ? "/home/${defaultUser}",
...
}: }:
pkgs.substituteAll { pkgs.substituteAll {
name = "syschdemd"; name = "syschdemd";
src = ./syschdemd.sh; src = ./syschdemd.sh;
dir = "bin"; dir = "bin";
isExecutable = true; isExecutable = true;
buildInputs = with pkgs; [ daemonize ]; buildInputs = with pkgs; [daemonize];
inherit defaultUser defaultUserHome; inherit defaultUser defaultUserHome;
inherit (pkgs) daemonize; inherit (pkgs) daemonize;

View File

@ -1,15 +1,19 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = [ ]; config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [];
boot.initrd.availableKernelModules = [ ]; boot.initrd.availableKernelModules = [];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
## NOTE: These filesystems are mounted by a wrapper script from nix-wsl ## NOTE: These filesystems are mounted by a wrapper script from nix-wsl
@ -43,25 +47,22 @@
# fsType = "drvfs"; # fsType = "drvfs";
# }; # };
fileSystems."/mnt/c" = fileSystems."/mnt/c" = {
{ device = "C:";
device = "C:"; fsType = "drvfs";
fsType = "drvfs"; };
};
fileSystems."/mnt/d" = fileSystems."/mnt/d" = {
{ device = "D:";
device = "D:"; fsType = "drvfs";
fsType = "drvfs"; };
};
fileSystems."/mnt/f" = fileSystems."/mnt/f" = {
{ device = "F:";
device = "F:"; fsType = "drvfs";
fsType = "drvfs"; };
};
swapDevices = [ ]; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -1,19 +1,22 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ lib,
(modulesPath + "/installer/scan/not-detected.nix") pkgs,
]; modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
# boot.initrd.kernelModules = [ "amdgpu" ]; # boot.initrd.kernelModules = [ "amdgpu" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-amd" "coretemp" ]; boot.kernelModules = ["kvm-amd" "coretemp"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" =
# Might be wise to use /dev/nvme0p1 instead # Might be wise to use /dev/nvme0p1 instead
@ -29,7 +32,7 @@
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ ]; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -1,17 +1,20 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ lib,
(modulesPath + "/profiles/qemu-guest.nix") pkgs,
]; modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ]; boot.initrd.availableKernelModules = ["virtio_pci" "virtio_scsi" "ahci" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelParams = [ "console=ttyS0,19200n8" ]; boot.kernelParams = ["console=ttyS0,19200n8"];
boot.loader.grub.extraConfig = '' boot.loader.grub.extraConfig = ''
serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1 serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1
terminal_input serial; terminal_input serial;
@ -20,17 +23,15 @@
boot.loader.grub.forceInstall = true; boot.loader.grub.forceInstall = true;
boot.loader.grub.device = "nodev"; boot.loader.grub.device = "nodev";
boot.loader.timeout = 10; boot.loader.timeout = 10;
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/sda";
device = "/dev/sda"; fsType = "ext4";
fsType = "ext4"; };
};
swapDevices = swapDevices = [{device = "/dev/sdb";}];
[{ device = "/dev/sdb"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -1,17 +1,20 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ lib,
(modulesPath + "/profiles/qemu-guest.nix") pkgs,
]; modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ]; boot.initrd.availableKernelModules = ["virtio_pci" "virtio_scsi" "ahci" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelParams = [ "console=ttyS0,19200n8" ]; boot.kernelParams = ["console=ttyS0,19200n8"];
boot.loader.grub.extraConfig = '' boot.loader.grub.extraConfig = ''
serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1 serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1
terminal_input serial; terminal_input serial;
@ -20,17 +23,15 @@
boot.loader.grub.forceInstall = true; boot.loader.grub.forceInstall = true;
boot.loader.grub.device = "nodev"; boot.loader.grub.device = "nodev";
boot.loader.timeout = 10; boot.loader.timeout = 10;
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/sda";
device = "/dev/sda"; fsType = "ext4";
fsType = "ext4"; };
};
swapDevices = swapDevices = [{device = "/dev/sdb";}];
[{ device = "/dev/sdb"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -1,17 +1,20 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ lib,
(modulesPath + "/profiles/qemu-guest.nix") pkgs,
]; modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ]; boot.initrd.availableKernelModules = ["virtio_pci" "virtio_scsi" "ahci" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelParams = [ "console=ttyS0,19200n8" ]; boot.kernelParams = ["console=ttyS0,19200n8"];
boot.loader.grub.extraConfig = '' boot.loader.grub.extraConfig = ''
serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1 serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1
terminal_input serial; terminal_input serial;
@ -20,8 +23,8 @@
boot.loader.grub.forceInstall = true; boot.loader.grub.forceInstall = true;
boot.loader.grub.device = "nodev"; boot.loader.grub.device = "nodev";
boot.loader.timeout = 10; boot.loader.timeout = 10;
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems = { fileSystems = {
"/" = { "/" = {
@ -35,8 +38,7 @@
}; };
}; };
swapDevices = swapDevices = [{device = "/dev/sdb";}];
[{ device = "/dev/sdb"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -1,20 +1,23 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ lib,
(modulesPath + "/profiles/qemu-guest.nix") pkgs,
]; modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ]; boot.initrd.availableKernelModules = ["virtio_pci" "virtio_scsi" "ahci" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
boot.kernelParams = [ "console=ttyS0,19200n8" ]; boot.kernelParams = ["console=ttyS0,19200n8"];
boot.loader.grub.extraConfig = '' boot.loader.grub.extraConfig = ''
serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1 serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1
terminal_input serial; terminal_input serial;
@ -23,14 +26,12 @@
boot.loader.grub.forceInstall = true; boot.loader.grub.forceInstall = true;
boot.loader.grub.device = "nodev"; boot.loader.grub.device = "nodev";
boot.loader.timeout = 10; boot.loader.timeout = 10;
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/sda";
device = "/dev/sda"; fsType = "ext4";
fsType = "ext4"; };
};
swapDevices = swapDevices = [{device = "/dev/sdb";}];
[{ device = "/dev/sdb"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -1,10 +1,7 @@
{ lib, ... }: {lib, ...}:
with lib; let
with lib;
let
nixos-wsl = import ./nixos-wsl; nixos-wsl = import ./nixos-wsl;
in in {
{
imports = [ imports = [
./configuration.nix ./configuration.nix
nixos-wsl.nixosModules.wsl nixos-wsl.nixosModules.wsl
@ -21,9 +18,7 @@ in
# Enable integration with Docker Desktop (needs to be installed) # Enable integration with Docker Desktop (needs to be installed)
docker-desktop.enable = true; docker-desktop.enable = true;
}; };
# users.users.<defaultUser>.uid = 1000; # users.users.<defaultUser>.uid = 1000;
# networking.hostName = "nixos"; # networking.hostName = "nixos";
} }

View File

@ -0,0 +1,11 @@
{
inputs,
cell,
}: let
inherit (inputs) std nixpkgs;
in {
default = std.lib.dev.mkShell {
name = "default";
imports = [inputs.std.std.devshellProfiles.default];
};
}

View File

@ -0,0 +1,24 @@
{
inputs,
cell,
}: let
inherit (inputs.nixpkgs) system;
inherit (inputs.nix-boost.pkgs."${system}".mypkgs) poetry2nix;
inherit (poetry2nix) mkPoetryApplication defaultPoetryOverrides;
in {
kpcli-py = mkPoetryApplication {
projectDir = inputs.kpcli-py;
overrides = defaultPoetryOverrides.extend (self: super: {
# TODO: add this to upstream poetry2nix
tableformatter = super.tableformatter.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or []) ++ [self.setuptools self.cython_3];
src = old.src;
});
kpcli = super.kpcli.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or []) ++ [self.setuptools];
});
});
};
}

View File

@ -0,0 +1,47 @@
# TODO: this should use winnow with a fair matching of supported systems
{
inputs,
cell,
}: let
inherit (cell) home-profiles home-modules;
inherit (inputs) home-manager;
pkgs = inputs.nixpkgs;
# hm is derivation that is compatible with homeConfigurations
home-config = {supported_systems, hm, tested_systems ? []}:
hm // {
_supported_systems = supported_systems;
_tested_systems = tested_systems;
};
base-modules = [
home-profiles.alacritty
# home-profiles.git
home-profiles.ssh
home-profiles.shells
({config.programs.home-manager.enable = true;})
home-profiles.nix-index
home-profiles.neovim
];
in {
homeConfigurations.htran = home-config {
supported_systems = ["aarch64-darwin" "x86_64-darwin"];
tested_systems = ["aarch64-darwin"];
hm = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = base-modules ++ [
home-profiles.nerd_font_module
home-profiles.git-htran
home-profiles.dev-packages
home-profiles.zk
home-modules.darwin-spotlight
({
home.username = "htran";
home.homeDirectory = "/Users/htran";
home.stateVersion = "23.11";
})
];
};
};
}

View File

@ -0,0 +1,250 @@
# This is an interface for home-profiles and should not contain opinionated
# configurations. It should provide alternative configurations, aggregates
# or new configurations
_imports@{ inputs, cell }:
let
namespace = "repo";
imports = _imports // { inherit namespace; };
in
{
git = { config, lib, ... }:
let
cfg = config."${namespace}".git;
baseAliases = {
a = "add";
c = "commit";
ca = "commit --amend";
cm = "commit -m";
lol = "log --graph --decorate --pretty=oneline --abbrev-commit";
lola = "log --graph --decorate --pretty=oneline --abbrev-commit --all";
sts = "status";
co = "checkout";
b = "branch";
};
default-user = "Pegasust";
default-email = "pegasucksgg@gmail.com";
in
{
options."${namespace}".git = {
aliases = lib.mkOption {
type = lib.types.attrs;
default = { };
example = baseAliases;
description = ''
Additional git aliases. This settings comes with base configuration.
Redeclaring the base config will override the values.
''; # TODO: Add baseAliases as string here (builtins.toString doesn't work)
};
name = lib.mkOption {
type = lib.types.str;
default = default-user;
description = "Git username that appears on commits";
example = default-user;
};
email = lib.mkOption {
type = lib.types.str;
default = default-email;
example = default-email;
description = "Git email that appears on commits";
};
ignores = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [
".vscode" # vscode settings
".direnv" # .envrc cached outputs
".DS_Store" # MacOS users, amrite
];
description = ''
.gitignore patterns that are applied in every "${namespace}"sitory.
This is useful for IDE-specific settings.
'';
example = [ ".direnv" "node_modules" ];
};
enable = lib.mkOption {
type = lib.types.bool;
default = true;
description = ''
Enables git
'';
example = false;
};
credentialCacheTimeoutSeconds = lib.mkOption {
type = lib.types.int;
default = 3000;
description = "Credential cache (in-memory store) for Git in seconds.";
example = 3000;
};
};
# TODO : anyway to override configuration?
# idk wtf I was thinking about. there is no context in this question
config.programs.git = {
inherit (cfg) enable ignores;
userName = cfg.name;
userEmail = cfg.email;
aliases = baseAliases // cfg.aliases;
extraConfig = {
# TODO: in the case of darwin, git always open up the built-in keychain.
# possibly something we can't really control since we don't have access to `nix-darwin`
credential.helper = "cache --timeout=${builtins.toString cfg.credentialCacheTimeoutSeconds}";
};
lfs.enable = true;
};
};
alacritty = { config, lib, ... }:
let
inherit (inputs.cells.repo.lib) fromYAML;
cfg = config."${namespace}".alacritty;
in
{
options."${namespace}".alacritty = {
font.family = lib.mkOption {
type = lib.types.nullOr lib.types.singleLineStr;
default = null;
description = ''
The font family for Alacritty
'';
example = "DroidSansMono NF";
};
font.size = lib.mkOption {
type = lib.types.nullOr lib.types.number;
default = 11.0;
description = ''
The default font size for Alacritty. This is probably measured in px.
'';
example = 7.0;
};
enable = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
Enables alacritty
'';
example = true;
};
config-path = lib.mkOption {
type = lib.types.path;
description = "Path to alacritty yaml";
default = null;
example = "./config/alacritty.yaml";
};
};
config.programs.alacritty = {
enable = cfg.enable;
settings =
let
actualConfig =
if cfg.config-path != null then fromYAML (builtins.readFile cfg.config-path) else { };
in
lib.recursiveUpdate actualConfig {
font.normal.family = lib.mkIf (cfg.font.family != null) cfg.font.family;
font.size = lib.mkIf (cfg.font.size != null) cfg.font.size;
};
};
};
# TODO: chromium is not really supported on darwin
private_chromium = { config, pkgs, lib, ... }:
let
cfg = config."${namespace}".private_chromium;
in
{
options."${namespace}".private_chromium = {
enable = lib.mkOption {
type = lib.types.bool;
default = true;
example = false;
description = ''
Enable extremely lightweight chromium with vimium plugin
'';
};
};
config = lib.mkIf (cfg.enable) {
# home.packages = [pkgs.ungoogled-chromium];
programs.chromium = {
enable = true;
package = pkgs.ungoogled-chromium;
extensions =
let
# TODO: how about a chrome extension registry?
mkChromiumExtForVersion = browserVersion: { id, sha256, extVersion, ... }:
{
inherit id;
crxPath = builtins.fetchurl {
url = "https://clients2.google.com/service/update2/crx" +
"?response=redirect" +
"&acceptformat=crx2,crx3" +
"&prodversion=${browserVersion}" +
"&x=id%3D${id}%26installsource%3Dondemand%26uc";
name = "${id}.crx";
inherit sha256;
};
version = extVersion;
};
mkChromiumExt = mkChromiumExtForVersion (lib.versions.major pkgs.ungoogled-chromium.version);
in
[
# vimium
(mkChromiumExt {
id = "dbepggeogbaibhgnhhndojpepiihcmeb";
sha256 = "00qhbs41gx71q026xaflgwzzridfw1sx3i9yah45cyawv8q7ziic";
extVersion = "1.67.4";
})
];
};
};
};
darwin-spotlight = { lib, pkgs, config, ... }: {
# This patch exists since Darwin's search bar requires solid apps and not
# symlinked
# TODO: QA
# - [x] works for base case
# - [x] works for repeated case
# - [ ] works after base case, then removed
# - [ ] works for repeated case, then removed
# Copy GUI apps to "~/Applications/Home Manager Apps"
# Based on this comment: https://github.com/nix-community/home-manager/issues/1341#issuecomment-778820334
home.activation.patch-spotlight =
if pkgs.stdenv.isDarwin then
let
apps = pkgs.buildEnv {
name = "home-manager-applications";
paths = config.home.packages;
pathsToLink = "/Applications";
};
in
lib.hm.dag.entryAfter [ "linkGeneration" ] ''
# Install MacOS applications to the user environment.
HM_APPS="$HOME/Applications/Home Manager Apps"
# Reset current state
if [ -e "$HM_APPS" ]; then
$DRY_RUN_CMD mv "$HM_APPS" "$HM_APPS.$(date +%Y%m%d%H%M%S)"
fi
$DRY_RUN_CMD mkdir -p "$HM_APPS"
# .app dirs need to be actual directories for Finder to detect them as Apps.
# In the env of Apps we build, the .apps are symlinks. We pass all of them as
# arguments to cp and make it dereference those using -H
$DRY_RUN_CMD cp --archive -H --dereference ${apps}/Applications/* "$HM_APPS"
$DRY_RUN_CMD chmod +w -R "$HM_APPS"
''
else
"";
# We need this in case upstream home-manager changes the behavior of linking
# applications
home.activation.remove-patch-spotlight =
if pkgs.stdenv.isDarwin then
lib.hm.dag.entryBefore [ "checkLinkTargets" ] ''
HM_APPS="$HOME/Applications/Home Manager Apps"
# Reset current state
if [ -e "$HM_APPS" ]; then
$DRY_RUN_CMD mv "$HM_APPS" "$HM_APPS.$(date +%Y%m%d%H%M%S)"
fi
''
else
"";
};
}

View File

@ -0,0 +1,47 @@
{
inputs,
cell,
namespace,
}: {
pkgs,
config,
lib,
...
}: let
cfg = config."${namespace}".graphics;
cfgEnable = cfg.enable or (cfg.useNixGL.defaultPackage != null);
types = lib.types;
in {
imports = [./shells.nix];
options."${namespace}".nixgl = {
enable = lib.mkEnableOption "nixgl";
useNixGL = {
package = lib.mkPackageOption pkgs "nixGL package" {
default = [
"nixgl"
"auto"
"nixGLDefault"
];
};
defaultPackage = lib.mkOption {
type = types.nullOr (types.enum ["nixGLIntel" "nixGLNvidia" "nixGLNvidiaBumblebee"]);
description = "Which nixGL package to be aliased as `nixGL` on the shell";
default = null;
example = "nixGLIntel";
};
};
};
# NOTE: importing shells does not mean we're enabling everything, if we do mkDefault false
# but the dilemma is, if the user import BOTH graphics.nix and shells.nix
# they will also need to do `config."${namespace}".shells.enable`
# generally, we want the behavior: import means enable
config = lib.mkIf cfgEnable {
"${namespace}".graphics._enable = lib.mkForce true;
"${namespace}".shells = {
shellAliases = lib.mkIf (cfg.useNixGL.defaultPackage != null) {
nixGL = cfg.useNixGL.defaultPackage;
};
};
home.packages = [cfg.useNixGL.package];
};
}

View File

@ -0,0 +1,200 @@
# This creates a layer that is specific to some profiles, but may require
# some variants in environment like username/email, work-oriented or personal
# and many more
_imports @ {
inputs,
cell,
}: let
# TODO: I don't think abstracting namespace away is a good idea in this case
namespace = "repo";
imports = _imports // {inherit namespace;};
inherit (cell) home-modules;
in {
neovim = import ./neovim.nix imports;
nerd_font_module = {
config,
pkgs,
...
}: {
config.fonts.fontconfig.enable = true;
config.home.packages = [
(pkgs.nerdfonts.override {fonts = ["Hack"];})
];
config."${namespace}".alacritty.font.family = "Hack Nerd Font Mono";
};
secrets = {
age.secrets.s3fs = {
file = "${inputs.self}/secrets/s3fs.age";
# mode = "600"; # owner + group only
# owner = "hungtr";
# group = "users";
};
age.secrets."s3fs.digital-garden" = {
file = "${inputs.self}/secrets/s3fs.digital-garden.age";
};
age.secrets._nhitrl_cred = {
file = "${inputs.self}/secrets/_nhitrl.age";
};
age.secrets."wifi.env" = {
file = "${inputs.self}/secrets/wifi.env.age";
};
};
ssh = {
config,
lib,
...
}: let
cfg = config."${namespace}".ssh;
in {
options."${namespace}".ssh.enable = lib.mkOption {
type = lib.types.bool;
default = true;
example = false;
description = ''
Enables SSH
'';
};
config.programs.ssh = {
inherit (cfg) enable;
forwardAgent = true;
includes = ["${inputs.self}/native_configs/ssh/config"];
};
};
alacritty = {
config,
lib,
...
}: let
cfg = config."${namespace}".alacritty;
in {
imports = [
inputs.cells.repo.home-modules.alacritty
];
config."${namespace}".alacritty = {
enable = true;
config-path = "${inputs.self}//native_configs/alacritty/alacritty.yml";
font.size = 11.0;
font.family = "Hack Nerd Font Mono";
};
};
shells = import ./shells.nix imports;
git = {
config,
pkgs,
lib,
...
}: let
baseAliases = {
a = "add";
c = "commit";
ca = "commit --amend";
cm = "commit -m";
lol = "log --graph --decorate --pretty=oneline --abbrev-commit";
lola = "log --graph --decorate --pretty=oneline --abbrev-commit --all";
sts = "status";
co = "checkout";
b = "branch";
};
cfg = config."${namespace}".profile.git;
in {
imports = [
home-modules.git
];
options."${namespace}".profile.git = {
aliases = lib.mkOption {
type = lib.types.attrs;
default = {};
example = baseAliases;
description = ''
Additional git aliases. This config is merged on top of base aliases.
'';
};
name = lib.mkOption {
type = lib.types.str;
default = "Pegasust";
description = "Git username that appears on commits";
example = "Pegasust";
};
email = lib.mkOption {
type = lib.types.str;
default = "pegasucksgg@gmail.com";
example = "peagsucksgg@gmail.com";
description = "Git email that appears on commits";
};
ignores = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [
".vscode" # vscode settings
".direnv" # .envrc cached outputs
".DS_Store" # MacOS users, amrite
];
description = ''
.gitignore patterns that are applied in every repository.
This is useful for IDE-specific or environment-specific settings.
'';
example = [".direnv" "node_modules"];
};
};
# WARNING: This should be completed wtf
config."${namespace}".git = {
inherit (cfg) name email ignores aliases;
enable = true;
};
};
git-htran = {
imports = [inputs.cells.repo.home-profiles.git];
config."${namespace}".profile.git = {
name = "htran";
email = "htran@egihosting.com";
};
};
git-pegasust = {
imports = [inputs.cells.repo.home-profiles.git];
config."${namespace}".profile.git = {
email = "pegasucksgg@gmail.com";
name = "pegasust";
};
};
dev-packages = let pkgs = inputs.nixpkgs; in {
programs.jq.enable = true;
home.packages = [
pkgs.htop
pkgs.ripgrep
pkgs.unzip
pkgs.zip
pkgs.yq-go
pkgs.mosh
pkgs.python310
];
};
# Local nixpkgs search and fallback if command not found to search from nixpkgs
nix-index = {
imports = [
inputs.nix-index-database.hmModules.nix-index
];
config.programs.nix-index = {
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
};
};
# digital garden stack
zk = {
config.xdg.configFile."zk/config.toml".source = "${inputs.self}/native_configs/zk/config.toml";
# NB: this is done with lib.mkMerge
config.home.packages = [
inputs.nixpkgs.zk
];
};
}

View File

@ -0,0 +1,178 @@
# TODO: vim-plug and Mason supports laziness. Probably worth it to explore incremental dependencies based on the project TODO: just install these things, then symlink to mason's bin directory
#
# One thing to consider, though, /nix/store of `nix-shell` or `nix-develop`
# might be different from `home-manager`'s (~/.nix_profile/bin/jq)
{
inputs,
cell,
namespace,
}: {
pkgs,
lib,
config,
...
}: let
# NOTE: Add packages to nvim_pkgs instead, so that it's available at userspace
# and is added to the path after wrapping.
# check: nix repl `homeConfigurations.hungtr.config.programs.neovim.finalPackage.buildCommand`
# see: :/--suffix.*PATH
# there should be mentions of additional packages
my_neovim = pkgs.neovim-unwrapped;
inherit (inputs.nixpkgs) system;
nvim_pkgs =
[
# pkgs.gccStdenv
pkgs.tree-sitter
pkgs.fzf # file name fuzzy search
pkgs.ripgrep # content fuzzy search
pkgs.zk # Zettelkasten (limited support)
pkgs.fd # Required by a Telescope plugin (?)
pkgs.stdenv.cc.cc.lib
pkgs.nil # oxalica's better nix language server
inputs.nix-boost.packages."${system}".rust4cargo
pkgs.nickel
pkgs.nls
pkgs.go # doesn't work, Mason installs from runtime path
# Language-specific stuffs
pkgs.sumneko-lua-language-server
# pkgs.python3Packages.python-lsp-server
pkgs.nodePackages.pyright
pkgs.python3Packages.pylint
pkgs.python3Packages.flake8
# FIXME: installing ansible from here just doesn't work :/
# pkgs.ansible-lint
# pkgs.python38Packages.ansible
# pkgs.ansible-language-server
# TODO: the devShell should provide rust-analyzer so that
# cargo test builds binaries compatible with rust-analyzer
# pkgs.rust-analyzer
# rust_pkgs
# pkgs.evcxr # Rust REPL for Conjure!
]
++ lib.optionals (pkgs.stdenv.isDarwin) (
let
inherit (pkgs.darwin.apple_sdk.frameworks) System CoreFoundation;
in [
System
CoreFoundation
]
);
in {
options.base.neovim = {
enable = lib.mkOption {
default = true;
description = "enable personalized neovim as default editor";
type = lib.types.bool;
example = false;
};
};
config = lib.mkIf config.base.neovim.enable {
# home-manager
programs.neovim = {
enable = true;
package = my_neovim;
viAlias = true;
vimAlias = true;
withPython3 = true;
withNodeJs = true;
# NOTE: this adds path to the wrapped version of neovim
extraPackages = nvim_pkgs;
extraLuaConfig = builtins.readFile "${inputs.self}/native_configs/neovim/init.lua";
plugins = let
inherit
(inputs.nixpkgs-latest.legacyPackages.${system}.vimPlugins)
plenary-nvim
nvim-treesitter
nvim-treesitter-textobjects
nvim-treesitter-context
telescope-fzf-native-nvim
telescope-file-browser-nvim
telescope-nvim
nvim-lspconfig
gruvbox-community
neodev-nvim
cmp-nvim-lsp
cmp-path
cmp-buffer
cmp-cmdline
nvim-cmp
lspkind-nvim
nvim-autopairs
nvim-ts-autotag
guess-indent-nvim
harpoon
zk-nvim
luasnip
fidget-nvim
rust-tools-nvim
cmp_luasnip
gitsigns-nvim
indent-blankline-nvim
lualine-nvim
mason-lspconfig-nvim
mason-nvim
neogit
nlua-nvim
nvim-jqx
nvim-surround
nvim-web-devicons
playground
todo-comments-nvim
trouble-nvim
vim-dispatch
vim-dispatch-neovim
vim-fugitive
vim-jack-in
;
in [
plenary-nvim
nvim-treesitter.withAllGrammars
nvim-treesitter-textobjects
telescope-fzf-native-nvim
telescope-file-browser-nvim
telescope-nvim
nvim-lspconfig
gruvbox-community
neodev-nvim
cmp-nvim-lsp
cmp-path
cmp-buffer
cmp-cmdline
nvim-cmp
lspkind-nvim
nvim-autopairs
nvim-ts-autotag
guess-indent-nvim
harpoon
zk-nvim
luasnip
nvim-treesitter-context
fidget-nvim
rust-tools-nvim
cmp_luasnip
gitsigns-nvim
indent-blankline-nvim
lualine-nvim
mason-lspconfig-nvim
mason-nvim
neogit
nlua-nvim
nvim-jqx
nvim-surround
nvim-web-devicons
playground
todo-comments-nvim
trouble-nvim
vim-dispatch
vim-dispatch-neovim
vim-fugitive
vim-jack-in
];
};
# home.packages = nvim_pkgs;
};
}

View File

@ -0,0 +1,133 @@
{
inputs,
cell,
namespace,
}: {
config,
lib,
pkgs,
...
}: let
cfg = config."${namespace}".shells;
in {
options."${namespace}".shells = {
enable = lib.mkOption {
type = lib.types.bool;
description = "Enable umbrella shell configuration";
default = true;
example = false;
};
shellInitExtra = lib.mkOption {
type = lib.types.str;
description = "Extra shell init. The syntax should be sh-compliant";
default = "";
example = ''
# X11 support for WSL
export DISPLAY=$(ip route list default | awk '{print $3}'):0
export LIBGL_ALWAYS_INDIRECT=1
'';
};
shellAliases = lib.mkOption {
type = lib.types.attrs;
description = "Shell command aliases";
default = {};
example = {
nixGL = "nixGLIntel";
};
};
};
config = lib.mkIf cfg.enable {
# nix: Propagates the environment with packages and vars when enter (children of)
# a directory with shell.nix-compatible and .envrc
programs.direnv = {
enable = true;
nix-direnv.enable = true;
# nix-direnv.enableFlakes = true; # must remove. this will always be supported.
};
# z <path> as smarter cd
programs.zoxide = {
enable = true;
enableZshIntegration = true;
};
programs.tmux = {
enable = true;
plugins = let inherit (pkgs.tmuxPlugins) cpu net-speed; in [cpu net-speed];
extraConfig = builtins.readFile "${inputs.self}/native_configs/tmux/tmux.conf";
};
xdg.configFile."tmux/tmux.conf".text = lib.mkOrder 600 ''
set -g status-right '#{cpu_bg_color} CPU: #{cpu_icon} #{cpu_percentage} | %a %h-%d %H:%M '
'';
# Colored ls
programs.exa = {
enable = true;
enableAliases = true;
};
# Make the shell look beautiful
programs.starship = {
enable = true;
enableZshIntegration = true;
settings = let
native = builtins.fromTOML (builtins.readFile "${inputs.self}/native_configs/starship/starship.toml");
patch-nix = pkgs.lib.recursiveUpdate native {
# WARNING: home-manager fails on here for some reason. Likely not at the
# validation phase (type-checking), but at evaluation phaase (stringify)
# I'm thinking when `settings` are evaluated, it has some sort of
# recursive processing before it gets turned into a toml
# c.commands = [
# ["nix" "run" "nixpkgs#clang" "--" "--version"]
# ["nix" "run" "nixpkgs#gcc" "--" "--version"]
# ];
c.disabled = true;
};
in
patch-nix;
};
# Fuzzy finder. `fzf` for TUI, `fzf -f '<fuzzy query>'` for UNIX piping
programs.fzf.enable = true;
programs.bash = {
enable = true;
enableCompletion = true;
initExtra = cfg.shellInitExtra or "";
};
programs.zsh = {
enable = true;
enableCompletion = true;
enableAutosuggestions = true;
shellAliases =
{
nix-rebuild = "sudo nixos-rebuild switch";
hm-switch = "home-manager switch --flake";
}
// (cfg.shellAliases or {});
history = {
size = 10000;
path = "${config.xdg.dataHome}/zsh/history";
};
oh-my-zsh = {
enable = true;
plugins = [
"git" # git command aliases: https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/git#aliases
"command-not-found" # suggests which package to install; does not support nixos (we have solution already)
"gitignore" # `gi list` -> `gi java >>.gitignore`
"ripgrep" # adds completion for `rg`
"rust" # compe for rustc/cargo
"poetry" # compe for poetry - Python's cargo
];
};
sessionVariables = {
# Vim mode on the terminal
# VI_MODE_RESET_PROMPT_ON_MODE_CHANGE = true;
# VI_MODE_SET_CURSOR = true;
# ZVM_VI_ESCAPE_BINDKEY = "";
ZVM_READKEY_ENGINE = "$ZVM_READKEY_ENGINE_NEX";
ZVM_KEYTIMEOUT = 0.004; # 40ms, or subtly around 25 FPS. I'm a gamer :)
ZVM_ESCAPE_KEYTIMEOUT = 0.004; # 40ms, or subtly around 25 FPS. I'm a gamer :)
};
initExtra =
(cfg.shellInitExtra or "")
+ ''
source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
'';
};
};
}

View File

@ -0,0 +1,16 @@
{ inputs, cell }:
let
namespace = "repo"; # ignore: unused
yamlToJsonDrv = pkgs: yamlContent: outputPath: (pkgs.runCommand
outputPath
{ inherit yamlContent; nativeBuildInputs = [ pkgs.yq ]; }
# run yq which outputs '.' (no filter) on file at yamlPath
# note that $out is passed onto the bash/sh script for execution
''
echo "$yamlContent" | yq >$out
'');
in
{
fromYAML = yamlContent: builtins.fromJSON (builtins.readFile (yamlToJsonDrv inputs.nixpkgs yamlContent "fromYaml.json"));
}

View File

@ -0,0 +1,6 @@
{
inputs,
cell,
}: {
inherit (inputs.cells.dotfiles.packages) kpcli-py;
}

View File

@ -0,0 +1,7 @@
{
inputs,
cell,
}: {
htran = inputs.cells.dotfiles.devshells.default;
hungtran = inputs.cells.dotfiles.devshells.default;
}

View File

@ -4,182 +4,265 @@
# calls the flake's 'outputs' function. It then returns an attrset # calls the flake's 'outputs' function. It then returns an attrset
# containing 'defaultNix' (to be used in 'default.nix'), 'shellNix' # containing 'defaultNix' (to be used in 'default.nix'), 'shellNix'
# (to be used in 'shell.nix'). # (to be used in 'shell.nix').
{
{ src, system ? builtins.currentSystem or "unknown-system" }: src,
system ? builtins.currentSystem or "unknown-system",
let }: let
lockFilePath = src + "/flake.lock"; lockFilePath = src + "/flake.lock";
lockFile = builtins.fromJSON (builtins.readFile lockFilePath); lockFile = builtins.fromJSON (builtins.readFile lockFilePath);
fetchTree = fetchTree = info:
info: if info.type == "github"
if info.type == "github" then then {
{ outPath = outPath =
fetchTarball fetchTarball
({ url = "https://api.${info.host or "github.com"}/repos/${info.owner}/${info.repo}/tarball/${info.rev}"; } (
// (if info ? narHash then { sha256 = info.narHash; } else {}) {url = "https://api.${info.host or "github.com"}/repos/${info.owner}/${info.repo}/tarball/${info.rev}";}
); // (
rev = info.rev; if info ? narHash
shortRev = builtins.substring 0 7 info.rev; then {sha256 = info.narHash;}
else {}
)
);
rev = info.rev;
shortRev = builtins.substring 0 7 info.rev;
lastModified = info.lastModified;
lastModifiedDate = formatSecondsSinceEpoch info.lastModified;
narHash = info.narHash;
}
else if info.type == "git"
then
{
outPath =
builtins.fetchGit
(
{url = info.url;}
// (
if info ? rev
then {inherit (info) rev;}
else {}
)
// (
if info ? ref
then {inherit (info) ref;}
else {}
)
// (
if info ? submodules
then {inherit (info) submodules;}
else {}
)
);
lastModified = info.lastModified; lastModified = info.lastModified;
lastModifiedDate = formatSecondsSinceEpoch info.lastModified; lastModifiedDate = formatSecondsSinceEpoch info.lastModified;
narHash = info.narHash; narHash = info.narHash;
} }
else if info.type == "git" then // (
{ outPath = if info ? rev
builtins.fetchGit then {
({ url = info.url; } rev = info.rev;
// (if info ? rev then { inherit (info) rev; } else {}) shortRev = builtins.substring 0 7 info.rev;
// (if info ? ref then { inherit (info) ref; } else {}) }
// (if info ? submodules then { inherit (info) submodules; } else {}) else {}
); )
lastModified = info.lastModified; else if info.type == "path"
lastModifiedDate = formatSecondsSinceEpoch info.lastModified; then {
narHash = info.narHash; outPath = builtins.path {
} // (if info ? rev then { path =
rev = info.rev; if builtins.substring 0 1 info.path != "/"
shortRev = builtins.substring 0 7 info.rev; then src + ("/" + info.path) # make this absolute path by prepending ./
} else {
})
else if info.type == "path" then
{ outPath = builtins.path {
path = if builtins.substring 0 1 info.path != "/"
then src + ("/" + info.path) # make this absolute path by prepending ./
else info.path; # it's already an absolute path else info.path; # it's already an absolute path
}; };
narHash = info.narHash; narHash = info.narHash;
} }
else if info.type == "tarball" then else if info.type == "tarball"
{ outPath = then {
fetchTarball outPath =
({ inherit (info) url; } fetchTarball
// (if info ? narHash then { sha256 = info.narHash; } else {}) (
); {inherit (info) url;}
} // (
else if info.type == "gitlab" then if info ? narHash
{ inherit (info) rev narHash lastModified; then {sha256 = info.narHash;}
outPath = else {}
fetchTarball )
({ url = "https://${info.host or "gitlab.com"}/api/v4/projects/${info.owner}%2F${info.repo}/repository/archive.tar.gz?sha=${info.rev}"; } );
// (if info ? narHash then { sha256 = info.narHash; } else {}) }
); else if info.type == "gitlab"
shortRev = builtins.substring 0 7 info.rev; then {
} inherit (info) rev narHash lastModified;
outPath =
fetchTarball
(
{url = "https://${info.host or "gitlab.com"}/api/v4/projects/${info.owner}%2F${info.repo}/repository/archive.tar.gz?sha=${info.rev}";}
// (
if info ? narHash
then {sha256 = info.narHash;}
else {}
)
);
shortRev = builtins.substring 0 7 info.rev;
}
else else
# FIXME: add Mercurial, tarball inputs. # FIXME: add Mercurial, tarball inputs.
throw "flake input has unsupported input type '${info.type}'"; throw "flake input has unsupported input type '${info.type}'";
callFlake4 = flakeSrc: locks: callFlake4 = flakeSrc: locks: let
let flake = import (flakeSrc + "/flake.nix");
flake = import (flakeSrc + "/flake.nix");
inputs = builtins.mapAttrs (n: v: inputs =
builtins.mapAttrs
(n: v:
if v.flake or true if v.flake or true
then callFlake4 (fetchTree (v.locked // v.info)) v.inputs then callFlake4 (fetchTree (v.locked // v.info)) v.inputs
else fetchTree (v.locked // v.info)) locks; else fetchTree (v.locked // v.info))
locks;
outputs = flakeSrc // (flake.outputs (inputs // {self = outputs;})); outputs = flakeSrc // (flake.outputs (inputs // {self = outputs;}));
in in
assert flake.edition == 201909; assert flake.edition == 201909; outputs;
outputs;
callLocklessFlake = flakeSrc: callLocklessFlake = flakeSrc: let
let flake = import (flakeSrc + "/flake.nix");
flake = import (flakeSrc + "/flake.nix"); outputs = flakeSrc // (flake.outputs {self = outputs;});
outputs = flakeSrc // (flake.outputs ({ self = outputs; })); in
in outputs; outputs;
rootSrc = let rootSrc = let
# Try to clean the source tree by using fetchGit, if this source # Try to clean the source tree by using fetchGit, if this source
# tree is a valid git repository. # tree is a valid git repository.
tryFetchGit = src: tryFetchGit = src:
if isGit && !isShallow if isGit && !isShallow
then then let
let res = builtins.fetchGit src; res = builtins.fetchGit src;
in if res.rev == "0000000000000000000000000000000000000000" then removeAttrs res ["rev" "shortRev"] else res in
else { outPath = src; }; if res.rev == "0000000000000000000000000000000000000000"
then removeAttrs res ["rev" "shortRev"]
else res
else {outPath = src;};
# NB git worktrees have a file for .git, so we don't check the type of .git # NB git worktrees have a file for .git, so we don't check the type of .git
isGit = builtins.pathExists (src + "/.git"); isGit = builtins.pathExists (src + "/.git");
isShallow = builtins.pathExists (src + "/.git/shallow"); isShallow = builtins.pathExists (src + "/.git/shallow");
in in
{ lastModified = 0; lastModifiedDate = formatSecondsSinceEpoch 0; } {
// (if src ? outPath then src else tryFetchGit src); lastModified = 0;
lastModifiedDate = formatSecondsSinceEpoch 0;
}
// (
if src ? outPath
then src
else tryFetchGit src
);
# Format number of seconds in the Unix epoch as %Y%m%d%H%M%S. # Format number of seconds in the Unix epoch as %Y%m%d%H%M%S.
formatSecondsSinceEpoch = t: formatSecondsSinceEpoch = t: let
let rem = x: y: x - x / y * y;
rem = x: y: x - x / y * y; days = t / 86400;
days = t / 86400; secondsInDay = rem t 86400;
secondsInDay = rem t 86400; hours = secondsInDay / 3600;
hours = secondsInDay / 3600; minutes = (rem secondsInDay 3600) / 60;
minutes = (rem secondsInDay 3600) / 60; seconds = rem t 60;
seconds = rem t 60;
# Courtesy of https://stackoverflow.com/a/32158604. # Courtesy of https://stackoverflow.com/a/32158604.
z = days + 719468; z = days + 719468;
era = (if z >= 0 then z else z - 146096) / 146097; era =
doe = z - era * 146097; (
yoe = (doe - doe / 1460 + doe / 36524 - doe / 146096) / 365; if z >= 0
y = yoe + era * 400; then z
doy = doe - (365 * yoe + yoe / 4 - yoe / 100); else z - 146096
mp = (5 * doy + 2) / 153; )
d = doy - (153 * mp + 2) / 5 + 1; / 146097;
m = mp + (if mp < 10 then 3 else -9); doe = z - era * 146097;
y' = y + (if m <= 2 then 1 else 0); yoe = (doe - doe / 1460 + doe / 36524 - doe / 146096) / 365;
y = yoe + era * 400;
doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
mp = (5 * doy + 2) / 153;
d = doy - (153 * mp + 2) / 5 + 1;
m =
mp
+ (
if mp < 10
then 3
else -9
);
y' =
y
+ (
if m <= 2
then 1
else 0
);
pad = s: if builtins.stringLength s < 2 then "0" + s else s; pad = s:
in "${toString y'}${pad (toString m)}${pad (toString d)}${pad (toString hours)}${pad (toString minutes)}${pad (toString seconds)}"; if builtins.stringLength s < 2
then "0" + s
else s;
in "${toString y'}${pad (toString m)}${pad (toString d)}${pad (toString hours)}${pad (toString minutes)}${pad (toString seconds)}";
allNodes = allNodes =
builtins.mapAttrs builtins.mapAttrs
(key: node: (
let key: node: let
sourceInfo = sourceInfo =
if key == lockFile.root if key == lockFile.root
then rootSrc then rootSrc
else fetchTree (node.info or {} // removeAttrs node.locked ["dir"]); else fetchTree (node.info or {} // removeAttrs node.locked ["dir"]);
subdir = if key == lockFile.root then "" else node.locked.dir or ""; subdir =
if key == lockFile.root
then ""
else node.locked.dir or "";
flake = import (sourceInfo + (if subdir != "" then "/" else "") + subdir + "/flake.nix"); flake = import (sourceInfo
+ (
if subdir != ""
then "/"
else ""
)
+ subdir
+ "/flake.nix");
inputs = builtins.mapAttrs inputs =
(inputName: inputSpec: allNodes.${resolveInput inputSpec}) builtins.mapAttrs
(node.inputs or {}); (inputName: inputSpec: allNodes.${resolveInput inputSpec})
(node.inputs or {});
# Resolve a input spec into a node name. An input spec is # Resolve a input spec into a node name. An input spec is
# either a node name, or a 'follows' path from the root # either a node name, or a 'follows' path from the root
# node. # node.
resolveInput = inputSpec: resolveInput = inputSpec:
if builtins.isList inputSpec if builtins.isList inputSpec
then getInputByPath lockFile.root inputSpec then getInputByPath lockFile.root inputSpec
else inputSpec; else inputSpec;
# Follow an input path (e.g. ["dwarffs" "nixpkgs"]) from the # Follow an input path (e.g. ["dwarffs" "nixpkgs"]) from the
# root node, returning the final node. # root node, returning the final node.
getInputByPath = nodeName: path: getInputByPath = nodeName: path:
if path == [] if path == []
then nodeName then nodeName
else
getInputByPath
# Since this could be a 'follows' input, call resolveInput.
(resolveInput lockFile.nodes.${nodeName}.inputs.${builtins.head path})
(builtins.tail path);
outputs = flake.outputs (inputs // { self = result; });
result = outputs // sourceInfo // { inherit inputs; inherit outputs; inherit sourceInfo; };
in
if node.flake or true then
assert builtins.isFunction flake.outputs;
result
else else
sourceInfo getInputByPath
) # Since this could be a 'follows' input, call resolveInput.
lockFile.nodes; (resolveInput lockFile.nodes.${nodeName}.inputs.${builtins.head path})
(builtins.tail path);
outputs = flake.outputs (inputs // {self = result;});
result =
outputs
// sourceInfo
// {
inherit inputs;
inherit outputs;
inherit sourceInfo;
};
in
if node.flake or true
then assert builtins.isFunction flake.outputs; result
else sourceInfo
)
lockFile.nodes;
result = result =
if !(builtins.pathExists lockFilePath) if !(builtins.pathExists lockFilePath)
@ -189,16 +272,30 @@ let
else if lockFile.version >= 5 && lockFile.version <= 7 else if lockFile.version >= 5 && lockFile.version <= 7
then allNodes.${lockFile.root} then allNodes.${lockFile.root}
else throw "lock file '${lockFilePath}' has unsupported version ${toString lockFile.version}"; else throw "lock file '${lockFilePath}' has unsupported version ${toString lockFile.version}";
in rec {
defaultNix =
(builtins.removeAttrs result ["__functor"])
// (
if result ? defaultPackage.${system}
then {default = result.defaultPackage.${system};}
else {}
)
// (
if result ? packages.${system}.default
then {default = result.packages.${system}.default;}
else {}
);
in shellNix =
rec { defaultNix
defaultNix = // (
(builtins.removeAttrs result ["__functor"]) if result ? devShell.${system}
// (if result ? defaultPackage.${system} then { default = result.defaultPackage.${system}; } else {}) then {default = result.devShell.${system};}
// (if result ? packages.${system}.default then { default = result.packages.${system}.default; } else {}); else {}
)
shellNix = // (
defaultNix if result ? devShells.${system}.default
// (if result ? devShell.${system} then { default = result.devShell.${system}; } else {}) then {default = result.devShells.${system}.default;}
// (if result ? devShells.${system}.default then { default = result.devShells.${system}.default; } else {}); else {}
} );
}

View File

@ -1,25 +1,25 @@
let let
pkgs = import ./nixpkgs.nix { config = { allowUnfree = true; }; }; pkgs = import ./nixpkgs.nix {config = {allowUnfree = true;};};
pure = pkgs.recurseIntoAttrs (pkgs.callPackage ./nixGL.nix { pure = pkgs.recurseIntoAttrs (pkgs.callPackage ./nixGL.nix {
nvidiaVersion = "440.82"; nvidiaVersion = "440.82";
nvidiaHash = "edd415acf2f75a659e0f3b4f27c1fab770cf21614e84a18152d94f0d004a758e"; nvidiaHash = "edd415acf2f75a659e0f3b4f27c1fab770cf21614e84a18152d94f0d004a758e";
}); });
versionFile440 = (pkgs.callPackage ./nixGL.nix { versionFile440 = pkgs.callPackage ./nixGL.nix {
nvidiaVersionFile = pkgs.writeText "nvidia-version-440.82" '' nvidiaVersionFile = pkgs.writeText "nvidia-version-440.82" ''
NVRM version: NVIDIA UNIX x86_64 Kernel Module 440.82 Wed Apr 1 20:04:33 UTC 2020 NVRM version: NVIDIA UNIX x86_64 Kernel Module 440.82 Wed Apr 1 20:04:33 UTC 2020
GCC version: gcc version 9.3.0 (Arch Linux 9.3.0-1) GCC version: gcc version 9.3.0 (Arch Linux 9.3.0-1)
''; '';
}); };
versionFile510 = (pkgs.callPackage ./nixGL.nix { versionFile510 = pkgs.callPackage ./nixGL.nix {
nvidiaVersionFile = pkgs.writeText "nvidia-version-510.54" '' nvidiaVersionFile = pkgs.writeText "nvidia-version-510.54" ''
NVRM version: NVIDIA UNIX x86_64 Kernel Module 510.54 Wed Apr 1 20:04:33 UTC 2020 NVRM version: NVIDIA UNIX x86_64 Kernel Module 510.54 Wed Apr 1 20:04:33 UTC 2020
GCC version: gcc version 9.3.0 (Arch Linux 9.3.0-1) GCC version: gcc version 9.3.0 (Arch Linux 9.3.0-1)
''; '';
}); };
in in
(with pure; [ nixGLIntel nixVulkanNvidia nixGLNvidia nixVulkanIntel ]) (with pure; [nixGLIntel nixVulkanNvidia nixGLNvidia nixVulkanIntel])
++ (with versionFile440.auto; [ nixGLNvidia nixGLDefault nixVulkanNvidia ]) ++ (with versionFile440.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia])
++ (with versionFile510.auto; [ nixGLNvidia nixGLDefault nixVulkanNvidia ]) ++ (with versionFile510.auto; [nixGLNvidia nixGLDefault nixVulkanNvidia])

View File

@ -1,36 +1,41 @@
{ {
## Nvidia informations. ## Nvidia informations.
# Version of the system kernel module. Let it to null to enable auto-detection. # Version of the system kernel module. Let it to null to enable auto-detection.
nvidiaVersion ? null nvidiaVersion ? null,
, # Hash of the Nvidia driver .run file. null is fine, but fixing a value here # Hash of the Nvidia driver .run file. null is fine, but fixing a value here
# will be more reproducible and more efficient. # will be more reproducible and more efficient.
nvidiaHash ? null nvidiaHash ? null,
, # Alternatively, you can pass a path that points to a nvidia version file # Alternatively, you can pass a path that points to a nvidia version file
# and let nixGL extract the version from it. That file must be a copy of # and let nixGL extract the version from it. That file must be a copy of
# /proc/driver/nvidia/version. Nix doesn't like zero-sized files (see # /proc/driver/nvidia/version. Nix doesn't like zero-sized files (see
# https://github.com/NixOS/nix/issues/3539 ). # https://github.com/NixOS/nix/issues/3539 ).
nvidiaVersionFile ? null nvidiaVersionFile ? null,
, # Enable 32 bits driver # Enable 32 bits driver
# This is on by default, you can switch it to off if you want to reduce a # This is on by default, you can switch it to off if you want to reduce a
# bit the size of nixGL closure. # bit the size of nixGL closure.
enable32bits ? true enable32bits ? true,
, # Make sure to enable config.allowUnfree to the instance of nixpkgs to be # Make sure to enable config.allowUnfree to the instance of nixpkgs to be
# able to access the nvidia drivers. # able to access the nvidia drivers.
pkgs ? import <nixpkgs> { pkgs ?
config = { allowUnfree = true; }; import <nixpkgs> {
} config = {allowUnfree = true;};
, # Enable all Intel specific extensions which only works on x86_64 },
enableIntelX86Extensions ? true # Enable all Intel specific extensions which only works on x86_64
enableIntelX86Extensions ? true,
}: }:
pkgs.callPackage ./nixGL.nix ({ pkgs.callPackage ./nixGL.nix ({
inherit inherit
nvidiaVersion nvidiaVersion
nvidiaVersionFile nvidiaVersionFile
nvidiaHash nvidiaHash
enable32bits enable32bits
; ;
} // (if enableIntelX86Extensions then { } }
else { // (
intel-media-driver = null; if enableIntelX86Extensions
vaapiIntel = null; then {}
})) else {
intel-media-driver = null;
vaapiIntel = null;
}
))

View File

@ -1,65 +1,81 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import urllib3 # execution: fetch.py >nvidia_versions.json
import http.client
import json import json
import sys
http = urllib3.PoolManager() NV_FREE_X86_URL = "download.nvidia.com"
dl_dir = http.request("GET", "https://download.nvidia.com/XFree86/Linux-x86_64/") POTENTIAL_SHA256_EXTS = [".sha256sum", ".sha256"]
RIGHT_PAD = " " * 20
# print(f"{dl_dir.status=}\n{dl_dir.data=}") conn = http.client.HTTPSConnection(NV_FREE_X86_URL)
conn.request("GET", "/XFree86/Linux-x86_64/")
response = conn.getresponse()
dir_html = response.read()
assert (dl_dir.status < 400), "Error probably occurred" assert (response.status < 400), "Error occurred fetching for source from"
def find_versions(dir_html: bytes) -> list[str]: def scrape_driver_versions(dir_html: bytes):
# this algorithm obviously need recursion because we need to discover the items # The idea is to recursively follows all interesting `src` from `<a href={src}>`
def _rec(dir_html: bytes, start: int = 0, so_far: list[str] = []) -> list[str]: def _rec(dir_html: bytes, href_url_start: int = 0, so_far: list[str] = []) -> list[str]:
MATCH_START = b"<span class=\'dir\'><a href=\'" MATCH_START = b"<span class=\'dir\'><a href=\'"
potential_start = dir_html.find(MATCH_START, start) href_url_start = dir_html.find(MATCH_START, href_url_start)
if potential_start == -1: if href_url_start == -1: # EOF
return so_far return so_far
# check that it starts with a number
potential_version_start = potential_start + len(MATCH_START) # version href should start with a number
potential_version_start = href_url_start + len(MATCH_START)
p = potential_version_start p = potential_version_start
if not (dir_html[p: p+1].decode().isnumeric()): if not (dir_html[p: p+1].decode().isnumeric()):
return _rec(dir_html, potential_version_start, so_far) return _rec(dir_html, potential_version_start, so_far)
# this thing matches, add to so_far and continue
version_end = dir_html.find(b"/", potential_version_start) version_end = dir_html.find(b"/", potential_version_start)
assert version_end != -1, "There should be matching /" assert version_end != -1, "Should have end-signaling /"
so_far.append(dir_html[potential_version_start:version_end].decode()) so_far.append(dir_html[potential_version_start:version_end].decode())
return _rec(dir_html, version_end, so_far) return _rec(dir_html, version_end, so_far)
return _rec(dir_html, 0, [])
versions = find_versions(dl_dir.data) versions = _rec(dir_html, 0, [])
# print("\n".join(versions)) num_versions = len(versions)
for i, version in enumerate(versions):
print(f"[{i+1}/{num_versions}] Processing version {version}{RIGHT_PAD}", end="\r", file=sys.stderr)
yield version
print()
download_urls = lambda ver: [f"https://download.nvidia.com/XFree86/Linux-x86_64/{ver}/NVIDIA-Linux-x86_64-{ver}.run"] versions = scrape_driver_versions(dir_html)
sha256_urls = lambda ver: [f"{url}{dl_ext}" for dl_ext in [".sha256sum", ".sha256"] for url in download_urls(ver)]
def req_monad(url: str, err_fn, then_fn):
res = http.request("GET", url)
if res.status >= 400:
return err_fn(res.status)
return then_fn(res.data)
identity = lambda e: e download_urls_of = lambda ver: [f"/XFree86/Linux-x86_64/{ver}/NVIDIA-Linux-x86_64-{ver}.run"]
none_id = lambda _: None sha256_urls_of = lambda ver: [
f"{url}{dl_ext}"
for dl_ext in POTENTIAL_SHA256_EXTS
for url in download_urls_of(ver)
]
def get_sha256(version: str) -> str | None: def sha256_of(version: str) -> str | None:
for url in sha256_urls(version): if int(version.split(".")[0]) < 256:
res = http.request("GET", url) # Has 3 different packages that we should probably not bother
# print(f"attempting: {url}") return None
if res.status < 400: for url in sha256_urls_of(version):
return res.data.decode().split()[0] conn = http.client.HTTPSConnection(NV_FREE_X86_URL)
conn.request("GET", url)
response = conn.getresponse()
if response.status < 400:
return response.read().decode().split()[0]
print(f"No sha256 for {version}{RIGHT_PAD}", file=sys.stderr)
return None return None
fetch_data = [(v, download_urls(v)[0], get_sha256(v)) for v in versions]
fetch_data.append(("latest", *fetch_data[-1][1:]))
# print(fetch_data) def fetch(version: str):
dl_url = download_urls_of(version)[0]
sha256 = sha256_of(version)
return (version, dl_url, sha256)
fetch_data = [fetch(v) for v in versions]
fetch_data.append(("latest", *fetch_data[-1][1:]))
# now print the JSON object # now print the JSON object
print(json.dumps({ print(json.dumps({
version: { version: {
"url": dl_url, "url": f"https://{NV_FREE_X86_URL}{dl_url}",
"sha256": sha256 "sha256": sha256
} for (version, dl_url, sha256) in fetch_data if sha256 is not None}, indent=4)) } for (version, dl_url, sha256) in fetch_data if sha256 is not None}, indent=4))
# execution: fetch.py >nvidia_versions.json

Some files were not shown because too many files have changed in this diff Show More