Compare commits
23 Commits
d70b0f9d5e
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| c156908621 | |||
| 7e44493b90 | |||
| 44ba137c4e | |||
| c72c6e09b4 | |||
| b35e900b41 | |||
| 8cc9007d77 | |||
| c06a28c59b | |||
| 6b463bb434 | |||
| 98fc942c58 | |||
| dd21db047d | |||
| 6ed8974212 | |||
| 0afb5b84f7 | |||
| f24315425a | |||
| 09f0177d54 | |||
| e103f51ef3 | |||
| 44fb4e1bc1 | |||
| 39b049d633 | |||
| 597c227b75 | |||
| ad32e70455 | |||
| 06cd6f92cf | |||
| 7c1276edcd | |||
| 52019180ef | |||
| e5e32f1ccc |
@@ -3,7 +3,7 @@
|
|||||||
url = "wss://ntfy.voidarc.co.uk:443"
|
url = "wss://ntfy.voidarc.co.uk:443"
|
||||||
|
|
||||||
# secret gotify token
|
# secret gotify token
|
||||||
token = "C5YKvW5h3NfJJIB"
|
token = { command = "cat /home/user01/.dotfiles/.secret-gotify"}
|
||||||
# if you want to get the token from a password manager, or other external command,
|
# if you want to get the token from a password manager, or other external command,
|
||||||
# you can also use for example:
|
# you can also use for example:
|
||||||
# token = { command = "secret-tool lookup Title 'Gotify token'" }
|
# token = { command = "secret-tool lookup Title 'Gotify token'" }
|
||||||
|
|||||||
Submodule .config/hypr updated: 203ea1b91c...0fea6f1450
@@ -16,6 +16,8 @@ cursor_trail_start_threshold 1
|
|||||||
cursor_trail_color #cba6f7
|
cursor_trail_color #cba6f7
|
||||||
cursor_shape beam
|
cursor_shape beam
|
||||||
|
|
||||||
|
allow_remote_control true
|
||||||
|
|
||||||
window_padding_width 10
|
window_padding_width 10
|
||||||
|
|
||||||
map ctrl+backspace send_text all \x17
|
map ctrl+backspace send_text all \x17
|
||||||
|
|||||||
Submodule .config/nvim updated: 0ad3049af0...7de01201e8
1
.config/quickshell
Submodule
1
.config/quickshell
Submodule
Submodule .config/quickshell added at 63e360d427
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1 +1,4 @@
|
|||||||
.session
|
.session
|
||||||
|
.gitsecret/keys/random_seed
|
||||||
|
!*.secret
|
||||||
|
.secret-gotify
|
||||||
|
|||||||
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -8,3 +8,6 @@
|
|||||||
[submodule ".config/hypr"]
|
[submodule ".config/hypr"]
|
||||||
path = .config/hypr
|
path = .config/hypr
|
||||||
url = https://git.voidarc.co.uk/voidarc/hypr
|
url = https://git.voidarc.co.uk/voidarc/hypr
|
||||||
|
[submodule ".config/quickshell"]
|
||||||
|
path = .config/quickshell
|
||||||
|
url = https://git.voidarc.co.uk/voidarc/quickshell
|
||||||
|
|||||||
BIN
.gitsecret/keys/pubring.kbx
Normal file
BIN
.gitsecret/keys/pubring.kbx
Normal file
Binary file not shown.
BIN
.gitsecret/keys/pubring.kbx~
Normal file
BIN
.gitsecret/keys/pubring.kbx~
Normal file
Binary file not shown.
BIN
.gitsecret/keys/trustdb.gpg
Normal file
BIN
.gitsecret/keys/trustdb.gpg
Normal file
Binary file not shown.
1
.gitsecret/paths/mapping.cfg
Normal file
1
.gitsecret/paths/mapping.cfg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
.secret-gotify:f6129ad401b60d5a491d582169088600bb58a537d232b93c22923aede129d5cc
|
||||||
2
.nixos
2
.nixos
Submodule .nixos updated: c0993eb22f...fd62c17426
2
.secret-gotify.secret
Normal file
2
.secret-gotify.secret
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
„^ýòêîø®j@:p®X–a=ÞmÑA¼å9×
|
||||||
|
Q‚îºt$)CÓ~†'s0³f JA@:I²ÌóÛo³î_Øz>Í*–¡šÒÎC«kß‹á))=ÂeBxÒYƒOè
|
||||||
4
.zshrc
4
.zshrc
@@ -8,6 +8,9 @@ zstyle ':completion:*' matcher-list 'm:{[:lower:]}={[:upper:]}' 'r:|[._-]=* r:|=
|
|||||||
# init oh my posh with theme from stow
|
# init oh my posh with theme from stow
|
||||||
eval "$(oh-my-posh init zsh --config $HOME/.config/oh-my-posh/zen.toml)"
|
eval "$(oh-my-posh init zsh --config $HOME/.config/oh-my-posh/zen.toml)"
|
||||||
|
|
||||||
|
# Add devenv
|
||||||
|
eval "$(devenv hook zsh)"
|
||||||
|
|
||||||
# make nix shell zsh instead of bash
|
# make nix shell zsh instead of bash
|
||||||
any-nix-shell zsh --info-right | source /dev/stdin
|
any-nix-shell zsh --info-right | source /dev/stdin
|
||||||
|
|
||||||
@@ -29,3 +32,4 @@ alias vinix="nvim --cmd 'cd ~/.dotfiles/.nixos'"
|
|||||||
alias man='man -P "bat -p"'
|
alias man='man -P "bat -p"'
|
||||||
|
|
||||||
source ~/.zshrc-local
|
source ~/.zshrc-local
|
||||||
|
source ~/.zshrc-functions
|
||||||
|
|||||||
17
.zshrc-functions
Normal file
17
.zshrc-functions
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
transcode-youtube() {
|
||||||
|
# Check if both input and output files are provided
|
||||||
|
if [ "$#" -ne 1 ]; then
|
||||||
|
echo "Usage: transcode-youtube <video number>"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
ffmpeg -vaapi_device /dev/dri/renderD128 -i "youtube-raw/vid$1.mov" \
|
||||||
|
-vf "format=nv12,hwupload" \
|
||||||
|
-c:v h264_vaapi -profile:v high -level 4.2 \
|
||||||
|
-rc_mode VBR -b:v 50M -maxrate 70M -bufsize 100M \
|
||||||
|
-g 120 -bf 2 \
|
||||||
|
-color_primaries bt709 -color_trc bt709 -colorspace bt709 \
|
||||||
|
-c:a aac -b:a 384k -ar 48000 \
|
||||||
|
-movflags +faststart \
|
||||||
|
"youtube-archive/vid-$1.mp4"
|
||||||
|
}
|
||||||
62
README.md
Normal file
62
README.md
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
# VoidFiles
|
||||||
|
Full Nixos/Hyprland/Nvim setup that I daily drive.
|
||||||
|
|
||||||
|
## Installing
|
||||||
|
1. Install nixos using default config (If you are an existing user then skip this step)
|
||||||
|
|
||||||
|
I recommend using the graphical installer and just installing KDE or something, and reccomend using the username user01
|
||||||
|
If you have already decided which config to use, you can also set your hostname accordingly, to either mobile02 or HACKSTATION
|
||||||
|
|
||||||
|
2. Clone this repo to `~/.dotfiles` (required for doot to work)
|
||||||
|
|
||||||
|
You will probably have to install/ use a nix shell for git, but you should only need it for this step (`nix shell -p git`)
|
||||||
|
|
||||||
|
```
|
||||||
|
git clone https://git.voidarc.co.uk/voidarc/config ~/.dotfiles --recurse-submodules
|
||||||
|
```
|
||||||
|
|
||||||
|
3. Use doot to put config files in place BEFORE BUILDING CONFIG
|
||||||
|
|
||||||
|
> [!CAUTION]
|
||||||
|
> IF YOU HAVE AN EXISTING CONFIG PLEASE BACK UP YOUR HOME DIRECTORY BEFORE RUNNING DOOT!!!
|
||||||
|
> I would reccomend making a new user called user01 and running from there.
|
||||||
|
> Nixos WILL delete any user account not in the config from passwd, but any existing files in the home directory will remain available.
|
||||||
|
> If you wish to use another user, add their config to common.nix
|
||||||
|
|
||||||
|
Run the command to get doot for nixos. Use the official repo or mine, either works.
|
||||||
|
```
|
||||||
|
nix shell github:voidarclabs/nixos.doot
|
||||||
|
```
|
||||||
|
Once you are in the shell, use the `doot` or `doot install` command to link the dotfiles to their proper locations
|
||||||
|
If there are any existing dotfiles, that doot flags, replace or keep them at your own discression. Keep in mind that
|
||||||
|
the "adopt" option will write over the files in the git repo. This is reversible by running `git restore .`, which
|
||||||
|
resets all unstaged changes back to the latest commit. For more info please refer to `man git-restore`.
|
||||||
|
This step is necessary because the flake for nvim has to exist for the config to build correctly.
|
||||||
|
|
||||||
|
4. Build the system config from flake
|
||||||
|
|
||||||
|
I use HACKSTATION on my main pc, with mobile02 on my laptop.
|
||||||
|
Mobile02 is reccomended for systems that only have 1 monitor, or people who want fewer packages. HACKSTATION has no
|
||||||
|
extra hyprland config for unknown monitors, so YMMV. Here is the command for mobile02. The output name is not case sensitive,
|
||||||
|
but conventionally lowercase
|
||||||
|
```
|
||||||
|
sudo nixos-rebuild switch --impure --flake ~/.dotfiles/.nixos#mobile02
|
||||||
|
```
|
||||||
|
If you have set your hostname, you can enter `zsh` and simply type `nrs`, which will rebuild the system according to your hostname.
|
||||||
|
|
||||||
|
5. Reboot
|
||||||
|
|
||||||
|
If all has gone well, you should be able to reboot and enter hyprland with my config. The mobile02 config will have an SDDM login screen,
|
||||||
|
but HACKSTATION logs in automatically.
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
For Hyprland and nvim, see the relevant repos.
|
||||||
|
The only custom behaviour in this repo is the `.zshrc` aliases, that can be found there.
|
||||||
|
Key aliases:
|
||||||
|
```
|
||||||
|
v - opens nvim in the current directory
|
||||||
|
lg - opens lazygit in the current directory
|
||||||
|
nrs - rebuilds system (see .zshrc-local in either laptop-files or pc-files)
|
||||||
|
vinix - opens nvim in ~/.dotfiles/.nixos
|
||||||
|
nsh - shorthand for nix shell, just put packages on the end
|
||||||
|
```
|
||||||
@@ -11,6 +11,10 @@ exclude_files = [
|
|||||||
".gitignore",
|
".gitignore",
|
||||||
".session",
|
".session",
|
||||||
".gitmodules",
|
".gitmodules",
|
||||||
|
".gitsecret",
|
||||||
|
"*.secret",
|
||||||
|
"**/.devenv",
|
||||||
|
".secret*"
|
||||||
]
|
]
|
||||||
|
|
||||||
# Files and directories that are always symlinked, overriding `exclude_files`. Each entry is a glob pattern relative to the dotfiles directory.
|
# Files and directories that are always symlinked, overriding `exclude_files`. Each entry is a glob pattern relative to the dotfiles directory.
|
||||||
|
|||||||
Reference in New Issue
Block a user