Compare commits

...

86 commits

Author SHA1 Message Date
Benjamin Bädorf 40b78924a5
Initial work on wlstreamer 2022-01-12 17:29:57 +01:00
Benjamin Bädorf 115f41466b
Merge branch 'main' into b12f 2022-01-06 14:14:57 +01:00
Benjamin Bädorf 87e48217d0
Merge branch 'main' into b12f 2022-01-06 14:14:13 +01:00
Benjamin Bädorf bcb5fd2d67
Share keyboard and mouse via looking glass client 2022-01-04 13:41:32 +01:00
Benjamin Bädorf 8b71991dba
Update chocolatebar screen configuration 2022-01-04 13:40:59 +01:00
Benjamin Bädorf 923f41e700
Fix merge issue 2022-01-04 13:40:39 +01:00
Benjamin Bädorf 0ec6d23551
Add hp scanner driver module 2022-01-04 13:40:03 +01:00
Benjamin Bädorf 21edcdf915
Create looking glass client wrapper 2022-01-04 13:38:20 +01:00
Benjamin Bädorf 1b760a2c9e Merge remote-tracking branch 'origin/main' into b12f 2021-12-13 00:27:18 +00:00
Benjamin Bädorf 4057c68bb7
Merge branch 'b12f' of git.b12f.io:pub-solar/os into b12f 2021-12-11 21:09:28 +01:00
Benjamin Bädorf f53c21f3e0
Update chocolatebar VMs; make USB handover optional, enable looking glass 2021-12-11 21:09:22 +01:00
Benjamin Bädorf 15c0412080
Add looking glass for VMs, switch from scream-ivshmem to qemu-pulse 2021-12-11 21:08:20 +01:00
Benjamin Bädorf a934ef4a21 Merge remote-tracking branch 'origin/main' into b12f 2021-12-03 00:27:11 +00:00
Benjamin Bädorf 7069fb2a62
Cleanup nvim config, add instant.nvim 2021-12-02 12:19:37 +01:00
Benjamin Bädorf 0b61f2808e Merge remote-tracking branch 'origin/main' into b12f 2021-12-01 00:27:16 +00:00
Benjamin Bädorf f9156a4976
Fix build 2021-11-29 19:09:49 +01:00
Benjamin Bädorf 65620a8bfc
Merge branch 'main' into b12f 2021-11-29 19:08:32 +01:00
Benjamin Bädorf 6e2c227969
Merge branch 'main' into b12f 2021-11-29 17:25:30 +01:00
Benjamin Bädorf 5c46477e44
Add obs 2021-11-18 20:12:24 +01:00
Benjamin Bädorf 43d421bcac
Update user description 2021-11-17 19:12:41 +01:00
Benjamin Bädorf 59f441e425
Change user description for ben 2021-11-17 12:05:59 +01:00
Benjamin Bädorf cfe5d77f9e
Allow changing the user description 2021-11-17 12:05:50 +01:00
Benjamin Bädorf 6c9ab61065
Use fixed telegram-desktop from unstable 2021-11-15 11:39:24 +01:00
Benjamin Bädorf fbdd35283e
Fix java session variable 2021-11-15 11:37:56 +01:00
Benjamin Bädorf decf354138 Merge remote-tracking branch 'origin/main' into b12f 2021-11-08 00:07:14 +00:00
Benjamin Bädorf 7cb8b30fe4
Merge branch 'main' into b12f 2021-11-05 23:49:38 +01:00
Benjamin Bädorf 79517658b3
Update vm rom location 2021-11-02 16:45:05 +01:00
Benjamin Bädorf 61e87ee30b
Merge branch 'b12f' of git.b12f.io:pub-solar/os into b12f 2021-11-01 10:11:14 +01:00
Benjamin Bädorf 3dc7ffd3a4
Update email signature for OP 2021-11-01 10:11:07 +01:00
Benjamin Bädorf 64e1a4583f
Add ssh hosts 2021-10-31 01:06:50 +02:00
Benjamin Bädorf 097d89d2b2
Remove git crypt form biolimo 2021-10-29 20:21:13 +02:00
Benjamin Bädorf 5a18a7c3c1
Merge branch 'main' into b12f 2021-10-29 18:47:33 +02:00
Benjamin Bädorf 5a6ec0d6ff Merge remote-tracking branch 'origin/main' into b12f 2021-10-27 00:07:29 +00:00
Benjamin Bädorf 2724982a4f Merge remote-tracking branch 'origin/main' into b12f 2021-10-26 00:07:47 +00:00
Benjamin Bädorf bcd191b291
Don't scale laptop screen, sway + firefox is broken then 2021-10-25 23:10:18 +02:00
Benjamin Bädorf 0015849858 Merge remote-tracking branch 'origin/main' into b12f 2021-10-25 00:07:45 +00:00
Benjamin Bädorf d064b27393
Fix build 2021-10-24 23:42:13 +02:00
teutat3s 8a848a789b
overrides: try out docker-compose v2, xdg-desktop-portal from latest 2021-10-24 23:36:57 +02:00
Benjamin Bädorf ab19dea908
Fix mopidy ownership 2021-10-24 17:30:24 +02:00
Benjamin Bädorf 415223a778
Move biolimo to systemd-boot 2021-10-24 17:30:15 +02:00
Benjamin Bädorf 067ce16246
Remove git crypt
Start move to /boot kernel mount
x-os: prepare booting from unencrypted /boot partition
Move to systemd-boot
Remove all unencrypted secrets
2021-10-24 17:13:16 +02:00
Benjamin Bädorf 132042220e
Double encrypt ?? 2021-10-23 14:49:36 +02:00
Benjamin Bädorf a44b506724
Merge branch 'b12f' of git.b12f.io:pub-solar/os into b12f 2021-10-23 13:24:28 +02:00
Benjamin Bädorf 87a9d94d0a
secrets via agenix 2021-10-23 13:24:22 +02:00
Benjamin Bädorf 4c3ddff217
Add 1 git-crypt collaborator
New collaborators:

	13CD656C Benjamin Bädorf (gitea) <gitea@benjaminbaedorf.eu>
2021-10-22 12:30:39 +02:00
Benjamin Bädorf cd5e19b10e
Fix byb@miom.space 2021-10-21 23:51:25 +02:00
Benjamin Bädorf 7569a75e65
Add byb@miom.space, update signature 2021-10-21 22:21:05 +02:00
Benjamin Bädorf 814f567fd7
Merge branch 'main' into b12f 2021-10-21 19:48:35 +02:00
Benjamin Bädorf 298f50ba95
Merge branch 'main' into b12f 2021-10-21 19:25:59 +02:00
Benjamin Bädorf 231abe6af4
Merge branch 'main' into b12f 2021-10-13 19:27:04 +02:00
Benjamin Bädorf 3cec4a51f2
Add mobile profile to ben user 2021-09-27 14:52:21 +02:00
Benjamin Bädorf 6dce415552
Add android mobile option 2021-09-27 14:52:13 +02:00
Benjamin Bädorf 6039a73b04 Merge remote-tracking branch 'origin/master' into b12f 2021-09-22 00:22:37 +00:00
Benjamin Bädorf 2e6fe672d2
Fix direnv cache 2021-09-21 22:21:29 +02:00
Benjamin Bädorf af4b2fb8f1
Fix missing element desktop 2021-09-14 10:51:19 +02:00
drone 23137a0764 Merge remote-tracking branch 'origin/master' into b12f 2021-09-11 00:22:09 +00:00
drone 73e7571487 Merge remote-tracking branch 'origin/master' into b12f 2021-09-09 00:22:05 +00:00
teutat3s 761b671549 b12f-to-master (#16)
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/16
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
2021-09-08 22:00:03 +00:00
Benjamin Bädorf 3dcc90fc24
feat(chocolatebar): enable virtualisation 2021-09-05 22:18:08 +02:00
Benjamin Bädorf e29ad5c23f
Enable the gaming suit for b12f 2021-09-05 00:47:56 +02:00
Benjamin Bädorf 9009fa4a52
Merge branch 'b12f-master' into b12f 2021-09-04 16:00:32 +02:00
Benjamin Bädorf f89384cbf0
Works for chocolatebar 2021-09-04 15:56:44 +02:00
teutat3s 12fafd7f97
docker-compose fix? 2021-09-02 21:17:19 +02:00
teutat3s 34ca8aadb9
fix biolimo host? 2021-09-02 20:55:17 +02:00
Benjamin Bädorf d132638c8e
Fix flake lock imports 2021-09-02 20:00:22 +02:00
Benjamin Bädorf 2293e703cc
Fix suites 2021-09-02 19:16:05 +02:00
teutat3s 3f4d3cf240
Merge branch 'b12f' into b12f-master 2021-09-01 19:12:50 +02:00
Benjamin Bädorf 72d089797b Merge remote-tracking branch 'origin/core' into b12f 2021-07-24 00:25:02 +00:00
Benjamin Bädorf 6025d489ac
New vim 2021-07-14 18:59:27 +02:00
drone 05836bcdf4 Merge remote-tracking branch 'origin/core' into b12f 2021-07-14 00:24:51 +00:00
teutat3s 99597d1b30
Merge branch 'core' into b12f 2021-07-13 18:45:59 +02:00
teutat3s f7901d94e8
Merge branch 'core' into b12f 2021-07-07 19:53:22 +02:00
Benjamin Bädorf 3cfbaba8e5
Add nodejs to home packages 2021-06-28 17:53:06 +02:00
Benjamin Bädorf 63750e6536
Add mdxjs support for nvim 2021-06-28 17:52:55 +02:00
Benjamin Bädorf 6280a04af5
Merge branch 'core' into b12f 2021-06-15 01:33:46 +02:00
Benjamin Bädorf a9e025c4f9
fix: Make chocolatebar work with the new config 2021-06-14 23:23:30 +02:00
Benjamin Bädorf 17a2833a89
feat: Add tea gitea cli 2021-06-14 21:03:41 +02:00
Benjamin Bädorf bf28a630c9
Merge branch 'core' into b12f 2021-06-14 19:50:35 +02:00
Benjamin Bädorf 83333fa0d6
Merge branch 'b12f' of git.b12f.io:pub-solar/os into b12f 2021-06-14 19:49:32 +02:00
Benjamin Bädorf e437f7fca6
Merge branch 'core' into b12f 2021-06-14 19:45:03 +02:00
Benjamin Bädorf fc23fbc05b
Merge upstream 2021-06-09 18:46:29 +02:00
Benjamin Bädorf 8d5db4dfb2
Add chocolatebar 2021-06-01 10:55:02 +02:00
Benjamin Bädorf 9d1991d6b8
Move fonts into separate flake 2021-05-31 19:57:17 +02:00
Benjamin Bädorf a577bd7333
Encrypt futura 2021-05-30 22:35:18 +02:00
Benjamin Bädorf bc76999a00
Add Futura 2021-05-30 22:01:17 +02:00
Benjamin Bädorf 91c8e77d25
Initial b12f commit 2021-05-30 21:33:09 +02:00
58 changed files with 1367 additions and 102 deletions

View file

@ -24,6 +24,14 @@ charset = unset
indent_style = unset
indent_size = unset
[*.rom]
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
charset = unset
indent_style = unset
indent_size = unset
[*.py]
indent_size = 4

4
.gitignore vendored
View file

@ -7,7 +7,7 @@ vm
iso
doi
pkgs/_sources/.shake*
# PubSolarOS
tags
/owners
pkgs/_sources/.shake*

View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1637793790,
"narHash": "sha256-oPXavjxETEWGXq8g7kQHyRLKUmLX2yPtGn+t3V0mrTY=",
"lastModified": 1640802000,
"narHash": "sha256-ZiI94Zv/IgW64fqKrtVaQqfUCkn9STvAjgfFmvtqcQ8=",
"owner": "ryantm",
"repo": "agenix",
"rev": "f85eea0e29fa9a8924571d0e398215e175f80d55",
"rev": "c5558c88b2941bf94886dfdede6926b1ba5f5629",
"type": "github"
},
"original": {
@ -20,13 +20,31 @@
"type": "github"
}
},
"b12f-nix-fonts": {
"inputs": {
"nixpkgs": [
"latest"
]
},
"locked": {
"lastModified": 1622501268,
"narHash": "sha256-wITrQEsJ5zWEl9yGUUPOUUpBN08Sva7MaB7uwYHmX7s=",
"ref": "main",
"rev": "51f94ad589c096e7fbb6a1f58f3b07037ef035bd",
"revCount": 4,
"type": "git",
"url": "https://git.b12f.io/b12f/nix-fonts"
},
"original": {
"ref": "main",
"type": "git",
"url": "https://git.b12f.io/b12f/nix-fonts"
}
},
"beautysh": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"bud",
"nixpkgs"
],
"nixpkgs": "nixpkgs",
"poetry2nix": "poetry2nix"
},
"locked": {
@ -90,11 +108,11 @@
]
},
"locked": {
"lastModified": 1634994402,
"narHash": "sha256-xmlCVVOYGpZoxgOqsDOVF0B0ASrnbNGVAEzID9qh2xo=",
"lastModified": 1641152326,
"narHash": "sha256-yQXzXrjrilGzBjC+2kZVPZRgBPSdCLovSLmJ7Na7EDo=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "44da835ac40dab5fd231298b59d83487382d2fab",
"rev": "15635ae63878b83598a18ae421e8c819b691dc55",
"type": "github"
},
"original": {
@ -113,11 +131,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1637357482,
"narHash": "sha256-mMRxOlcQs3V9cZYsKGKWEjl+oqclhaH1SKT3QGeTQ0Q=",
"lastModified": 1639771334,
"narHash": "sha256-4hgZmsCPaL5QlcEijHmzaYYrEwHtUFqraCUrCqLGJOo=",
"owner": "input-output-hk",
"repo": "deploy-rs",
"rev": "5a6db26726ec8c7904aea5bcdf13589342386f9d",
"rev": "7267eab9139ca4476fd8ed49e2e8652bba4c037f",
"type": "github"
},
"original": {
@ -148,7 +166,7 @@
"deploy"
],
"devshell": "devshell",
"flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_2",
"flake-utils-plus": "flake-utils-plus",
"home-manager": [
"home"
@ -163,11 +181,11 @@
]
},
"locked": {
"lastModified": 1640031018,
"narHash": "sha256-ZzyS803XuCl99XE4581m0Suni+q1Hz+Mpw6A9bs7VKM=",
"lastModified": 1641238104,
"narHash": "sha256-L+a+YEQ8DpX94qv/8/AhRRC+J7PcIdqWfH1i4Dd2gZI=",
"owner": "divnix",
"repo": "digga",
"rev": "3157889810e51a1ae03f82bf6bf6657ba8cf93c6",
"rev": "feeddc0a1bce63ec73938e390ee0971f6b39462b",
"type": "github"
},
"original": {
@ -182,11 +200,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1637303083,
"narHash": "sha256-e2A5JBjxYNpjoGd53K0oVUUaS9ojwOT5rnThyPNS46M=",
"lastModified": 1639117493,
"narHash": "sha256-67H9uXUdauaqMfkcKzpgHR3GeOKPAwOs6G3C1VpT67o=",
"owner": "nix-community",
"repo": "fenix",
"rev": "8294ceadbbbe1a886640bfcc15f5a02a2b471955",
"rev": "94b5686cad2ed210da106b0b7e1e212dab43fbf2",
"type": "github"
},
"original": {
@ -244,7 +262,7 @@
},
"flake-utils-plus": {
"inputs": {
"flake-utils": "flake-utils_4"
"flake-utils": "flake-utils_3"
},
"locked": {
"lastModified": 1638994888,
@ -307,11 +325,11 @@
},
"flake-utils_5": {
"locked": {
"lastModified": 1631561581,
"narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github"
},
"original": {
@ -327,11 +345,11 @@
]
},
"locked": {
"lastModified": 1637917557,
"narHash": "sha256-3u5bLyGn5NUG3RJA7/v1Bqa/QCFGqp/01Bh/4REf9m4=",
"lastModified": 1639871969,
"narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "4daff26495ca9ac67476cba8cf15c3e36d91ab18",
"rev": "697cc8c68ed6a606296efbbe9614c32537078756",
"type": "github"
},
"original": {
@ -359,11 +377,11 @@
},
"latest_2": {
"locked": {
"lastModified": 1638198142,
"narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
"lastModified": 1641230035,
"narHash": "sha256-hFyqihERaTbLxCOlugy/rpp22VLtLh8SPRnA2uu3F/8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8a308775674e178495767df90c419425474582a1",
"rev": "78cd22c1b8604de423546cd49bfe264b786eca13",
"type": "github"
},
"original": {
@ -380,11 +398,11 @@
]
},
"locked": {
"lastModified": 1638203339,
"narHash": "sha256-Sz3iCvbWrVWOD/XfYQeRJgP/7MVYL3/VKsNXvDeWBFc=",
"lastModified": 1639947939,
"narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=",
"owner": "nmattia",
"repo": "naersk",
"rev": "c3e56b8a4ffb6d906cdfcfee034581f9a8ece571",
"rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653",
"type": "github"
},
"original": {
@ -393,32 +411,17 @@
"type": "github"
}
},
"nixlib": {
"locked": {
"lastModified": 1640478849,
"narHash": "sha256-S4lNc3fb9UpYgVtTa/mZZXphq7+xGy74YGIlOWB1ceE=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "c85a293f7d094a799dcf1197c31925bc44e94d6b",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nix-dram": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs"
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1628492639,
"narHash": "sha256-ffF/oEhLs/stAsXXobruKHyH9jnMC2rt/SM3ASrs2U8=",
"lastModified": 1639388919,
"narHash": "sha256-SdeGx7cPVj5WhQ08jcOwIoZkW8o3CAam5C04RNimmIw=",
"owner": "dramforever",
"repo": "nix-dram",
"rev": "fba426108ea6bdeb1e362bac9da06cbd33726f41",
"rev": "abab5fab1a63675aac85bffb5c1567e3837ccaeb",
"type": "github"
},
"original": {
@ -427,13 +430,28 @@
"type": "github"
}
},
"nixlib": {
"locked": {
"lastModified": 1641083655,
"narHash": "sha256-S4lNc3fb9UpYgVtTa/mZZXphq7+xGy74YGIlOWB1ceE=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "a07deba0302ca942aca4440a43efb3b4bbba2baf",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixos": {
"locked": {
"lastModified": 1638231428,
"narHash": "sha256-Sm5loBKdeusSvIAC+LtzRT6I7tAcqZdIPnHcxZt7NaE=",
"lastModified": 1641441041,
"narHash": "sha256-HNRsnurIzLqLyy5U1Ev+hv5OCNlEjNAjOst5x4vpic0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "393c5357a0071d51668bcdc69dfc25ddacbd5840",
"rev": "d3179446efde6bc6f5b01f18438b9131fe8f1741",
"type": "github"
},
"original": {
@ -464,11 +482,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1638182287,
"narHash": "sha256-vBzf+hbTJz2ZdXV/DWirl6wOO7tjdqzTIU+0FANt65U=",
"lastModified": 1640686209,
"narHash": "sha256-6glXUlKRDhEhNuYx6r3fXU6KH2/Vq9mJZjB9oUpwrmc=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "6b3f79de09c3de7c91ab51e55e87879f61b6faec",
"rev": "46df95ca81e7e4cf3458cdb4b7d1714b5fce9da5",
"type": "github"
},
"original": {
@ -479,26 +497,27 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1640831728,
"narHash": "sha256-KK5SKqqfAt+ev3bHLrVXJ6i4zx9YQW6k19oUInY8T2M=",
"lastModified": 1641233575,
"narHash": "sha256-7RQLnIAIEpqv2hv8C2tHGit07hF2RQ4beyzHacJ/i4I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5d90841dd0179430db010dfc2c58b2a7de4371be",
"rev": "a19ed837728332d183ed641edb310d1b6a50f55d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1636976544,
"narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=",
"lastModified": 1638986258,
"narHash": "sha256-OceRdctKZRSgqQxVRvvNB0MaEnFMzQqjUffecoDE9eI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6",
"rev": "581d2d6c9cd5c289002203581d8aa0861963a933",
"type": "github"
},
"original": {
@ -510,11 +529,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1640418986,
"narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
"lastModified": 1641463613,
"narHash": "sha256-xZN9igqdZvnhSeTx8OlGby/OaYQHwgXVrBrPW0gLEh8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
"rev": "77fda7f672726e1a95c8cd200f27bccfc86c870b",
"type": "github"
},
"original": {
@ -524,14 +543,29 @@
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1639347265,
"narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1638231901,
"narHash": "sha256-XzuvFTmsXULdWynQWzgaPHikepNhjEpK4o5WXfmRqek=",
"owner": "nix-community",
"repo": "NUR",
"rev": "4e68fb3d8f48e91196deb13f44bcfb421da25afb",
"type": "github"
"lastModified": 1626378135,
"narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=",
"path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source",
"rev": "00c2ec8f0bbdf0cfb2135bde55fbae5d6b64aa6d",
"type": "path"
},
"original": {
"id": "nur",
@ -547,11 +581,11 @@
]
},
"locked": {
"lastModified": 1634524567,
"narHash": "sha256-v9ZTZj1WNQaaVfs1P1mUPuh518mmwpqszj1EjdeGUmc=",
"lastModified": 1641071623,
"narHash": "sha256-jxquDPaIJPub49c1UK96LHlFTzSCXCJ6Mv5fpeGtD90=",
"owner": "berberman",
"repo": "nvfetcher",
"rev": "807513f4bbd0e3b5863f4c3b91f8ac846ed6da9b",
"rev": "8aedc71c67960945bc18fb1077e7bdcd9046f1ee",
"type": "github"
},
"original": {
@ -562,8 +596,16 @@
},
"poetry2nix": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs"
"flake-utils": [
"bud",
"beautysh",
"flake-utils"
],
"nixpkgs": [
"bud",
"beautysh",
"nixpkgs"
]
},
"locked": {
"lastModified": 1625240517,
@ -582,6 +624,7 @@
"root": {
"inputs": {
"agenix": "agenix",
"b12f-nix-fonts": "b12f-nix-fonts",
"bud": "bud",
"darwin": "darwin",
"deploy": "deploy",
@ -590,10 +633,6 @@
"latest": "latest_2",
"naersk": "naersk",
"nix-dram": "nix-dram",
"nixlib": [
"digga",
"nixlib"
],
"nixos": "nixos",
"nixos-hardware": "nixos-hardware",
"nur": "nur",
@ -603,11 +642,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1637268320,
"narHash": "sha256-lxB1r+7cmZisiGLx0tZ2LaC6X/EcQTbRIWZfnLIIgs4=",
"lastModified": 1639071661,
"narHash": "sha256-4YySLORuK0qGGIEJj78S7CZ4jy4GIHJ5ks17k5AWblo=",
"owner": "rust-analyzer",
"repo": "rust-analyzer",
"rev": "f0da9406bcbde1bc727242b481d8de825e84f59a",
"rev": "2534b7db1a093543d5bd759b3a1ca9e34418fa31",
"type": "github"
},
"original": {

View file

@ -42,6 +42,10 @@
# PubSolarOS additions
nix-dram.url = "github:dramforever/nix-dram";
# b12f additions
b12f-nix-fonts.url = "git+https://git.b12f.io/b12f/nix-fonts?ref=main";
b12f-nix-fonts.inputs.nixpkgs.follows = "latest";
};
outputs =
@ -56,6 +60,7 @@
, nvfetcher
, deploy
, nix-dram
, b12f-nix-fonts
, ...
} @ inputs:
digga.lib.mkFlake
@ -72,6 +77,7 @@
agenix.overlay
nvfetcher.overlay
nix-dram.overlay
b12f-nix-fonts.overlay
./pkgs/default.nix
];
};
@ -116,7 +122,10 @@
suites = with profiles; rec {
base = [ core users.nixos users.root ];
pubsolaros = [ core base-user users.root ];
anonymous = [ pubsolaros users.nixos ];
anonymous = pubsolaros ++ [ users.nixos ];
b12f = pubsolaros ++ [ users.ben gaming mobile ];
biolimo = b12f ++ [ graphical ];
chocolatebar = b12f ++ [ graphical virtualisation ];
};
};
};
@ -127,11 +136,12 @@
importables = rec {
profiles = digga.lib.rakeLeaves ./users/profiles;
suites = with profiles; rec {
base = [ direnv git ];
base = [ direnv ];
};
};
users = {
nixos = { suites, ... }: { imports = suites.base; };
ben = { suites, ... }: { imports = suites.base; };
}; # digga.lib.importers.rakeLeaves ./users/hm;
};

View file

@ -0,0 +1,6 @@
# Autostart applications
#
# Example:
# exec swayidle
exec keepassxc

View file

@ -0,0 +1,19 @@
# Touchpad controls
#bindsym XF86TouchpadToggle exec $HOME/Workspace/ben/toggletouchpad.sh # toggle touchpad
# Screen brightness controls
bindsym XF86MonBrightnessUp exec "brightnessctl -d intel_backlight set +10%; notify-send $(brightnessctl -d intel_backlight i | awk '/Current/ {print $4}')"
bindsym XF86MonBrightnessDown exec "brightnessctl -d intel_backlight set 10%-; notify-send $(brightnessctl -d intel_backlight i | awk '/Current/ { print $4}')"
# Keyboard backlight brightness controls
bindsym XF86KbdBrightnessDown exec "brightnessctl -d smc::kbd_backlight set 10%-; notify-send $(brightnessctl -d smc::kbd_backlight i | awk '/Current/ { print $4}')"
bindsym XF86KbdBrightnessUp exec "brightnessctl -d smc::kbd_backlight set +10%; notify-send $(brightnessctl -d smc::kbd_backlight i | awk '/Current/ { print $4}')"
# Pulse Audio controls
bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 && notify-send 'Vol. up' #increase sound volume
bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 && notify-send 'Vol. down' #decrease sound volume
bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle && notify-send 'Mute sound' # mute sound
# Media player controls
bindsym XF86AudioPlay exec "playerctl play-pause; notify-send 'Play/Pause'"
bindsym XF86AudioNext exec "playerctl next; notify-send 'Next'"
bindsym XF86AudioPrev exec "playerctl previous; notify-send 'Prev.'"

View file

@ -0,0 +1,9 @@
input "1739:0:Synaptics_TM3288-011" {
dwt enabled
tap enabled
middle_emulation enabled
}
input * {
xkb_layout us(intl),de
xkb_options ctrl:nocaps
}

View file

@ -0,0 +1,21 @@
set $internal eDP-1
set $middle "Hewlett Packard HP E231 3CQ4290S5J"
set $standup "Hewlett Packard HP E231 3CQ4251F33"
output $internal {
scale 1
pos 0 500
}
output $middle {
scale 1
# 1969 is the 1.3 scaled width of the internal monitor
pos 1969 0
}
output $standup {
scale 1
transform 270
pos 3889 0
}

24
hosts/biolimo/biolimo.nix Normal file
View file

@ -0,0 +1,24 @@
{ config, pkgs, lib, ... }:
with lib;
let
psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
in
{
imports = [
./configuration.nix
];
config = {
hardware.cpu.intel.updateMicrocode = true;
networking.firewall.allowedTCPPorts = [ 5000 ];
home-manager.users."${psCfg.user.name}".xdg.configFile = mkIf psCfg.sway.enable {
"sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf;
"sway/config.d/10-autostart.conf".source = ./.config/sway/config.d/autostart.conf;
"sway/config.d/10-input-defaults.conf".source = ./.config/sway/config.d/input-defaults.conf;
"sway/config.d/10-custom-keybindings.conf".source = ./.config/sway/config.d/custom-keybindings.conf;
};
};
}

View file

@ -0,0 +1,26 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }:
{
imports =
[
# Include the results of the hardware scan.
./hardware-configuration.nix
];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# 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.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "20.09"; # Did you read the comment?
}

View file

@ -0,0 +1,6 @@
{ suites, ... }:
{
imports = [
./biolimo.nix
] ++ suites.biolimo;
}

View file

@ -0,0 +1,36 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{
device = "/dev/disk/by-uuid/abc3fe04-368e-46eb-8c7a-3a829bb2deab";
fsType = "ext4";
};
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/aed21f8d-8e15-4f43-8710-460cb36d488b";
fileSystems."/boot" =
{
device = "/dev/disk/by-uuid/3B67-0CAB";
fsType = "vfat";
};
swapDevices = [ ];
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
# high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true;
}

View file

@ -0,0 +1,6 @@
# Autostart applications
#
# Example:
# exec swayidle
exec keepassxc

View file

@ -0,0 +1,19 @@
# Touchpad controls
#bindsym XF86TouchpadToggle exec $HOME/Workspace/ben/toggletouchpad.sh # toggle touchpad
# Screen brightness controls
bindsym XF86MonBrightnessUp exec "brightnessctl -d intel_backlight set +10%; notify-send $(brightnessctl -d intel_backlight i | awk '/Current/ {print $4}')"
bindsym XF86MonBrightnessDown exec "brightnessctl -d intel_backlight set 10%-; notify-send $(brightnessctl -d intel_backlight i | awk '/Current/ { print $4}')"
# Keyboard backlight brightness controls
bindsym XF86KbdBrightnessDown exec "brightnessctl -d smc::kbd_backlight set 10%-; notify-send $(brightnessctl -d smc::kbd_backlight i | awk '/Current/ { print $4}')"
bindsym XF86KbdBrightnessUp exec "brightnessctl -d smc::kbd_backlight set +10%; notify-send $(brightnessctl -d smc::kbd_backlight i | awk '/Current/ { print $4}')"
# Pulse Audio controls
bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 && notify-send 'Vol. up' #increase sound volume
bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 && notify-send 'Vol. down' #decrease sound volume
bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle && notify-send 'Mute sound' # mute sound
# Media player controls
bindsym XF86AudioPlay exec "playerctl play-pause; notify-send 'Play/Pause'"
bindsym XF86AudioNext exec "playerctl next; notify-send 'Next'"
bindsym XF86AudioPrev exec "playerctl previous; notify-send 'Prev.'"

View file

@ -0,0 +1,9 @@
input "1739:0:Synaptics_TM3288-011" {
dwt enabled
tap enabled
middle_emulation enabled
}
input * {
xkb_layout us(intl),de
xkb_options ctrl:nocaps
}

View file

@ -0,0 +1,18 @@
set $left DP-3
set $middle DP-1
set $right HDMI-A-1
output $left {
scale 1
pos 0 0
}
output $middle {
scale 1
pos 1920 0
}
output $right {
scale 1
pos 3840 0
}

View file

@ -0,0 +1,27 @@
{ config, pkgs, lib, ... }:
with lib;
let
psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
in
{
imports = [
./configuration.nix
./virtualisation
];
config = {
hardware.cpu.amd.updateMicrocode = true;
hardware.opengl.extraPackages = with pkgs; [
rocm-opencl-icd
rocm-opencl-runtime
];
home-manager.users."${psCfg.user.name}".xdg.configFile = mkIf psCfg.sway.enable {
"sway/config.d/10-autostart.conf".source = ./.config/sway/config.d/autostart.conf;
"sway/config.d/10-input-defaults.conf".source = ./.config/sway/config.d/input-defaults.conf;
"sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf;
};
};
}

View file

@ -0,0 +1,25 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }:
{
imports =
[
# Include the results of the hardware scan.
./hardware-configuration.nix
];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# 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.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "20.09"; # Did you read the comment?
}

View file

@ -0,0 +1,6 @@
{ suites, ... }:
{
imports = [
./chocolatebar.nix
] ++ suites.chocolatebar;
}

View file

@ -0,0 +1,33 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbcore" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{
device = "/dev/disk/by-uuid/a3a74208-b244-4268-b374-e58265810fce";
fsType = "ext4";
};
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/afcde41f-9811-4ac8-bb7b-a683844acc5c";
fileSystems."/boot" =
{
device = "/dev/disk/by-uuid/12FD-62A8";
fsType = "vfat";
};
swapDevices = [ ];
}

View file

@ -0,0 +1,90 @@
{ config, pkgs, lib, vm, ... }:
let
psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
varsFile = "${xdg.dataHome}/libvirt/OVMF_VARS_${vm.name}.fd";
generateXML = import ./guest-xml.nix;
in
{
serviceConfig = {
Type = "oneshot";
RemainAfterExit = "yes";
Restart = "no";
};
script =
let
networkXML = pkgs.writeText "network.xml" (import ./network-xml.nix { inherit config; inherit pkgs; inherit lib; });
machineXML = pkgs.writeText "${vm.name}.xml" (generateXML { inherit config; inherit pkgs; inherit lib; inherit vm; varsFile = varsFile; });
in
''
echo "Checking if ${vm.name} is already running"
STATUS=$(${pkgs.libvirt}/bin/virsh list --all | grep "${vm.name}" | ${pkgs.gawk}/bin/awk '{ print $3 " " $4 }' )
if [[ $STATUS != "shut off" && $STATUS != "" ]]; then
echo "Domain ${vm.name} is already running or in an inconsistent state:"
${pkgs.libvirt}/bin/virsh list --all
exit 0
fi
NET_TMP_FILE="/tmp/network.xml"
NETUUID="$(${pkgs.libvirt}/bin/virsh net-uuid 'default' || true)"
(sed "s/UUID/$NETUUID/" '${networkXML}') > "$NET_TMP_FILE"
${pkgs.libvirt}/bin/virsh net-define "$NET_TMP_FILE"
${pkgs.libvirt}/bin/virsh net-start 'default' || true
VARS_FILE=${varsFile}
if [ ! -f "$VARS_FILE" ]; then
cp /run/libvirt/nix-ovmf/OVMF_VARS.fd "$VARS_FILE"
fi
# Load the template contents into a tmp file
TMP_FILE="/tmp/${vm.name}.xml"
cat "${machineXML}" > "$TMP_FILE"
# Set VM UUID
UUID="$(${pkgs.libvirt}/bin/virsh domuuid '${vm.name}' || true)"
sed -i "s/UUID/''${UUID}/" "$TMP_FILE"
${if vm.handOverUSBDevices then ''
# Hand over keyboard
USB_DEV=$(${pkgs.usbutils}/bin/lsusb | grep 046d:c52b | grep 'Bus 001' | cut -b 18)
LINE_NUMBER=$(cat $TMP_FILE | grep -n -A 1 0xc52b | tail -n 1 | cut -b 1,2,3)
sed -i "''${LINE_NUMBER}s/\(.\{33\}\)./\1''${USB_DEV}/" "$TMP_FILE"
# Hand over mouse
USB_BUS=$(${pkgs.usbutils}/bin/lsusb | grep 046d:c328 | cut -b 7)
USB_DEV=$(${pkgs.usbutils}/bin/lsusb | grep 046d:c328 | cut -b 18)
LINE_NUMBER=$(cat $TMP_FILE | grep -n -A 1 0xc328 | tail -n 1 | cut -b 1,2,3)
sed -i "''${LINE_NUMBER}s/.*/<address bus=\"''${USB_BUS}\" device=\"''${USB_DEV}\" \/>/" "$TMP_FILE"
'' else ""}
# TODO: Set correct pci address for the GPU too
# Setup looking glass shm file
${pkgs.coreutils-full}/bin/truncate -s 0 /dev/shm/looking-glass
${pkgs.coreutils-full}/bin/dd if=/dev/zero of=/dev/shm/looking-glass bs=1M count=32
# Load and start the xml definition
${pkgs.libvirt}/bin/virsh define "$TMP_FILE"
${pkgs.libvirt}/bin/virsh start '${vm.name}'
'';
preStop =
''
${pkgs.libvirt}/bin/virsh shutdown '${vm.name}'
let "timeout = $(date +%s) + 10"
while [ "$(${pkgs.libvirt}/bin/virsh list --name | grep --count '^${vm.name}$')" -gt 0 ]; do
if [ "$(date +%s)" -ge "$timeout" ]; then
# Meh, we warned it...
${pkgs.libvirt}/bin/virsh destroy '${vm.name}'
else
# The machine is still running, let's give it some time to shut down
sleep 0.5
fi
done
${pkgs.libvirt}/bin/virsh net-destroy 'default' || true
'';
}

View file

@ -0,0 +1,54 @@
{ config, pkgs, lib, ... }:
with lib;
let
psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
createService = import ./create-service.nix;
isolateGPU = "rx550x";
handOverUSBDevices = false;
isolateAnyGPU = isolateGPU != null;
in
{
config = mkIf psCfg.virtualisation.enable {
boot.extraModprobeConfig = mkIf isolateAnyGPU (concatStringsSep "\n" [
"softdep amdgpu pre: vfio vfio_pci"
(if isolateGPU == "rx5700xt"
then "options vfio-pci ids=1002:731f,1002:ab38"
else "options vfio-pci ids=1002:699f,1002:aae0"
)
]);
systemd.user.services = {
vm-windows = createService {
inherit config;
inherit pkgs;
inherit lib;
vm = {
name = "windows";
disk = "/dev/disk/by-id/ata-SanDisk_SDSSDA240G_162402455603";
id = "http://microsoft.com/win/10";
gpu = true;
mountHome = false;
isolateGPU = isolateGPU;
handOverUSBDevices = handOverUSBDevices;
};
};
vm-manjaro = createService {
inherit config;
inherit pkgs;
inherit lib;
vm = {
name = "manjaro";
disk = "/dev/disk/by-id/ata-KINGSTON_SM2280S3G2240G_50026B726B0265CE";
id = "https://manjaro.org/download/#i3";
gpu = true;
mountHome = true;
isolateGPU = isolateGPU;
handOverUSBDevices = handOverUSBDevices;
};
};
};
};
}

View file

@ -0,0 +1,246 @@
{ config, pkgs, lib, vm, varsFile, ... }:
let
psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
home = config.home-manager.users."${psCfg.user.name}".home;
in
''
<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
<name>${vm.name}</name>
<uuid>UUID</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
<libosinfo:os id="${vm.id}"/>
</libosinfo:libosinfo>
</metadata>
<memory unit='KiB'>33554432</memory>
<currentMemory unit='KiB'>33554432</currentMemory>
<vcpu placement='static'>12</vcpu>
<cputune>
<vcpupin vcpu='0' cpuset='6'/>
<vcpupin vcpu='1' cpuset='7'/>
<vcpupin vcpu='2' cpuset='8'/>
<vcpupin vcpu='3' cpuset='9'/>
<vcpupin vcpu='4' cpuset='10'/>
<vcpupin vcpu='5' cpuset='11'/>
<vcpupin vcpu='6' cpuset='18'/>
<vcpupin vcpu='7' cpuset='19'/>
<vcpupin vcpu='8' cpuset='20'/>
<vcpupin vcpu='9' cpuset='21'/>
<vcpupin vcpu='10' cpuset='22'/>
<vcpupin vcpu='11' cpuset='23'/>
</cputune>
<resource>
<partition>/machine</partition>
</resource>
<os>
<type arch='x86_64' machine='pc-q35-4.2'>hvm</type>
<loader readonly='yes' type='pflash'>/run/libvirt/nix-ovmf/OVMF_CODE.fd</loader>
<nvram>${varsFile}</nvram>
<boot dev='hd'/>
</os>
<features>
<acpi/>
<apic/>
<hyperv>
<relaxed state='on'/>
<vapic state='on'/>
<spinlocks state='on' retries='8191'/>
<vendor_id state='on' value='wahtever'/>
</hyperv>
<kvm>
<hidden state='on'/>
</kvm>
<vmport state='off'/>
</features>
<cpu mode='custom' match='exact' check='full'>
<model fallback='forbid'>EPYC-IBPB</model>
<vendor>AMD</vendor>
<topology sockets='1' dies='1' cores='6' threads='2'/>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='tsc-deadline'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clwb'/>
<feature policy='require' name='umip'/>
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='perfctr_core'/>
<feature policy='require' name='clzero'/>
<feature policy='require' name='wbnoinvd'/>
<feature policy='require' name='amd-ssbd'/>
<feature policy='require' name='virt-ssbd'/>
<feature policy='require' name='rdctl-no'/>
<feature policy='require' name='skip-l1dfl-vmentry'/>
<feature policy='require' name='mds-no'/>
<feature policy='require' name='pschange-mc-no'/>
<feature policy='disable' name='monitor'/>
<feature policy='disable' name='svm'/>
<feature policy='require' name='topoext'/>
</cpu>
<clock offset='utc'>
<timer name='rtc' tickpolicy='catchup'/>
<timer name='pit' tickpolicy='delay'/>
<timer name='hpet' present='no'/>
</clock>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<pm>
<suspend-to-mem enabled='no'/>
<suspend-to-disk enabled='no'/>
</pm>
<devices>
<emulator>${pkgs.qemu}/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='${vm.disk}'/>
<backingStore/>
<target dev='vdb' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
</disk>
<controller type='usb' index='0' model='qemu-xhci' ports='15'>
<address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
</controller>
<controller type='sata' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pcie-root'/>
<controller type='pci' index='1' model='pcie-root-port'>
<model name='pcie-root-port'/>
<target chassis='1' port='0x10'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
</controller>
<controller type='pci' index='2' model='pcie-root-port'>
<model name='pcie-root-port'/>
<target chassis='2' port='0x11'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
</controller>
<controller type='pci' index='3' model='pcie-root-port'>
<model name='pcie-root-port'/>
<target chassis='3' port='0x12'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
</controller>
<controller type='pci' index='4' model='pcie-root-port'>
<model name='pcie-root-port'/>
<target chassis='4' port='0x13'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
</controller>
<controller type='pci' index='5' model='pcie-root-port'>
<model name='pcie-root-port'/>
<target chassis='5' port='0x14'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
</controller>
<controller type='pci' index='6' model='pcie-root-port'>
<model name='pcie-root-port'/>
<target chassis='6' port='0x15'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
</controller>
<controller type='pci' index='7' model='pcie-root-port'>
<model name='pcie-root-port'/>
<target chassis='7' port='0x16'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
</controller>
<controller type='pci' index='8' model='pcie-to-pci-bridge'>
<model name='pcie-pci-bridge'/>
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
</controller>
<controller type='pci' index='9' model='pcie-root-port'>
<model name='pcie-root-port'/>
<target chassis='9' port='0x17'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
</controller>
<controller type='virtio-serial' index='0'>
<address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
</controller>
${if vm.mountHome then ''
<filesystem type='mount' accessmode='mapped'>
<source dir='/home/${psCfg.user.name}'/>
<target dir='/media/home'/>
<address type='pci' domain='0x0000' bus='0x07' slot='0x00' function='0x0'/>
</filesystem>
'' else ""}
<interface type='network'>
<mac address='52:54:00:44:cd:ac'/>
<source network='default'/>
<model type='virtio'/>
<address type='pci' domain='0x0000' bus='0x08' slot='0x01' function='0x0'/>
</interface>
<console type='pty'>
<target type='serial' port='0'/>
</console>
<input type='tablet' bus='usb'>
<address type='usb' bus='0' port='1'/>
</input>
<input type='mouse' bus='virtio'/>
<input type='keyboard' bus='virtio'/>
<graphics type='spice' autoport='yes' listen='127.0.0.1'>
<listen type='address' address='127.0.0.1'/>
<image compression='off'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</video>
${if vm.handOverUSBDevices then ''
<hostdev mode='subsystem' type='usb' managed='yes'>
<source>
<vendor id='0x046d'/>
<product id='0xc328'/>
<address bus='1' device='2'/>
</source>
<address type='usb' bus='0' port='4'/>
</hostdev>
<hostdev mode='subsystem' type='usb' managed='yes'>
<source>
<vendor id='0x046d'/>
<product id='0xc52b'/>
<address bus='1' device='4'/>
</source>
<address type='usb' bus='0' port='5'/>
</hostdev>
'' else ""}
${if vm.gpu && vm.isolateGPU != null then ''
<hostdev mode='subsystem' type='pci' managed='yes'>
<driver name='vfio'/>
<source>
<address domain='0x0000' bus='0x0b' slot='0x00' function='0x0'/>
</source>
<rom bar='on' file='/etc/nixos/hosts/chocolatebar/virtualisation/${vm.isolateGPU}.rom'/>
<address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0' multifunction='on'/>
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
<driver name='vfio'/>
<source>
<address domain='0x0000' bus='0x0b' slot='0x00' function='0x1'/>
</source>
<address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x1'/>
</hostdev>
'' else ""}
<redirdev bus='usb' type='spicevmc'>
<address type='usb' bus='0' port='2'/>
</redirdev>
<redirdev bus='usb' type='spicevmc'>
<address type='usb' bus='0' port='3'/>
</redirdev>
<memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
</memballoon>
<shmem name='looking-glass'>
<model type='ivshmem-plain'/>
<size unit='M'>32</size>
</shmem>
</devices>
<qemu:commandline>
<qemu:arg value='-device'/>
<qemu:arg value='ich9-intel-hda,bus=pcie.0,addr=0x1b'/>
<qemu:arg value='-device'/>
<qemu:arg value='hda-micro,audiodev=hda'/>
<qemu:arg value='-audiodev'/>
<qemu:arg value='pa,id=hda,server=unix:/run/user/1001/pulse/native'/>
</qemu:commandline>
</domain>
''

View file

@ -0,0 +1,19 @@
{ config, pkgs, lib, ... }:
''
<network>
<name>default</name>
<uuid>UUID</uuid>
<forward mode='nat'>
<nat>
<port start='1024' end='65535'/>
</nat>
</forward>
<bridge name='virbr0' stp='on' delay='0'/>
<mac address='52:54:00:bd:a0:73'/>
<ip address='192.168.122.1' netmask='255.255.255.0'>
<dhcp>
<range start='192.168.122.2' end='192.168.122.254'/>
</dhcp>
</ip>
</network>
''

Binary file not shown.

Binary file not shown.

View file

@ -12,6 +12,7 @@ in
config = mkIf cfg.enable {
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
home.packages = [
croc
drone-cli
nmap
pgcli
@ -19,6 +20,7 @@ in
restic
shellcheck
terraform_0_15
tea
];
};
};

View file

@ -17,6 +17,7 @@ in
environment.systemPackages = with pkgs; [
docker-compose
docker-compose_2
];
};
}

View file

@ -0,0 +1,19 @@
{ lib, config, pkgs, ... }:
with lib;
let
psCfg = config.pub-solar;
cfg = config.pub-solar.mobile;
in
{
options.pub-solar.mobile = {
enable = mkEnableOption "Add android adb and tooling";
};
config = mkIf cfg.enable {
programs.adb.enable = true;
users.users = with pkgs; lib.setAttrByPath [ psCfg.user.name ] {
extraGroups = [ "adbusers" ];
};
};
}

View file

@ -29,6 +29,7 @@ in
hardware.sane = {
enable = true;
brscan4.enable = true;
extraBackends = [ pkgs.hplipWithPlugin ];
};
};
}

View file

@ -51,6 +51,15 @@ let
sha256 = "QPTCl6KaGcAjTS5yVDov9yxmv0fDaFoPLMsrtVIG6GQ=";
};
};
vim-mdx-js = pkgs.vimUtils.buildVimPlugin {
name = "vim-mdx-js";
src = pkgs.fetchFromGitHub {
owner = "jxnblk";
repo = "vim-mdx-js";
rev = "17179d7f2a73172af5f9a8d65b01a3acf12ddd50";
sha256 = "wfYCvw9JVGG8p8PQhRPT6CeGGf2OVz9SR2KQM0LjQhY=";
};
};
in
{
enable = true;
@ -137,6 +146,7 @@ in
vim-toml
vim-vue
yats-vim
vim-mdx-js
];
extraConfig = builtins.concatStringsSep "\n" [

View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }:
{ config, pkgs, lib, self, ... }:
let
cfg = config.pub-solar.x-os;

View file

@ -4,6 +4,8 @@ channels: final: prev: {
inherit (channels.latest)
cachix
docker
docker-compose_2
dhall
discord
element-desktop

View file

@ -16,4 +16,5 @@ with final; {
toggle-kbd-layout = writeShellScriptBin "toggle-kbd-layout" (import ./toggle-kbd-layout.nix final);
uhk-agent = import ./uhk-agent.nix final;
wcwd = writeShellScriptBin "wcwd" (import ./wcwd.nix final);
wlstreamer = import ./wlstreamer.nix final;
}

View file

@ -1,3 +1,3 @@
self: with self; ''
${self.looking-glass-client}/bin/looking-glass-client -f /dev/shm/looking-glass input:ignoreWindowsKeys=yes input:grabKeyboardOnFocus=no
${self.looking-glass-client}/bin/looking-glass-client -f /dev/shm/looking-glass input:ignoreWindowsKeys=yes input:grabKeyboardOnFocus=no input:rawMouse=yes
''

19
pkgs/wlstreamer.nix Normal file
View file

@ -0,0 +1,19 @@
self: with self; rustPlatform.buildRustPackage rec {
pname = "wlstreamer";
version = "0.4.0";
src = fetchGit {
url = "git@git.b12f.io:b12f/wlstreamer.git";
rev = "8625f0f2c90667401dd61c7d88cca9cf75eca337";
sha256 = "";
};
cargoSha256 = "";
meta = with stdenv.lib; {
description = "";
homepage = "https://github.com/b12f/wlstreamer";
license = licenses.unlicense;
maintainers = [ maintainers.tailhook ];
};
}

View file

@ -9,7 +9,7 @@ in
./session-variables.nix
];
home-manager = pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
home-manager.users = pkgs.lib.setAttrByPath [ psCfg.user.name ] {
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;

View file

@ -3,7 +3,4 @@ let inherit (lib) fileContents;
in
{
pub-solar.gaming.enable = true;
pub-solar.docker.enable = true;
pub-solar.docker.enable = true;
pub-solar.docker.enable = true;
};
}

View file

@ -0,0 +1,6 @@
{ self, config, lib, pkgs, ... }:
let inherit (lib) fileContents;
in
{
pub-solar.mobile.enable = true;
}

View file

@ -0,0 +1,6 @@
{ self, config, lib, pkgs, ... }:
let inherit (lib) fileContents;
in
{
pub-solar.virtualisation.enable = true;
}

Binary file not shown.

Binary file not shown.

BIN
secrets/keyfile-biolimo.bin Normal file

Binary file not shown.

Binary file not shown.

44
secrets/mopidy.conf Normal file
View file

@ -0,0 +1,44 @@
age-encryption.org/v1
-> ssh-rsa kFDS0A
pgJUXnYT0UgB7h8dWOBCIO6OuXwpjmBuQpJBXnI2Zh5X2fiGQVyrrcrm8VSWLHOd
za9SME+PxcGXDGgwaGpCl8tOh93WRUC0RtNTBmoiyzrfkbQtm9gfnt51JpHscuTc
wzZ9cxMvtKSNGsCuK5oeX9ZxVgXH5QFomwvADXoy14HacgEOzLTPU6vrPrOonGAG
kDqYDzf87V2BfPttzONoScsVsFV26EQntxDx5/8Hja4ceOvgBwm2GczUzpgfIRCA
To+az2B1Y0h/BWMqzRAhobuN/UIQcZAKro4uf8SbpKqPQrON+k1tAE+lrMUFLx1A
2ZayulT/Partcm6L8Yb0JAn24eXFla52XQ6JyukSbtoqZxEQIcjbM34+KFKMftIA
M8taZIG2JWyFdHBPO4RAMyGbNpQN5hsDvJWGIJePj4bAxW7GX9JJiT7gg1iCKce3
SINdaBt4O3RJ49wTGqJtMSJSlfzLf7s4zHx5oaozAEt84h97A2Yt/8Lg1Wmc2Aji
Q4XG6w8OQ/Fk8E/EeSZ27udMHF94TfQ9mzbKdMJRclLDlKKlxeYA6gea4QYb6GLi
8tY6qnDpF9jwV7ehehM9KYhJcCLw7MYNwGI6oPmTagZCRhXDYULbmK5gfkspcrZ1
zZn5yOCwt+MA3U2NfpxNOMs0LvaGU7HOruzyD9DLp+4
-> ssh-ed25519 TnSWKQ SWZZJeUCYeSkYwIKmrsMa/MUkNK7xIn+213hy6X51Uk
FDzM+HzDh+5+9RI+gjTPKNT74DPSvxA+CKJpHXSMX5c
-> ssh-rsa 8daibg
XthUstyN7tDd/vAw3y6knQWNI1M2GEKGDzvmOXFMgwxUcBUNPZmPnZvTfmUXY81Z
iF13Lruwid0/4Pb9dcYyyifzoqnNb6SvnzczoUSpqQc6m+6BLX4kSTIN1Pulwt8A
kWrOekvKy9J7Z2QsW6QKfxB4xaAc+BA9kHOgWWpLTyx2GOm0ksLjUnsd3Zo/xXsc
JpjuSNcsUM9mCP00RjamX1SwrAc/tRnoOSOD6jmED5M0Xfb7bE2AORUQ3Em8B4iG
CgaTEXFppZN96+BHOumOP1wAbH7uI0EdQP/SvR+qelCH35C0pSWZ4AuyvT5kvoYL
CyK6GQ8rVnDrBaWQIj4TPhpB1xVxKd01AZX9ITdhPdTATJFwCcVxoWgCTtjNGaIc
4GldFh0+nXUUV9spzxFbAhiJwy+PHfNfuJ1gyYMrgLY4mQPhA6ntPeWqZOb20cYZ
ABl7eHN9AAQnibw6EufkgH/U9v81HlWjbLWedAHNPGAldDF5uNrY+FRiqXWT2Ivb
9CkU/pUFAAcZs7GwEHTVz2dWsuxthS/P/DhN1YshDmY17gTBEf+40SUATsD1wBV0
tdmbU3i79djbfXXvazR+hi7qDtKo+zJKCDORSq66J70njl0pwN/QIKGQnKt5sYCm
3kPTZHrR6ys82MhTFk/C1G4aJjQScTz4buA5UH+0hsE
-> ssh-ed25519 2Ca8Kg eqyr8Yr3rrWlhCd+TmKsnywFdp1mwt3jZwuJzO0TwzM
mcfYZGTAebrZY9Ool8sPn25wPiwe6StBUzdVAyEErAE
-> ssh-rsa 2ggJWw
h00c7evck2bHux9EhMjLQa1f3O3tReLd65LDJB28jH7SbpT6t8Gxfk9tamGFHg4Z
lGxkzZjK9xnroBpZv5ikuP+tD7A6A2saDXDnnAw+wHUGv0UO5yzr0HPIvwE1bVR5
GOW1iqPMHKB2v6NeTaBG1g5TohSYEDDINkQv+Q4NyPhdpX9bGd3biWiBAa1gy3Xp
XmDwtUfBg9IN+EeQTpC/tc4C1pLd3k7E+5pZDQebfTlvXZ83SH05BpBnpakPWNty
Pf3s/iMwWBiJ+8GiwQ7c6FjTrr9ImJe8nD6mknWGpsMEQ9wB4Bd9l5RTjpTW9wCo
DNtN8Mo0SGgFXjj/5XO0kMDhDike/GLr6wfD0HVgRP9MtcatvEaezp4RY6NIknjy
F49KFsZWhzqwU2c4VX3ayFGJHcn/TT6o2QL3qZoI6x23ZFHQlXtQjXfhTkXk2qJt
565cgrWzLYV7y+DB5fwaG/+Twlnr8rMQOPwyEnrWylh+AY3H/2/M1qQz2b2UQapl
-> }L0d&,o-grease QVMP gPkF4&,`
YaavYxfymQIl4xRnz1AZxLAY7+r2R9Mftt9AIk11bEymVtCWhsWtSbnhsq9q+fjm
yYwVUyIh4eeH4oOdz3ssnmB3gg
--- 5VOiRneXGtTtik3m0OJY8zV8Sboh18DIB4eM07M+1Lo
ö™:üŠØþI{ˆ)ƒô½-tÈ«½©jT»0rE™ÚYæg4wFA³SÖ÷9RÐ…çëQ¡5<C2A1>c{ºÈzj…lÁRAØãàÛH”L y£ø²W•6¢¢l>¸–ߪ}­m¤Ý¿óÆbѱ“ô6*ÎËg"ßãÈè}Xˆí>W¬œÛÇ<C39B>ÕTÉÞ­™é¼Ì# mÍi@êiö:°zõ愲jbc(ƦŸýìùô{ô™¨ª¯©âwã(ÖθÈäyÔ§`iÌó_ïC-`ŽPô³²e«¶ç<C2B6>CÈ»tSÆ5Ž·e÷Zp%þQ´B¿Êh4yžC°dY¿«<C2BF>—Lˆ<Nw½µýÆ<>„ÊVñ4ù/ð:•+Ÿãx5ÚÞÁ8_V F6ð½)a>…. }É‘^h¿óÖ®îÍ<C3AE>ø.Ÿ<C5B8>»ËË¿GÑà”ÿ~ÝŒd¢EoZ=|×C•O ö”x7,Nƒ•ïú¹PÖä¥ ˆ%*I%®kÎ[<5B>ØÐ|-<2D>ÈžT¦úe~3¥6ËÞ!C"Öai/kDmì]<5D>íJ÷Û>ü¬n^»OýÚ—MãÌíüSÁ°7„¼»<C2BC>1P €ú?x\;B¸#u”BŽ$hѵ:¶Ë

View file

@ -1,9 +1,43 @@
let
# set ssh public keys here for your system and user
system = "";
user = "";
allKeys = [ system user ];
bbcom = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCmXpOU6vzQiVSSYCoxHYv7wDxC63Qg3dxlAMR6AOzwIABCU5PFFNcO0NWYms/YR7MOViorl+19LCLRABar9JgHU1n+uqxKV6eGph3OPeMp5sN8LAh7C9N+TZj8iJzBxQ3ch+Z/LdmLRwYNJ7KSUI+gwGK6xRS3+z1022Y4P0G0sx7IeCBl4lealQEIIF10ZOfjUdBcLQar7XTc5AxyGKnHCerXHRtccCoadLQujk0AvPXbv3Ma4JwX9X++AnCWRWakqS5UInu2tGuZ/6Hrjd2a9AKWjTaBVDcbYqCvY4XVuMj2/A2bCceFBaoi41apybSk26FSFTU4qiEUNQ6lxeOwG4+1NCXyHe2bGI4VyoxinDYa8vLLzXIRfTRA0qoGfCweXNeWPf0jMqASkUKaSOH5Ot7O5ps34r0j9pWzavDid8QeKJPyhxKuF1a5G4iBEZ0O9vuti60dPSjJPci9oTxbune2/jb7Sa0yO06DtLFJ2ncr5f70s/BDxKk4XIwQLy+KsvzlQEGdY8yA6xv28bOGxL3sQ0HE2pDTsvIbAisVOKzdJeolStL9MM5W8Hg0r/KkGj2bg0TfoRp1xHV9hjKkvJrsQ6okaPvNFeZq0HXzPhWMOVQ+/46z80uaQ1ByRLr3FTwuWJ7F/73ndfxiq6bDE4z2Ji0vOjeWJm6HCxTdGw== hello@benjaminbaedorf.com";
biolimo-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBZzg8pfVtFonx/IvO2MKG5uVF/sMJAOt1Ifm9Vds2eA root@biolimo";
biolimo-user = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDoYNvXWunQYFORRjcYH1F98+zr20U79ROh+gmaC7AY/x3yf4y8uyMayF56VgQLVNwgEchT5t4dNb9qo2+1oUnjiKrKAVfQMN6WMMMEr4F4WT784uvBx5Uo6vmhgAa+xoo62c4TV2Uf49ZiPd+zAApBHW1F/whPtunPF28Wfr9g+ozSidhnAr+3nkfJh331tz9s+wgQ39AFzFWftQ60Guulpfj8SaVyxyv/yZZAuFpXNzN0Cz4fWBIWFOsib6Z8y+SlUCzSzOguZ7FygHjwlvOxoISsASAuf0OfUKHxVshiL5F5AX1ddmUgXbUKUTp/3Iunr74pfOQC8TXzZHqhrlFzYDmK5J9E6eADSpgx++bCCaHycl73BWeertCBZSHBXeb3Db9HX+mxwpfP3alVAt4ZqQb3YD/VB7XGDvHbmLn+wSfecO2qA9PxiA0yX7e2BZLN9r3G3bRNSk0GpnYM0i84FE9IipiKKnWVjj7J0UPQmz7rzAn2Lki1CnX9PDdxZneqTxgpBomHJt4H+vXMw13scA4xxEDBvfS5KkjbEJqWLbfklCoER6nV3NPLZ6CBl0Xe/VQBSkqEuUEIXih/oa8emDOGUODNF75ck5NJmKiGg6AFZoeiDa7PZMIxhhOq4vsR2Ty43rztUJ0CMX7iSIk3Eql7kqNdvrJaJ7z0GBsiw== ben@biolimo";
chocolatebar-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINZT3QrKugNTWNOwYziQnxrT5zFqWQDafWjScDuIpMhN root@chocolatebar";
chocolatebar-user = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDwyNsGCMuyI9x2IxYEbYIL6oYsEfe1wqhHaRxSnK9oc10ge1LJni5o7g6XgryoQpCD9YenImcCxwkKblmlLQ2327uoVC2PUo07li1uT0eIPk0TQoxwp6besFs7/LEzZlgWQsc3gkEXmjk/E0mu0U6z2fkqciJ/ZxWYt9fLP6jBG47U9878rSaZ7k7Ilv6oRA3suArH189k1nerk/tonS4EWXeHZxHh/Eu0tqwmxN/6+g2GicYn6b+MbFQVdQAkctqT5Yz9USm9UKzbaAuZ799u0dJzagHm9JJZOr8r11ENtAkY9kAzRzm3u/ACiSdVzyLdjAK6m0dIPhp3OhedzuHiI6/wRll60tYtQTH1XwUpVbtir3+DT+jwZgO1zH3yL4iNh79kuUo+UEg1ZmGkSZRzSS2vb5qr0J5aSJmCd5sNB7a01PTtSlQPOqSF9PB+UmcLDF7JoKFub0KT/gRZ5neZkXTYQ/Y05qtaaFVlOVISijnm+sLUvKBv6OW8oYXIHBk= ben@chocolatebar";
allKeys = [
bbcom
biolimo-host
biolimo-user
chocolatebar-host
chocolatebar-user
];
biolimoKeys = [
bbcom
biolimo-host
biolimo-user
];
chocolatebarKeys = [
bbcom
chocolatebar-host
chocolatebar-user
];
in
{
"secret.age".publicKeys = allKeys;
"keyfile-biolimo.bin".publicKeys = biolimoKeys;
"keyfile-chocolatebar.bin".publicKeys = chocolatebarKeys;
"crypto_keyfile-chocolatebar.bin".publicKeys = chocolatebarKeys;
"hdd_keyfile-chocolatebar.bin".publicKeys = chocolatebarKeys;
"mopidy.conf".publicKeys = allKeys;
}

View file

@ -0,0 +1,42 @@
account hello@benjaminbaedorf.eu
host mail.hosting.de
port 587
protocol smtp
auth on
from hello@benjaminbaedorf.eu
user hello@benjaminbaedorf.eu
tls on
tls_trust_file /etc/ssl/certs/ca-certificates.crt
account benjamin.baedorf@rwth-aachen.de
host mail.rwth-aachen.de
port 587
protocol smtp
auth on
from benjamin.baedorf@rwth-aachen.de
user bb564306@rwth-aachen.de
tls on
tls_trust_file /etc/ssl/certs/ca-certificates.crt
account b.baedorf@openproject.com
host smtp.mailbox.org
port 465
protocol smtp
auth on
from b.baedorf@openproject.com
user b.baedorf@openproject.com
tls on
tls_trust_file /etc/ssl/certs/ca-certificates.crt
account byb@miom.space
host mail.hosting.de
port 587
protocol smtp
auth on
from byb@miom.space
user byb@miom.space
tls on
tls_trust_file /etc/ssl/certs/ca-certificates.crt
account default : hello@benjaminbaedorf.eu

View file

@ -0,0 +1,24 @@
# vim: filetype=muttrc
set from = "Benjamin Bädorf <b.baedorf@openproject.com>"
set sendmail = "msmtp -a b.baedorf@openproject.com"
set signature = "~/.config/mutt/b.baedorf@openproject.com.signature"
set pgp_default_key="DB94333951EC9A362B33FBA5069CA2D117AB5CCF"
set imap_user = b.baedorf@openproject.com
set imap_pass = `secret-tool lookup service smtp host smtp.mailbox.org user b.baedorf@openproject.com`
set folder = imaps://imap.mailbox.org:993
set spoolfile = "+INBOX"
set postponed = "+Drafts"
set record = "+Sent"
set trash = "+Trash"
mbox-hook = "+Archive"
unmailboxes *
mailboxes +INBOX \
+Drafts \
+Sent \
+Archive \
+Trash

View file

@ -0,0 +1,19 @@
--
Benjamin Bädorf
Senior Frontend Engineer
OpenProject GmbH
Krausenstraße 9
10117 Berlin
E: b.baedorf@openproject.com
GPG: DB94 3339 51EC 9A36 2B33 FBA5 069C A2D1 17AB 5CC
T: +49 9599 899 22
M: +49 151 2266 2777
I: www.openproject.org
Amtsgericht Berlin-Charlottenburg HRB 117935
Geschäftsführer Niels Lindenthal
UStID DE211309779

View file

@ -0,0 +1,21 @@
# vim: filetype=muttrc
set from = "Benjamin Bädorf <benjamin.baedorf@rwth-aachen.de>"
set sendmail = "msmtp -a benjamin.baedorf@rwth-aachen.de"
set signature = "~/.config/mutt/hello@benjaminbaedorf.eu.signature"
set pgp_default_key="4332E0D02B214D31376C366E4406E80E13CD656C"
set mbox_type = Maildir
set folder = ~/Mail
set spoolfile = "+benjamin.baedorf\@rwth-aachen.de/INBOX"
set postponed = "+benjamin.baedorf\@rwth-aachen.de/Drafts"
set record = "+benjamin.baedorf\@rwth-aachen.de/Sent"
set trash = "+benjamin.baedorf\@rwth-aachen.de/Trash"
mbox-hook = "+benjamin.baedorf\@rwth-aachen.de/Journal"
unmailboxes *
mailboxes +benjamin.baedorf\@rwth-aachen.de/INBOX \
+benjamin.baedorf\@rwth-aachen.de/Drafts \
+benjamin.baedorf\@rwth-aachen.de/Sent \
+benjamin.baedorf\@rwth-aachen.de/Journal \
+benjamin.baedorf\@rwth-aachen.de/Trash

View file

@ -0,0 +1,21 @@
# vim: filetype=muttrc
set from = "Benjamin Bädorf <byb@miom.space>"
set sendmail = "msmtp -a byb@miom.space"
set signature = "~/.config/mutt/byb@miom.space.signature"
set pgp_default_key="4332E0D02B214D31376C366E4406E80E13CD656C"
set mbox_type = Maildir
set folder = ~/Mail
set spoolfile = "+byb\@miom.space/INBOX"
set postponed = "+byb\@miom.space/Drafts"
set record = "+byb\@miom.space/Sent"
set trash = "+byb\@miom.space/Trash"
mbox-hook = "+byb\@miom.space/Archive"
unmailboxes *
mailboxes +byb\@miom.space/INBOX \
+byb\@miom.space/Drafts \
+byb\@miom.space/Sent \
+byb\@miom.space/Archive \
+byb\@miom.space/Trash

View file

@ -0,0 +1,12 @@
--
Benjamin Bädorf (he/him)
Software Engineer at MiOM 202
MAIL: byb@miom.space
TEL: +49 15 778 959 877
GPG: 4332 E0D0 2B21 4D31 376C 366E 4406 E80E 13CD 656C
GIT: git.b12f.io/b12f
MATRIX: @b12f:pub.solar
WEB: benjaminbaedorf.eu

View file

@ -0,0 +1,21 @@
# vim: filetype=muttrc
set from = "Benjamin Bädorf <hello@benjaminbaedorf.eu>"
set sendmail = "msmtp -a hello@benjaminbaedorf.eu"
set signature = "~/.config/mutt/hello@benjaminbaedorf.eu.signature"
set pgp_default_key="4332E0D02B214D31376C366E4406E80E13CD656C"
set mbox_type = Maildir
set folder = ~/Mail
set spoolfile = "+hello\@benjaminbaedorf.eu/INBOX"
set postponed = "+hello\@benjaminbaedorf.eu/Drafts"
set record = "+hello\@benjaminbaedorf.eu/Sent"
set trash = "+hello\@benjaminbaedorf.eu/Trash"
mbox-hook = "+hello\@benjaminbaedorf.eu/Archive"
unmailboxes *
mailboxes +hello\@benjaminbaedorf.eu/INBOX \
+hello\@benjaminbaedorf.eu/Drafts \
+hello\@benjaminbaedorf.eu/Sent \
+hello\@benjaminbaedorf.eu/Archive \
+hello\@benjaminbaedorf.eu/Trash

View file

@ -0,0 +1,12 @@
--
Benjamin Bädorf (he/him)
Software Engineer
MAIL: hello@benjaminbaedorf.eu
TEL: +49 15 778 959 877
GPG: 4332 E0D0 2B21 4D31 376C 366E 4406 E80E 13CD 656C
GIT: git.b12f.io/b12f
MATRIX: @b12f:pub.solar
WEB: benjaminbaedorf.eu

View file

@ -0,0 +1,64 @@
[general]
pythonfile = $XDG_CONFIG_HOME/offlineimap/functions.py
metadata = $XDG_DATA_HOME/offlineimap
accounts = BBEU, RWTH, MiOM
[Account BBEU]
localrepository = LocalBBEU
remoterepository = RemoteBBEU
[Repository LocalBBEU]
type = Maildir
localfolders = ~/Mail/hello@benjaminbaedorf.eu
[Repository RemoteBBEU]
type = IMAP
remotehost = mail.hosting.de
remoteuser = hello@benjaminbaedorf.eu
remotepasseval = get_secret("service", "smtp", "host", "mail.hosting.de", "user", "hello@benjaminbaedorf.eu")
sslcacertfile = /etc/ssl/certs/ca-certificates.crt
[Account RWTH]
localrepository = LocalRWTH
remoterepository = RemoteRWTH
[Repository LocalRWTH]
type = Maildir
localfolders = ~/Mail/benjamin.baedorf@rwth-aachen.de
[Repository RemoteRWTH]
type = IMAP
remotehost = mail.rwth-aachen.de
remoteuser = bb564306@rwth-aachen.de
remotepasseval = get_secret("service", "smtp", "host", "mail.rwth-aachen.de", "user", "bb564306@rwth-aachen.de")
sslcacertfile = /etc/ssl/certs/ca-certificates.crt
[Account OPGmail]
localrepository = LocalOPGmail
remoterepository = RemoteOPGmail
[Repository LocalOPGmail]
type = Maildir
localfolders = ~/Mail/b.baedorf@openproject.com
[Repository RemoteOPGmail]
type = IMAP
remotehost = imap.gmail.com
remoteuser = b.baedorf@openproject.com
remotepasseval = get_secret("service", "smtp", "host", "smtp.gmail.com", "user", "b.baedorf@openproject.com")
sslcacertfile = /etc/ssl/certs/ca-certificates.crt
[Account MiOM]
localrepository = LocalMiOM
remoterepository = RemoteMiOM
[Repository LocalMiOM]
type = Maildir
localfolders = ~/Mail/byb@miom.space
[Repository RemoteMiOM]
type = IMAP
remotehost = mail.hosting.de
remoteuser = byb@miom.space
remotepasseval = get_secret("service", "smtp", "host", "mail.hosting.de", "user", "byb@miom.space")
sslcacertfile = /etc/ssl/certs/ca-certificates.crt

40
users/ben/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ config, hmUsers, pkgs, lib, ... }:
let
psCfg = config.pub-solar;
in
{
imports = [
./home.nix
];
config = {
home-manager.users = { inherit (hmUsers) ben; };
pub-solar = {
# These are your personal settings
# The only required settings are `name` and `password`,
# The rest is used for programs like git
user = {
name = "ben";
description = "b12f";
password = "$6$LO2YoaHwuRQhUoSz$iHw9avM887eJg9cIty2nmG4Ibkol3YpviEhYpivVQP31VrnihFz/6LyugxD7X4VmXx9nxvcYIZnN90rlGxwjT.";
fullName = "Benjamin Bädorf";
email = "hello@benjaminbaedorf.eu";
gpgKeyId = "4406E80E13CD656C";
};
email.enable = true;
uhk.enable = true;
};
networking.hosts = {
"127.0.0.1" = [
"openproject.local"
"saas-1.openproject.local"
"transmission.local"
];
};
fonts.fonts = lib.attrValues pkgs.b12f.fonts;
};
}

77
users/ben/home.nix Normal file
View file

@ -0,0 +1,77 @@
{ config, pkgs, lib, self, ... }:
with lib;
let
psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
in
{
imports = [
./session-variables.nix
];
home-manager = pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
home.packages = with pkgs; [
dogecoin
nodejs
];
programs.ssh = {
enable = true;
matchBlocks = {
"git.b12f.io" = {
hostname = "git.b12f.io";
user = "git";
port = 2222;
};
"aur.archlinux.org" = {
user = "aur";
};
"leavieler.art" = {
hostname = "web5svsvy.wh.hosting.zone";
user = "web5svsvy_cgzqa3";
port = 2244;
};
"benjaminbaedorf.eu" = {
hostname = "web5svsvy.wh.hosting.zone";
user = "web5svsvy_cgzqa3";
port = 2244;
};
"miom.space" = {
hostname = "web7dgkba.wh.hosting.zone";
user = "web7dgkba_c9em8f";
port = 2244;
};
};
};
xdg.configFile."mutt/accounts.muttrc".text = ''
source ./hello@benjaminbaedorf.eu.muttrc
macro index <f1> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/hello@benjaminbaedorf.eu.muttrc<enter><change-folder>!<enter>'
macro index <f2> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/benjamin.baedorf@rwth-aachen.de.muttrc<enter><change-folder>!<enter>'
macro index <f3> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/b.baedorf@openproject.com.muttrc<enter><change-folder>!<enter>'
macro index <f4> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/byb@miom.space.muttrc<enter><change-folder>!<enter>'
'';
xdg.configFile."mutt/hello@benjaminbaedorf.eu.muttrc".source = ./.config/mutt + "/hello@benjaminbaedorf.eu.muttrc";
xdg.configFile."mutt/benjamin.baedorf@rwth-aachen.de.muttrc".source = ./.config/mutt + "/benjamin.baedorf@rwth-aachen.de.muttrc";
xdg.configFile."mutt/hello@benjaminbaedorf.eu.signature".source = ./.config/mutt + "/hello@benjaminbaedorf.eu.signature";
xdg.configFile."mutt/b.baedorf@openproject.com.muttrc".source = ./.config/mutt + "/b.baedorf@openproject.com.muttrc";
xdg.configFile."mutt/b.baedorf@openproject.com.signature".source = ./.config/mutt + "/b.baedorf@openproject.com.signature";
xdg.configFile."mutt/byb@miom.space.muttrc".source = ./.config/mutt + "/byb@miom.space.muttrc";
xdg.configFile."mutt/byb@miom.space.signature".source = ./.config/mutt + "/byb@miom.space.signature";
xdg.configFile."offlineimap/config".source = ./.config/offlineimap/config;
xdg.configFile."msmtp/config".source = ./.config/msmtp/config;
# xdg.configFile."wallpaper.jpg".source = ./assets/wallpaper.jpg;
};
age.secrets = pkgs.lib.setAttrByPath [ "mopidy.conf" ] {
file = "${self}/secrets/mopidy.conf";
mode = "700";
owner = "mopidy";
};
services.mopidy.extraConfigFiles = [ "/run/secrets/mopidy.conf" ];
}

View file

@ -0,0 +1,14 @@
{ config, pkgs, ... }:
let
psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
in
{
home-manager = pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
home.sessionVariables = {
DRONE_SERVER = "https://ci.b12f.io";
RESTIC_REPOSITORY = "sftp:root@backup.b12f.io:/media/internal/backups";
RESTIC_PASSWORD_COMMAND = "secret-tool lookup restic repository-password";
};
};
}