165 Commits

Author SHA1 Message Date
f7ac2caaee [NixOS] Use yshui/pijulius picom 2024-09-05 17:41:53 -06:00
10b8f61d27 [NixOS] Picom is only needed for xmonad 2024-08-20 00:43:37 -06:00
58432fe908 [NixOS] Host docs.railbird.ai 2024-08-19 14:32:48 -06:00
79908fae93 [NixOS] Add ryzen-shine kubernetes token 2024-08-18 15:32:36 -06:00
b597b6e239 [Emacs] Use rubocop in ruby-mode 2024-08-18 15:32:10 -06:00
9e8cd58d7f [nix-darwin] Add gitea-runner token for mac-demarco-mini 2024-08-15 01:52:05 -06:00
6643428fca Revert "[NixOS] Use yshui's picom version from git"
This reverts commit 6cb9597df7.
2024-08-14 01:33:19 -06:00
10a732ad75 [taffybar] Bump version 2024-08-11 17:54:49 -06:00
e6a75734fb [NixOS] [zsh] Enable bracketed-paste-magic 2024-08-11 17:54:03 -06:00
eb22968ab4 [NixOS] Package renames 2024-08-11 17:52:53 -06:00
b12f84c007 [NixOS] Bump nixpkgs version 2024-08-11 17:52:37 -06:00
54645ba497 [NixOS] Fix deprecated option use in ryzen-shine 2024-08-11 17:52:17 -06:00
6cb9597df7 [NixOS] Use yshui's picom version from git 2024-08-11 17:51:56 -06:00
51e6116100 [Emacs] Search hidden files when doing directory based consult-rg search 2024-08-10 12:40:01 -06:00
4fd99eae63 [NixOS] Add interview user 2024-08-09 12:41:32 -06:00
b8f2452d11 [NixOS] Add ns function for incrementally searching through nixpkgs 2024-08-04 22:21:13 -06:00
ddb4a257cf Add nix-darwin justfile 2024-08-04 22:20:33 -06:00
Kat
3a6c9fbb49 Add nix-darwin 2024-08-04 22:20:33 -06:00
Kat
f3b8a769c6 [Emacs] Add swift-mode 2024-08-04 22:20:33 -06:00
4a27118f24 Delete travis 2024-08-04 22:20:33 -06:00
7ddc215dcc [Emacs] Remove indent-guide 2024-08-04 22:02:59 -06:00
3559edb3a5 [git] Don't ignore .sw* files (swift) 2024-07-28 14:20:58 -06:00
0e611dbb57 Fix location of DISABLE_REGISTRATION 2024-07-20 01:18:56 -06:00
3a71c8600c [NixOS] Remove sound.enable 2024-07-18 15:57:42 -06:00
280debd530 [NixOS] Disable gitea registration 2024-07-18 15:55:59 -06:00
e34248ede3 [NixOS] Add dean to syncthing 2024-07-18 14:09:37 -06:00
ea3ba8e2d6 [Emacs] Replace highlight-indent-guides with indent-bars 2024-07-11 01:44:13 -06:00
69411c14f6 [NixOS] Use testing kernel on strixi-minaj to fix audio 2024-07-04 12:44:23 -06:00
f560d87aa3 [linux] Allow selection of specific path for case where multiple brightness paths 2024-07-03 22:49:29 -06:00
e188936253 [NixOS] Use module from nixos-hardware for strixy-minaj 2024-07-03 02:12:56 -06:00
f91ff8c987 Revert "[NixOS] Use intel drivers on strixi-minaj"
This reverts commit 204569fff1.
2024-07-03 02:12:56 -06:00
f4b87c40eb Remove gtkrc 2024-07-02 17:19:51 -06:00
26fb168ec5 [NixOS] Set backup extension for home-manager 2024-07-02 17:18:03 -06:00
16e6b980ba [NixOS] Flake update past ssh issue 2024-07-01 22:45:03 -06:00
204569fff1 [NixOS] Use intel drivers on strixi-minaj 2024-07-01 22:44:44 -06:00
fb671d1401 [NixOS] Disable home-assistant 2024-06-13 04:49:59 +00:00
a18188d3b1 [NixOS] Fix zulip only works on x86 2024-06-12 21:09:50 -06:00
4515ea2e05 [NixOS] Allow dev keys for railbird user 2024-06-11 16:37:33 -06:00
KAT
60e1947dd8 [NixOS] Add swap to jimi-hendnix 2024-06-10 19:45:21 -06:00
0305fa4683 [NixOS] Bump railbird secrets 2024-06-11 01:27:29 +00:00
84a1f22326 Delete htop configuration 2024-06-10 18:26:56 -06:00
4cb057109f [Emacs] Add logg snippet 2024-06-10 18:25:40 -06:00
51d2863cdc [NixOS] Rename razer to david-blade 2024-06-10 18:25:25 -06:00
0c1cd15391 [Emacs] Fix avy in eat 2024-06-10 18:24:50 -06:00
cef3b04ebd [NixOS] Add railbird user 2024-06-10 16:13:19 -06:00
b9f87ac490 [NixOS] Allow agent forwarding 2024-06-03 04:08:10 +00:00
3b55c26a2c [NixOS] Enable ssh agent auth 2024-06-03 03:58:13 +00:00
dcd38e777a [NixOS] Add cuda-maintainers cache 2024-06-03 03:57:57 +00:00
2116f650f7 Revert "[starship] Switch prompt"
This reverts commit 2af8204750.
2024-06-03 02:07:31 +00:00
00139ef2fe [NixOS] [Emacs] Enable eat shell integration 2024-06-02 18:10:49 -06:00
2af8204750 [starship] Switch prompt 2024-06-02 18:10:49 -06:00
cd64244bd8 [Emacs] Disable org-wild notifications for kat 2024-06-02 18:06:48 -06:00
4cc68dedea [Emacs] Finish switching to eat including migrating term-projectile 2024-06-02 17:55:13 -06:00
77fe614b7b [Emacs] Add eat 2024-06-02 06:08:34 +00:00
6bbe7f186a [NixOS] Setup argcomplete completino for prb, prod-prb and railbird 2024-06-02 04:53:48 +00:00
77fc296e9e [NixOS] Add strixy-minaj-wsl 2024-06-02 04:04:05 +00:00
807944f182 [Emacs] Add ign and 401 snippets 2024-06-01 13:56:06 -06:00
97c2779d1b Merge pull request #25 from bcorner/master
Add ben to realUsers, users.nix
2024-05-29 00:11:41 -06:00
9d900057f6 Working ben.nix file.
Probably unrelated, had to remove ~/.zshrc and ~/.zprofile in order for
nixos-rebuild switch to work.
2024-05-29 01:03:49 -05:00
86b545761f Move home-manager.backupFileExtension entry to bottom of ben.nix 2024-05-29 00:02:55 -05:00
a8a66916f4 Add shellAliases, set backupFileExtension in ben.nix. 2024-05-28 23:01:07 -05:00
32d68061a5 Make sure user ben has sudo; quick fix, prefer no repeat extraGroups 2024-05-28 22:17:40 -05:00
94e7e738fb Add ben to realUsers, users.nix; key to keys.nix. zsh now default??
uhh paste contents of .profile into .zprofile I guess?
2024-05-28 21:07:48 -06:00
77cf8d46a3 Add ben module 2024-05-28 20:55:02 -06:00
b5fb07519c [NixOS] Add dean's new ssh key 2024-05-27 14:49:19 -06:00
0f7e3596de Merge pull request #24 from bcorner/master
[NixOS] Add bencbox
2024-05-15 20:07:31 -06:00
7aeed13a34 [NixOS] Add bencbox 2024-05-15 20:54:01 -05:00
7f87156a58 Merge pull request #23 from deanwenstrand/master
Add dean-zephyrus
2024-05-13 17:43:43 -06:00
8a7cec11cf Add dean-zephyrus 2024-05-13 21:50:27 +00:00
da865671ad [NixOS] Flake update 2024-05-11 23:42:45 -06:00
3004f57c1a [NixOS] Update vscode-server flake 2024-05-07 14:16:23 -06:00
f82c4fb659 [NixOS] Enable vscode-server 2024-05-07 14:09:44 -06:00
a4d6664b77 [NixOS] Add zulip 2024-05-05 22:25:58 -06:00
dd256a24f4 [git] Add find-merge 2024-04-28 17:18:24 -06:00
03829b74ce [NixOS] Reenable element-desktop 2024-04-28 17:18:24 -06:00
29e68d1714 [NixOS] Move my-python-packages to overlay 2024-04-28 17:18:24 -06:00
c0c51f571d [NixOS] Add global argcomplete completion support 2024-04-28 17:18:24 -06:00
9c54be10e1 [Emacs] Update mc-lists 2024-04-28 17:18:24 -06:00
eb69712a7c [Emacs] Add org-drill 2024-04-08 23:44:09 -06:00
b86cce1c12 [NixOS] Typo 2024-04-08 07:47:07 +00:00
1b44c66902 [NixOS] Add unpriveleged 2024-04-08 07:46:22 +00:00
b54cb9fceb [NixOS] Make kanivan keys work for syncthing 2024-04-08 07:39:11 +00:00
5fae69b391 [NixOS] Gitea secret can access syncthing user 2024-04-08 05:49:38 +00:00
b8d4cf59b8 [NixOS] Fix syncthing directory location 2024-03-23 21:20:40 -06:00
9ab7b41780 [NixOS] Update nixquick port 2024-03-22 16:50:54 -06:00
4f37050c1c Make nixquick the cache server instead of ryzen-shine 2024-03-22 16:22:48 -06:00
49d98cbca1 [NixOS] Fix for jay-lenovo 2024-03-21 18:11:06 -06:00
47ecc2a0c4 [NixOS] Fix strixi-minaj vs wsl identification in syncthing 2024-03-21 15:22:23 -06:00
149de8faae [NixOS] Fix perms issues with syncthing 2024-03-21 15:16:11 -06:00
487aae9a58 [NixOS] Remove picom inactive dim 2024-03-21 15:16:01 -06:00
fde42131d2 [NixOS] Remove 1896Office config 2024-03-20 22:01:15 -06:00
ddbe91c669 [taffybar] Fix 2024-03-20 03:43:21 -06:00
74a6e98e90 [taffybar] Fix taffybar.hs 2024-03-20 03:38:50 -06:00
1aaeeaedf0 [Linux] Generalize brightness manager to work for nvidia 2024-03-20 03:36:37 -06:00
e66a48a311 [NixOS] Rename strixy-minaj to strixi-minaj 2024-03-19 20:33:00 -06:00
ce1ba6dd90 [taffybar] Make strixy-minaj use laptop widgets 2024-03-19 20:31:04 -06:00
165646b395 [NixOS] Add new computers to syncthing 2024-03-19 20:27:37 -06:00
4de88f623c [NixOS] Set dpi for strixy-minaj 2024-03-14 20:52:13 -06:00
c656ebf8dc [NixOS] Add asusd on strixy-minaj 2024-03-14 19:48:38 -06:00
4c3ec2a29b [NixOS] Fix warning 2024-03-15 01:32:11 +00:00
6157a2b047 [NixOS] Add just 2024-03-15 01:32:03 +00:00
d149bc7755 [NixOS] Deprioritize railbird cache 2024-03-15 01:29:08 +00:00
4f669db603 [NixOS] Replace scripts with justfile 2024-03-15 01:28:56 +00:00
eccceb0d31 Add keymap for strixy-minaj 2024-03-15 00:52:28 +00:00
277432379c [NixOS] Add strixy-minaj 2024-03-15 00:24:38 +00:00
4e3e75c3e2 [NixOS] Add strixy-minaj 2024-03-14 16:56:27 -06:00
b2bf550aa0 [NixOS] Bump flake.lock 2024-03-12 00:10:59 -06:00
fdc4bda993 [NixOS] Allow an insecure nix 2024-03-12 00:10:11 -06:00
23a4d50b4a [NixOS] d-spy replaces dfeet 2024-03-12 00:08:32 -06:00
96012de10c Wrok 2024-03-12 00:00:10 -06:00
83940416d2 Hmm fix gitea runner 2024-03-11 23:58:51 -06:00
6e0427d4e0 Make gitea-runner docker work 2024-03-11 23:53:55 -06:00
6f2f2c54a7 Add fix_nix shell alias 2024-03-11 20:43:55 -06:00
3d121c8908 [Emacs] Add graphql-mode 2024-03-09 20:44:01 -07:00
66842d545a [Emacs] Add imalison:lsp-deferred-when-enabled 2024-03-06 18:15:21 -07:00
dc0dea2695 [git] Ignore the untracked directory 2024-03-01 00:58:52 -07:00
3017ea1b63 [NixOS] Add git-fame 2024-03-01 00:58:37 -07:00
ef7e685007 [Emacs] Add just-mode 2024-03-01 00:58:11 -07:00
4700030548 [NixOS] Fix picom service 2024-02-15 00:01:19 -07:00
45fd9aadef [NixOS] Flake update 2024-02-13 12:29:30 -07:00
b034f12adc [NixOS] Disable pgadmin 2024-02-13 12:27:54 -07:00
2458cb6081 [Alacritty] More fixes 2024-02-13 12:06:41 -07:00
2f49c3f86b [Alacritty] Move to toml 2024-02-12 22:54:04 -07:00
e7d536417c [NixOS] Changes for bump 2024-02-12 22:05:06 -07:00
61752b600d [NixOS] Remove gnupg override 2024-02-11 18:00:37 -07:00
00cfd236ab [NixOS] Add android studio to adele 2024-02-04 01:33:50 -07:00
88937e9acc [NixOS] Add rabbitmq 2024-01-29 19:51:02 -07:00
30146f4fdb [XMonad] Bump contrib 2024-01-29 01:55:14 -07:00
737167fe3f [git] Fix del-merged-branches 2024-01-29 01:55:14 -07:00
5809b012c5 taffybar fixes 2024-01-17 17:02:25 -07:00
90952a3dc0 [NixOS] Enable postgres by default 2024-01-05 01:34:26 -07:00
d8dee1504e Add postgres to jay lenovo 2024-01-04 20:50:46 -07:00
b744be3b00 [nixos] Dont haddock taffybar 2024-01-04 20:38:59 -07:00
8b83c429d1 [NixOS] Remove initialization for postgres 2024-01-04 20:02:11 -07:00
0c685bee88 [NixOS] Enable postgres on jimi-hendnix 2024-01-04 19:55:09 -07:00
830499c7d6 [NixOS] More sophisticated postgres initialization 2024-01-04 19:52:46 -07:00
18ef010bf1 [NixOS] Add postgres configuration 2024-01-03 13:45:20 -07:00
a75824ee2a [NixOS] Programatically get the list of users 2023-12-30 22:42:43 -07:00
0f65575a35 [NixOS] Add ffmpeg to essential 2023-12-22 22:13:36 -07:00
c9638dbbcd [NixOS] Allow openssl-1.1.1w 2023-12-21 16:21:32 -07:00
aff5aff63f [NixOS] Add neovim systemwide 2023-12-21 16:08:34 -07:00
0dd9976a38 [NixOS] Fix avahi warning 2023-12-21 16:04:06 -07:00
a98b45590a [NixOS] Add neovim for micah 2023-12-21 16:01:34 -07:00
6f1242b02c [NixOS] Add dean syncthing and railbird directory 2023-12-21 13:26:46 -07:00
1eea8c61e7 [NixOS] Backup gitea 2023-12-20 23:02:27 -07:00
f0d35c59dd [NixOS] Add ed25519 key for micah 2023-12-20 14:43:09 -07:00
e36ba46f34 [NixOS] Add micah 2023-12-20 14:30:55 -07:00
08ef11f1ec [NixOS] Use nvidia drivers on adele 2023-12-19 22:20:05 -07:00
fa9466dadd [NixOS] Add android-studio to jay-lenovo 2023-12-16 21:18:23 -07:00
0aa212b83d [Emacs] Run alejandra automatically 2023-12-16 13:46:53 -07:00
6b8789d566 [NixOS] Add script to expire home manager generations 2023-12-16 13:35:37 -07:00
1db30187cb [XMonad] Bump contrib pointer 2023-12-16 13:35:21 -07:00
e425d5c1f6 [Emacs] Add terraform-mode 2023-12-16 13:34:35 -07:00
98b49c63d4 [NixOS] Disable nix overlay 2023-12-15 20:23:19 -07:00
f933f5527d [Emacs] Add functions to allow git-link to work with dev.railbird.ai 2023-12-15 20:11:56 -07:00
8c49d47324 [Emacs] Adds groovy mode 2023-12-15 20:11:16 -07:00
42015c284a [NixOS] Fix vscode? 2023-12-13 11:56:10 -07:00
58b9a395d7 [NixOS] Use home manager for vscode support 2023-12-13 11:55:20 -07:00
b102fd2b85 [NixOS] Move nginx mods to biskcomp 2023-12-13 11:41:50 -07:00
4a7edcda75 [NixOS] Set system user for nginx 2023-12-13 11:39:43 -07:00
d3f552afda [NixOS] Fix nginx group 2023-12-13 11:38:45 -07:00
e8095c2081 [NixOS] Add primary group for nginx 2023-12-13 11:37:25 -07:00
f810880d90 [NixOS] Put vscode-server in baseModules 2023-12-13 11:35:47 -07:00
4b71ea64fe [NixOS] Share syncthing directory from biskcomp 2023-12-13 11:31:58 -07:00
5692999aa1 [NixOS] Add vscode server fix 2023-12-13 11:31:01 -07:00
84 changed files with 2457 additions and 686 deletions

View File

@@ -1,8 +0,0 @@
language: generic
script: bash ./gen-gh-pages/deploy.sh
env:
global:
- ENCRYPTION_LABEL: "73e6c870aa87"
- COMMIT_AUTHOR_EMAIL: "IvanMalison@gmail.com"
- COMMIT_AUTHOR_NAME: "Ivan Malison"

View File

@@ -0,0 +1,15 @@
import = ["/home/imalison/.config/alacritty/themes/themes/dracula.toml"]
[font]
size = 8
[scrolling]
history = 10000
multiplier = 3
[window]
decorations = "full"
[window.padding]
x = 10
y = 10

View File

@@ -1,34 +0,0 @@
scrolling:
# How many lines of scrollback to keep,
# '0' will disable scrolling.
history: 10000
# Number of lines the viewport will move for every line
# scrolled when scrollback is enabled (history > 0).
multiplier: 3
# Faux Scrolling
#
# The `faux_multiplier` setting controls the number
# of lines the terminal should scroll when the alternate
# screen buffer is active. This is used to allow mouse
# scrolling for applications like `man`.
#
# To disable this completely, set `faux_multiplier` to 0.
faux_multiplier: 3
# Automatically scroll to the bottom when new text is written
# to the terminal.
auto_scroll: false
font:
size: 8
window:
padding:
x: 10
y: 10
decorations: full
import:
- ~/.config/alacritty/themes/themes/dracula.yaml

View File

@@ -0,0 +1,20 @@
output DP-0
off
output DP-1
off
output HDMI-0
off
output DP-3
off
output DP-4
off
output DP-5
off
output DP-6
off
output DP-2
crtc 0
mode 2560x1600
pos 0x0
rate 240.00
x-prop-non_desktop 0

View File

@@ -0,0 +1 @@
DP-2 00ffffffffffff0009e5580c0000000001210104b527187803bbc5ae503fb7250c515500000001010101010101010101010101010101c07200a0a040c8603020360084f21000001a000000fd0c30f0b1b176010a202020202020000000fe00424f452043510a202020202020000000fc004e4531383051444d2d4e4d310a029602030f00e3058080e606050195731000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa702079020021001d280f7409000a400680dd2a511824b249120e023554b060ec64662a1378220014ffed1185ff099f002f001f003f06c700020005002b000c27003cef00002700303b0000810015741a0000030b30f0006095107310f0000000008d00000000000000000000000000000000000000000000000000000000bc90

View File

@@ -1,63 +0,0 @@
# Beware! This file is rewritten by htop when settings are changed in the interface.
# The parser is also very primitive, and not human-friendly.
htop_version=3.2.2
config_reader_min_version=3
fields=0 48 17 18 38 39 40 2 46 47 49 1
hide_kernel_threads=1
hide_userland_threads=1
hide_running_in_container=0
shadow_other_users=0
show_thread_names=0
show_program_path=1
highlight_base_name=0
highlight_deleted_exe=1
shadow_distribution_path_prefix=0
highlight_megabytes=1
highlight_threads=0
highlight_changes=0
highlight_changes_delay_secs=5
find_comm_in_cmdline=1
strip_exe_from_cmdline=1
show_merged_command=0
header_margin=1
screen_tabs=0
detailed_cpu_time=0
cpu_count_from_one=1
show_cpu_usage=1
show_cpu_frequency=0
show_cpu_temperature=0
degree_fahrenheit=0
update_process_names=0
account_guest_in_cpu_meter=0
color_scheme=0
enable_mouse=1
delay=15
hide_function_bar=0
header_layout=two_50_50
column_meters_0=AllCPUs Memory Swap
column_meter_modes_0=1 1 1
column_meters_1=Tasks LoadAverage Uptime
column_meter_modes_1=2 2 2
tree_view=0
sort_key=46
tree_sort_key=46
sort_direction=-1
tree_sort_direction=-1
tree_view_always_by_pid=0
all_branches_collapsed=0
screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
.sort_key=PERCENT_CPU
.tree_sort_key=PERCENT_CPU
.tree_view=0
.tree_view_always_by_pid=0
.sort_direction=-1
.tree_sort_direction=-1
.all_branches_collapsed=0
screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command
.sort_key=IO_RATE
.tree_sort_key=PID
.tree_view=0
.tree_view_always_by_pid=0
.sort_direction=-1
.tree_sort_direction=1
.all_branches_collapsed=0

699
dotfiles/config/taffybar/flake.lock generated Normal file
View File

@@ -0,0 +1,699 @@
{
"nodes": {
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fourmolu-011": {
"flake": false,
"locked": {
"narHash": "sha256-g/yDZXeLCHq/iXoZTaTYSb8l9CMny3AKsRQgWElagZI=",
"type": "tarball",
"url": "https://hackage.haskell.org/package/fourmolu-0.11.0.0/fourmolu-0.11.0.0.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://hackage.haskell.org/package/fourmolu-0.11.0.0/fourmolu-0.11.0.0.tar.gz"
}
},
"fourmolu-012": {
"flake": false,
"locked": {
"narHash": "sha256-yru8ls67DMM6WSeVU6xDmmwa48I8S9CUv9NBaxSQ29M=",
"type": "tarball",
"url": "https://hackage.haskell.org/package/fourmolu-0.12.0.0/fourmolu-0.12.0.0.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://hackage.haskell.org/package/fourmolu-0.12.0.0/fourmolu-0.12.0.0.tar.gz"
}
},
"git-ignore-nix": {
"inputs": {
"nixpkgs": [
"taffybar",
"nixpkgs"
]
},
"locked": {
"lastModified": 1660459072,
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"ref": "master",
"repo": "gitignore.nix",
"type": "github"
}
},
"git-ignore-nix_2": {
"inputs": {
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1703887061,
"narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"ref": "master",
"repo": "gitignore.nix",
"type": "github"
}
},
"gitignore": {
"flake": false,
"locked": {
"lastModified": 1660459072,
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"gtk-sni-tray": {
"inputs": {
"flake-utils": [
"taffybar",
"flake-utils"
],
"git-ignore-nix": [
"taffybar",
"git-ignore-nix"
],
"nixpkgs": [
"taffybar",
"nixpkgs"
],
"status-notifier-item": [
"taffybar",
"status-notifier-item"
]
},
"locked": {
"lastModified": 1663379298,
"narHash": "sha256-m18+G7V1N+g/pPeKJG9hkblGA5c8QTnUYnsU5t14sOw=",
"owner": "taffybar",
"repo": "gtk-sni-tray",
"rev": "1927d86308d34b5d21a709cf8ff5332ec5d37de4",
"type": "github"
},
"original": {
"owner": "taffybar",
"ref": "master",
"repo": "gtk-sni-tray",
"type": "github"
}
},
"gtk-strut": {
"inputs": {
"flake-utils": [
"taffybar",
"flake-utils"
],
"git-ignore-nix": [
"taffybar",
"git-ignore-nix"
],
"nixpkgs": [
"taffybar",
"nixpkgs"
]
},
"locked": {
"lastModified": 1663377859,
"narHash": "sha256-UrBd+R3NaJIDC2lt5gMafS3KBeLs83emm2YorX2cFCo=",
"owner": "taffybar",
"repo": "gtk-strut",
"rev": "d946eb230cdccf5afc063642b3215723e555990b",
"type": "github"
},
"original": {
"owner": "taffybar",
"ref": "master",
"repo": "gtk-strut",
"type": "github"
}
},
"haskell-hie-bios": {
"flake": false,
"locked": {
"lastModified": 1686930638,
"narHash": "sha256-gfcxxHtZ2jUsiKNn/O4jEkfWF/2H04aTnaIvPDbtNlQ=",
"owner": "haskell",
"repo": "hie-bios",
"rev": "3d4fadfb0dc44cb287db9897ecfb503899d33513",
"type": "github"
},
"original": {
"owner": "haskell",
"repo": "hie-bios",
"type": "github"
}
},
"haskell-implicit-hie-cradle": {
"flake": false,
"locked": {
"lastModified": 1686495518,
"narHash": "sha256-OAe+zOkMZuoTfVEMnxnCT1cmPgRF/riAR8nVdomnwxo=",
"owner": "smunix",
"repo": "implicit-hie-cradle",
"rev": "d6aa00355898469af56cfd5e62f7fc8bd9959ded",
"type": "github"
},
"original": {
"owner": "smunix",
"ref": "smunix-patch-hls-0.5-1",
"repo": "implicit-hie-cradle",
"type": "github"
}
},
"haskell-language-server": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_3",
"fourmolu-011": "fourmolu-011",
"fourmolu-012": "fourmolu-012",
"gitignore": "gitignore",
"haskell-hie-bios": "haskell-hie-bios",
"haskell-implicit-hie-cradle": "haskell-implicit-hie-cradle",
"hiedb": "hiedb",
"hlint-35": "hlint-35",
"hlint-36": "hlint-36",
"lsp": "lsp",
"lsp-test": "lsp-test",
"lsp-types": "lsp-types",
"nixpkgs": "nixpkgs_2",
"ormolu-052": "ormolu-052",
"ormolu-07": "ormolu-07",
"stylish-haskell-0145": "stylish-haskell-0145"
},
"locked": {
"lastModified": 1693851896,
"narHash": "sha256-799JUHpBd2iMRCrTYDme5RsROKnIwSKBe2xYxgVN7QI=",
"owner": "colonelpanic8",
"repo": "haskell-language-server",
"rev": "ea368cef0673059fff95e953ef983109b5979dbc",
"type": "github"
},
"original": {
"owner": "colonelpanic8",
"ref": "goto-dependency-definition-2",
"repo": "haskell-language-server",
"type": "github"
}
},
"hiedb": {
"flake": false,
"locked": {
"lastModified": 1691542357,
"narHash": "sha256-90ftphhoIo0CklJrjfCGQrZIUKZfdMJ2Og6tep9dmJ8=",
"owner": "nlander",
"repo": "HieDb",
"rev": "4eebfcf8fab54f24808e6301227d77ae64d2509c",
"type": "github"
},
"original": {
"owner": "nlander",
"ref": "all-new-functions",
"repo": "HieDb",
"type": "github"
}
},
"hlint-35": {
"flake": false,
"locked": {
"narHash": "sha256-qQNUlQQnahUGEO92Lm0RwjTGBGr2Yaw0KRuFRMoc5No=",
"type": "tarball",
"url": "https://hackage.haskell.org/package/hlint-3.5/hlint-3.5.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://hackage.haskell.org/package/hlint-3.5/hlint-3.5.tar.gz"
}
},
"hlint-36": {
"flake": false,
"locked": {
"narHash": "sha256-fH4RYnWeuBqJI5d3Ba+Xs0BxYr0IYFH1OWO3k2iHGlU=",
"type": "tarball",
"url": "https://hackage.haskell.org/package/hlint-3.6.1/hlint-3.6.1.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://hackage.haskell.org/package/hlint-3.6.1/hlint-3.6.1.tar.gz"
}
},
"lsp": {
"flake": false,
"locked": {
"narHash": "sha256-HcEfdYUrCHufEa+10M2wESjnK41xM/msd+t6r6JwQO0=",
"type": "tarball",
"url": "https://hackage.haskell.org/package/lsp-2.2.0.0/lsp-2.2.0.0.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://hackage.haskell.org/package/lsp-2.2.0.0/lsp-2.2.0.0.tar.gz"
}
},
"lsp-test": {
"flake": false,
"locked": {
"narHash": "sha256-E1D3X2+I9ZTZLpHDEDTXexQFYpyG5byOFRIvRTeBsn8=",
"type": "tarball",
"url": "https://hackage.haskell.org/package/lsp-test-0.16.0.0/lsp-test-0.16.0.0.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://hackage.haskell.org/package/lsp-test-0.16.0.0/lsp-test-0.16.0.0.tar.gz"
}
},
"lsp-types": {
"flake": false,
"locked": {
"narHash": "sha256-Oa5HuKdsdTSQUKtuSt06zVAq19Qxq5IJZObrnPwlB6s=",
"type": "tarball",
"url": "https://hackage.haskell.org/package/lsp-types-2.0.2.0/lsp-types-2.0.2.0.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://hackage.haskell.org/package/lsp-types-2.0.2.0/lsp-types-2.0.2.0.tar.gz"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1702312524,
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"path": "/nix/store/4fgs7yzsy2dqnjw8j42qlp9i1vgarzy0-source",
"rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1686874404,
"narHash": "sha256-u2Ss8z+sGaVlKtq7sCovQ8WvXY+OoXJmY1zmyxITiaY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "efc10371d5c5b8d2d58bab6c1100753efacfe550",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "haskell-updates",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1689098530,
"narHash": "sha256-fxc/9f20wRyo/5ydkmZkX/Sh/ULa7RcT8h+cUv8p/44=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f2406198ea0e4e37d4380d0e20336c575b8f8ef9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1666603677,
"narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "074da18a72269cc5a6cf444dce42daea5649b2fe",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1702312524,
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"path": "/nix/store/4fgs7yzsy2dqnjw8j42qlp9i1vgarzy0-source",
"rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"ormolu-052": {
"flake": false,
"locked": {
"narHash": "sha256-H7eqId488RBRxcf7flgJefAZmRgFJASJva+Oy7GG4q4=",
"type": "tarball",
"url": "https://hackage.haskell.org/package/ormolu-0.5.2.0/ormolu-0.5.2.0.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://hackage.haskell.org/package/ormolu-0.5.2.0/ormolu-0.5.2.0.tar.gz"
}
},
"ormolu-07": {
"flake": false,
"locked": {
"narHash": "sha256-5M5gNzSvsiQH1+0oexRByzf5EIET+0BFwR4fLIr2P7g=",
"type": "tarball",
"url": "https://hackage.haskell.org/package/ormolu-0.7.1.0/ormolu-0.7.1.0.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://hackage.haskell.org/package/ormolu-0.7.1.0/ormolu-0.7.1.0.tar.gz"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"taffybar": "taffybar",
"xmonad": "xmonad_2"
}
},
"status-notifier-item": {
"inputs": {
"flake-utils": [
"taffybar",
"flake-utils"
],
"git-ignore-nix": [
"taffybar",
"git-ignore-nix"
],
"nixpkgs": [
"taffybar",
"nixpkgs"
]
},
"locked": {
"lastModified": 1641783528,
"narHash": "sha256-wJymJfYPFj4/r1e4kT/wt9FEsyCXo5JkkcOoozpuhag=",
"owner": "taffybar",
"repo": "status-notifier-item",
"rev": "f4f9c66ab57fc42eeed0de8cfac9f5f9d30d9dc7",
"type": "github"
},
"original": {
"owner": "taffybar",
"repo": "status-notifier-item",
"type": "github"
}
},
"stylish-haskell-0145": {
"flake": false,
"locked": {
"narHash": "sha256-EE7RFQ6q4Ek8daRgOpNMGepYLa9o8cM4OLjTNUSHQf0=",
"type": "tarball",
"url": "https://hackage.haskell.org/package/stylish-haskell-0.14.5.0/stylish-haskell-0.14.5.0.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://hackage.haskell.org/package/stylish-haskell-0.14.5.0/stylish-haskell-0.14.5.0.tar.gz"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"taffybar": {
"inputs": {
"flake-utils": "flake-utils_2",
"git-ignore-nix": "git-ignore-nix",
"gtk-sni-tray": "gtk-sni-tray",
"gtk-strut": "gtk-strut",
"haskell-language-server": "haskell-language-server",
"nixpkgs": "nixpkgs_3",
"status-notifier-item": "status-notifier-item",
"xmonad": "xmonad"
},
"locked": {
"lastModified": 1696612500,
"narHash": "sha256-Q19F91yVQviqxgY+FkvEwtX2vcw414eVtK8erim0NrU=",
"owner": "taffybar",
"repo": "taffybar",
"rev": "46eba89c2a4d4ffefe42c3ee4506d1b74c8e61fd",
"type": "github"
},
"original": {
"owner": "taffybar",
"repo": "taffybar",
"type": "github"
}
},
"unstable": {
"locked": {
"lastModified": 1689098530,
"narHash": "sha256-fxc/9f20wRyo/5ydkmZkX/Sh/ULa7RcT8h+cUv8p/44=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f2406198ea0e4e37d4380d0e20336c575b8f8ef9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"unstable_2": {
"locked": {
"lastModified": 1704538339,
"narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"xmonad": {
"inputs": {
"flake-utils": [
"taffybar",
"flake-utils"
],
"git-ignore-nix": [
"taffybar",
"git-ignore-nix"
],
"nixpkgs": [
"taffybar",
"nixpkgs"
],
"unstable": "unstable"
},
"locked": {
"lastModified": 1687976934,
"narHash": "sha256-hUZmKy3jJ1+5rTGeQzfNR+LxgzmLaaeRVnbsJMEVw0Q=",
"owner": "xmonad",
"repo": "xmonad",
"rev": "1aac6611d82065c9198e5584176058a9483fcbb0",
"type": "github"
},
"original": {
"owner": "xmonad",
"ref": "master",
"repo": "xmonad",
"type": "github"
}
},
"xmonad_2": {
"inputs": {
"flake-utils": "flake-utils_4",
"git-ignore-nix": "git-ignore-nix_2",
"nixpkgs": "nixpkgs_5",
"unstable": "unstable_2"
},
"locked": {
"lastModified": 1702895348,
"narHash": "sha256-ADRTw4DTfDCmsSFFWZKmvdmIjnEVY7pjjUxYytKXy1E=",
"owner": "xmonad",
"repo": "xmonad",
"rev": "c4cf4715f736fed77fb2af622c0760259ac2cf43",
"type": "github"
},
"original": {
"owner": "xmonad",
"ref": "master",
"repo": "xmonad",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

View File

@@ -2,11 +2,14 @@
inputs = { inputs = {
flake-utils.url = github:numtide/flake-utils; flake-utils.url = github:numtide/flake-utils;
xmonad.url = github:xmonad/xmonad/master; xmonad.url = github:xmonad/xmonad/master;
taffybar.url = path:./taffybar; taffybar.url = "github:taffybar/taffybar";
}; };
outputs = { self, flake-utils, taffybar, nixpkgs, xmonad }: outputs = { self, flake-utils, taffybar, nixpkgs, xmonad }:
let let
hoverlay = final: prev: hself: hsuper: { hoverlay = final: prev: hself: hsuper: {
taffybar = hsuper.taffybar.overrideAttrs (old: {
doHaddock = false;
});
imalison-taffybar = prev.haskell.lib.addPkgconfigDepends ( imalison-taffybar = prev.haskell.lib.addPkgconfigDepends (
hself.callCabal2nix "imalison-taffybar" hself.callCabal2nix "imalison-taffybar"
( (

View File

@@ -226,12 +226,14 @@ main = do
, startWidgets = [myWorkspaces, myLayout] , startWidgets = [myWorkspaces, myLayout]
} }
) )
, ( "strixi-minaj"
, baseConfig { endWidgets = laptopEndWidgets }
)
, ( "jay-lenovo" , ( "jay-lenovo"
, baseConfig { endWidgets = laptopEndWidgets } , baseConfig { endWidgets = laptopEndWidgets }
), )
( "nixquick" , ( "nixquick"
, baseConfig { endWidgets = [ myTray , myMpris ] , baseConfig { endWidgets = [ myTray , myMpris ] }
}
) )
] ]

View File

@@ -54,12 +54,14 @@
sp-remove-active-pair-overlay sp-remove-active-pair-overlay
sp-splice-sexp sp-splice-sexp
sp-splice-sexp-killing-backward sp-splice-sexp-killing-backward
string-inflection-all-cycle
string-inflection-toggle string-inflection-toggle
tern-ac-dot-complete tern-ac-dot-complete
transpose-sexps transpose-sexps
transpose-words transpose-words
undo-redo undo-redo
universal-argument-minus universal-argument-minus
upcase-region
wdired-finish-edit wdired-finish-edit
yaml-electric-backspace yaml-electric-backspace
yaml-electric-dash-and-dot yaml-electric-dash-and-dot

View File

@@ -1514,20 +1514,25 @@ https://github.com/alpaker/Fill-Column-Indicator/issues/21 for more details
(advice-add 'company-call-frontends :before #'fci-on-off-fci-before-company) (advice-add 'company-call-frontends :before #'fci-on-off-fci-before-company)
(add-hook 'prog-mode-hook 'fci-mode))) (add-hook 'prog-mode-hook 'fci-mode)))
#+END_SRC #+END_SRC
** highlight-indent-guides ** indent-bars
If the load-theme hook from this package starts causing trouble check for #+begin_src emacs-lisp
custom-set-faces in your custom file. (use-package indent-bars
#+BEGIN_SRC emacs-lisp :straight (indent-bars :type git :host github :repo "jdtsmith/indent-bars")
(use-package highlight-indent-guides
:commands highlight-indent-guides-mode
:diminish highlight-indent-guides-mode
:preface
(progn
(add-hook 'prog-mode-hook 'highlight-indent-guides-mode))
:config :config
(progn (require 'indent-bars-ts) ; not needed with straight
(setq highlight-indent-guides-method 'fill))) :custom
#+END_SRC (indent-bars-treesit-support t)
(indent-bars-treesit-ignore-blank-lines-types '("module"))
;; Add other languages as needed
(indent-bars-treesit-scope '((python function_definition class_definition for_statement
if_statement with_statement while_statement)))
;; wrap may not be needed if no-descend-list is enough
;; (indent-bars-treesit-wrap '((python argument_list parameters ; for python, as an example
;; list list_comprehension
;; dictionary dictionary_comprehension
;; parenthesized_expression subscript)))
:hook ((prog-mode) . indent-bars-mode))
#+end_src
** man-mode ** man-mode
Man page escape sequences aren't properly handled by emacs pager. This function Man page escape sequences aren't properly handled by emacs pager. This function
fixes that, but for now, it needs to be run manually, since I haven't figured fixes that, but for now, it needs to be run manually, since I haven't figured
@@ -1785,7 +1790,8 @@ bind-key and global-set-key forms.
(defun imalison:do-rg-default-directory (&rest args) (defun imalison:do-rg-default-directory (&rest args)
(interactive) (interactive)
(apply 'consult-ripgrep default-directory args)) (let ((consult-ripgrep-args (concat consult-ripgrep-args " --no-ignore" " --hidden")))
(apply 'consult-ripgrep default-directory args)))
(emit-prefix-selector imalison:do-rg (emit-prefix-selector imalison:do-rg
consult-ripgrep consult-ripgrep
@@ -2316,6 +2322,13 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab
(unbind-key "C-j" python-mode-map) (unbind-key "C-j" python-mode-map)
(add-hook 'python-mode-hook #'imalison:python-mode))) (add-hook 'python-mode-hook #'imalison:python-mode)))
#+END_SRC #+END_SRC
*** ruby
#+begin_src emacs-lisp
(use-package ruby-mode
:config
(setf (alist-get 'ruby-ts-mode apheleia-mode-alist)
'(rubocop)))
#+end_src
*** go *** go
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package go-mode (use-package go-mode
@@ -2622,6 +2635,13 @@ eval-last-sexp.
(shell-command-to-string "nix eval -I \"$NIX_PATH\" --expr '<nixpkgs>' --impure")))) (shell-command-to-string "nix eval -I \"$NIX_PATH\" --expr '<nixpkgs>' --impure"))))
:config :config
(progn (progn
(use-package apheleia
:demand t
:config
(progn
(add-to-list 'apheleia-formatters '(alejandra . ("alejandra")))
(setf (alist-get 'nix-mode apheleia-mode-alist)
'(alejandra))))
(setq nix-indent-function 'nix-indent-line))) (setq nix-indent-function 'nix-indent-line)))
(use-package lsp-nix (use-package lsp-nix
@@ -2885,6 +2905,14 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877
:defer t :defer t
:mode ("\\.kt\\'")) :mode ("\\.kt\\'"))
#+END_SRC #+END_SRC
*** swift
#+begin_src emacs-lisp
(use-package swift-mode)
#+end_src
*** groovy
#+begin_src emacs-lisp
(use-package groovy-mode)
#+end_src
*** vala *** vala
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package vala-mode (use-package vala-mode
@@ -2931,6 +2959,10 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877
(use-package protobuf-mode (use-package protobuf-mode
:defer t) :defer t)
#+END_SRC #+END_SRC
*** graphql
#+begin_src emacs-lisp
(use-package graphql-mode)
#+end_src
*** json-mode *** json-mode
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package json-mode (use-package json-mode
@@ -2947,6 +2979,10 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877
:mode (("\\.yaml\\'" . yaml-mode) :mode (("\\.yaml\\'" . yaml-mode)
("\\.yml\\'" . yaml-mode))) ("\\.yml\\'" . yaml-mode)))
#+END_SRC #+END_SRC
*** just-mode
#+begin_src emacs-lisp
(use-package just-mode)
#+end_src
*** es-mode *** es-mode
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package es-mode (use-package es-mode
@@ -2967,6 +3003,11 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877
(use-package toml-mode (use-package toml-mode
:mode (("\\.toml\\'" . toml-mode))) :mode (("\\.toml\\'" . toml-mode)))
#+end_src #+end_src
*** terraform
#+begin_src emacs-lisp
(use-package terraform-mode
:mode (("\\.tf\\'" . terraform-mode)))
#+end_src
** Document ** Document
*** org *** org
My org-mode configuration now lives in its own file org-config.org. My org-mode configuration now lives in its own file org-config.org.
@@ -3146,7 +3187,21 @@ My org-mode configuration now lives in its own file org-config.org.
:defer t :defer t
:config :config
(progn (progn
(setq git-link-use-commit t))) (setq git-link-use-commit t)
(defun git-link-commit-gitea (hostname dirname commit)
(format "https://%s/%s/commit/%s"
hostname
dirname
commit))
(defun git-link-gitea (hostname dirname filename branch commit start end)
(format "https://%s/%s/src/commit/%s/%s#L%s"
hostname
dirname
commit
filename
start))
(add-to-list 'git-link-remote-alist '("dev.railbird.ai" git-link-gitea))
(add-to-list 'git-link-commit-remote-alist '("dev.railbird.ai" git-link-gitea))))
#+END_SRC #+END_SRC
** magit-gitflow ** magit-gitflow
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
@@ -3269,10 +3324,15 @@ emr (emacs refactor) provides support for refactoring in many programming langua
#+END_SRC #+END_SRC
** language-server-protocol (lsp) ** language-server-protocol (lsp)
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(defvar imalison:use-lsp nil)
(use-package lsp-mode (use-package lsp-mode
:defer 3
:commands lsp :commands lsp
:preface :preface
(defun imalison:lsp-deferred-when-enabled ()
(add-hook 'hack-local-variables-hook
(lambda ()
(when imalison:use-lsp
(lsp-deferred))) nil t))
(defun imalison:nix-develop-lsp-wrapper-function (argv) (defun imalison:nix-develop-lsp-wrapper-function (argv)
(append (append
(append (list "nix" "develop" "-I" "." "--impure" "--command") (append (list "nix" "develop" "-I" "." "--impure" "--command")
@@ -3283,10 +3343,35 @@ emr (emacs refactor) provides support for refactoring in many programming langua
(use-package lsp-ui (use-package lsp-ui
:config :config
(progn (progn
(add-hook 'prog-mode-hook 'imalison:lsp-deferred-when-enabled)
(add-hook 'lsp-mode-hook 'lsp-ui-mode) (add-hook 'lsp-mode-hook 'lsp-ui-mode)
(setq lsp-ui-doc-position 'bottom))))) (setq lsp-ui-doc-position 'bottom)))))
#+END_SRC #+END_SRC
* Utility * Utility
** eat
#+begin_src emacs-lisp
(use-package eat
:preface
(progn
(defun imalison:avy-eat (arg)
(interactive "P")
(eat-emacs-mode)
(imalison:avy arg)))
:bind
(:map eat-mode-map
("C-c C-k" . eat-semi-char-mode)
:map eat-semi-char-mode-map
("C-c C-j" . eat-emacs-mode)
("C-j" . imalison:avy-eat))
:config
(progn
(setq eat--install-path
(file-name-directory
(file-truename (imalison:join-paths eat--install-path "eat.el"))))
(eat-compile-terminfo)
(setq eat-term-shell-integration-directory
(imalison:join-paths eat--install-path "integration"))))
#+end_src
** term ** term
The main thing I do here is restore a bunch of keybindings that are eliminated The main thing I do here is restore a bunch of keybindings that are eliminated
in term-mode. This makes term-mode 1000% more useful in term-mode. This makes term-mode 1000% more useful
@@ -3368,6 +3453,12 @@ in term-mode. This makes term-mode 1000% more useful
term-projectile-switch) term-projectile-switch)
:config :config
(progn (progn
(use-package term-manager-eat
:demand t
:straight
(term-manager-eat :type git :files ("term-manager-eat.el")
:host github :repo "colonelpanic8/term-manager"))
(setq term-projectile-term-manager (term-projectile :build-term 'term-manager-eat-build-term))
(emit-prefix-selector imalison:term (emit-prefix-selector imalison:term
term-projectile-forward term-projectile-forward
term-projectile-create-new) term-projectile-create-new)
@@ -3563,15 +3654,6 @@ I had to disable this mode because something that it does messes with coding set
(progn (progn
(setq dtrt-indent-active-mode-line-info " [⟼]"))) (setq dtrt-indent-active-mode-line-info " [⟼]")))
#+END_SRC #+END_SRC
** indent-guide
#+BEGIN_SRC emacs-lisp
(use-package indent-guide
:disabled t
:config
(progn
(indent-guide-global-mode -1)
(setq indent-guide-delay 0.1)))
#+END_SRC
** rainbow-delimiters ** rainbow-delimiters
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package rainbow-delimiters (use-package rainbow-delimiters
@@ -4056,7 +4138,12 @@ This also adds syntax highlighting for gradle
#+END_SRC #+END_SRC
** evil ** evil
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package evil :commands (evil-mode)) (use-package evil
:commands (evil-mode)
:config
(use-package evil-collection
:config
(with-eval-after-load 'eat (evil-collection-eat-setup))))
#+END_SRC #+END_SRC
** hackernews ** hackernews
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp

View File

@@ -157,3 +157,14 @@ This makes evil-mode play nice with org-fc
(setf (alist-get 'python-ts-mode apheleia-mode-alist) (setf (alist-get 'python-ts-mode apheleia-mode-alist)
(alist-get 'python-mode apheleia-mode-alist)))) (alist-get 'python-mode apheleia-mode-alist))))
#+end_src #+end_src
* Packages
#+begin_src emacs-lisp
(use-package org-drill)
#+end_src
* Disable wild notifactions
#+begin_src emacs-lisp
(setq org-wild-notifier-day-wide-alert-times nil)
#+end_src

View File

@@ -0,0 +1,5 @@
# -*- mode: snippet -*-
# name: ign
# key: ign
# --
# type: ignore

View File

@@ -0,0 +1,5 @@
# -*- mode: snippet -*-
# name: logg
# key: logg
# --
logger = logging.getLogger(__name__)

View File

@@ -0,0 +1,5 @@
# -*- mode: snippet -*-
# name: 401
# key: 401
# --
# noqa: F401

View File

@@ -10,7 +10,7 @@
cpr = cherry-pick-range cpr = cherry-pick-range
cam = commit -am cam = commit -am
clean-branches = "!r() { git branch --merged ${1-origin/master} | grep -v '*' | xargs -n1 git branch -d; }; r" clean-branches = "!r() { git branch --merged ${1-origin/master} | grep -v '*' | xargs -n1 git branch -d; }; r"
del-merged-branches = "!f() { git fetch $1 && git branch -r --merged $1/$2 | awk -F/ \"/$1/ && !/$2$/ {print \\$2}\" | xargs -I {} git push $1 --delete {}; }; f" del-merged-branches = "!f() { git fetch $1 && git branch -r --merged $1/$2 | grep -v \"$1/$2$\" | sed \"s:$1/::\" | xargs -I {} sh -c \"git push $1 :{}\" _; }; f"
clone = clone --recursive clone = clone --recursive
credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f" # Credit an author on the latest commit credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f" # Credit an author on the latest commit
co = checkout co = checkout
@@ -50,6 +50,7 @@
tb = rev-parse --abbrev-ref --symbolic-full-name @{u} tb = rev-parse --abbrev-ref --symbolic-full-name @{u}
untracked = "!u() { git status -s | grep "??" | awk '{print $2}'; }; u" untracked = "!u() { git status -s | grep "??" | awk '{print $2}'; }; u"
which-branch = "!wb() { b="$(git symbolic-ref HEAD)" && echo ${b#refs/heads/}; }; wb" which-branch = "!wb() { b="$(git symbolic-ref HEAD)" && echo ${b#refs/heads/}; }; wb"
find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"
[core] [core]
# Use custom `.gitignore` and `.gitattributes` # Use custom `.gitignore` and `.gitattributes`

View File

@@ -24,7 +24,6 @@ pom.xml
TAGS TAGS
# Vim # Vim
*.sw*
*.tmp* *.tmp*
# JavaScript # JavaScript
@@ -75,3 +74,7 @@ cabal.project.local
# #
.direnv .direnv
/dotfiles/config/gtk-3.0/settings.ini /dotfiles/config/gtk-3.0/settings.ini
/untracked
railbird-infra-*.json

View File

@@ -1,20 +0,0 @@
binding "gtk-emacs-text-entry"
{
bind "<alt>BackSpace" { "delete-from-cursor" (word-ends, -1) }
}
gtk-theme-name="Paper"
gtk-icon-theme-name="Paper"
gtk-font-name="Roboto 11"
gtk-cursor-theme-name="Paper"
gtk-cursor-theme-size=0
gtk-toolbar-style=GTK_TOOLBAR_BOTH
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
gtk-button-images=1
gtk-menu-images=1
gtk-enable-event-sounds=1
gtk-enable-input-feedback-sounds=1
gtk-xft-antialias=1
gtk-xft-hinting=1
gtk-xft-hintstyle="hintfull"

View File

@@ -2,12 +2,25 @@
import argparse import argparse
import os import os
import sys import sys
import logging
logger = logging.getLogger(__name__)
class BrightnessManager(object): class BrightnessManager(object):
@classmethod
def find_brightness(cls):
items_in_backlight_directory = os.listdir("/sys/class/backlight")
if len(items_in_backlight_directory) > 1:
logger.warning(f"More than one entry in the backlight directory {items_in_backlight_directory}")
return cls.from_path(
os.path.join("/sys/class/backlight", items_in_backlight_directory[0])
)
@classmethod @classmethod
def from_path(cls, path): def from_path(cls, path):
logger.warning(f"Using path {path}")
return cls( return cls(
set_brightness_filepath=os.path.join(path, "brightness"), set_brightness_filepath=os.path.join(path, "brightness"),
actual_brightness_filepath=os.path.join(path, "actual_brightness"), actual_brightness_filepath=os.path.join(path, "actual_brightness"),
@@ -15,7 +28,7 @@ class BrightnessManager(object):
) )
def __init__( def __init__(
self, set_brightness_filepath, max_brightness_filepath, actual_brightness_filepath self, set_brightness_filepath, max_brightness_filepath, actual_brightness_filepath
): ):
self.set_brightness_filepath = set_brightness_filepath self.set_brightness_filepath = set_brightness_filepath
self.max_brightness_filepath = max_brightness_filepath self.max_brightness_filepath = max_brightness_filepath
@@ -46,11 +59,6 @@ class BrightnessManager(object):
return float(self.current_brightness) / self.max_brightness return float(self.current_brightness) / self.max_brightness
IntelBrightnessManager = BrightnessManager.from_path(
"/sys/class/backlight/intel_backlight",
)
def build_parser(): def build_parser():
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description='Interact with macbook brightness', description='Interact with macbook brightness',
@@ -70,6 +78,11 @@ def build_parser():
if __name__ == '__main__': if __name__ == '__main__':
args = build_parser().parse_args() args = build_parser().parse_args()
IntelBrightnessManager.increment_by_proportion(float(args.change) / 100) symlink_path = os.readlink("/home/imalison/.config/brightness_manager/symlink")
if os.path.exists(symlink_path):
manager = BrightnessManager.from_path(symlink_path)
else:
manager = BrightnessManager.find_brightness()
manager.increment_by_proportion(float(args.change) / 100)
if args.do_print: if args.do_print:
print(int(IntelBrightnessManager.current_proportion * 100)) print(int(manager.current_proportion * 100))

7
dotfiles/lib/functions/nr Executable file
View File

@@ -0,0 +1,7 @@
#!/usr/bin/env sh
function nr {
nix run nixpkgs#"$@"
}
nr "$@"

7
dotfiles/lib/functions/ns Executable file
View File

@@ -0,0 +1,7 @@
#!/usr/bin/env sh
function nr {
sk --ansi -i -c 'nix-search "{}"' | get_cols 1
}
nr "$@"

View File

@@ -10,5 +10,3 @@ function split_by_char {
} }
split_by_char "$@" split_by_char "$@"

View File

@@ -0,0 +1,7 @@
xkb_keymap {
xkb_keycodes { include "evdev+aliases(qwerty)" };
xkb_types { include "complete" };
xkb_compat { include "complete" };
xkb_symbols { include "pc+us+inet(evdev)+altwin(swap_lalt_lwin)+imalison(ralt_as_hyper)+capslock(ctrl_modifier)" };
xkb_geometry { include "pc(pc105)" };
};

355
nix-darwin/flake.lock generated Normal file
View File

@@ -0,0 +1,355 @@
{
"nodes": {
"agenix": {
"inputs": {
"darwin": "darwin",
"home-manager": "home-manager",
"nixpkgs": [
"railbird-secrets",
"nixpkgs"
],
"systems": "systems_2"
},
"locked": {
"lastModified": 1707830867,
"narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
"owner": "ryantm",
"repo": "agenix",
"rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
"type": "github"
},
"original": {
"owner": "ryantm",
"repo": "agenix",
"type": "github"
}
},
"brew-src": {
"flake": false,
"locked": {
"lastModified": 1718075954,
"narHash": "sha256-4TeUhv5VLEufP+Z/NkKnUk4NUaf59cMsj6NvsVbE+8w=",
"owner": "Homebrew",
"repo": "brew",
"rev": "3f08c75e7b950d4340dab462f3e7f77e8093fa2b",
"type": "github"
},
"original": {
"owner": "Homebrew",
"ref": "4.3.5",
"repo": "brew",
"type": "github"
}
},
"darwin": {
"inputs": {
"nixpkgs": [
"railbird-secrets",
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1700795494,
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1709126324,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"railbird-secrets",
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1703113217,
"narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"homebrew-cask": {
"flake": false,
"locked": {
"lastModified": 1722820732,
"narHash": "sha256-Y8TBYxYeUVvgYFylqBUtWxFuOZVstXW+yylI2wz2eQ0=",
"owner": "homebrew",
"repo": "homebrew-cask",
"rev": "9e3db5dd3130f9bf388409f39ce1706ca7b59efe",
"type": "github"
},
"original": {
"owner": "homebrew",
"repo": "homebrew-cask",
"type": "github"
}
},
"homebrew-core": {
"flake": false,
"locked": {
"lastModified": 1722823168,
"narHash": "sha256-3sKYVUrhuS1fZJkrYAtB+O67dvaKyTvXXI9UqjAgI8A=",
"owner": "homebrew",
"repo": "homebrew-core",
"rev": "dd20841f7fe7375738708bc2f458152906a71f1d",
"type": "github"
},
"original": {
"owner": "homebrew",
"repo": "homebrew-core",
"type": "github"
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1722609272,
"narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49",
"type": "github"
},
"original": {
"owner": "LnL7",
"repo": "nix-darwin",
"type": "github"
}
},
"nix-darwin_2": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1716329735,
"narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c",
"type": "github"
},
"original": {
"owner": "LnL7",
"repo": "nix-darwin",
"type": "github"
}
},
"nix-homebrew": {
"inputs": {
"brew-src": "brew-src",
"flake-utils": "flake-utils",
"nix-darwin": "nix-darwin_2",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1719720211,
"narHash": "sha256-FNK5ZxmNC+V/wOuioc5HqkUy0ld4eW3NqcsZHLYg9HI=",
"owner": "zhaofengli-wip",
"repo": "nix-homebrew",
"rev": "0afc51fd86693c73e4b60be8ed8c782c4c09b4cc",
"type": "github"
},
"original": {
"owner": "zhaofengli-wip",
"repo": "nix-homebrew",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1687274257,
"narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
"path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source",
"rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1716330097,
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1722640603,
"narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "81610abc161d4021b29199aa464d6a1a521e0cc9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1709703039,
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"railbird-secrets": {
"inputs": {
"agenix": "agenix",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1722639965,
"narHash": "sha256-ZRe5Z5s/UNaXI2piyncQ3YrFl5q3GryZAfFTyeJ/vhM=",
"ref": "refs/heads/master",
"rev": "9a92b83c3ad376620db3556c33e51a4300c5badd",
"revCount": 73,
"type": "git",
"url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git"
},
"original": {
"type": "git",
"url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git"
}
},
"root": {
"inputs": {
"homebrew-cask": "homebrew-cask",
"homebrew-core": "homebrew-core",
"nix-darwin": "nix-darwin",
"nix-homebrew": "nix-homebrew",
"nixpkgs": "nixpkgs_3",
"railbird-secrets": "railbird-secrets"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

78
nix-darwin/flake.nix Normal file
View File

@@ -0,0 +1,78 @@
{
description = "Example Darwin system flake";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nix-darwin.url = "github:LnL7/nix-darwin";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
railbird-secrets = {
url = "git+ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git";
};
nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
# Optional: Declarative tap management
homebrew-core = {
url = "github:homebrew/homebrew-core";
flake = false;
};
homebrew-cask = {
url = "github:homebrew/homebrew-cask";
flake = false;
};
};
outputs = inputs@{ self, nix-darwin, nixpkgs, ... }:
let
configuration = { pkgs, config, ... }: {
environment.systemPackages = with pkgs; [
emacs
slack
gitFull
ripgrep
yarn
nodePackages.prettier
vim
just
];
nixpkgs.config.allowUnfree = true;
# Auto upgrade nix package and the daemon service.
services.nix-daemon.enable = true;
launchd.user.envVariables.PATH = config.environment.systemPath;
programs.direnv.enable = true;
# Necessary for using flakes on this system.
nix.settings.experimental-features = "nix-command flakes";
# Create /etc/zshrc that loads the nix-darwin environment.
programs.zsh.enable = true;
# Set Git commit hash for darwin-version.
system.configurationRevision = self.rev or self.dirtyRev or null;
# Used for backwards compatibility, please read the changelog before changing.
# $ darwin-rebuild changelog
system.stateVersion = 4;
# The platform the configuration will be used on.
nixpkgs.hostPlatform = "aarch64-darwin";
users.users.kat.openssh.authorizedKeys.keys = inputs.railbird-secrets.keys.kanivanKeys;
};
in
{
# Build darwin flake using:
# $ darwin-rebuild build --flake .#Kats-Mac-mini
darwinConfigurations."Kats-Mac-mini" = nix-darwin.lib.darwinSystem {
modules = [
configuration
];
};
# Expose the package set, including overlays, for convenience.
darwinPackages = self.darwinConfigurations."Kats-Mac-mini".pkgs;
};
}

2
nix-darwin/justfile Normal file
View File

@@ -0,0 +1,2 @@
switch:
nix run nix-darwin -- switch --flake .#

View File

@@ -1,10 +1,12 @@
{ config, pkgs, options, inputs, makeEnable, ... }: { config, pkgs, forEachUser, makeEnable, realUsers, ... }:
makeEnable config "modules.base" true { makeEnable config "modules.base" true {
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"openssl-1.0.2u" "openssl-1.0.2u"
"electron-12.2.3" "electron-12.2.3"
"etcher" "etcher"
"electron-19.1.9" "electron-19.1.9"
"openssl-1.1.1w"
"nix-2.16.2"
]; ];
# Disabling these waits disables the stuck on boot up issue # Disabling these waits disables the stuck on boot up issue
@@ -18,7 +20,6 @@ makeEnable config "modules.base" true {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
}; };
package = pkgs.gnupg_2_4_0;
}; };
services.pcscd.enable = true; services.pcscd.enable = true;
@@ -32,14 +33,9 @@ makeEnable config "modules.base" true {
enable = true; enable = true;
enableStrongSwan = true; enableStrongSwan = true;
plugins = [ pkgs.networkmanager-l2tp pkgs.networkmanager-openvpn ]; plugins = [ pkgs.networkmanager-l2tp pkgs.networkmanager-openvpn ];
extraConfig = ''
[main]
rc-manager=resolvconf
'';
}; };
# Audio # Audio
sound.enable = true;
hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = true;
# Bluetooth # Bluetooth
@@ -72,4 +68,7 @@ makeEnable config "modules.base" true {
services.dbus.packages = [ pkgs.gcr ]; services.dbus.packages = [ pkgs.gcr ];
programs.dconf.enable = true; programs.dconf.enable = true;
home-manager.users = forEachUser (import ./home-manager.nix);
nix.settings.trusted-users = realUsers;
} }

18
nixos/ben.nix Normal file
View File

@@ -0,0 +1,18 @@
{ pkgs, inputs, config, makeEnable, ... }:
makeEnable config "modules.ben" true {
home-manager.backupFileExtension = "backup"; # Add this line
home-manager.users.ben = {
programs.zsh = {
enable = true;
shellAliases = {
l = "ls -CF";
la = "ls -A";
ll = "ls -lh";
lla = "ls -alh";
ls = "ls --color=auto";
gts = "git status";
gtl = "git log";
};
};
};
}

View File

@@ -98,7 +98,7 @@
inherit inputs machineNames; inherit inputs machineNames;
makeEnable = (import ../make-enable.nix) nixpkgs.lib; makeEnable = (import ../make-enable.nix) nixpkgs.lib;
mapValueToKeys = keys: value: builtins.listToAttrs (map (name: { inherit name value; }) keys); mapValueToKeys = keys: value: builtins.listToAttrs (map (name: { inherit name value; }) keys);
realUsers = [ "root" "imalison" "kat" "dean" "alex" ]; realUsers = [ "root" "imalison" "kat" "dean" "alex" "ben"];
forEachUser = mapValueToKeys realUsers; forEachUser = mapValueToKeys realUsers;
} // specialArgs // (import ../keys.nix); } // specialArgs // (import ../keys.nix);
}); });

View File

@@ -57,6 +57,7 @@ makeEnable config "modules.code" true {
# nix # nix
nixd nixd
nil nil
alejandra
] ++ (if pkgs.system == "x86_64-linux" then with pkgs; [ ] ++ (if pkgs.system == "x86_64-linux" then with pkgs; [
# purescript # purescript
purescript purescript

View File

@@ -1,12 +1,14 @@
{ config, lib, ... }: { config, lib, forEachUser, ... }:
{ {
imports = [ imports = [
./android.nix ./android.nix
./base.nix ./base.nix
./ben.nix
./cache-server.nix ./cache-server.nix
./cache.nix ./cache.nix
./code.nix ./code.nix
./desktop.nix ./desktop.nix
./electron.nix
./environment.nix ./environment.nix
./essential.nix ./essential.nix
./extra.nix ./extra.nix
@@ -15,7 +17,6 @@
./gitea-runner.nix ./gitea-runner.nix
./gitea.nix ./gitea.nix
./gnome.nix ./gnome.nix
./electron.nix
./imalison.nix ./imalison.nix
./internet-computer.nix ./internet-computer.nix
./kat.nix ./kat.nix
@@ -24,10 +25,14 @@
./nixified.ai.nix ./nixified.ai.nix
./options.nix ./options.nix
./plasma.nix ./plasma.nix
./postgres.nix
./rabbitmq.nix
./secrets.nix ./secrets.nix
./ssh.nix ./ssh.nix
./syncthing.nix ./syncthing.nix
./user-specific.nix
./users.nix ./users.nix
./vscode.nix
./wsl.nix ./wsl.nix
./xmonad.nix ./xmonad.nix
]; ];

View File

@@ -1,4 +1,4 @@
{ config, pkgs, makeEnable, forEachUser, ... }: { config, pkgs, makeEnable, ... }:
makeEnable config "modules.desktop" true { makeEnable config "modules.desktop" true {
imports = [ imports = [
./fonts.nix ./fonts.nix
@@ -7,7 +7,9 @@ makeEnable config "modules.desktop" true {
services.xserver = { services.xserver = {
exportConfiguration = true; exportConfiguration = true;
enable = true; enable = true;
layout = "us"; xkb = {
layout = "us";
};
displayManager = { displayManager = {
sessionCommands = '' sessionCommands = ''
systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH
@@ -32,7 +34,7 @@ makeEnable config "modules.desktop" true {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Appearance # Appearance
gnome.adwaita-icon-theme adwaita-icon-theme
hicolor-icon-theme hicolor-icon-theme
libsForQt5.breeze-gtk libsForQt5.breeze-gtk
# materia-theme # materia-theme
@@ -53,24 +55,21 @@ makeEnable config "modules.desktop" true {
alacritty alacritty
blueman blueman
clipit clipit
dfeet d-spy
dolphin dolphin
feh feh
firefox firefox
gnome.cheese cheese
gnome.gpaste gpaste
kleopatra kleopatra
libnotify libnotify
# Seems to be broken
libreoffice libreoffice
lxappearance lxappearance
lxqt.lxqt-powermanagement lxqt.lxqt-powermanagement
networkmanagerapplet networkmanagerapplet
notify-osd-customizable notify-osd-customizable
okular okular
picom
pinentry pinentry
psensor psensor
quassel quassel
@@ -82,7 +81,7 @@ makeEnable config "modules.desktop" true {
simplescreenrecorder simplescreenrecorder
skippy-xd skippy-xd
synergy synergy
transmission-gtk transmission_3-gtk
vlc vlc
volnoti volnoti
xfce.thunar xfce.thunar
@@ -104,5 +103,6 @@ makeEnable config "modules.desktop" true {
spotify spotify
tor-browser-bundle-bin tor-browser-bundle-bin
vscode vscode
zulip
] else []); ] else []);
} }

View File

@@ -1,7 +1,7 @@
{ pkgs, config, makeEnable, forEachUser, ... }: { pkgs, config, makeEnable, forEachUser, ... }:
makeEnable config "modules.electron" false { makeEnable config "modules.electron" false {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# element-desktop element-desktop
# bitwarden # bitwarden
discord discord
# etcher # etcher

View File

@@ -27,6 +27,26 @@ with lib;
do do
autoload "''${file##*/}" autoload "''${file##*/}"
done done
fpath+="${pkgs.python-with-my-packages}/lib/python3.11/site-packages/argcomplete/bash_completion.d"
'';
interactiveShellInit = ''
eval "$(register-python-argcomplete prb)"
eval "$(register-python-argcomplete prod-prb)"
eval "$(register-python-argcomplete railbird)"
[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/zsh"
# Enable bracketed paste
autoload -Uz bracketed-paste-magic
zle -N bracketed-paste bracketed-paste-magic
'';
};
programs.bash = {
interactiveShellInit = ''
eval "$(register-python-argcomplete prb)"
eval "$(register-python-argcomplete prod-prb)"
eval "$(register-python-argcomplete railbird)"
[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/bash"
''; '';
}; };
@@ -47,6 +67,7 @@ with lib;
localBinInPath = true; localBinInPath = true;
shellAliases = { shellAliases = {
df_ssh = "TERM='xterm-256color ssh -o StrictHostKeyChecking=no'"; df_ssh = "TERM='xterm-256color ssh -o StrictHostKeyChecking=no'";
fix_nix = "LD_LIBRARY_PATH='' nix";
}; };
variables = { variables = {
ROFI_SYSTEMD_TERM = "alacritty -e"; ROFI_SYSTEMD_TERM = "alacritty -e";

View File

@@ -1,25 +1,11 @@
{ pkgs, ... }: { pkgs, ... }:
let
my-python-packages = python-packages: with python-packages; [
appdirs
ipdb
ipython
numpy
openpyxl
pip
requests
tox
virtualenv
virtualenvwrapper
];
python-with-my-packages = pkgs.python311.withPackages my-python-packages;
in
{ {
nixpkgs.config.allowBroken = true; nixpkgs.config.allowBroken = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
automake automake
bazel bazel
bento4
bind bind
binutils binutils
cachix cachix
@@ -30,10 +16,12 @@ in
efibootmgr efibootmgr
emacs emacs
fd fd
ffmpeg
file file
gawk gawk
gcc gcc
gdb gdb
git-fame
git-lfs git-lfs
git-sync git-sync
gitFull gitFull
@@ -46,12 +34,15 @@ in
iotop iotop
ispell ispell
jq jq
just
lshw lshw
lsof lsof
magic-wormhole-rs magic-wormhole-rs
ncdu ncdu
neofetch neofetch
neovim
nix-index nix-index
nix-search-cli
pass pass
patchelf patchelf
pciutils pciutils
@@ -61,8 +52,9 @@ in
rcm rcm
ripgrep ripgrep
silver-searcher silver-searcher
sysz skim
sshfs sshfs
sysz
tmux tmux
tzupdate tzupdate
udiskie udiskie

View File

@@ -1,6 +0,0 @@
#!/usr/bin/env sh
nix flake lock --update-input taffybar
nix flake lock --update-input imalison-taffybar
nix flake lock --update-input xmonad
nix flake lock --update-input xmonad-contrib

573
nixos/flake.lock generated
View File

@@ -4,14 +4,39 @@
"inputs": { "inputs": {
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1696775529, "lastModified": 1723293904,
"narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
"type": "github"
},
"original": {
"owner": "ryantm",
"repo": "agenix",
"type": "github"
}
},
"agenix_2": {
"inputs": {
"darwin": "darwin_2",
"home-manager": "home-manager_3",
"nixpkgs": [
"railbird-secrets",
"nixpkgs"
],
"systems": "systems_4"
},
"locked": {
"lastModified": 1707830867,
"narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
"owner": "ryantm",
"repo": "agenix",
"rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -28,11 +53,34 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1673295039, "lastModified": 1700795494,
"narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "87b9d090ad39b25b2400029c64825fc2a8868943", "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"darwin_2": {
"inputs": {
"nixpkgs": [
"railbird-secrets",
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1700795494,
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -45,11 +93,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1696426674,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -109,16 +157,16 @@
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nixified-ai", "nix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1685662779, "lastModified": 1719994518,
"narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -129,19 +177,23 @@
}, },
"flake-parts_2": { "flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": [
"nixified-ai",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1685662779, "lastModified": 1698882062,
"narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "flake-parts", "owner": "hercules-ci",
"type": "indirect" "repo": "flake-parts",
"type": "github"
} }
}, },
"flake-parts_3": { "flake-parts_3": {
@@ -149,22 +201,20 @@
"nixpkgs-lib": [ "nixpkgs-lib": [
"nixified-ai", "nixified-ai",
"hercules-ci-effects", "hercules-ci-effects",
"hercules-ci-agent",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1685662779, "lastModified": 1696343447,
"narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hercules-ci", "id": "flake-parts",
"repo": "flake-parts", "type": "indirect"
"type": "github"
} }
}, },
"flake-utils": { "flake-utils": {
@@ -174,11 +224,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1710146030,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -189,14 +239,14 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1710146030,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -207,7 +257,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1685518550,
@@ -225,7 +275,25 @@
}, },
"flake-utils_4": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_5"
},
"locked": {
"lastModified": 1709126324,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1685518550,
@@ -241,6 +309,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_6": {
"inputs": {
"systems": "systems_8"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fourmolu-011": { "fourmolu-011": {
"flake": false, "flake": false,
"locked": { "locked": {
@@ -289,6 +375,37 @@
"url": "https://hackage.haskell.org/package/fourmolu-0.12.0.0/fourmolu-0.12.0.0.tar.gz" "url": "https://hackage.haskell.org/package/fourmolu-0.12.0.0/fourmolu-0.12.0.0.tar.gz"
} }
}, },
"git-hooks-nix": {
"inputs": {
"flake-compat": [
"nix"
],
"gitignore": [
"nix"
],
"nixpkgs": [
"nix",
"nixpkgs"
],
"nixpkgs-stable": [
"nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1721042469,
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"git-ignore-nix": { "git-ignore-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -296,11 +413,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694102001, "lastModified": 1709087332,
"narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=", "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "gitignore.nix", "repo": "gitignore.nix",
"rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6", "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -396,22 +513,6 @@
"type": "github" "type": "github"
} }
}, },
"haskell-flake": {
"locked": {
"lastModified": 1684780604,
"narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
"owner": "srid",
"repo": "haskell-flake",
"rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
"type": "github"
},
"original": {
"owner": "srid",
"ref": "0.3.0",
"repo": "haskell-flake",
"type": "github"
}
},
"haskell-hie-bios": { "haskell-hie-bios": {
"flake": false, "flake": false,
"locked": { "locked": {
@@ -493,7 +594,7 @@
"lsp": "lsp", "lsp": "lsp",
"lsp-test": "lsp-test", "lsp-test": "lsp-test",
"lsp-types": "lsp-types", "lsp-types": "lsp-types",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_6",
"ormolu-052": "ormolu-052", "ormolu-052": "ormolu-052",
"ormolu-07": "ormolu-07", "ormolu-07": "ormolu-07",
"stylish-haskell-0145": "stylish-haskell-0145" "stylish-haskell-0145": "stylish-haskell-0145"
@@ -516,7 +617,7 @@
"haskell-language-server_2": { "haskell-language-server_2": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"fourmolu-011": "fourmolu-011_2", "fourmolu-011": "fourmolu-011_2",
"fourmolu-012": "fourmolu-012_2", "fourmolu-012": "fourmolu-012_2",
"gitignore": "gitignore_2", "gitignore": "gitignore_2",
@@ -548,40 +649,20 @@
"type": "github" "type": "github"
} }
}, },
"hercules-ci-agent": {
"inputs": {
"flake-parts": "flake-parts_3",
"haskell-flake": "haskell-flake",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1686721748,
"narHash": "sha256-ilD6ANYID+b0/+GTFbuZXfmu92bqVqY5ITKXSxqIp5A=",
"owner": "hercules-ci",
"repo": "hercules-ci-agent",
"rev": "7192b83935ab292a8e894db590dfd44f976e183b",
"type": "github"
},
"original": {
"id": "hercules-ci-agent",
"type": "indirect"
}
},
"hercules-ci-effects": { "hercules-ci-effects": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_3",
"hercules-ci-agent": "hercules-ci-agent",
"nixpkgs": [ "nixpkgs": [
"nixified-ai", "nixified-ai",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1686830987, "lastModified": 1699381651,
"narHash": "sha256-1XLTM0lFr3NV+0rd55SQW/8oQ3ACnqlYcda3FelIwHU=", "narHash": "sha256-mZlQ54xJs3j5+SJrLhzePPMXzS+Czbx7gNyOnOAQrHA=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "04e4ab63b9eed2452edee1bb698827e1cb8265c6", "rev": "0bd99f5ab7ec7a74c11238bd02bb29e709c14328",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -680,11 +761,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682203081, "lastModified": 1703113217,
"narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -700,11 +781,33 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700261679, "lastModified": 1723399884,
"narHash": "sha256-jpQq/rJnjhkUHXz/KOQxk6fSfF7H0vV9PjFvfgTFHG8=", "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3feeb7715584fd45ed1389cec8fb15f6930e8dab", "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_3": {
"inputs": {
"nixpkgs": [
"railbird-secrets",
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1703113217,
"narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -730,7 +833,7 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-rua03PcdrDhQoRjqAVHqUHfTUazlK0L1Pw8iIMM+YDA=", "narHash": "sha256-o42629VeuDMu2N76vrw2L8CIawLK3RP10W+M4e8qCCA=",
"path": "../dotfiles/config/taffybar", "path": "../dotfiles/config/taffybar",
"type": "path" "type": "path"
}, },
@@ -756,19 +859,20 @@
"type": "github" "type": "github"
} }
}, },
"lowdown-src": { "libgit2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1633514407, "lastModified": 1715853528,
"narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=",
"owner": "kristapsdz", "owner": "libgit2",
"repo": "lowdown", "repo": "libgit2",
"rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "kristapsdz", "owner": "libgit2",
"repo": "lowdown", "ref": "v1.8.1",
"repo": "libgit2",
"type": "github" "type": "github"
} }
}, },
@@ -847,39 +951,40 @@
"nix": { "nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"lowdown-src": "lowdown-src", "flake-parts": "flake-parts",
"git-hooks-nix": "git-hooks-nix",
"libgit2": "libgit2",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-23-11": "nixpkgs-23-11",
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1690515062, "lastModified": 1723343056,
"narHash": "sha256-PyvvANcbsjHAjvUsrGDyxk0b/CVExcrJAlCEQRp9HWc=", "narHash": "sha256-ixvBNplVIqUqvshVi5azgPiGIFXlXDmahDcoP/guuTE=",
"owner": "IvanMalison", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "bedf108a183191519fdfa99a913f766090515d34", "rev": "18485d2d53622c6ec7beab80c77efbd49ed682e2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "IvanMalison", "id": "nix",
"ref": "my2.15.1", "type": "indirect"
"repo": "nix",
"type": "github"
} }
}, },
"nixified-ai": { "nixified-ai": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts_2",
"hercules-ci-effects": "hercules-ci-effects", "hercules-ci-effects": "hercules-ci-effects",
"invokeai-src": "invokeai-src", "invokeai-src": "invokeai-src",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"textgen-src": "textgen-src" "textgen-src": "textgen-src"
}, },
"locked": { "locked": {
"lastModified": 1698023400, "lastModified": 1701304375,
"narHash": "sha256-2wrm9Y9gsI/OaZEsTqc2wflkfxlrvCRocJHpqkOm/Cc=", "narHash": "sha256-WI/SimUvHPIWFhQTY04+1yCVjZzVjVb28pSE4S2yhFA=",
"owner": "nixified-ai", "owner": "nixified-ai",
"repo": "flake", "repo": "flake",
"rev": "7b9730e0a75bcd6375b0780aef75e406ea20a9a4", "rev": "63339e4c8727578a0fe0f2c63865f60b6e800079",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -890,15 +995,16 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1699997707, "lastModified": 1719989395,
"narHash": "sha256-ugb+1TGoOqqiy3axyEZpfF6T4DQUGjfWZ3Htry1EfvI=", "narHash": "sha256-AppMOCCJ6LYteg4mvlf0xQV+cc9a4iehRWxTOHewouA=",
"owner": "NixOS", "owner": "colonelpanic8",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "5689f3ebf899f644a1aabe8774d4f37eb2f6c2f9", "rev": "a91e03ef13614285d5d476fbf2f096ce65de0a71",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "colonelpanic8",
"ref": "add-g834jzr",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"type": "github" "type": "github"
} }
@@ -907,14 +1013,14 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1700096639, "lastModified": 1723124175,
"narHash": "sha256-FVOTqjwjLX4El7n3jErrWWQ4gR5NVcL7B8cvGRGFQSo=", "narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "83ce0dbe362b9b866414bbc31a2dc9f1d41be649", "rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -925,11 +1031,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1677676435, "lastModified": 1703013332,
"narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=", "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169", "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -939,21 +1045,19 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-23-11": {
"locked": { "locked": {
"dir": "lib", "lastModified": 1717159533,
"lastModified": 1685564631, "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
"narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a", "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
"type": "github" "type": "github"
}, },
"original": { "original": {
"dir": "lib",
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
"type": "github" "type": "github"
} }
}, },
@@ -975,11 +1079,11 @@
}, },
"nixpkgs-regression_2": { "nixpkgs-regression_2": {
"locked": { "locked": {
"lastModified": 1700284104, "lastModified": 1723405223,
"narHash": "sha256-oNsJfAyAuBCTkusesiK0LWuO59F6vEGcP4wwa7kc1ZA=", "narHash": "sha256-VSHY8GQ64AseobyeoVkJl+ZDaWPGzKs+CG6RfDM159o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "005617587ee2b7c003388b4539b9120ebcc90e44", "rev": "938253e0f8d5c98c4515a10cc388239cc1431db8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -990,27 +1094,27 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1670461440, "lastModified": 1721548954,
"narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425", "rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-22.11-small", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1686501370, "lastModified": 1700204040,
"narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1022,43 +1126,27 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1697059129, "lastModified": 1722087241,
"narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", "rev": "8c50662509100d53229d4be607f1a3a31157fa12",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1697851979, "lastModified": 1723175592,
"narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=", "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8", "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1699963925,
"narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bf744fe90419885eefced41b3e5ae442d732712d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1068,7 +1156,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1686874404, "lastModified": 1686874404,
"narHash": "sha256-u2Ss8z+sGaVlKtq7sCovQ8WvXY+OoXJmY1zmyxITiaY=", "narHash": "sha256-u2Ss8z+sGaVlKtq7sCovQ8WvXY+OoXJmY1zmyxITiaY=",
@@ -1084,6 +1172,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": {
"locked": {
"lastModified": 1709703039,
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1686874404, "lastModified": 1686874404,
@@ -1100,6 +1204,20 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": {
"locked": {
"lastModified": 1682134069,
"narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fd901ef4bf93499374c5af385b2943f5801c0833",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"notifications-tray-icon": { "notifications-tray-icon": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@@ -1175,6 +1293,26 @@
"url": "https://hackage.haskell.org/package/ormolu-0.7.1.0/ormolu-0.7.1.0.tar.gz" "url": "https://hackage.haskell.org/package/ormolu-0.7.1.0/ormolu-0.7.1.0.tar.gz"
} }
}, },
"railbird-secrets": {
"inputs": {
"agenix": "agenix_2",
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1722639965,
"narHash": "sha256-ZRe5Z5s/UNaXI2piyncQ3YrFl5q3GryZAfFTyeJ/vhM=",
"ref": "refs/heads/master",
"rev": "9a92b83c3ad376620db3556c33e51a4300c5badd",
"revCount": 73,
"type": "git",
"url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git"
},
"original": {
"type": "git",
"url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
@@ -1188,12 +1326,14 @@
"nixified-ai": "nixified-ai", "nixified-ai": "nixified-ai",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_5",
"nixpkgs-regression": "nixpkgs-regression_2", "nixpkgs-regression": "nixpkgs-regression_2",
"notifications-tray-icon": "notifications-tray-icon", "notifications-tray-icon": "notifications-tray-icon",
"railbird-secrets": "railbird-secrets",
"status-notifier-item": "status-notifier-item", "status-notifier-item": "status-notifier-item",
"systems": "systems_3", "systems": "systems_6",
"taffybar": "taffybar", "taffybar": "taffybar",
"vscode-server": "vscode-server",
"xmonad": "xmonad", "xmonad": "xmonad",
"xmonad-contrib": "xmonad-contrib" "xmonad-contrib": "xmonad-contrib"
} }
@@ -1337,6 +1477,66 @@
"type": "github" "type": "github"
} }
}, },
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_8": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"taffybar": { "taffybar": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@@ -1361,11 +1561,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1696612500, "lastModified": 1714656757,
"narHash": "sha256-Q19F91yVQviqxgY+FkvEwtX2vcw414eVtK8erim0NrU=", "narHash": "sha256-OZNPY2LNBm+NkIHqo8SX2f/BfuwqkQIGYePkiAmz2YA=",
"owner": "taffybar", "owner": "taffybar",
"repo": "taffybar", "repo": "taffybar",
"rev": "46eba89c2a4d4ffefe42c3ee4506d1b74c8e61fd", "rev": "a82a8a0cffb34b5eae38e46d88f02641bf8a8fe5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1393,11 +1593,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1699963925, "lastModified": 1723175592,
"narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bf744fe90419885eefced41b3e5ae442d732712d", "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1407,6 +1607,25 @@
"type": "github" "type": "github"
} }
}, },
"vscode-server": {
"inputs": {
"flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1713958148,
"narHash": "sha256-8PDNi/dgoI2kyM7uSiU4eoLBqUKoA+3TXuz+VWmuCOc=",
"owner": "nix-community",
"repo": "nixos-vscode-server",
"rev": "fc900c16efc6a5ed972fb6be87df018bcf3035bc",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixos-vscode-server",
"type": "github"
}
},
"xmonad": { "xmonad": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@@ -1421,11 +1640,11 @@
"unstable": "unstable" "unstable": "unstable"
}, },
"locked": { "locked": {
"lastModified": 1699833963, "lastModified": 1722277235,
"narHash": "sha256-JNT6nnDJUvi/aPh9nOP7dQJGrfMdjzEabbHc+Qduwic=", "narHash": "sha256-fuEgR51OPzwff+ygFhBqJm51oA17rR0KtPfuDLv0Fp0=",
"owner": "xmonad", "owner": "xmonad",
"repo": "xmonad", "repo": "xmonad",
"rev": "2f585679120747defaa8b49880cbbab943b4c22c", "rev": "a58ccac7ba46414915de6c7f2b4da08b37784016",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1450,11 +1669,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1692232716, "lastModified": 1707727304,
"narHash": "sha256-MwbeBTfcf6vE7bQvha4ueg5zLZxBiU3678ESYrXD4lw=", "narHash": "sha256-KTtenUGK03CjBYnoceDIYG1d12oNgvfDa3dakILz7jY=",
"owner": "IvanMalison", "owner": "IvanMalison",
"repo": "xmonad-contrib", "repo": "xmonad-contrib",
"rev": "b5ef6265b87338f30dc9fc055c86d1ec021527a7", "rev": "229c7baf006bf68e76ec1305f55d7d42a6cf7042",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -1,6 +1,9 @@
{ {
inputs = { inputs = {
nixos-hardware = { url = "github:NixOS/nixos-hardware"; }; railbird-secrets = {
url = "git+ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git";
};
nixos-hardware = { url = "github:colonelpanic8/nixos-hardware/add-g834jzr"; };
nixpkgs = { nixpkgs = {
url = "github:NixOS/nixpkgs/nixos-unstable"; url = "github:NixOS/nixpkgs/nixos-unstable";
@@ -59,10 +62,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix = {
url = "github:IvanMalison/nix/my2.15.1";
};
flake-utils = { flake-utils = {
url = "github:numtide/flake-utils"; url = "github:numtide/flake-utils";
inputs.systems.follows = "systems"; inputs.systems.follows = "systems";
@@ -103,6 +102,8 @@
}; };
}; };
vscode-server.url = "github:nix-community/nixos-vscode-server";
nixpkgs-regression = { url = "github:NixOS/nixpkgs"; }; nixpkgs-regression = { url = "github:NixOS/nixpkgs"; };
nixified-ai = { url = "github:nixified-ai/flake"; }; nixified-ai = { url = "github:nixified-ai/flake"; };
@@ -153,10 +154,17 @@
specialArgs = rec { specialArgs = rec {
inherit inputs machineNames; inherit inputs machineNames;
makeEnable = (import ./make-enable.nix) nixpkgs.lib; makeEnable = (import ./make-enable.nix) nixpkgs.lib;
mapValueToKeys = keys: value: builtins.listToAttrs (map (name: { inherit name value; }) keys);
realUsers = [ "root" "imalison" "kat" "dean" "alex" "will" ];
forEachUser = mapValueToKeys realUsers;
keys = (import ./keys.nix); keys = (import ./keys.nix);
usersInfo = (import ./users.nix) {
pkgs = { zsh = "zsh"; };
inherit keys inputs system;
};
realUsers = (builtins.attrNames
(nixpkgs.lib.filterAttrs
(_: value: (builtins.elem "isNormalUser" (builtins.attrNames value)) && value.isNormalUser) usersInfo.users.users)
);
mapAllKeysToValue = keys: value: builtins.listToAttrs (map (name: { inherit name value; }) keys);
forEachUser = mapAllKeysToValue realUsers;
} // specialArgs; } // specialArgs;
}); });
in in
@@ -169,7 +177,6 @@
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
]; ];
extra-substituters = [ extra-substituters = [
"http://1896Folsom.duckdns.org"
"http://192.168.1.26:5050" "http://192.168.1.26:5050"
]; ];
extra-trusted-public-keys = [ extra-trusted-public-keys = [

View File

@@ -21,6 +21,7 @@ makeEnable config "modules.gitea-runner" false {
}; };
hostPackages = with pkgs; [ hostPackages = with pkgs; [
bash bash
direnv
coreutils coreutils
curl curl
gawk gawk
@@ -29,6 +30,8 @@ makeEnable config "modules.gitea-runner" false {
gitFull gitFull
gnused gnused
nodejs nodejs
docker
openssh
wget wget
]; ];
enable = true; enable = true;
@@ -46,4 +49,11 @@ makeEnable config "modules.gitea-runner" false {
XDG_CONFIG_HOME = gitea-runner-directory; XDG_CONFIG_HOME = gitea-runner-directory;
XDG_CACHE_HOME = "${gitea-runner-directory}/.cache"; XDG_CACHE_HOME = "${gitea-runner-directory}/.cache";
}; };
users.groups.gitea-runner = {};
users.users.gitea-runner = {
isSystemUser = true;
group = "gitea-runner";
extraGroups = ["docker"];
home = "/var/lib/gitea-runner";
};
} }

View File

@@ -4,11 +4,16 @@ makeEnable config "modules.gitea" false {
services.gitea = { services.gitea = {
enable = true; enable = true;
lfs.enable = true; lfs.enable = true;
dump = {
enable = true;
interval = "23:05";
};
settings.server = { settings.server = {
DOMAIN = "dev.railbird.ai"; DOMAIN = "dev.railbird.ai";
SSH_PORT = 1123; SSH_PORT = 1123;
HTTP_PORT = 3001; HTTP_PORT = 3001;
ROOT_URL = "https://dev.railbird.ai"; ROOT_URL = "https://dev.railbird.ai";
DISABLE_REGISTRATION = true;
}; };
settings.actions = { settings.actions = {
ENABLED = true; ENABLED = true;

View File

@@ -1,7 +1,7 @@
{ config, makeEnable, ... }: { config, makeEnable, ... }:
makeEnable config "modules.gnome" false { makeEnable config "modules.gnome" false {
services.xserver = { services.xserver = {
desktopManager.gnome3.enable = true; desktopManager.gnome.enable = true;
displayManager.gdm.enable = true; displayManager.gdm.enable = true;
}; };
} }

View File

@@ -1,4 +1,4 @@
{ pkgs, config, specialArgs, ... }: { pkgs, ... }:
{ {
xsession = { xsession = {
enable = true; enable = true;
@@ -14,14 +14,11 @@
forwardAgent = true; forwardAgent = true;
}; };
programs.gpg.package = pkgs.gnupg_2_4_0;
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
defaultCacheTtl = 8 * 60 * 60; defaultCacheTtl = 8 * 60 * 60;
maxCacheTtl = 8 * 60 * 60; maxCacheTtl = 8 * 60 * 60;
enableSshSupport = true; enableSshSupport = true;
pinentryFlavor = "qt";
extraConfig = '' extraConfig = ''
allow-emacs-pinentry allow-emacs-pinentry
allow-loopback-pinentry allow-loopback-pinentry

14
nixos/justfile Normal file
View File

@@ -0,0 +1,14 @@
switch *args:
sudo nixos-rebuild switch --flake '.#' --impure {{args}}
fix-local-path-issue:
nix flake lock --update-input imalison-taffybar
expire-home-manager-generations:
#!/usr/bin/env bash
set -euxo pipefail
for user in $(awk -F':' '{ if ($3 >= 1000 && $7 !~ /nologin|false|sync|shutdown|halt/) print $1 }' /etc/passwd); do
echo $user
sudo su - $user -c 'home-manager expire-generations -1days'
done

View File

@@ -1,4 +1,5 @@
rec { rec {
giteaSecret = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHRNHlKPGVnOATsbnkPccyK+C15TWGKbBwqNKt0UcQ81 imalison@adele";
hostKeys = [ hostKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG3UqIYs/NY0okKuiIO+dU2OM7A8vv3b6//GedagvLoX ryzen-shine.local" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG3UqIYs/NY0okKuiIO+dU2OM7A8vv3b6//GedagvLoX ryzen-shine.local"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINFbM1sL/vlDhrqPV1OMIGi4dKG0tMKhWSXx95ccbfyM biskcomp.local" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINFbM1sL/vlDhrqPV1OMIGi4dKG0tMKhWSXx95ccbfyM biskcomp.local"
@@ -21,9 +22,11 @@ rec {
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMCJ08qswd3OoApAIHQwojEUJ4sre89vSngbM3x5pBP2 imalison@jay-lenovo.local" # Kat's Lenovo Legion "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMCJ08qswd3OoApAIHQwojEUJ4sre89vSngbM3x5pBP2 imalison@jay-lenovo.local" # Kat's Lenovo Legion
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOVGIGnpkU7HNQ/zl/Ffi562M+laWY9/yIjB63BCMiTS kat@nixcomp.local" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOVGIGnpkU7HNQ/zl/Ffi562M+laWY9/yIjB63BCMiTS kat@nixcomp.local"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO3tlMePru6ZlSuf8yUii3N1dy3WwJnSQAt3EgETkctK kat@jay-lenovo.local" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO3tlMePru6ZlSuf8yUii3N1dy3WwJnSQAt3EgETkctK kat@jay-lenovo.local"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFrOYD3ReFc2+xFUylBFHREcm1lO7BRJGW5JrOoY3I8s ivanm@strixi-minaj"
]; ];
deanKeys = [ deanKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICDvbEVL+y7eV4+mtxOuHwyomBBQ6uYMesctstua20+e deanwenstrand@deans-mbp-2.lan" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICDvbEVL+y7eV4+mtxOuHwyomBBQ6uYMesctstua20+e deanwenstrand@deans-mbp-2.lan"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeXvPyHIYBPtn6QJtOrjlBUsZjDonVRfmWqTTM2ITWx nixos@nixos"
]; ];
alexKeys = [ alexKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP2SQkJenAX67Ze99SKOVpKDD1XvAZnxQ8RLP0dL/Ej2 alexm@MALISONSERVER" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP2SQkJenAX67Ze99SKOVpKDD1XvAZnxQ8RLP0dL/Ej2 alexm@MALISONSERVER"
@@ -45,4 +48,14 @@ rec {
railbird-sf = [ railbird-sf = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDozY/3Cd9npaYPCgIn/E7MjW9c7Zb5/wTO5Qi7yRU45 root@railbird-sf" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDozY/3Cd9npaYPCgIn/E7MjW9c7Zb5/wTO5Qi7yRU45 root@railbird-sf"
]; ];
micahKeys = [
"AAAAB3NzaC1yc2EAAAADAQABAAACAQC4ayU9sly58EHQ2YdrnoJ5o0mFD8I8UiDvN3kVh6oSMMQ9wkVzLUY6wUzlc0uq3P/OYco9mURMt83C+lY4UC+jvN09nIEHV7yVJWsKV3ntmnEqM63e9cOWnpC9XA1MSha7xrf9DaO/doxST4fY6ixZA+nbE0bFgNTqyjzdya7pCamAdnPqKqwUEha+0KfpA8TJlrfgrDLd65f2/+jLU8fhTkU6yhrJ9Piq7C+RwVTu/dlrp50PNirfQRSa7vUPNS8Y973XtK6jzB/xS2Qc6iGJ+4QcCy6lgu2xksO/MNIimZYGOCP2yx6/GDp/gnOlAktrJ3flMycJdEHkZVH61HfQV76O/mY3tck/SiCwhuNxXw0uh9wf4UO8JHlnJcsIsBkSBemJsxQul+G7kV4EV/gqW/iO5U2nKmDqbwNWigO9mN44LqBOwsnAnu78kiSE8sNCEdSy/qVWloBw4VyT/emvmTwP1okh/CKNnu0/HmfSNL6Vib1XuvKSPvrUIOLMrSeRdtu85LrWaS0CvKEoMrIgpvc+3jHtdbxwINE3JBGrbXvfe20CuHl6Fx0ONkhirRmrjG7iUjV/4c6nS2aguPVsGi7q3GYvtz7cNEe3XbfpZaHzrCncnoQPbnSDLjHdeZf4O5Aew6iOwwkpgBBDA3lJO55ujq2vNbgkpH3hmQjltQ=="
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBEBce6E/XCdo8+dC4PPyyTsO/Z0BZxuz0IrTLaGehrT weitzman.micah@gmail.com"
];
benKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAJ6lD0c+frh2vzQjvsrsmJpwM1ovaY59m5NNPml5G+E benjamin.j.corner@gmail.com"
];
interviewKeys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDr3Rim92K0aNWh2wCZjZMj927H6NZMvw+Jg5giVEklv/eeXlJn81xm9kFsqWOmN0IyS4X+2V2G/43t4C+REmzMKjkzTu9u6SJi+pC3jdJRm80sJCz2LBdRjPaY3CEubiUdxWvjisE8wUI1YuxxdegJpcemvhZXBfDU+DOqNEtF9KiPhXFMOoGU18k5AqFatdmE4z0H158cc6rCxdEiM8s+H6AJDA+xZSn9BPSx2I/ySRapoN0qJDloV19795ggnegBOjNuGejnKI0RZ8CyTcf1945Yi8/O/i/IChRlxiArjgAbC2DItkQig8YyQYz6WlKE9bwruMqe+8mgBAfuQXH8yTADwD1156VCRGoYAorAz4CLm73oGKtx4pa6WFsklWAIK1UEAhuLT6FKaJ/mmfKxcqdHxj+29FNo3d2Pam/ecFd0aERi5TExH5GKZr+LI7yKQmgk6laiR0n1wZuDwlNN7+69GH+ScxRngGCkc3RdTToqXzEaN3B6EyiAN/sAUgs= finn@LAPTOP-JI7BSSRJ"
];
} }

View File

@@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../configuration.nix ../configuration.nix
inputs.nixos-hardware.nixosModules.dell-xps-17-9700-intel inputs.nixos-hardware.nixosModules.dell-xps-17-9700-nvidia
]; ];
modules.base.enable = true; modules.base.enable = true;
@@ -15,14 +15,21 @@
modules.syncthing.enable = true; modules.syncthing.enable = true;
modules.fonts.enable = true; modules.fonts.enable = true;
modules.nixified-ai.enable = false; modules.nixified-ai.enable = false;
modules.gitea-runner.enable = true; modules.gitea-runner.enable = false;
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
environment.systemPackages = with pkgs; [
android-studio
];
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
services.xserver = {
videoDrivers = [ "nvidia" ];
};
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;

View File

@@ -0,0 +1,39 @@
{ lib, pkgs, config, inputs, forEachUser, ... }:
{
imports = [
../configuration.nix
];
services.xserver.enable = true;
environment.systemPackages = with pkgs; [
sublime
vlc
];
modules.desktop.enable = false;
modules.plasma.enable = false;
imalison.nixOverlay.enable = false;
modules.wsl.enable = true;
networking.hostName = "bencbox";
wsl.defaultUser = "ben";
system.stateVersion = "22.05";
home-manager.users = forEachUser {
home.stateVersion = "22.05";
};
users.users.ben = {
extraGroups = [
"audio"
"adbusers"
"disk"
"docker"
"networkmanager"
"openrazer"
"plugdev"
"syncthing"
"systemd-journal"
"video"
] ++ ["wheel"];
};
}

View File

@@ -7,6 +7,12 @@ in
../raspberry-pi.nix ../raspberry-pi.nix
]; ];
users.users.nginx = {
group = "nginx";
isSystemUser = true;
extraGroups = ["syncthing"];
};
modules.raspberry-pi.enable = true; modules.raspberry-pi.enable = true;
modules.base.enable = true; modules.base.enable = true;
@@ -40,14 +46,14 @@ in
defaults.email = "IvanMalison@gmail.com"; defaults.email = "IvanMalison@gmail.com";
}; };
services.nextcloud = { # services.nextcloud = {
enable = true; # enable = true;
hostName = "nextcloud.railbird.ai"; # hostName = "nextcloud.railbird.ai";
config = { # config = {
dbtype = "pgsql"; # dbtype = "pgsql";
database.createLocally = true; # database.createLocally = true;
}; # };
}; # };
services.nginx = { services.nginx = {
enable = true; enable = true;
@@ -66,14 +72,27 @@ in
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
locations."/" = { locations."/" = {
proxyPass = "http://192.168.1.26:3090"; proxyPass = "http://192.168.1.20:3090";
}; };
}; };
"syncthing.railbird.ai" = { "syncthing.railbird.ai" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
root = "/var/lib/syncthing/railbird";
locations."/" = { locations."/" = {
proxyPass = "http://[::1]:8384"; extraConfig = ''
autoindex on;
'';
};
};
"docs.railbird.ai" = {
enableACME = true;
forceSSL = true;
root = "/var/lib/syncthing/railbird/docs";
locations."/" = {
extraConfig = ''
autoindex on;
'';
}; };
}; };
}; };
@@ -89,7 +108,7 @@ in
}; };
services.home-assistant = { services.home-assistant = {
enable = true; enable = false;
extraComponents = [ extraComponents = [
# Components required to complete the onboarding # Components required to complete the onboarding
"met" "met"

View File

@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, forEachUser, ... }:
{ {
imports = [ imports = [
@@ -7,7 +7,7 @@
modules.base.enable = true; modules.base.enable = true;
modules.desktop.enable = true; modules.desktop.enable = true;
modules.xmonad.enable = true; modules.xmonad.enable = false;
modules.extra.enable = false; modules.extra.enable = false;
modules.code.enable = true; modules.code.enable = true;
modules.games.enable = false; modules.games.enable = false;
@@ -34,29 +34,15 @@
services.xserver.libinput.enable = true; services.xserver.libinput.enable = true;
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/58218a04-3ba1-4295-86bb-ada59f75e3b6"; device = "/dev/disk/by-uuid/36864608-8e74-42b8-a075-27b59ef2701d";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/8142784e-45c6-4a2b-91f1-09df741ac00f";
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/36E1-BE93"; device = "/dev/disk/by-uuid/36E1-BE93";
fsType = "vfat"; fsType = "vfat";
}; };
systemd.services.resume-fix = {
description = "Fixes acpi immediate resume after suspend";
wantedBy = [ "multi-user.target" "post-resume.target" ];
after = [ "multi-user.target" "post-resume.target" ];
script = ''
if ${pkgs.gnugrep}/bin/grep -q '\bXHC\b.*\benabled\b' /proc/acpi/wakeup; then
echo XHC > /proc/acpi/wakeup
fi
'';
serviceConfig.Type = "oneshot";
};
swapDevices = [ swapDevices = [
{ {
device = "/swapfile"; device = "/swapfile";
@@ -65,10 +51,12 @@
} }
]; ];
networking.hostName = "ivanm-dfinity-razer"; networking.hostName = "david-blade";
nix.settings.maxJobs = lib.mkDefault 12; home-manager.users = forEachUser {
home.stateVersion = "24.05";
};
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
system.stateVersion = "18.03"; system.stateVersion = "24.05";
} }

View File

@@ -0,0 +1,21 @@
{ lib, pkgs, config, inputs, forEachUser, ... }:
{
imports = [
../configuration.nix
];
services.xserver.enable = true;
environment.systemPackages = with pkgs; [sublime];
modules.desktop.enable = false;
modules.plasma.enable = false;
imalison.nixOverlay.enable = false;
modules.wsl.enable = true;
networking.hostName = "dean-zephyrus";
wsl.defaultUser = "dean";
system.stateVersion = "22.05";
home-manager.users = forEachUser {
home.stateVersion = "22.05";
};
}

View File

@@ -8,6 +8,7 @@
features.full.enable = true; features.full.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
android-studio
linuxPackages_latest.perf linuxPackages_latest.perf
zenmonitor zenmonitor
]; ];
@@ -25,13 +26,13 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
modules.postgres.enable = true;
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
services.xserver = { services.xserver = {
enable = true; enable = true;
libinput.enable = true; libinput.enable = true;
displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true;
videoDrivers = [ "amdgpu" ]; videoDrivers = [ "amdgpu" ];
}; };

View File

@@ -15,6 +15,7 @@
modules.fonts.enable = true; modules.fonts.enable = true;
modules.nixified-ai.enable = false; modules.nixified-ai.enable = false;
modules.gitea-runner.enable = true; modules.gitea-runner.enable = true;
modules.postgres.enable = true;
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
@@ -44,6 +45,10 @@
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [
{ device = "/dev/disk/by-uuid/598e9aa1-4940-4410-a2fa-3dfd8b7d2c0d"; }
];
home-manager.users = forEachUser { home-manager.users = forEachUser {
home.stateVersion = "23.11"; home.stateVersion = "23.11";
}; };

View File

@@ -5,8 +5,12 @@
]; ];
features.full.enable = true; features.full.enable = true;
modules.cache-server.enable = true; modules.cache-server = {
enable = true;
port = 3090;
};
modules.gitea-runner.enable = true; modules.gitea-runner.enable = true;
modules.vscode.enable = true;
networking.hostName = "nixquick"; networking.hostName = "nixquick";

View File

@@ -13,6 +13,7 @@
port = 3090; port = 3090;
}; };
modules.gitea-runner.enable = true; modules.gitea-runner.enable = true;
modules.postgres.enable = true;
boot.loader.systemd-boot.configurationLimit = 5; boot.loader.systemd-boot.configurationLimit = 5;
@@ -29,29 +30,6 @@
services.autorandr = { services.autorandr = {
enable = true; enable = true;
profiles = {
"1896Office" = {
fingerprint = {
DP-0 = "00ffffffffffff0010ace4a153364b300c200104b55123783bfce1b04d3bb8250e505421080001010101010101010101010101010101e77c70a0d0a029503020150829623100001a000000ff0023473749594d78677741413052000000fd0001afffff63010a202020202020000000fc0044656c6c20415733343233445702d8020320f12309070183010000654b04000101e305c000e2006ae6060501634b004ed470a0d0a046503020e50c29623100001a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009970127903000f000aa4140e0e07012045000002010d310cdb4dbd13b85b620e01455403013c520101046f0d9f002f801f009f0554004c000400663801046f0d9f002f801f009f0566005e0004008b8101046f0d9f002f801f009f057e007600040000000000000000000000000000000000000000000000000000000000005f90";
HDMI-0 = "00ffffffffffff0010ac67d0534d39312d1a0103803c2278ee4455a9554d9d260f5054a54b00b300d100714fa9408180778001010101565e00a0a0a029503020350055502100001a000000ff00483759434336423831394d530a000000fc0044454c4c205532373135480a20000000fd0038561e711e000a202020202020019e020322f14f1005040302071601141f1213202122230907078301000065030c001000023a801871382d40582c250055502100001e011d8018711c1620582c250055502100009e011d007251d01e206e28550055502100001e8c0ad08a20e02d10103e9600555021000018483f00ca808030401a50130055502100001e00000094";
};
config = {
DP-0 = {
enable = true;
mode = "3440x1440";
rate = "143.97";
position = "0x1440";
primary = true;
};
HDMI-0 = {
enable = true;
rate = "59.95";
mode = "2560x1440";
position = "440x0";
};
};
};
};
}; };
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
@@ -67,15 +45,15 @@
boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.initrd.kernelModules = [ "dm-snapshot" ];
# install nvidia drivers in addition to intel one # install nvidia drivers in addition to intel one
hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ]; hardware.graphics.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
hardware.opengl.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ]; hardware.graphics.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ];
services.xserver = { services.xserver = {
videoDrivers = [ "nvidia" ]; videoDrivers = [ "nvidia" ];
}; };
hardware.nvidia.modesetting.enable = true; hardware.nvidia.modesetting.enable = true;
hardware.opengl.driSupport32Bit = true; hardware.graphics.enable32Bit = true;
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@@ -96,7 +74,7 @@
options = [ "nofail" ]; options = [ "nofail" ];
}; };
swapDevices =[ swapDevices = [
{ device = "/dev/disk/by-uuid/f719b44e-295a-4909-9a60-84f87acb7f77"; } { device = "/dev/disk/by-uuid/f719b44e-295a-4909-9a60-84f87acb7f77"; }
]; ];

View File

@@ -0,0 +1,34 @@
{ lib, pkgs, config, inputs, forEachUser, ... }:
{
imports = [
../configuration.nix
];
modules.wsl.enable = true;
networking.hostName = "strixi-minaj-wsl";
wsl.defaultUser = "imalison";
system.stateVersion = "23.11"; # Did you read the comment?
home-manager.users = forEachUser {
home.stateVersion = "23.11";
};
programs.gnupg = {
agent = {
pinentryPackage = pkgs.pinentry-curses;
enable = true;
enableSSHSupport = true;
};
};
nixpkgs.config.permittedInsecurePackages = [
"openssl-1.0.2u"
"electron-12.2.3"
"etcher"
"electron-19.1.9"
"openssl-1.1.1w"
"nix-2.16.2"
];
}

View File

@@ -0,0 +1,65 @@
{ config, lib, pkgs, inputs, forEachUser, ... }:
{
imports = [
../configuration.nix
inputs.nixos-hardware.nixosModules.asus-rog-strix-g834jzr
];
modules.base.enable = true;
modules.desktop.enable = true;
modules.xmonad.enable = true;
modules.extra.enable = false;
modules.code.enable = true;
modules.games.enable = false;
modules.syncthing.enable = true;
modules.fonts.enable = true;
modules.nixified-ai.enable = false;
modules.gitea-runner.enable = false;
hardware.enableRedistributableFirmware = true;
environment.systemPackages = with pkgs; [
android-studio
];
services.xserver.dpi = 96;
boot.kernelPackages = pkgs.linuxPackages_testing;
boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
hardware.graphics = {
enable = true;
enable32Bit = true;
};
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
services.asusd.enable = true;
fileSystems."/" =
{ device = "/dev/disk/by-uuid/fc06a54c-cc45-423a-914b-8dfcb5939106";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/B28A-829A";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/27f277a0-b552-43a0-904d-625e48922bb9"; }
];
networking.hostName = "strixi-minaj";
powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
home-manager.users = forEachUser {
home.stateVersion = "23.05";
};
system.stateVersion = "23.05";
}

View File

@@ -6,7 +6,7 @@
options = { options = {
imalison.nixOverlay.enable = lib.mkOption { imalison.nixOverlay.enable = lib.mkOption {
default = true; default = false;
type = lib.types.bool; type = lib.types.bool;
}; };
}; };
@@ -18,6 +18,7 @@
}; };
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.backupFileExtension = "backup";
nix = rec { nix = rec {
extraOptions = '' extraOptions = ''
@@ -29,10 +30,11 @@
keep-derivations = true; keep-derivations = true;
substituters = [ substituters = [
"https://cache.nixos.org" "https://cache.nixos.org"
"https://cache.railbird.ai" "https://cuda-maintainers.cachix.org"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"cache.railbird.ai:KhnvcouxtIU2zxUcjJsm4bUK3o1S3p8xMf9qfZGF7/A=" "cache.railbird.ai:KhnvcouxtIU2zxUcjJsm4bUK3o1S3p8xMf9qfZGF7/A="
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
]; ];
nix-path = nixPath; nix-path = nixPath;
}; };

View File

@@ -1,5 +1,5 @@
final: prev: { final: prev: {
rofi-systemd = prev.rofi-systemd.overrideAttrs(_: { rofi-systemd = prev.rofi-systemd.overrideAttrs (_: {
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
repo = "rofi-systemd"; repo = "rofi-systemd";
owner = "IvanMalison"; owner = "IvanMalison";
@@ -8,7 +8,7 @@ final: prev: {
}; };
}); });
git-sync = prev.git-sync.overrideAttrs(_: { git-sync = prev.git-sync.overrideAttrs (_: {
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
repo = "git-sync"; repo = "git-sync";
owner = "IvanMalison"; owner = "IvanMalison";
@@ -17,23 +17,24 @@ final: prev: {
}; };
}); });
picom = prev.picom.overrideAttrs(_: { picom-pijulius = prev.picom-pijulius.overrideAttrs (old: {
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
repo = "picom"; repo = "picom";
owner = "dccsillag"; owner = "pijulius";
rev = "51b21355696add83f39ccdb8dd82ff5009ba0ae5"; rev = "cb93ce9aeed7362c10f2537cd51f4ba45e7d88b5";
sha256 = "sha256-crCwRJd859DCIC0pEerpDqdX2j8ZrNAzVaSSB3mTPN8=="; sha256 = "sha256-VAYC4ksQHnO3PctkmPlO/5/lL/7vLcHYRptwb03Hcwc=";
}; };
nativeBuildInputs = old.nativeBuildInputs ++ [final.asciidoctor];
}); });
expressvpn = prev.expressvpn.overrideAttrs(_: { expressvpn = prev.expressvpn.overrideAttrs (_: {
src = prev.fetchurl { src = prev.fetchurl {
url = "https://www.expressvpn.works/clients/linux/expressvpn_3.46.0.7-1_amd64.deb"; url = "https://www.expressvpn.works/clients/linux/expressvpn_3.46.0.7-1_amd64.deb";
hash = "sha256-v0rr1s32jj79A8IGfJgSGJVlz7rSnZYn4ealOpqee0w="; hash = "sha256-v0rr1s32jj79A8IGfJgSGJVlz7rSnZYn4ealOpqee0w=";
}; };
}); });
gnupg_2_4_0 = prev.gnupg.overrideAttrs(_: rec { gnupg_2_4_0 = prev.gnupg.overrideAttrs (_: rec {
pname = "gnupg"; pname = "gnupg";
# 2.4.1 breaks emacs # 2.4.1 breaks emacs
version = "2.4.0"; version = "2.4.0";
@@ -48,6 +49,24 @@ final: prev: {
withTreeSitter = true; withTreeSitter = true;
}; };
python-with-my-packages = let
my-python-packages = python-packages:
with python-packages; [
argcomplete
appdirs
ipdb
ipython
numpy
openpyxl
pip
requests
tox
virtualenv
virtualenvwrapper
];
in
final.python311.withPackages my-python-packages;
# gitea = prev.gitea.overrideAttrs(_: { # gitea = prev.gitea.overrideAttrs(_: {
# src = prev.fetchFromGitHub { # src = prev.fetchFromGitHub {
# repo = "gitea"; # repo = "gitea";

View File

@@ -1,7 +1,7 @@
{ config, makeEnable, ... }: { config, makeEnable, ... }:
makeEnable config "modules.plasma" true { makeEnable config "modules.plasma" true {
services.displayManager.sddm.enable = true;
services.xserver = { services.xserver = {
desktopManager.plasma5.enable = true; desktopManager.plasma5.enable = true;
displayManager.sddm.enable = true;
}; };
} }

32
nixos/postgres.nix Normal file
View File

@@ -0,0 +1,32 @@
{ pkgs, config, makeEnable, realUsers, ... }:
makeEnable config "modules.postgres" true {
services.postgresql = {
enable = true;
package = pkgs.postgresql_15;
ensureDatabases = [ "railbird" "public" ];
authentication = pkgs.lib.mkOverride 10 ''
#type database DBuser CIDR-ADDRESS auth-method
local all all trust
host all all 0.0.0.0/0 trust
host all all ::1/128 trust
'';
ensureUsers = map (username: {
name = username;
ensureClauses = {
superuser = true;
createrole = true;
createdb = true;
};
}) realUsers;
# initialScript = pkgs.writeText "init-sql-script" ''
# CREATE DATABASE IF NOT EXISTS railbird;
# \c railbird
# CREATE SCHEMA IF NOT EXISTS railbird;
# '';
};
services.pgadmin = {
enable = false;
initialEmail = "IvanMalison@gmail.com";
initialPasswordFile = (builtins.toFile "password" "This is the content of the file.");
};
}

6
nixos/rabbitmq.nix Normal file
View File

@@ -0,0 +1,6 @@
{ pkgs, config, makeEnable, realUsers, ... }:
makeEnable config "modules.rabbitmq" true {
services.rabbitmq = {
enable = true;
};
}

View File

@@ -1,4 +0,0 @@
#!/usr/bin/env sh
rm flake.lock
nix flake update --impure --inputs-from .
sudo nixos-rebuild switch --flake '.#' --impure

Binary file not shown.

View File

@@ -1,48 +1,49 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-ed25519 ZgrTqA ZhQai78QiRxex0hvG+zf+qL1hbTb4/JVJVWmDG8rAUU -> ssh-ed25519 ZgrTqA zsIOhgeJ7P+Ahrrh+coSbVgxw6RtPymZs5ll8X2BpTA
yKincV6tR86Qr28JC+0+LdXWLamys7D3Zka6JKFk1sk ON9VLFUzhFU/sxslo4Wt7EgohGdY+k58ri+G5naolLs
-> ssh-ed25519 ZaBdSg /bWisLCN6LpAZpgwqZvtp0Bpmr4EBDZKKw67w6DwCDQ -> ssh-ed25519 ZaBdSg /OzROBe2BME+hsdWTna+UV4tIEJK9lDDaZQnpUYWfmA
qdlTc0+bgu040JrSFHxVYhOOjBgL/mlpv41d7BnbBdw PjU8bzoct2GPytjXMxbYdPlGi9RgfaGNdlcdx8X9mcs
-> ssh-ed25519 MHZylw 7mUaZTrTTusBBB3c9bwD8xiYOEu2Yy0vD0/JBhIfThQ -> ssh-ed25519 MHZylw RKGcQyfmai8OeNo0c6zyW0KaZ4Mgt66qikomlON272c
x9vauqbTA+OL4yObO5EHsXhSurtYTYkSH8VQKl+B4Tk lO2AvsQ/3oWl0aNzitwjnFOV20H//wiuMY1MY/3WDrM
-> ssh-ed25519 sIUg6g wPIoib/eshBQvzAKdWqD6eWyWozxKuOf9h6ebG3KmUo -> ssh-ed25519 sIUg6g 8at+Rg94MgOePuOA9fUCPuxyleQHDaGPnsaNQNy6824
9D74H5EqsPlrNCgrDJo7ZofwNz0JvB0GzvwI4RAILRw CCNrSkINVlqAhi2rzAEjnzX+aJBj8S7D5OjOc7+282I
-> ssh-ed25519 TnanwQ aFqE3LuU6rjBTISLPzdz0dCcurg/8T6CLFI8ota2m2M -> ssh-ed25519 TnanwQ JQ5HncLZsUKpXbUhRBvS+UdMa8ARJBRIK75w2kuD0Hs
sFCyTPiqu6t/qqXSdmjnDVYjIGDLEGxUPYxerUTZlFU 6giGtalrSpcO2Xb7IxCvqhi7Op/wdNnhPqGOVxumutc
-> ssh-rsa gwJx0Q -> ssh-rsa gwJx0Q
yKgI9wnuT5YhySbf2mxkNwnSgdHv5fnaDI759day+jw7rwtV/Q/RoWPghCEfS3T9 q9YKescXHdvkSEEL+buHyFpedrkyP8KN+U5mwe4ML9bdFGsEESBjtwRs+wTHBKfR
+u/dFpNubL1+Sue/d0PxpJwaGV+nZb13/a1DpYZaaXYXIYiMpBaZR/3bCF1uSuOp DGueZFt8yloafYJJi2bDSOwQM+YQ7l3I9pmkdK8xppUpoxc5lsd3za4tZvl7Q3mQ
LAJAqS2WlG8+ysTj5EN+RBud4sFYYZ5gp+xk+wX/aY+NIxjQ/cKhZtlk9e9THAHJ JMgqfQ1pwpPG8YnKEnS1rZ6DFq3wJ4dH5dOkEcSkUflUse2GrVpkFHA6B0iF4Fth
WYdYkc25sp7DCsj5HlIczkmx2Wn2wajJvOKOBK95Jijn/y7+Zj+hTF2MKjfRJnGw F8cpVOpBh8zruRp5b1hNlzuC+4E4fgLC/dqo/WK17gEQmPBoVLmZurAsLUz63VBR
EoizLrr1EN2hkCbUJCwbef2NNBlUnI4A/LvKvr/2xmdw8aJc+lgEA1EssVab0Ugx XJ0cphb39Jx+OqID0pfoRx8F7pWNMXeziQ/figtfX1BVsvAgAfG/G52UQIHPBB9l
jgBHsW+70T/yT8CbSo+n6Q lRbUKp533f8J4B3uQlplAQ
-> ssh-ed25519 YFIoHA j1o7t3EaY5JBJFlxv406aS+5nrQbjj2xu2l/rkwsfhU -> ssh-ed25519 YFIoHA As3dFA/KZEv4uK3cABiksYAbbRKD/SAYHn6DMu5A/ho
CTlM2FFqysa2cu+tonQ+XtdkOe8lSx7bA0XX5cRuHh4 1Gui6pI2/Y/4fhL+sV+ReE/Q8YzOXpa+el9ieDI63hg
-> ssh-ed25519 KQfiow iTAhqJszH3qfZLcJEPsPUOfsg2lnWE1yGcFHmVqcK04 -> ssh-ed25519 KQfiow JfOvjZPAjSMEtyMj1ES5hgZQ3ChceOAgCUlAwdUWvHE
rAcVdfcrYcqDTUiyB1Xj3OsxQZGaXsd7XPT2ZENZxg4 cHOS/ogIjIt3/cpcsip/OUbTa/XTsqabxpih0Q4d+vs
-> ssh-ed25519 kScIxg SdRrX6jPDbApqYb0BUvoPENfO0EREAcVzov0mYiqfW0 -> ssh-ed25519 kScIxg Ss92xRhzfFLuQ7cZ9qOXWYlxPosZJiIA5WUtnBn5uAA
YxCq3/YI0RAI6tSe2S9eFFHRiRT+cgiqKG38R1Ed0rk eFbchoQ2WFT5QZlbMp3ie2IO+oN1gDx5LEHYgtmibyU
-> ssh-ed25519 HzX1zw +77mjckApgLbOn6r+E9ftgUOFFhDX7t6wQcCn8shA1c -> ssh-ed25519 HzX1zw CXFvvKTr+chLDjxeHIQq6YgfsyNguoqQgWMVCriq03s
LzP5oBw0YDfET9c6AiuRUrDPAblExBtPfO/aLM5bTPY AfZclyaLfIyVgRsSt6gFw/n3Gmjz9+qqcbS+jKLUTdU
-> ssh-ed25519 KQfiow /kv2czudYV5/knn4gm9UjWkTgK7h52OSwnBtQkJ4Ogs -> ssh-ed25519 KQfiow hoWtmj8tL3hYQaCusTzoEe2wy/hzOBQF/+ygYN0j0QU
x3U//RiRVbD2q+2BB7fRZ+D/mOuq2RBBrUwRaGaZ4t4 lvfAsrOv1vtQeYvlacFyg6rlEUeb2nwxelSCkHZL1JQ
-> ssh-ed25519 1o2X0w sWQrEHabTxKgPXctvjbozGia0TOFNY/nMkJkbg9wjDk -> ssh-ed25519 1o2X0w hSNKyIkQ5HrqUodLzWRrx+7RkxFg9A1TVuXbq+EFlw0
xKMdH3+dGd0I/GCuII/29D49X0pGTkB3lig3PizcfAA CXUpZnKGuXV34Tt4YWGL1hheYHSYB2JonuxmZC9BNZg
-> ssh-ed25519 KQ5iUA 0GxPwSfFhyFmgFjg17ZdQ+Np8ozLcZw4qnmJXf8e5Fs -> ssh-ed25519 KQ5iUA jbUaWkNa1xj8gKEalGx7wJWcVwwDWQ5Mzq7kw0Rk3BU
BmMvDNnEFqRHN/DQxTS2xYr64rsNwwcJ/ISx+tSgwIk y71HcF0ApASye3RgUHEThP1aFZZX5jocKHL25qZ2yZ8
-> ssh-ed25519 AKGkDw LP67Vi5XAYaeCRzKRvUol+9sYhj5DfRM2XFcfpBObCk -> ssh-ed25519 AKGkDw n5MO4SkU61QWZ57aG+383Q3raFRdomDMXGaDMgpQUSs
sQR+s300FSVp7MGvc0lAlsiriF1yYG+gv2O8qXLC0qI 4g2UfsdaNa++TRXNrUfVV8pj6irb0W+F10XfVAPJk+Y
-> ssh-ed25519 0eS5+A 6W01v2D+eo7ykmdt/c6+OngbOgPYhp3IRzOP7YycGAE -> ssh-ed25519 0eS5+A DMk4jzjnfPWzk3kz1gwebXqJ5a3yAvqTi1fXCEBLi2k
xSiwX/pPa6u+wMP99930ZALt3fUI52k56o9DIj5MJP8 JL5wGUcHNQDz4Czo6yQ2Eo5sc0/psjo0O0C9unL3V0g
-> ssh-ed25519 9/4Prw OhlAdZNG5GI60FecavQWNBHWOK5u+ONItDSnJ7kW6hE -> ssh-ed25519 9/4Prw 9RMdxeyRXz8pKxAaiOrd/D5UdImOB48C0OE4x1MbSnw
KBybj+3HZ4FCHht8lwBqJszCMZvylSoLrnOeKslDvi0 5m4g4ZSMLP99bYR0+twroVvnowpGBPolw/u0T/wDCmk
-> ssh-ed25519 gAk3+Q t5ItGM7NarFQYDU4Ae+39ZIdhmnX7liY+bqRtsqY8F8 -> ssh-ed25519 gAk3+Q Mos0Csznmt3wZF0fE+BKlqTMJgLKR/+Yih7DTNaLF3s
o+MKA8rMnXOUECFLf0bnqo4uohTjI2PN2ejvKSDbOeE EfaOXBbeS2q36lUfydPL35GcL0qzxEyG1/g1HUk+Bjc
-> ssh-ed25519 X6eGtQ JbV/sf9/HVBpVcCym7rDvSXUNvE7t1/eHQpIjksw0Cs -> ssh-ed25519 X6eGtQ 3uAhhDAEQQCu7MQmNbEAs8/bDxEeh50VefU+prQN5SU
UO0cDqFmcEQt+vasnMAc4O4bmEkLdkYzj9YzsMmsfzM jdp6QFF9Yw3zHrbmijJQV0CqlcoOm0BU3fkJTJAsxpY
-> ssh-ed25519 0ma8Cw WMNiHynQWBF/8ig0JF5tZcGruRDHHxlJOQtJalv7+lg -> ssh-ed25519 0ma8Cw +7QmGjIuxHsqeDxeLkiSvpaC7ztv+Ix0rEwEhbTeHG0
8U5QXXo3qV9QlRZobD2K4O01uQfzCd+BSViZf9fIRYo DUHK8xqoxnE78AMIh9z846eWcSToc6PruVERTOCdya8
-> }-grease WA! -> ssh-ed25519 Tp0Z1Q Alv9QyL6AzdLRTyN8pn413eeKW32ql3i/WVhasuKETI
O5uhSTAdlz9vuYJoelzj2CABhv00grAx EkkG/JknXDT5opzLSZ3Gbf8d3+FlHwwxzbZK/nCQ6ng
--- m3xCzyC0aFdfuklw+MDS1kx0oor72n4iP9w3iaYDpJs --- zN1cSiDL5ZI84c9DI4ewQLqaGZJS1IR6EoSlpQC44zI
<EFBFBD>1<EFBFBD><EFBFBD><EFBFBD>;b<>2_<><5F>Dz<44> a<><61>L15Otѓ<74><D193><EFBFBD>!+<13><><1B><>Pl<50>E<EFBFBD>23<14>"kzdFIE<49><45><EFBFBD><14><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD><77>(<28><12>,<2C><>K<EFBFBD><17> <EFBFBD>ط<EFBFBD>ۨ9<EFBFBD>H<01>G<>.Dh{<7B>:<3A><>p<EFBFBD>2<>yY<79><59><EFBFBD>`<60>o<EFBFBD>c<EFBFBD><63><><0E>Z
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>T<EFBFBD><EFBFBD><EFBFBD>I<EFBFBD>l2<EFBFBD><EFBFBD>O<EFBFBD><14>P<EFBFBD><50><EFBFBD><EFBFBD><EFBFBD>$<24>G

Binary file not shown.

View File

@@ -1,48 +1,48 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-ed25519 ZgrTqA swipq6Fr927DGa/aS5gVWl3TaGIwwyVn/pLb61AOjBc -> ssh-ed25519 ZgrTqA Hv1BMWICdw57RojY05L13liVfrg9qt6WxhiK6SAnqnc
WZjYqhvV4UuYRWE1VOhlrZZwDZl5LaTgwJRpidx6xBE vveVXJsn4MVYTLX/HvKaofXWOeJ0IMdWSeDljKSlSwg
-> ssh-ed25519 ZaBdSg j1wG6GxL536GI98uQDjvd3k4NX9i6xJaTURsOeM8tmI -> ssh-ed25519 ZaBdSg iyNGSlaHdvTctpECP5qXFSO0gC0skd25gCidX8mJhXE
omHmMEDCCjoCDb/CClty0crcLxyGgHUswr4HOP4L86k 4lC4UIFuPimSfPuavLjhR94M5roDeco5yRDClI4P0V8
-> ssh-ed25519 MHZylw BS4N9FGQvoBFYMcUKZ/0fNAR5b8gRdEqdBahN4IjhWc -> ssh-ed25519 MHZylw a8Ueer7YzQ1f4PPgedktuyNWa1r4cE3u2nDU61nC7UU
ZnDyOGMiVn2zyKisDpHu5o9AFg+Sxsor09p1BpL3hQU SETxeXg59NOznOfuLvduM2tKUolThR+CNWVCAj4fahc
-> ssh-ed25519 sIUg6g hGohSvdPUBmiD5XvGT5S8svHKeoX4iADR0wnTXBrvm4 -> ssh-ed25519 sIUg6g A/C7Vtugn4p3w7gc6s/ZBbTIUW2dOEcGwSVfm0kwY1c
q2kb1n46DQAceE0PpHwk32cycGur8eWGUwjyfp4o38M 66bSBWF+ZVKHvmEi+OEnfQF9m+7u+W0VnbDHxw9WY/Q
-> ssh-ed25519 TnanwQ 9eI4k/NX5NgWWsydOu0bi8OhBncIKS6xyMEzuJrYY1s -> ssh-ed25519 TnanwQ E2I98KMUGzMDiyJLUeZcLpb++1v8udmnONioiVmVzyk
dY4WyWbqcGS+RQUM391kGBlRXFzB5fIX+PpVQPvcD2I Sbc6bfi8VUyO6eBBkyv5DoEfVNd99K1G8NexeDmuDhA
-> ssh-rsa gwJx0Q -> ssh-rsa gwJx0Q
Hc+8CkU0zml1AMG2z4mxx8/0Yd0YlcdSkPgMqXk7TL+Pu7uJPLNfsxHDGKFKLeOJ vwnSvESPfLtlWVchHtsmPAYqUnSoKIjf16qwk6rKD976cDQt8TEQqKjbGExHNBZF
uWeyFRJHXx3gOoGo2sQpMcInnU1PL6bNq6r86KeUruYDUMgxak8Pze9LFv9ZzsfY hnXfPxLy4at1cJzPCVOsumGVdkTkGPhMkyOSTnzipGBA0hiFZ/YKmoqyl8MnOy9H
+nJ7u/kpSFvhRQR4J3cbwK3ZI2ezWHGi6vClGf+Orxt2k6I8WkwDPVC7+xeQDOFh RVd51JJLdmUUDUsVLdv8DEbYw2mTmLJsoum+LXi1oYHrYqhQvC2PhXH8b/jfn0En
pFa1V44OfcJXeSLEyioPKxB2LXBl30qcVcWiCMWyHt4GiITLovGKqYxrM1Q5jPXU vYrzIxbFaJ/xw6o+T+4G/5d3DCX4fb9ccYHnLhv9GQWvQPH+wEfYkKBaxriur1ir
Ty08vkYlgqGEOdvmE4LaBsZ/SnKukArUHykjstUp7bCqqVAaywy5zcDt9RhOnz3k 9gkE1kErSzemr0sND5NoZKkGqf4P4ear3Vnjtf1gg1Can3Fqutb0B9ou71RD111J
tTSB2Gy5/reAD4NqbLb8Sw SupcBHc0D7Kc47CTzI/V4w
-> ssh-ed25519 YFIoHA 5dSh3gD/8VZAzoUqs0qhcPl91+i+Bf9et1DXXDukr2M -> ssh-ed25519 YFIoHA HSIHZ70ZSLrbeieWFfRI8Syj5QVr3X3g3J68ZEsOSSg
2GUCUGw0lqyJj9Doed75mG5ix3La9BjeLUd39ZiTeyg 8veYBdbZfkqQ/7YvpFeE7pjWR1hZ9HF4JfM5yPUdl3Y
-> ssh-ed25519 KQfiow Xv1iY0dBtz3V8T5GyPET9BwqbX4Y4af7eecBY7y1Anc -> ssh-ed25519 KQfiow 4Ofzo/KS6qE+bb2O2l9p+Xl7sVSyYztBW1wy7e8aGCk
ts5ErCZqFcRTf6lLprZrr2np8o6BBGblRPrOh44UFNA gzeCLM85g+tSGYFAM3z03HVwyO67sriOVgL6uiOGWV0
-> ssh-ed25519 kScIxg G2Je9Qp1A9Zj9b5luvK2sJO1SWy2AZKGcM6EHKigPns -> ssh-ed25519 kScIxg MNZ5ZwjuGahkB/N3KlIzCwQjtenikYhCcqOqUsotG3c
bKIxxBdJ+DiRWuXRNDilOKxQJdVekzs9IwR7GiTireY SvDAuGNWu1SG7EEQLJboFJ0VKEAbcc1rZbg9LCdxtyk
-> ssh-ed25519 HzX1zw wMhENDQMUsij9CbQaxkVIglL6WBZlDeZbRLqm7otEAg -> ssh-ed25519 HzX1zw 9Z3XU4h4otPcP+3hx4gA3t3/T5RJAOyf/Lm/gWK8Y28
gzlH0PS+wgoHm9RiJnOwJtxWdAILLHNGOd/lsk35vCE WEpitv/XIXxHg0Rmf2zibIq8Vrf01ieEPJ9teXgHp1g
-> ssh-ed25519 KQfiow 3U/Gl7VGyBSCaQ06XLIatyCUsu/78MvyuyUXoSi3Djw -> ssh-ed25519 KQfiow HF3fZ69+NwB+1tyZDoBb+vL7S0sAB4VtFbteA8l3myE
HV+Dj3VpnCdzz7XuRfhfJGhAD+7Fv+5vb60VZI2/T/k EPE0dZ4HAsE2SLXT+BlDUrWGGNKlBUQZLYVKiOYwvs0
-> ssh-ed25519 1o2X0w HsEk1SiUhTqOTAw6DminH+BAc5Y7Peogb3BuGpgB6FM -> ssh-ed25519 1o2X0w NQodm0eoA8H57E1Lgt11GubQIXXn+9a9Ho79akD1FQ8
Zm4j5robwQS5T2sBOiSNPncXkltdBgYfYu/d2qgKcQA pG8VFyXUBsrTKEZnR/pCU5pZaIBu8s4l02tv27IFBO4
-> ssh-ed25519 KQ5iUA hvAKzXWUKMyNaJxWuk2Ath21FI0UJUWVO8GkVS01iTw -> ssh-ed25519 KQ5iUA /XRx2bwU4u47q0pmFFjnmopgeAFDRcdwVUgiZvFZBEU
8WGPzRRaxrVuX8gTe9+P//oM8Opk6tcVJbQ+WLTdzEg hb7OR5qsZ2ctqoi9F9yoJiOSCMIEFhsKTxmTzTlNcgs
-> ssh-ed25519 AKGkDw 3ALLobyiLBam2jGvDTnvQnFDKwqMu6Sms6VK6A9jCSg -> ssh-ed25519 AKGkDw MDy7x7w+m12Un+WJzIjlT1sqFUqyMgvs5cUX96YtTBE
LA1XgPi4EvZ+RYKaYyYVMThEu+edYyQyOccfX7arCco 4idv3M2g8lkjGTXiH3zxR3sORP3K6OijlCF2vTlGDs0
-> ssh-ed25519 0eS5+A L+MOMKygaYRXXslO2pp7smRudxO3SFCU1Y2OXxbjyyQ -> ssh-ed25519 0eS5+A GxaSMOtNOuri6nFhtEmPCUAYO7ULTRgfhoSEhwsQhTA
EScEV5/7m+HSNhvFYj1uOvKf/vTj/T5pSr62cWkEYyY eFGFTZB2z4zBOp+yuU9ryvhNh25v5S5bT77+XYlZ3eo
-> ssh-ed25519 9/4Prw 1VFfT7FpfFEFfnx/Tf1VQYKvEbc+raAnveL7xckM+AM -> ssh-ed25519 9/4Prw 2dVb0418rDvJEJ8yYDm3+eofjwEA0r8tuloPN+VC01c
oYZ2WuJ0BE5T/j25EACfB/cjLCP9IElCnKla6aZPLD4 uVjqjHdZCvfZJKZukaDT0m2SL1S0CMB/exuNeIEBlH4
-> ssh-ed25519 gAk3+Q zhmxSdCJmIySnMINqbKxNjmVctS9eHX4rTKqC0z+xGc -> ssh-ed25519 gAk3+Q 659Yfnz4QIdJCq1X3FxiDyL2F9QQEBSxyjnx+SCl3CI
GSnqECoK+bj3aRWvQ2ALVV0VFznk7fSr77Vcv+oWpl0 VuGpJwysc8y3Mq/HrIJP5DY1DdMJC7QlXTlyoCaWbzw
-> ssh-ed25519 X6eGtQ 5xUEtBKxwQLtlmz4Ne05pjUsxeXFRZEn3rIEnk71tXI -> ssh-ed25519 X6eGtQ hYe08q7Sofe8mdwVTCitTayJNbV9Tl9Bkt4RPexxMDU
fG2mfswiyhZB9J69Y91zo0YocbDnftd2lIkv0knbqys FhU5gPGYUi6DBMt2O1wY5uL25dyI3aGhXEFXfgyUgBQ
-> ssh-ed25519 0ma8Cw o+sHqr3FeOdpdrSKMCFl6M0YypkFUklOuOcdTuxzjFg -> ssh-ed25519 0ma8Cw z0Di7JjAJLIcQx2+B01JVBRbmh9fV1T0+Q6E8S+xGjw
s6veJeLpYv4XcHGv/fvHTDBV2LzN4lkkgMiw9r3Tmh0 507pjrUEDf7r/DY0zC3gGj78uifvpe13BHKVtetSPFw
-> cFiHfJ[~-grease U^| y& -> ssh-ed25519 Tp0Z1Q PMwAaVX/1envqO+cf93hMvw7skIHIwDHizPpjn3zLWk
eE+uq9nid3cWH7UO/044x6hCr/ZBZUwRIQIMi7X0yFDf4We54/kRGdA sNGxgzKWwS29pTBnv8YVQwGm7WzH0LnYXfqYjwsJ+gw
--- yja3ejJfODu7JOeNwFGq3l73whtWcDCBdqV3zM7R3Us --- 7ziHLKL/XsD7aJ+uEbNNNwxEC05vAINt+E5+Lvhm7oE
ɠkޞ<EFBFBD>,%de<64>lmJ_E9%"<22>G<EFBFBD><47>7<EFBFBD><37>w<EFBFBD>r<EFBFBD><0F><>zj<7A>c@<0E><16>ڋ2<DA8B>JM FSw<53><77>օJ<D685>Ǝ<05><><EFBFBD>{~E<><45><0F>}}!- <EFBFBD><15>;<3B>K<EFBFBD><4B><EFBFBD>Tc6L<08>$<03>s<04>O[3<><33><EFBFBD>U<EFBFBD><55><EFBFBD>t6<74>s a S<>n<12><>#jE^qh<19><04>5eɈQA<><41><EFBFBD><13><>2<EFBFBD><15>I/

Binary file not shown.

View File

@@ -1,50 +1,48 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-ed25519 ZgrTqA nxDhZDKcFwSoxR/i34N//ivTJDLC/11977XU4VmaWxg -> ssh-ed25519 ZgrTqA gwgbZfsmN/IZSoLT93ftwBDJ9FMFkumWuDYLAdR5mDw
JEwXfBrRVtkOkrpmsU+Zk4YAIrxZkBbsTmUXOtOR6eo wjVFV+RNqRUomklgh+/I+upUzOjIF7NbeHDG/ZfAkXU
-> ssh-ed25519 ZaBdSg 22smm7JR4fwhhlb5sNo9Qrfyd70NZCDEQqQNrhfamzo -> ssh-ed25519 ZaBdSg vfpZjIfCwFXEkEUrErLcCSigL4Uqm0/NZkIyzMkJmC4
aVwrulW5nWBqVLfB21A5wVdKYOpJq44venb3qXjpr+Y NgGeogehq3w0AUawo9blKKMrr1HfwSseUndNSvA0cDw
-> ssh-ed25519 MHZylw eOjkoAZZjqMKZgCH+XOsdX7QfOAh23Qh7byqgWLvbEg -> ssh-ed25519 MHZylw 9gx87i2+xptkEFAq4brfSa28StOcKHrBrQ6YdPrEXVw
2HUuAPBYmMwfyAD/ZKoYkwknPWwvldHpfHrOc8BMHXs Wz0TkHL3865UNTalO5GLyla3eh5HO8CU1OpvmFnUz1Y
-> ssh-ed25519 sIUg6g DTno5u3GShRGLl3O21bMAeworZSGPTHyawVkQUdOCX8 -> ssh-ed25519 sIUg6g kXECNgiZ+7BenXVIvbioQwYb0Kni3uCAyHgRgbw11C4
1EKEyC0g0Bzdut5kj5+YcTVW+QqWxXX0INKHOh1yQmY +ky0U9p0KaAu35zSOSNHXPmHFqdIf8BGAveLDMxpeTU
-> ssh-ed25519 TnanwQ duKkCYjd1yIG4rRPWyN8KF7Ktc8yRa2t5urLGzOYqwA -> ssh-ed25519 TnanwQ G5nA7iVSLYTx4TE5Xb5G/69JKJ9qm8xpYq3xi4A7ZDE
72Q4lVsHbAAmxfxazFk1Uhd2WgY1tDtA3Bma81oyDQo yMW2ny1+QuPB+xzSRxxdYN5bjKZiJVY04qN6W+V1Y3E
-> ssh-rsa gwJx0Q -> ssh-rsa gwJx0Q
U15JflZHy2YXgUL+YbLw21GGrjo9kUUGBIUy9zviyfRze2FsP/s64o4I5RcMHZQE IEv+jd2oOZskPWM/LWUb9ZLA8IzRfaBQTafgQyEzVoD7v8lbfpMKTI31ylxJQSvh
fMeSZkZSECPW55EnyNXPP58B9afruHPttq0cA+8KhmvN92pTJFVW3B29NZvAmbg+ d+gutl9xgGtVDHXjGdNKbDHwAVzYaz3IbvP+Vje9jtSqH6A0AU+1OqXeRzI3ZAux
yw6k8m9CbTTNj1YAiPP4zoW5VA5bWB9vNsTC42RLN+mXvnk3jHhJiyQ77E0m6dsX oBJlCEGZqSBspA8AhH3cv4ion0G6iC1wmqaIb9Nk/qnzfBvtE/cIpqErv19byVUj
gT6JePlb8iOySx6i90/b6PuFB23i2QFnyBUsGcwhU4VPqPcNEoXZwpS9ibbQoXYW pZr5NviDXETV29Gz2HDyv3RsZ4wfJE/npebSu+ORakOH6PLRtnMpB4aKOensv31Y
Ce15tbkfjm7HffI8cnrnJh3HpO+3onoqfwJLSm7v1twGGN3neqJU31ywFPE5kvtA UJQMTHNuJRgPdxgSI0P9W/LaCSMT5vuXR4ETz4vEqDNzcFm1ekqfY8821/AbOtlD
J53Ii0JuEjqghm9GaspfTQ Q2c0zr2C+ayGW5zwGp2XTQ
-> ssh-ed25519 YFIoHA 44F44WcZamqz8iYwS4HQhqT1zNdUZDCI+Zfq1zlpGjQ -> ssh-ed25519 YFIoHA UMEeywWPiRXx07jalhLcS4/TmK+gwg8nWdtBpM/IJzI
dyroggIjVoJCFayVjmp2zN7m6s9uDECkXUL8XJQ9uFk 9SDhcDfTgwRi7HJ5zL9i8jHL6i00oi6y/qaTzsjb6uc
-> ssh-ed25519 KQfiow /50omkmktdLNxaOHB3ImSrtL+wCtKQqVH8nGyo4Q8xE -> ssh-ed25519 KQfiow furHqLazJ3qLEIod24dfGPfu6ie7zutEXDV0N2NGYDY
90cGcqXOePnHjAhn262MeuMzn3odfKrgwsky1yE+6Hg Se5igVc1LJtobjLioH05RPtQfUh5jjYV/bRgU3RL4dY
-> ssh-ed25519 kScIxg j/12yl3KUndaxmFovvXeWvNjDiS4gLmTu60h091vFCE -> ssh-ed25519 kScIxg mBFDyzrNBg33LQAJMvlikmd7h0X9d7Eus/p86PF8mxU
hscYo/JdGuH9jFiZl7qKP7nNwiBsTKwMgqLK1SLPXPM MCHgXOGu9AE83VulyxcPEwbfbiymqiZ9c6p3IqLzhak
-> ssh-ed25519 HzX1zw /+sbKjdDKP7tzxD5Bi3KXLf/qKbIdXqkvgv5VVMtGgc -> ssh-ed25519 HzX1zw dAgBHAtVniUDV5W/MGrQX1cQh+P+cpHErnxCMn/b8A0
kv7Bv79YUyVy2MpMECI5+1Z/jz9hKG+guAB3joIEF94 zx0RxAMo2b6fzjx1U2hw/wHjz8dRXHcM+e20dXRkN98
-> ssh-ed25519 KQfiow z+1XnwF0MvV1WoLMOm1y1SBFmMCuBs52bEHNOVWHrSI -> ssh-ed25519 KQfiow NxL41InC5f7Za+/EIQT+z+vhzkkzQxOBRBqTe0J2U2c
AV1Desi4VRies/yqXcSjISdxPGvKn8aWYTfDFPMyzEY t0IJoVJ9Ap6P4D4kCM+TGgU2oKhTEpeiFktAQxM+C54
-> ssh-ed25519 1o2X0w q/W93yDVRDYcazyOIlf8jUBHSNng0GgPsqZA7r3Mn2U -> ssh-ed25519 1o2X0w ++MXOZdgCeKxiKyQ6mAiVz1i4dXnpyFSuhSq5hG3vVM
NtlRyyH4mbAnTAWBRpf5PL4vLyk2wSxAobSkYMBBX+A KeMSC/Cb10lF2ZvdLS5JXRkOE6iEcLtju3I6YMRQoqU
-> ssh-ed25519 KQ5iUA 0RLXvcC+cuMFXGgQQnCBJhWQU6+PglxxQaxlZSqVNE0 -> ssh-ed25519 KQ5iUA +5L7eIEu1RGoVXxpd/nJHi1/DIF82YCKtzt71mhKqRc
8WRPF58jm6m/gKubZgomqCZNpQoLA26fOzfY0Hqx3vI +La1804HzEBjkHeQdRGboNwIj8NarvZ/SJG3Ua4y+Vo
-> ssh-ed25519 AKGkDw Wi+UsCD95sykFp2c+5mGWGM1XgHxt7CAnSQR5vT8S2Y -> ssh-ed25519 AKGkDw Ru9l2BXa/LUZCn5DpMVDh4ca7w1JU2thmChLOeY8Ii0
TPk8gkZkmhdZnNiI1Wo1yRGkMgQdzf12dLJCDHISCjY GSua+XJoy3g9NNZ2qHstAbomR/3xKEAe6SOcn6g2Q/w
-> ssh-ed25519 0eS5+A Ip2KcVBtziu8Gtgz0ekmbk3G4yB4EUjUCQcaqXbQcjs -> ssh-ed25519 0eS5+A e2prXUG804KhjGO+rg/eXrZUQM73HxQ/BnN1vsHbuQU
t2y53xf2mEHGxFaeONMXa3/t+zGDCdQKb6RQecYfkmY nIANuBAF2Tk7hWT9HJJ4uvUrPbtUhsBW59eOkVnK5IY
-> ssh-ed25519 9/4Prw zkAdxlDmai9tSFu+a6a3jhoUnyxzZUpCiLgAyJ85uwY -> ssh-ed25519 9/4Prw DOtRMtKN5Q1YFq8AFrH/37SJxaHoaZuTMa/JVzT2Bzk
u+z5fSEzJtPvz7iEFFng4cn0WQJuMYO5zFsBCnXvXvs j+mawty5y3Ox2Nzp3TncHbR/rMmcmIQD5EfezhUUtWg
-> ssh-ed25519 gAk3+Q 6S8D1fDXLKPc9MvrnHbhMLqoY8f1W+yy9LrZq2345lY -> ssh-ed25519 gAk3+Q mZVlRxtH9jV7N6/aoJ1je+jkxuF7sffcGsLiYwjReHw
oSkGUfVxlqPnqS4sHqiywVg/cSu8rDiosw8KbXtlhn8 XOQKhZ60vBfHaO7u9Fkwy40po/jh/Y4/Yj/D4gRO0k0
-> ssh-ed25519 X6eGtQ kCtmcfUdTp8vJ8rBFDDJeJmk7s/uhlRuvrk9fhvQzw4 -> ssh-ed25519 X6eGtQ 8+iFJD1esMa/3yuKAx8fZBEJ2SxLdrzXhqqkEicRvgQ
lKwwGc+86muQv8dZ0BuivDHHR2vX/hXuhqDHNgq+/nA R9jJ7vDcxA/sOSF329GW8d18Jzdwot/BpFEl/knraSE
-> ssh-ed25519 0ma8Cw NAFySfIt7dQ3kTL73/7E1WzpOlcyd7PU1DyMsYWGnl4 -> ssh-ed25519 0ma8Cw LgbM+4liQS3j9acMcFnnp9gi4Gzkq6Xtmrm4KQoO5hU
JTZh0eM06/IOC8HNRxn5gF3KAlnBmmEUpxv5UFjuwks TX50NCZoZpH4SzS7ZfkDbEcGO/A3dzRJXvtDqxjzsuk
-> ZhDG9-grease > ~YTLl -> ssh-ed25519 Tp0Z1Q yHfAA3IRIM3rDcPNoV9qh1RU7g6LX9aelELZGXVt7Wc
MzCy45d4My1EJc2k/SzhXa2v9geyu45HhXth4R/CMejeVSk+NuTfB1UhSp6iCErU QIlWb0xzr+RpVwcyBqr8oRR4WrOz9st4fFSKNCEXCWE
eK4qPQoPCx2z1ihs5fQCC+lf55jE88+tP9aDqYPnTzXVPPHMNpDYLQYAow --- ztKYvZNf3AP9x0CiM2gtLQEIRHtkwAEgaBRHWJSZuKc
--- dVpM8R96RIKRuG6yQ672A543LxhU9ttuiSrbG4fcsvQ @6<>ۑ34p<34>oq<6F>Dv<44>ub9}`<60>I <15>ɞ[Y +<2B>&<26>&n<>3<EFBFBD>
D4'Vp<56>
Z<EFBFBD>x YA`<60>x<EFBFBD><78> :<3A>S<EFBFBD>5u<35>W[<5B><>u<>

View File

@@ -1,48 +1,48 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-ed25519 ZgrTqA NY+NeYANgfnbzJytFHoNyuZM32BvSxpANGRLqA3ZC3A -> ssh-ed25519 ZgrTqA l1KhMBYmv+TZzBET8kptlZsQqzk3PWm4KA1YbQ7pLDw
4dcp8UMmg/xc6Cufnle3kOvfTHbrAf54yJE8A+nsxmE XQdF+ZjcWyWs1oprvb5J5GWL9qhQ2oyTiAHU580I9Us
-> ssh-ed25519 ZaBdSg 15wn0r9WtCt3wZnWnvpCZqSagdJW+PDHU5E8c1MU3HU -> ssh-ed25519 ZaBdSg HpBQZKCjSZLWOgUhlZNBSQdEh4VqHyIRsnWeqOoNu1w
PJI1Em+RM0yqB3HCnQOF8E6/mn6VdrDOnzsK9vPFxeM olbfsFPUKa6n64WxIjqSfzEN0Sv69rkMem7l4BSdRO0
-> ssh-ed25519 MHZylw fKAiMMUbKVhrmGeqzS5RU8364EtC8aDD9dfqs8dnDkY -> ssh-ed25519 MHZylw i3v/ahcgJ0eNpv+eyLcLW5HFbJgDxmILPwRIfYbfYSo
lYFyJt7guYf9iuSOvTLjHFWEQ7sa/969I9SJ0AteIuM gNFYiAJFaeTE2psIhpAOEbdh8qpNPkHhQ+JimwLWHMU
-> ssh-ed25519 sIUg6g Dry+fBijBDlFtG97q6aS39xJMp5mVLTX38GbzSl1ixE -> ssh-ed25519 sIUg6g qhpWT0ZYGs7L9phprKuuTc5x3ONa5HxfJrml9hZXCDA
DfD9vxrtp+wHpMRAoj5G6fcMCimWkENRSASygIg1uH8 bSUNBSgE4THO24IldTR6UDl1nibM6wJVhfQDNgXDHoQ
-> ssh-ed25519 TnanwQ LA+lGm44Ea/xCCjjsFiSVWFNLmPHGzy/kckElhpK0zo -> ssh-ed25519 TnanwQ oIiKhCPi2Q6Aie4hdnMM+GD0X1AP+RRYX3MhPZr6mwg
xfHLX6kS7igBG37nQjv6bO7iBoDCO68SzTA+FgaxLNY +eQAf9brHo6aFjChm0AhUcF9taFNqrwIITVanvAJBZI
-> ssh-rsa gwJx0Q -> ssh-rsa gwJx0Q
1AyD6KZ88+xEBsqr2hB8Jl7qn+xCfpKIYYr++HbLeXaUsOHtYFXtHvs5+X5sknJm bPnrY1qe+cJIrAL66CjfIoHrwpyIsJ3hxMnjecNpbYwj0VD2FDy8oLknXvUs+Qr7
Xqe/Olx0EqQRJg+msmteCS326If6jJl8Vssr3wFj6ju9gFXcbAhgnUWzb5extlPx 9AVJXYnkJ2qP/KSxZe0Kq4yvuIVu30CcibMWdA+FbDSC+BGhkFuVMbn87ewujBZO
eJPc9mysx7YouZZRop29Qpkw7mDCZT2tYQKtdkcI1LjQoqFpoOclTz/KBBB0KNay yckIiiW0Z26mmBWTc2wOxJvQBsvNmEzJqt75g1SKjZYd4yD2ZHybLZkd5S2CRNnE
8C3tF3c8nFL0ClwDDLW0UB2CmU1lhuXeu4BDlAkFApzMsjC6nNeN9oghkYmCb26w P+9UZstX+ZGQT7N4xCaYi1nBn3ZyDx6QfUtWPK+W+ZBxCmeCWSKA6GdPhG3Xy/sD
hoAmIvcEuiosoQ/+axQTbVZ8xYpaSFpFRrOrrCmzDNIF2vPaTjZUDfam7MX51apJ 7Emq3VQpFwByBzgno7u3XzhY+RgGDDWz9YnvieUPT7VloXnjD+2+CqiS5zYj4ueM
GBpKEtOxAT7aJcYFEGmWGw 5VHE4pYUTczXWBe2kurwpg
-> ssh-ed25519 YFIoHA ksA+0+fsX1bdcHPyUAjXYFcAcpMw5QXqGCJN0+s7Lyk -> ssh-ed25519 YFIoHA zgTafEG44X/fXwXLIlogjs45fAjoEMtWwOH1bJiUXA0
mlaW6utuNRIzy9hGGESel6QSAu/IfaReUTzPPlMLOFU vp/8r42Zr97CVwG5K9F8be5OUy9lAjqMC/86mgsHyok
-> ssh-ed25519 KQfiow b6eCnVUUd65LIKiBS4qzHjo0YQ8pBxKBSToa4JEb3VE -> ssh-ed25519 KQfiow 0mtQJsqu9ilrlYIcxEURoPR4v26ovNb+xK3HsA67J3k
QJhhpkW1Pt4BmifAVqb6+k2wRpNY8eDrdWxkLiG6wR8 sUGJ2uJXmDCzjWVGvD+kQq/k1Kjh1GWxalx66PdbRLo
-> ssh-ed25519 kScIxg fVG2ArX8DRcFC8xv6NdWYDtontCKvadsMt6MQUbrEmE -> ssh-ed25519 kScIxg G/D+dmQhzFH8baIl1/LEcFm6Srag72DfUwMi2lU4FSI
AtsJoMsb+eqy8RsbXBaFD1a2FEP8aGWmlx3jqOkq1XQ lUm3v86TvpXOCEOD7x2c6OQfglVlNpz3RJQKgLos4A0
-> ssh-ed25519 HzX1zw jfNu5hD39Dt1buKIW0QTAdWwMCYRfF4lUEHXkxWizhA -> ssh-ed25519 HzX1zw mOWnNPTDS2uWUhaBDh5W20sa6L8Sv82B/i5fyYtBg2I
V2ljbdbVN+Ofd0t9kr/NVK84Ddnr46j0NO6XSbDVf3g ml3ypIN6Hk9ZLWAHgeeX9Fl69cVo0quKKnIOzf0gtiA
-> ssh-ed25519 KQfiow phu8fsZdpY+8Zlx0SM7yuAgtTcor1x2RaFwPah7rKSk -> ssh-ed25519 KQfiow +KbirvF1s4PLCPVko1UuvGkPUWT4ysU7IURr61WBYFI
0JGun84YbHJ6q1WiDjjK6ClUIZbOObdCLg49d90eOek EIEFzIrqBu0eF2qsJ0sNYWVLdxUVWhER05C//iU8Hik
-> ssh-ed25519 1o2X0w UvwoXYUFgtZbIi5zmj5pOEEugnrGJkqLhKfrMQQx3WI -> ssh-ed25519 1o2X0w SEi4GVg7eYsP4H5x+FzMWaHzQ10qYuD63DtlNbdtEjg
f+qnB26Cwm2fPcVMnMC/Rw3+VIvl6jnnpXDZSlVnVho hvVJMGz0mrfKYua9kfc+QfZgAqAapKlRoxmJQvX076g
-> ssh-ed25519 KQ5iUA 7GSK9XUZysG0K6f5BrmJ8ww4AfeXt++FRKPajQGsNzg -> ssh-ed25519 KQ5iUA DH/T6YbQufZDEejYJwyTvxeR2dn/CaTm1i68Rh03yyU
vXTaiB+Bw+CCtGbcr3qA8x65qkaxPqg4803U3qgCiHw u3sMfE0YupucU58UVrCkEsVKPWCvxEfDDCvRhON0J+4
-> ssh-ed25519 AKGkDw 9QdLmJH1aIuzx+KaJzZxlZK0gokn4H/k18ziVb3SKlY -> ssh-ed25519 AKGkDw N/s4jeBT7J8oTXqiJhfNRzUuxR9PTyGApTqCjERFH10
Bgi4viUtVMsja54a6B1xhB51IazlsM/Fe2lo7bJkEnc oxEicNoou7wTRuLra2lNHUGp6ZAVNMAV88X/UTdI16M
-> ssh-ed25519 0eS5+A dvHrNx5cXKx1/vtNQ42LHY/039TR3gX0/9D/5rhyez8 -> ssh-ed25519 0eS5+A mJLNn95SfVF6fBBmPJHBxeGH74+hCbHVC3CHN3bcr1c
jmsJOgiRKhspmfe7PXToIfxgrHByTNuhr2BjX0ikL78 mVc2Rsz6tXZlPGSMNNmmo4sbPN36we7YVy17mXkwKas
-> ssh-ed25519 9/4Prw 2ynwRf5Ucyl0dl07MPqM8wTTcohNEXrgUVqwcr7bvgs -> ssh-ed25519 9/4Prw moIGBpA5A/k4RqRFbiESz4LjB57/e7CV4Usp0kJ+o1Q
lv7TsAgFbohdiIh98jQkDtRxsLyjLZqdYvNi7Ax9HoA MCDzUd0ZM8jEFPkcHaYXcCBeJT7L6vkqfSlpZQ/sG5o
-> ssh-ed25519 gAk3+Q HyOc53gCKtJxzQfzrAy/JlN6N7YibLTemyNsrE34Hjk -> ssh-ed25519 gAk3+Q DkXPTEBi/E6aZkDQeeXPMs/rhg+ZyipHQ5PfbrutMSk
jON1KFEHbgsieAPQA5VhvUKhb2oo/3q6TIBQ+M+/w6s lOlrZmHIgLzUkMUYjWwVs7c3oR3xA3PEevT41nXkKcs
-> ssh-ed25519 X6eGtQ vAd/TTWqU5zh7WwgyYgr4ZFQfNw7Fy0rWjGXejinF3g -> ssh-ed25519 X6eGtQ FnKi617TVTcL4xNmWCiYdFZXqN46WaoGS9XUsR4cvSY
5j5amiIfaM7FMs2nI+JlO18CzCqNrr8vLBP/qw1t87U STQh6M7mB15fSvndYx7wei1M/NLuKx7P1IGfjfzW+VY
-> ssh-ed25519 0ma8Cw TsdGNhJW/RJdw8LMFO7/GFuk8hIlS+27W9Jy6V3n+W4 -> ssh-ed25519 0ma8Cw jNGzFMl5ln7nhFcmZkzLcMDlCliMTP0d9FI0pA0PaDQ
FS9pfWJa/p1Yh8sjAInGOyFAWl8k39Mf8HoWa8+nmy4 sgMfIzoC4fi2aMvtvxNpifw2pXeJJtB/rI1Js8qZmlM
-> _-grease 9T~ Ch Zf` -> ssh-ed25519 Tp0Z1Q 4H03FYzl4l7Qy96uo+WxUcpQiWWXdEPva8nPcIPg71w
zKY0P/ZvZMCgNRKNUIekvbYbYhrmi83Yibogh8Orxg pza0c3a9aTnXFs/MT3wkORn6WUKQmxW/xqAaorZHmSA
--- /D7mRa/4E1XTXzFKPm4SE0Fx9OUBJcKrxwe5M1uX400 --- qteXhOgvLyIakAwNEcpK5Mtk0aERS+2hNZFT+bmE/HU
4<EFBFBD>s<> <20>9f<39>m) (*BM<42><4D>zM<7A><4D><EFBFBD><EFBFBD>E<EFBFBD> Vi%sIsy<73>{8[<5B>{<7B>7<EFBFBD>[sޘ<73>S<EFBFBD>̊N<EFBFBD> <EFBFBD>Z<EFBFBD><EFBFBD>iCG(k<><6B>fa<66>?<3F><><EFBFBD>k<02><><EFBFBD><EFBFBD><EFBFBD>}<0F><15><EFBFBD>

Binary file not shown.

View File

@@ -10,5 +10,7 @@ in
"gitea-runner-token.jimi-hendnix.age".publicKeys = keys.agenixKeys; "gitea-runner-token.jimi-hendnix.age".publicKeys = keys.agenixKeys;
"gitea-runner-token.adele.age".publicKeys = keys.agenixKeys; "gitea-runner-token.adele.age".publicKeys = keys.agenixKeys;
"gitea-runner-token.railbird-sf.age".publicKeys = keys.agenixKeys ++ keys.railbird-sf; "gitea-runner-token.railbird-sf.age".publicKeys = keys.agenixKeys ++ keys.railbird-sf;
"gitea-runner-token.mac-demarco-mini.age".publicKeys = keys.agenixKeys ++ keys.railbird-sf;
"nextcloud-admin.age".publicKeys = keys.agenixKeys; "nextcloud-admin.age".publicKeys = keys.agenixKeys;
"ryzen-shine-kubernetes-token.age".publicKeys = keys.agenixKeys;
} }

View File

@@ -1,8 +1,9 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
security.pam.sshAgentAuth.enable = true;
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns = true; nssmdns4 = true;
publish = { publish = {
enable = true; enable = true;
domain = true; domain = true;
@@ -19,13 +20,15 @@
services.openssh = { services.openssh = {
enable = true; enable = true;
settings = { settings = {
AllowAgentForwarding = true;
AllowTcpForwarding = true;
PasswordAuthentication = false; PasswordAuthentication = false;
X11Forwarding = true; X11Forwarding = true;
}; };
}; };
programs.ssh = { programs.ssh = {
forwardX11 = true; forwardX11 = false;
setXAuthLocation = true; setXAuthLocation = true;
knownHosts = { knownHosts = {
github = { github = {

View File

@@ -1,2 +0,0 @@
#!/usr/bin/env sh
sudo nixos-rebuild switch --flake '.#' --impure "$@"

View File

@@ -13,6 +13,11 @@ let
jay-lenovo = { id = "AP5ZUKJ-QBVYWCN-DYHR3UB-JJXRWNI-CAORGYM-HWRKHEH-ZJSTRLN-PP5USQX"; }; jay-lenovo = { id = "AP5ZUKJ-QBVYWCN-DYHR3UB-JJXRWNI-CAORGYM-HWRKHEH-ZJSTRLN-PP5USQX"; };
jimi-hendnix = { id = "55JWW5K-4NY5DKT-TR4MVPO-UNOMQKM-J7TYCRF-CCCZGPM-FVRKHID-JVFLAAV"; }; jimi-hendnix = { id = "55JWW5K-4NY5DKT-TR4MVPO-UNOMQKM-J7TYCRF-CCCZGPM-FVRKHID-JVFLAAV"; };
railbird-sf = { id = "5F4FPJM-KRBFVIH-CTTB2NC-7CPVGAM-CONMH2Q-SQPRODO-CWKRFPF-HVN4AAD"; }; railbird-sf = { id = "5F4FPJM-KRBFVIH-CTTB2NC-7CPVGAM-CONMH2Q-SQPRODO-CWKRFPF-HVN4AAD"; };
dean = { id = "RIVW4FP-NZNGGGD-4ET26IC-R6CZHEU-4EBIDHX-U756VWB-W7EM3LE-3YQ6YA3"; };
mixos = { id = "7DMMUDT-CO33EMS-LQW65MX-3BVYDBT-ZZWDJC6-SWEF6SW-ICUMWOE-ZC4IBQK"; };
strixi-minaj-wsl = { id = "DOAEFFI-W6EZY3K-GDUHDLX-6DQPVFC-XU3G65X-5KX6RKK-EMF7ZT7-YKKKOAM"; };
strixi-minaj = { id = "IF76WOS-WVYFAQG-ZZMIT3R-ZR6EQQH-YQP3FGZ-BJ3LJKO-56FK2XA-UREADQM"; };
dean-zephyrus = { id = "UVIQVZQ-WFWVUQT-OTXPK7V-RXFKAVV-RY5DV2Z-XZEH3Q2-JQZIQLW-XMSB6AT"; };
}; };
allDevices = builtins.attrNames devices; allDevices = builtins.attrNames devices;
in in
@@ -22,8 +27,15 @@ makeEnable config "modules.syncthing" true {
chown -R syncthing:syncthing /var/lib/syncthing chown -R syncthing:syncthing /var/lib/syncthing
chmod -R 2770 /var/lib/syncthing chmod -R 2770 /var/lib/syncthing
mkdir -p /var/lib/syncthing/sync mkdir -p /var/lib/syncthing/sync
mkdir -p /var/lib/syncthing/railbird
''; '';
}; };
systemd.services.syncthing = {
serviceConfig = {
AmbientCapabilities = "CAP_CHOWN";
CapabilityBoundingSet = "CAP_CHOWN";
};
};
services.syncthing = { services.syncthing = {
enable = true; enable = true;
settings = { settings = {
@@ -32,6 +44,13 @@ makeEnable config "modules.syncthing" true {
sync = { sync = {
path = "~/sync"; path = "~/sync";
devices = allDevices; devices = allDevices;
ignorePerms = true;
copyOwnershipFromParent = true;
};
railbird = {
path = "~/railbird";
devices = allDevices;
ignorePerms = true;
copyOwnershipFromParent = true; copyOwnershipFromParent = true;
}; };
}; };

7
nixos/user-specific.nix Normal file
View File

@@ -0,0 +1,7 @@
{
home-manager.users.micah = {pkgs, ...}: {
home.packages = [
pkgs.neovim
];
};
}

View File

@@ -1,4 +1,4 @@
{ pkgs, realUsers, forEachUser, keys, ... }: { pkgs, keys, inputs, system, ... }:
let let
extraGroups = [ extraGroups = [
"audio" "audio"
@@ -27,35 +27,36 @@ in
extraGroups = [ "syncthing" "wheel" ]; extraGroups = [ "syncthing" "wheel" ];
home = "/var/lib/syncthing"; home = "/var/lib/syncthing";
createHome = true; createHome = true;
openssh.authorizedKeys.keys = [giteaSecret] ++ kanivanKeys;
};
ivanm = userDefaults // {
extraGroups = extraGroupsWithWheel;
name = "ivanm";
openssh.authorizedKeys.keys = kanivanKeys;
}; };
imalison = userDefaults // { imalison = userDefaults // {
extraGroups = extraGroupsWithWheel; extraGroups = extraGroupsWithWheel;
name = "imalison"; name = "imalison";
shell = pkgs.zsh;
openssh.authorizedKeys.keys = kanivanKeys; openssh.authorizedKeys.keys = kanivanKeys;
}; };
kat = userDefaults // { kat = userDefaults // {
extraGroups = extraGroupsWithWheel; extraGroups = extraGroupsWithWheel;
name = "kat"; name = "kat";
shell = pkgs.zsh;
openssh.authorizedKeys.keys = kanivanKeys; openssh.authorizedKeys.keys = kanivanKeys;
}; };
dean = userDefaults // { dean = userDefaults // {
extraGroups = extraGroupsWithWheel; extraGroups = extraGroupsWithWheel;
name = "dean"; name = "dean";
shell = pkgs.zsh;
openssh.authorizedKeys.keys = kanivanKeys ++ deanKeys; openssh.authorizedKeys.keys = kanivanKeys ++ deanKeys;
}; };
will = userDefaults // { will = userDefaults // {
extraGroups = extraGroupsWithWheel; extraGroups = extraGroupsWithWheel;
name = "will"; name = "will";
shell = pkgs.zsh;
openssh.authorizedKeys.keys = kanivanKeys ++ willKeys; openssh.authorizedKeys.keys = kanivanKeys ++ willKeys;
}; };
alex = userDefaults // { alex = userDefaults // {
extraGroups = extraGroupsWithWheel; extraGroups = extraGroupsWithWheel;
name = "alex"; name = "alex";
shell = pkgs.zsh;
openssh.authorizedKeys.keys = kanivanKeys ++ alexKeys; openssh.authorizedKeys.keys = kanivanKeys ++ alexKeys;
}; };
loewy = userDefaults // { loewy = userDefaults // {
@@ -73,13 +74,35 @@ in
name = "andy"; name = "andy";
openssh.authorizedKeys.keys = kanivanKeys ++ andyKeys; openssh.authorizedKeys.keys = kanivanKeys ++ andyKeys;
}; };
micah = userDefaults // {
inherit extraGroups;
name = "micah";
openssh.authorizedKeys.keys = kanivanKeys ++ micahKeys;
};
unprivileged = userDefaults // {
extraGroups = ["syncthing"];
name = "unprivileged";
openssh.authorizedKeys.keys = [giteaSecret] ++ kanivanKeys;
};
ben = userDefaults // {
inherit extraGroups;
name = "ben";
openssh.authorizedKeys.keys = benKeys ++ kanivanKeys;
};
railbird = userDefaults // {
inherit extraGroups;
name = "railbird";
openssh.authorizedKeys.keys = inputs.railbird-secrets.keys.railbirdDevKeys;
};
interview = userDefaults // {
inherit extraGroups;
name = "interview";
openssh.authorizedKeys.keys = interviewKeys ++ inputs.railbird-secrets.keys.railbirdDevKeys;
};
}; };
nix.settings.trusted-users = realUsers;
nix.sshServe = { nix.sshServe = {
enable = true; enable = true;
keys = keys.allKeys; keys = keys.allKeys;
}; };
home-manager.users = forEachUser (import ./home-manager.nix);
} }

7
nixos/vscode.nix Normal file
View File

@@ -0,0 +1,7 @@
{ inputs, config, makeEnable, forEachUser, ... }:
makeEnable config "modules.vscode" true {
home-manager.users = forEachUser {
imports = [inputs.vscode-server.homeModules.default];
services.vscode-server.enable = true;
};
}

View File

@@ -7,15 +7,16 @@ makeEnable config "modules.wsl" false {
modules.base.enable = false; modules.base.enable = false;
modules.desktop.enable = false; modules.desktop.enable = false;
modules.xmonad.enable = false; modules.xmonad.enable = false;
modules.plasma.enable = false;
# Update timezone automatically # Update timezone automatically
services.tzupdate.enable = true; services.tzupdate.enable = true;
wsl.wslConf.automount.root = "/mnt";
wsl = { wsl = {
enable = true; enable = true;
automountPath = "/mnt";
startMenuLaunchers = true; startMenuLaunchers = true;
nativeSystemd = true; nativeSystemd = true;
docker-native.enable = true;
}; };
} }

View File

@@ -1,4 +1,4 @@
{ config, pkgs, options, inputs, forEachUser, makeEnable, ... }: { config, pkgs, inputs, forEachUser, makeEnable, ... }:
makeEnable config "modules.xmonad" true { makeEnable config "modules.xmonad" true {
nixpkgs.overlays = with inputs; [ nixpkgs.overlays = with inputs; [
xmonad.overlay xmonad.overlay
@@ -82,7 +82,8 @@ makeEnable config "modules.xmonad" true {
enable = true; enable = true;
vSync = config.modules.xmonad.picom.vSync.enable; vSync = config.modules.xmonad.picom.vSync.enable;
backend = "glx"; backend = "glx";
extraArgs = ["--experimental-backends"]; # extraArgs = ["--experimental-backends"];
package = pkgs.picom-pijulius;
settings = { settings = {
animations = true; animations = true;
@@ -104,7 +105,6 @@ makeEnable config "modules.xmonad" true {
}; };
settings = { settings = {
inactive-dim = 0.2;
focus-exclude = ["class_g ?= 'rofi'" "class_g ?= 'Steam'"]; focus-exclude = ["class_g ?= 'rofi'" "class_g ?= 'Steam'"];
rounded-corners-exclude = [ rounded-corners-exclude = [
"! name~=''" # Qtile == empty wm_class.. "! name~=''" # Qtile == empty wm_class..