mirror of
https://github.com/nmasur/dotfiles
synced 2025-07-06 22:30:13 +00:00
Compare commits
1 Commits
nixd
...
language-c
Author | SHA1 | Date | |
---|---|---|---|
f85a008741 |
166
.github/workflows/arrow-aws.yml
vendored
166
.github/workflows/arrow-aws.yml
vendored
@ -1,166 +0,0 @@
|
|||||||
name: Arrow (AWS)
|
|
||||||
|
|
||||||
run-name: Arrow (AWS) - ${{ inputs.rebuild && 'Rebuild and ' || '' }}${{ inputs.action == 'create' && 'Create' || ( inputs.action == 'destroy' && 'Destroy' || 'No Action' ) }}
|
|
||||||
|
|
||||||
env:
|
|
||||||
TERRAFORM_DIRECTORY: hosts/arrow/aws
|
|
||||||
DEPLOY_IDENTITY_BASE64: ${{ secrets.DEPLOY_IDENTITY_BASE64 }}
|
|
||||||
ARROW_IDENTITY_BASE64: ${{ secrets.ARROW_IDENTITY_BASE64 }}
|
|
||||||
ZONE_NAME: masu.rs
|
|
||||||
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
|
||||||
CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
rebuild:
|
|
||||||
type: boolean
|
|
||||||
default: false
|
|
||||||
action:
|
|
||||||
type: choice
|
|
||||||
required: true
|
|
||||||
default: create
|
|
||||||
options:
|
|
||||||
- create
|
|
||||||
- destroy
|
|
||||||
- nothing
|
|
||||||
size:
|
|
||||||
type: choice
|
|
||||||
required: false
|
|
||||||
options:
|
|
||||||
- t3a.small # 2 GB RAM / $10
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
id-token: write
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-deploy:
|
|
||||||
name: Build and Deploy
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout Repo Code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Free Disk Space (Ubuntu)
|
|
||||||
if: inputs.rebuild && inputs.action != 'destroy'
|
|
||||||
uses: jlumbroso/free-disk-space@main
|
|
||||||
with:
|
|
||||||
tool-cache: true
|
|
||||||
|
|
||||||
# Enable access to KVM, required to build an image
|
|
||||||
- name: Enable KVM group perms
|
|
||||||
if: inputs.rebuild && inputs.action != 'destroy'
|
|
||||||
run: |
|
|
||||||
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
|
|
||||||
sudo udevadm control --reload-rules
|
|
||||||
sudo udevadm trigger --name-match=kvm
|
|
||||||
|
|
||||||
# Login to AWS
|
|
||||||
- name: AWS Assume Role
|
|
||||||
uses: aws-actions/configure-aws-credentials@v4
|
|
||||||
with:
|
|
||||||
role-to-assume: arn:aws:iam::286370965832:role/github_actions_admin
|
|
||||||
aws-region: us-east-1
|
|
||||||
|
|
||||||
# Install Nix
|
|
||||||
- name: Install Nix
|
|
||||||
if: inputs.rebuild && inputs.action != 'destroy'
|
|
||||||
uses: cachix/install-nix-action@v20
|
|
||||||
|
|
||||||
# Build the image
|
|
||||||
- name: Build Image
|
|
||||||
if: inputs.rebuild && inputs.action != 'destroy'
|
|
||||||
run: nix build .#arrow-aws
|
|
||||||
|
|
||||||
- name: Upload Image to S3
|
|
||||||
if: inputs.rebuild && inputs.action != 'destroy'
|
|
||||||
run: |
|
|
||||||
aws s3 cp \
|
|
||||||
result/nixos-amazon-image-*.vhd \
|
|
||||||
s3://${{ secrets.IMAGES_BUCKET }}/arrow.vhd \
|
|
||||||
|
|
||||||
# Installs the Terraform binary and some other accessory functions.
|
|
||||||
- name: Setup Terraform
|
|
||||||
uses: hashicorp/setup-terraform@v2
|
|
||||||
|
|
||||||
# Checks whether Terraform is formatted properly. If this fails, you
|
|
||||||
# should install the pre-commit hook.
|
|
||||||
- name: Check Formatting
|
|
||||||
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
|
||||||
run: |
|
|
||||||
terraform fmt -no-color -check -diff -recursive
|
|
||||||
|
|
||||||
# Connects to remote state backend and download providers.
|
|
||||||
- name: Terraform Init
|
|
||||||
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
|
||||||
run: |
|
|
||||||
terraform init \
|
|
||||||
-backend-config="bucket=${{ secrets.TERRAFORM_STATE_BUCKET }}" \
|
|
||||||
-backend-config="key=arrow.tfstate"
|
|
||||||
|
|
||||||
# Deploys infrastructure or changes to infrastructure.
|
|
||||||
- name: Terraform Apply
|
|
||||||
if: inputs.action == 'create'
|
|
||||||
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
|
||||||
env:
|
|
||||||
TF_VAR_ec2_size: ${{ inputs.size }}
|
|
||||||
TF_VAR_images_bucket: ${{ secrets.IMAGES_BUCKET }}
|
|
||||||
run: |
|
|
||||||
terraform apply \
|
|
||||||
-auto-approve \
|
|
||||||
-input=false
|
|
||||||
|
|
||||||
# Removes infrastructure.
|
|
||||||
- name: Terraform Destroy
|
|
||||||
if: inputs.action == 'destroy'
|
|
||||||
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
|
||||||
env:
|
|
||||||
TF_VAR_ec2_size: ${{ inputs.size }}
|
|
||||||
TF_VAR_images_bucket: ${{ secrets.IMAGES_BUCKET }}
|
|
||||||
run: |
|
|
||||||
terraform destroy \
|
|
||||||
-auto-approve \
|
|
||||||
-input=false
|
|
||||||
|
|
||||||
- name: Get Host IP
|
|
||||||
if: inputs.action == 'create'
|
|
||||||
id: host
|
|
||||||
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
|
||||||
run: terraform output -raw host_ip
|
|
||||||
|
|
||||||
- name: Wait on SSH
|
|
||||||
if: inputs.action == 'create'
|
|
||||||
run: |
|
|
||||||
for i in $(seq 1 15); do
|
|
||||||
if $(nc -z -w 3 ${{ steps.host.outputs.stdout }} 22); then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
sleep 10
|
|
||||||
done
|
|
||||||
|
|
||||||
- name: Write Identity Keys to Files
|
|
||||||
if: inputs.action == 'create'
|
|
||||||
run: |
|
|
||||||
echo "${{ env.DEPLOY_IDENTITY_BASE64 }}" | base64 -d > deploy_ed25519
|
|
||||||
chmod 0600 deploy_ed25519
|
|
||||||
echo "${{ env.ARROW_IDENTITY_BASE64 }}" | base64 -d > arrow_ed25519
|
|
||||||
chmod 0600 arrow_ed25519
|
|
||||||
|
|
||||||
- name: Copy Identity File to Host
|
|
||||||
if: inputs.action == 'create'
|
|
||||||
run: |
|
|
||||||
ssh -i deploy_ed25519 -o StrictHostKeyChecking=accept-new noah@${{ steps.host.outputs.stdout }} 'mkdir -pv .ssh'
|
|
||||||
scp -i deploy_ed25519 arrow_ed25519 noah@${{ steps.host.outputs.stdout }}:~/.ssh/id_ed25519
|
|
||||||
|
|
||||||
- name: Wipe Records
|
|
||||||
if: ${{ inputs.action == 'destroy' }}
|
|
||||||
run: |
|
|
||||||
RECORD_ID=$(curl --request GET \
|
|
||||||
--url https://api.cloudflare.com/client/v4/zones/${{ env.CLOUDFLARE_ZONE_ID }}/dns_records \
|
|
||||||
--header 'Content-Type: application/json' \
|
|
||||||
--header "Authorization: Bearer ${{ env.CLOUDFLARE_API_TOKEN }}" | jq -r '.result[] | select(.name == "n8n2.${{ env.ZONE_NAME }}") | .id')
|
|
||||||
curl --request DELETE \
|
|
||||||
--url https://api.cloudflare.com/client/v4/zones/${{ env.CLOUDFLARE_ZONE_ID }}/dns_records/${RECORD_ID} \
|
|
||||||
--header 'Content-Type: application/json' \
|
|
||||||
--header "Authorization: Bearer ${{ env.CLOUDFLARE_API_TOKEN }}"
|
|
154
.github/workflows/arrow.yml
vendored
154
.github/workflows/arrow.yml
vendored
@ -1,154 +0,0 @@
|
|||||||
name: Arrow
|
|
||||||
|
|
||||||
run-name: Arrow - ${{ inputs.rebuild && 'Rebuild and ' || '' }}${{ inputs.action == 'create' && 'Create' || ( inputs.action == 'destroy' && 'Destroy' || 'No Action' ) }}
|
|
||||||
|
|
||||||
env:
|
|
||||||
TERRAFORM_DIRECTORY: hosts/arrow/vultr
|
|
||||||
DEPLOY_IDENTITY_BASE64: ${{ secrets.DEPLOY_IDENTITY_BASE64 }}
|
|
||||||
ARROW_IDENTITY_BASE64: ${{ secrets.ARROW_IDENTITY_BASE64 }}
|
|
||||||
CLOUDFLARE_R2_ENDPOINT: "${{ secrets.CLOUDFLARE_ACCOUNT_ID }}.r2.cloudflarestorage.com"
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_R2_ACCESS_KEY }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_R2_SECRET_KEY }}
|
|
||||||
AWS_DEFAULT_REGION: auto
|
|
||||||
AWS_ENDPOINT_URL_S3: "https://${{ secrets.CLOUDFLARE_ACCOUNT_ID }}.r2.cloudflarestorage.com"
|
|
||||||
TF_VAR_vultr_api_key: ${{ secrets.VULTR_API_KEY }}
|
|
||||||
ZONE_NAME: masu.rs
|
|
||||||
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
|
||||||
CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
rebuild:
|
|
||||||
type: boolean
|
|
||||||
default: false
|
|
||||||
action:
|
|
||||||
type: choice
|
|
||||||
required: true
|
|
||||||
default: create
|
|
||||||
options:
|
|
||||||
- create
|
|
||||||
- destroy
|
|
||||||
- nothing
|
|
||||||
plan:
|
|
||||||
type: choice
|
|
||||||
required: false
|
|
||||||
options:
|
|
||||||
- vc2-1c-1gb # 25 GB / $5
|
|
||||||
- vc2-1c-2gb # 55 GB / $10 (default)
|
|
||||||
- vc2-2c-2gb # 65 GB / $15
|
|
||||||
- vc2-2c-4gb # 80 GB / $20
|
|
||||||
- vc2-4c-8gb # 160 GB / $40
|
|
||||||
- vc2-6c-16gb # 320 GB / $80
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-deploy:
|
|
||||||
name: Build and Deploy
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout Repo Code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
# Enable access to KVM, required to build an image
|
|
||||||
- name: Enable KVM group perms
|
|
||||||
if: inputs.rebuild && inputs.action != 'destroy'
|
|
||||||
run: |
|
|
||||||
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
|
|
||||||
sudo udevadm control --reload-rules
|
|
||||||
sudo udevadm trigger --name-match=kvm
|
|
||||||
|
|
||||||
# Install Nix
|
|
||||||
- name: Install Nix
|
|
||||||
if: inputs.rebuild && inputs.action != 'destroy'
|
|
||||||
uses: cachix/install-nix-action@v17
|
|
||||||
|
|
||||||
# Build the image
|
|
||||||
- name: Build Image
|
|
||||||
if: inputs.rebuild && inputs.action != 'destroy'
|
|
||||||
run: nix build .#arrow
|
|
||||||
|
|
||||||
- name: Upload Image to S3
|
|
||||||
if: inputs.rebuild && inputs.action != 'destroy'
|
|
||||||
run: |
|
|
||||||
aws s3 cp \
|
|
||||||
result/iso/nixos.iso \
|
|
||||||
s3://noahmasur-arrow-images/arrow.iso \
|
|
||||||
--endpoint-url "https://${{ env.CLOUDFLARE_R2_ENDPOINT }}"
|
|
||||||
|
|
||||||
# Installs the Terraform binary and some other accessory functions.
|
|
||||||
- name: Setup Terraform
|
|
||||||
uses: hashicorp/setup-terraform@v2
|
|
||||||
|
|
||||||
# Checks whether Terraform is formatted properly. If this fails, you
|
|
||||||
# should install the pre-commit hook.
|
|
||||||
- name: Check Formatting
|
|
||||||
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
|
||||||
run: |
|
|
||||||
terraform fmt -no-color -check -diff -recursive
|
|
||||||
|
|
||||||
# Connects to remote state backend and download providers.
|
|
||||||
- name: Terraform Init
|
|
||||||
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
|
||||||
run: terraform init
|
|
||||||
|
|
||||||
# Deploys infrastructure or changes to infrastructure.
|
|
||||||
- name: Terraform Apply
|
|
||||||
if: inputs.action == 'create'
|
|
||||||
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
|
||||||
env:
|
|
||||||
TF_VAR_vultr_plan: ${{ inputs.plan }}
|
|
||||||
run: |
|
|
||||||
terraform apply \
|
|
||||||
-auto-approve \
|
|
||||||
-input=false
|
|
||||||
|
|
||||||
# Removes infrastructure.
|
|
||||||
- name: Terraform Destroy
|
|
||||||
if: inputs.action == 'destroy'
|
|
||||||
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
|
||||||
run: |
|
|
||||||
terraform destroy \
|
|
||||||
-auto-approve \
|
|
||||||
-input=false
|
|
||||||
|
|
||||||
- name: Get Host IP
|
|
||||||
if: inputs.action == 'create'
|
|
||||||
id: host
|
|
||||||
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
|
||||||
run: terraform output -raw host_ip
|
|
||||||
|
|
||||||
- name: Wait on SSH
|
|
||||||
if: inputs.action == 'create'
|
|
||||||
run: |
|
|
||||||
for i in $(seq 1 15); do
|
|
||||||
if $(nc -z -w 3 ${{ steps.host.outputs.stdout }} 22); then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
sleep 10
|
|
||||||
done
|
|
||||||
|
|
||||||
- name: Write Identity Keys to Files
|
|
||||||
if: inputs.action == 'create'
|
|
||||||
run: |
|
|
||||||
echo "${{ env.DEPLOY_IDENTITY_BASE64 }}" | base64 -d > deploy_ed25519
|
|
||||||
chmod 0600 deploy_ed25519
|
|
||||||
echo "${{ env.ARROW_IDENTITY_BASE64 }}" | base64 -d > arrow_ed25519
|
|
||||||
chmod 0600 arrow_ed25519
|
|
||||||
|
|
||||||
- name: Copy Identity File to Host
|
|
||||||
if: inputs.action == 'create'
|
|
||||||
run: |
|
|
||||||
ssh -i deploy_ed25519 -o StrictHostKeyChecking=accept-new noah@${{ steps.host.outputs.stdout }} 'mkdir -pv .ssh'
|
|
||||||
scp -i deploy_ed25519 arrow_ed25519 noah@${{ steps.host.outputs.stdout }}:~/.ssh/id_ed25519
|
|
||||||
|
|
||||||
- name: Wipe Records
|
|
||||||
if: ${{ inputs.action == 'destroy' }}
|
|
||||||
run: |
|
|
||||||
RECORD_ID=$(curl --request GET \
|
|
||||||
--url https://api.cloudflare.com/client/v4/zones/${{ env.CLOUDFLARE_ZONE_ID }}/dns_records \
|
|
||||||
--header 'Content-Type: application/json' \
|
|
||||||
--header "Authorization: Bearer ${{ env.CLOUDFLARE_API_TOKEN }}" | jq -r '.result[] | select(.name == "n8n2.${{ env.ZONE_NAME }}") | .id')
|
|
||||||
curl --request DELETE \
|
|
||||||
--url https://api.cloudflare.com/client/v4/zones/${{ env.CLOUDFLARE_ZONE_ID }}/dns_records/${RECORD_ID} \
|
|
||||||
--header 'Content-Type: application/json' \
|
|
||||||
--header "Authorization: Bearer ${{ env.CLOUDFLARE_API_TOKEN }}"
|
|
6
.github/workflows/check.yml
vendored
6
.github/workflows/check.yml
vendored
@ -11,10 +11,10 @@ jobs:
|
|||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- name: Install Nix
|
- name: Install Nix
|
||||||
uses: DeterminateSystems/nix-installer-action@v11
|
uses: DeterminateSystems/nix-installer-action@v4
|
||||||
- name: Check Nixpkgs Inputs
|
- name: Check Nixpkgs Inputs
|
||||||
uses: DeterminateSystems/flake-checker-action@v7
|
uses: DeterminateSystems/flake-checker-action@v5
|
||||||
- name: Add Nix Cache
|
- name: Add Nix Cache
|
||||||
uses: DeterminateSystems/magic-nix-cache-action@v6
|
uses: DeterminateSystems/magic-nix-cache-action@v2
|
||||||
- name: Check the Flake
|
- name: Check the Flake
|
||||||
run: nix flake check
|
run: nix flake check
|
||||||
|
12
.github/workflows/update.yml
vendored
12
.github/workflows/update.yml
vendored
@ -3,7 +3,7 @@ name: Update Flake
|
|||||||
on:
|
on:
|
||||||
workflow_dispatch: # allows manual triggering
|
workflow_dispatch: # allows manual triggering
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '33 3 * * 6' # runs weekly on Saturday at 03:33
|
- cron: '33 3 * * 0' # runs weekly on Sunday at 03:33
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
@ -18,15 +18,13 @@ jobs:
|
|||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- name: Install Nix
|
- name: Install Nix
|
||||||
uses: DeterminateSystems/nix-installer-action@v11
|
uses: DeterminateSystems/nix-installer-action@v4
|
||||||
with:
|
|
||||||
nix-package-url: https://releases.nixos.org/nix/nix-2.18.4/nix-2.18.4-x86_64-linux.tar.xz
|
|
||||||
- name: Check Nixpkgs Inputs
|
- name: Check Nixpkgs Inputs
|
||||||
uses: DeterminateSystems/flake-checker-action@v7
|
uses: DeterminateSystems/flake-checker-action@v5
|
||||||
- name: Add Nix Cache
|
- name: Add Nix Cache
|
||||||
uses: DeterminateSystems/magic-nix-cache-action@v6
|
uses: DeterminateSystems/magic-nix-cache-action@v2
|
||||||
- name: Update flake.lock
|
- name: Update flake.lock
|
||||||
uses: DeterminateSystems/update-flake-lock@v23
|
uses: DeterminateSystems/update-flake-lock@v19
|
||||||
id: update
|
id: update
|
||||||
with:
|
with:
|
||||||
pr-title: "Update flake.lock" # Title of PR to be created
|
pr-title: "Update flake.lock" # Title of PR to be created
|
||||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,7 +1,6 @@
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
*.bak
|
*.bak
|
||||||
*.db
|
*.db
|
||||||
*.qcow2
|
|
||||||
**/.direnv/**
|
**/.direnv/**
|
||||||
result
|
result
|
||||||
private/**
|
private/**
|
||||||
|
14
README.md
14
README.md
@ -9,7 +9,7 @@ configuration may be difficult to translate to a non-Nix system.
|
|||||||
## System Features
|
## System Features
|
||||||
|
|
||||||
| Feature | Program | Configuration |
|
| Feature | Program | Configuration |
|
||||||
|----------------|-----------------------------------------------------|-----------------------------------------------|
|
| --- | --- | --- |
|
||||||
| OS | [NixOS](https://nixos.org) | [Link](./modules/nixos) |
|
| OS | [NixOS](https://nixos.org) | [Link](./modules/nixos) |
|
||||||
| Display Server | [X11](https://www.x.org/wiki/) | [Link](./modules/nixos/graphical/xorg.nix) |
|
| Display Server | [X11](https://www.x.org/wiki/) | [Link](./modules/nixos/graphical/xorg.nix) |
|
||||||
| Compositor | [Picom](https://github.com/yshui/picom) | [Link](./modules/nixos/graphical/picom.nix) |
|
| Compositor | [Picom](https://github.com/yshui/picom) | [Link](./modules/nixos/graphical/picom.nix) |
|
||||||
@ -21,11 +21,11 @@ configuration may be difficult to translate to a non-Nix system.
|
|||||||
## User Features
|
## User Features
|
||||||
|
|
||||||
| Feature | Program | Configuration |
|
| Feature | Program | Configuration |
|
||||||
|--------------|----------------------------------------------------------------------------------|----------------------------------------------------|
|
| --- | --- | --- |
|
||||||
| Dotfiles | [Home-Manager](https://github.com/nix-community/home-manager) | [Link](./modules/common) |
|
| Dotfiles | [Home-Manager](https://github.com/nix-community/home-manager) | [Link](./modules/common) |
|
||||||
| Terminal | [Kitty](https://sw.kovidgoyal.net/kitty/) | [Link](./modules/common/applications/kitty.nix) |
|
| Terminal | [Kitty](https://sw.kovidgoyal.net/kitty/) | [Link](./modules/common/applications/kitty.nix) |
|
||||||
| Shell | [Fish](https://fishshell.com/) | [Link](./modules/common/shell/fish) |
|
| Shell | [Fish](https://fishshell.com/) | [Link](./modules/common/shell/fish) |
|
||||||
| Shell Prompt | [Starship](https://starship.rs/) | [Link](./modules/common/shell/starship.nix) |
|
| Shell Prompt | [Starship](https://starship.rs/) | [Link](./modules/common/shell/starhip.nix) |
|
||||||
| Colorscheme | [Gruvbox](https://github.com/morhetz/gruvbox) | [Link](./colorscheme/gruvbox/default.nix) |
|
| Colorscheme | [Gruvbox](https://github.com/morhetz/gruvbox) | [Link](./colorscheme/gruvbox/default.nix) |
|
||||||
| Wallpaper | [Road](https://gitlab.com/exorcist365/wallpapers/-/blob/master/gruvbox/road.jpg) | [Link](./hosts/tempest/default.nix) |
|
| Wallpaper | [Road](https://gitlab.com/exorcist365/wallpapers/-/blob/master/gruvbox/road.jpg) | [Link](./hosts/tempest/default.nix) |
|
||||||
| Text Editor | [Neovim](https://neovim.io/) | [Link](./modules/common/neovim/config) |
|
| Text Editor | [Neovim](https://neovim.io/) | [Link](./modules/common/neovim/config) |
|
||||||
@ -38,12 +38,16 @@ configuration may be difficult to translate to a non-Nix system.
|
|||||||
## macOS Features
|
## macOS Features
|
||||||
|
|
||||||
| Feature | Program | Configuration |
|
| Feature | Program | Configuration |
|
||||||
|----------|---------------------------------------------|--------------------------------------|
|
| --- | --- | --- |
|
||||||
| Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./modules/darwin/hammerspoon) |
|
| Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./modules/darwin/hammerspoon) |
|
||||||
|
|
||||||
# Diagram
|
# Diagram
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
- [flake.nix](./flake.nix)
|
||||||
|
- [hosts](./hosts/)
|
||||||
|
- [modules](./modules/)
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: rec {
|
||||||
rec {
|
|
||||||
|
|
||||||
# Show quick helper
|
# Show quick helper
|
||||||
default = import ./help.nix { inherit pkgs; };
|
default = import ./help.nix { inherit pkgs; };
|
||||||
@ -31,4 +30,5 @@ rec {
|
|||||||
# Run neovim as an app
|
# Run neovim as an app
|
||||||
neovim = import ./neovim.nix { inherit pkgs; };
|
neovim = import ./neovim.nix { inherit pkgs; };
|
||||||
nvim = neovim;
|
nvim = neovim;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,19 +1,19 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
# nix run github:nmasur/dotfiles#encrypt-secret > private/mysecret.age
|
# nix run github:nmasur/dotfiles#encrypt-secret > private/mysecret.age
|
||||||
|
|
||||||
type = "app";
|
type = "app";
|
||||||
|
|
||||||
program = builtins.toString (
|
program = builtins.toString (pkgs.writeShellScript "encrypt-secret" ''
|
||||||
pkgs.writeShellScript "encrypt-secret" ''
|
printf "\nEnter the secret data to encrypt for all hosts...\n\n" 1>&2
|
||||||
printf "\nEnter the secret data to encrypt for all hosts...\n\n" 1>&2
|
read -p "Secret: " secret
|
||||||
read -p "Secret: " secret
|
printf "\nEncrypting...\n\n" 1>&2
|
||||||
printf "\nEncrypting...\n\n" 1>&2
|
tmpfile=$(mktemp)
|
||||||
tmpfile=$(mktemp)
|
echo "''${secret}" > ''${tmpfile}
|
||||||
echo "''${secret}" > ''${tmpfile}
|
${pkgs.age}/bin/age --encrypt --armor --recipients-file ${
|
||||||
${pkgs.age}/bin/age --encrypt --armor --recipients-file ${builtins.toString ../misc/public-keys} $tmpfile
|
builtins.toString ../misc/public-keys
|
||||||
rm $tmpfile
|
} $tmpfile
|
||||||
''
|
rm $tmpfile
|
||||||
);
|
'');
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,41 +1,39 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
# This script will partition and format drives; use at your own risk!
|
# This script will partition and format drives; use at your own risk!
|
||||||
|
|
||||||
type = "app";
|
type = "app";
|
||||||
|
|
||||||
program = builtins.toString (
|
program = builtins.toString (pkgs.writeShellScript "format-root" ''
|
||||||
pkgs.writeShellScript "format-root" ''
|
set -e
|
||||||
set -e
|
|
||||||
|
|
||||||
DISK=$1
|
DISK=$1
|
||||||
|
|
||||||
if [ -z "''${DISK}" ]; then
|
if [ -z "''${DISK}" ]; then
|
||||||
${pkgs.gum}/bin/gum style --width 50 --margin "1 2" --padding "2 4" \
|
${pkgs.gum}/bin/gum style --width 50 --margin "1 2" --padding "2 4" \
|
||||||
--foreground "#fb4934" \
|
--foreground "#fb4934" \
|
||||||
"Missing required parameter." \
|
"Missing required parameter." \
|
||||||
"Usage: format-root -- <disk>" \
|
"Usage: format-root -- <disk>" \
|
||||||
"Flake example: nix run github:nmasur/dotfiles#format-root -- nvme0n1"
|
"Flake example: nix run github:nmasur/dotfiles#format-root -- nvme0n1"
|
||||||
echo "(exiting)"
|
echo "(exiting)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
${pkgs.disko-packaged}/bin/disko \
|
${pkgs.disko-packaged}/bin/disko \
|
||||||
--mode create \
|
--mode create \
|
||||||
--dry-run \
|
--dry-run \
|
||||||
--flake "path:$(pwd)#root" \
|
--flake "path:$(pwd)#root" \
|
||||||
--arg disk \""/dev/''${DISK}"\"
|
--arg disk \""/dev/''${DISK}"\"
|
||||||
|
|
||||||
${pkgs.gum}/bin/gum confirm \
|
${pkgs.gum}/bin/gum confirm \
|
||||||
"This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
|
"This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
|
||||||
--default=false
|
--default=false
|
||||||
|
|
||||||
${pkgs.disko-packaged}/bin/disko \
|
${pkgs.disko-packaged}/bin/disko \
|
||||||
--mode create \
|
--mode create \
|
||||||
--flake "path:$(pwd)#root" \
|
--flake "path:$(pwd)#root" \
|
||||||
--arg disk "/dev/''${DISK}"
|
--arg disk "/dev/''${DISK}"
|
||||||
|
|
||||||
|
'');
|
||||||
|
|
||||||
''
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
@ -1,25 +1,23 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
type = "app";
|
type = "app";
|
||||||
|
|
||||||
program = builtins.toString (
|
program = builtins.toString (pkgs.writeShellScript "default" ''
|
||||||
pkgs.writeShellScript "default" ''
|
${pkgs.gum}/bin/gum style --margin "1 2" --padding "0 2" --foreground "15" --background "55" "Options"
|
||||||
${pkgs.gum}/bin/gum style --margin "1 2" --padding "0 2" --foreground "15" --background "55" "Options"
|
${pkgs.gum}/bin/gum format --type=template -- ' {{ Italic "Run with" }} {{ Color "15" "69" " nix run github:nmasur/dotfiles#" }}{{ Color "15" "62" "someoption" }}{{ Color "15" "69" " " }}.'
|
||||||
${pkgs.gum}/bin/gum format --type=template -- ' {{ Italic "Run with" }} {{ Color "15" "69" " nix run github:nmasur/dotfiles#" }}{{ Color "15" "62" "someoption" }}{{ Color "15" "69" " " }}.'
|
echo ""
|
||||||
echo ""
|
echo ""
|
||||||
echo ""
|
${pkgs.gum}/bin/gum format --type=template -- \
|
||||||
${pkgs.gum}/bin/gum format --type=template -- \
|
' • {{ Color "15" "57" " readme " }} {{ Italic "Documentation for this repository." }}' \
|
||||||
' • {{ Color "15" "57" " readme " }} {{ Italic "Documentation for this repository." }}' \
|
' • {{ Color "15" "57" " rebuild " }} {{ Italic "Switch to this configuration." }}' \
|
||||||
' • {{ Color "15" "57" " rebuild " }} {{ Italic "Switch to this configuration." }}' \
|
' • {{ Color "15" "57" " installer " }} {{ Italic "Format and install from nothing." }}' \
|
||||||
' • {{ Color "15" "57" " installer " }} {{ Italic "Format and install from nothing." }}' \
|
' • {{ Color "15" "57" " neovim " }} {{ Italic "Test out the Neovim package." }}' \
|
||||||
' • {{ Color "15" "57" " neovim " }} {{ Italic "Test out the Neovim package." }}' \
|
' • {{ Color "15" "57" " loadkey " }} {{ Italic "Load an ssh key for this machine using melt." }}' \
|
||||||
' • {{ Color "15" "57" " loadkey " }} {{ Italic "Load an ssh key for this machine using melt." }}' \
|
' • {{ Color "15" "57" " encrypt-secret " }} {{ Italic "Encrypt a secret for all machines." }}' \
|
||||||
' • {{ Color "15" "57" " encrypt-secret " }} {{ Italic "Encrypt a secret for all machines." }}' \
|
' • {{ Color "15" "57" " reencrypt-secrets " }} {{ Italic "Reencrypt all secrets when new machine is added." }}' \
|
||||||
' • {{ Color "15" "57" " reencrypt-secrets " }} {{ Italic "Reencrypt all secrets when new machine is added." }}' \
|
' • {{ Color "15" "57" " netdata " }} {{ Italic "Connect a machine to Netdata cloud." }}'
|
||||||
' • {{ Color "15" "57" " netdata " }} {{ Italic "Connect a machine to Netdata cloud." }}'
|
echo ""
|
||||||
echo ""
|
echo ""
|
||||||
echo ""
|
'');
|
||||||
''
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
@ -1,50 +1,48 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
# Inspired by https://github.com/cleverca22/nix-tests/blob/master/kexec/justdoit.nix
|
# Inspired by https://github.com/cleverca22/nix-tests/blob/master/kexec/justdoit.nix
|
||||||
# This script will partition and format drives; use at your own risk!
|
# This script will partition and format drives; use at your own risk!
|
||||||
|
|
||||||
type = "app";
|
type = "app";
|
||||||
|
|
||||||
program = builtins.toString (
|
program = builtins.toString (pkgs.writeShellScript "installer" ''
|
||||||
pkgs.writeShellScript "installer" ''
|
set -e
|
||||||
set -e
|
|
||||||
|
|
||||||
DISK=$1
|
DISK=$1
|
||||||
FLAKE=$2
|
FLAKE=$2
|
||||||
PARTITION_PREFIX=""
|
PARTITION_PREFIX=""
|
||||||
|
|
||||||
if [ -z "$DISK" ] || [ -z "$FLAKE" ]; then
|
if [ -z "$DISK" ] || [ -z "$FLAKE" ]; then
|
||||||
${pkgs.gum}/bin/gum style --width 50 --margin "1 2" --padding "2 4" \
|
${pkgs.gum}/bin/gum style --width 50 --margin "1 2" --padding "2 4" \
|
||||||
--foreground "#fb4934" \
|
--foreground "#fb4934" \
|
||||||
"Missing required parameter." \
|
"Missing required parameter." \
|
||||||
"Usage: installer -- <disk> <host>" \
|
"Usage: installer -- <disk> <host>" \
|
||||||
"Example: installer -- nvme0n1 tempest" \
|
"Example: installer -- nvme0n1 tempest" \
|
||||||
"Flake example: nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest"
|
"Flake example: nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest"
|
||||||
echo "(exiting)"
|
echo "(exiting)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case "$DISK" in nvme*)
|
case "$DISK" in nvme*)
|
||||||
PARTITION_PREFIX="p"
|
PARTITION_PREFIX="p"
|
||||||
esac
|
esac
|
||||||
|
|
||||||
${pkgs.gum}/bin/gum confirm \
|
${pkgs.gum}/bin/gum confirm \
|
||||||
"This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
|
"This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
|
||||||
--default=false
|
--default=false
|
||||||
|
|
||||||
${pkgs.parted}/bin/parted /dev/''${DISK} -- mklabel gpt
|
${pkgs.parted}/bin/parted /dev/''${DISK} -- mklabel gpt
|
||||||
${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart primary 512MiB 100%
|
${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart primary 512MiB 100%
|
||||||
${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart ESP fat32 1MiB 512MiB
|
${pkgs.parted}/bin/parted /dev/''${DISK} -- mkpart ESP fat32 1MiB 512MiB
|
||||||
${pkgs.parted}/bin/parted /dev/''${DISK} -- set 3 esp on
|
${pkgs.parted}/bin/parted /dev/''${DISK} -- set 3 esp on
|
||||||
mkfs.ext4 -L nixos /dev/''${DISK}''${PARTITION_PREFIX}1
|
mkfs.ext4 -L nixos /dev/''${DISK}''${PARTITION_PREFIX}1
|
||||||
mkfs.fat -F 32 -n boot /dev/''${DISK}''${PARTITION_PREFIX}2
|
mkfs.fat -F 32 -n boot /dev/''${DISK}''${PARTITION_PREFIX}2
|
||||||
|
|
||||||
mount /dev/disk/by-label/nixos /mnt
|
mount /dev/disk/by-label/nixos /mnt
|
||||||
mkdir --parents /mnt/boot
|
mkdir --parents /mnt/boot
|
||||||
mount /dev/disk/by-label/boot /mnt/boot
|
mount /dev/disk/by-label/boot /mnt/boot
|
||||||
|
|
||||||
|
${pkgs.nixos-install-tools}/bin/nixos-install --flake github:nmasur/dotfiles#''${FLAKE}
|
||||||
|
'');
|
||||||
|
|
||||||
${pkgs.nixos-install-tools}/bin/nixos-install --flake github:nmasur/dotfiles#''${FLAKE}
|
|
||||||
''
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
@ -1,15 +1,13 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
type = "app";
|
type = "app";
|
||||||
|
|
||||||
program = builtins.toString (
|
program = builtins.toString (pkgs.writeShellScript "loadkey" ''
|
||||||
pkgs.writeShellScript "loadkey" ''
|
printf "\nEnter the seed phrase for your SSH key...\n"
|
||||||
printf "\nEnter the seed phrase for your SSH key...\n"
|
printf "\nThen press ^D when complete.\n\n"
|
||||||
printf "\nThen press ^D when complete.\n\n"
|
mkdir -p ~/.ssh/
|
||||||
mkdir -p ~/.ssh/
|
${pkgs.melt}/bin/melt restore ~/.ssh/id_ed25519
|
||||||
${pkgs.melt}/bin/melt restore ~/.ssh/id_ed25519
|
printf "\n\nContinuing activation.\n\n"
|
||||||
printf "\n\nContinuing activation.\n\n"
|
'');
|
||||||
''
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
type = "app";
|
type = "app";
|
||||||
|
|
||||||
program = "${
|
program = "${
|
||||||
(import ../modules/common/neovim/package {
|
(import ../modules/common/neovim/package {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
colors = (import ../colorscheme/nord).dark;
|
colors = (import ../colorscheme/nord).dark;
|
||||||
})
|
})
|
||||||
}/bin/nvim";
|
}/bin/nvim";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,21 +1,19 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
type = "app";
|
type = "app";
|
||||||
|
|
||||||
program = builtins.toString (
|
program = builtins.toString (pkgs.writeShellScript "netdata-cloud" ''
|
||||||
pkgs.writeShellScript "netdata-cloud" ''
|
if [ "$EUID" -ne 0 ]; then
|
||||||
if [ "$EUID" -ne 0 ]; then
|
echo "Please run as root"
|
||||||
echo "Please run as root"
|
exit 1
|
||||||
exit 1
|
fi
|
||||||
fi
|
mkdir --parents --mode 0750 /var/lib/netdata/cloud.d
|
||||||
mkdir --parents --mode 0750 /var/lib/netdata/cloud.d
|
printf "\nEnter the claim token for netdata cloud...\n\n"
|
||||||
printf "\nEnter the claim token for netdata cloud...\n\n"
|
read -p "Token: " token
|
||||||
read -p "Token: " token
|
echo "''${token}" > /var/lib/netdata/cloud.d/token
|
||||||
echo "''${token}" > /var/lib/netdata/cloud.d/token
|
chown -R netdata:netdata /var/lib/netdata
|
||||||
chown -R netdata:netdata /var/lib/netdata
|
${pkgs.netdata}/bin/netdata-claim.sh -id=$(uuidgen)
|
||||||
${pkgs.netdata}/bin/netdata-claim.sh -id=$(uuidgen)
|
printf "\n\nNow restart netdata service.\n\n"
|
||||||
printf "\n\nNow restart netdata service.\n\n"
|
'');
|
||||||
''
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,9 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
type = "app";
|
type = "app";
|
||||||
|
|
||||||
program = builtins.toString (
|
program = builtins.toString (pkgs.writeShellScript "readme" ''
|
||||||
pkgs.writeShellScript "readme" ''
|
${pkgs.glow}/bin/glow --pager ${builtins.toString ../README.md}
|
||||||
${pkgs.glow}/bin/glow --pager ${builtins.toString ../README.md}
|
'');
|
||||||
''
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
@ -1,17 +1,15 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
type = "app";
|
type = "app";
|
||||||
|
|
||||||
program = builtins.toString (
|
program = builtins.toString (pkgs.writeShellScript "rebuild" ''
|
||||||
pkgs.writeShellScript "rebuild" ''
|
echo ${pkgs.system}
|
||||||
echo ${pkgs.system}
|
SYSTEM=${if pkgs.stdenv.isDarwin then "darwin" else "linux"}
|
||||||
SYSTEM=${if pkgs.stdenv.isDarwin then "darwin" else "linux"}
|
if [ "$SYSTEM" == "darwin" ]; then
|
||||||
if [ "$SYSTEM" == "darwin" ]; then
|
sudo darwin-rebuild switch --flake ${builtins.toString ../.}
|
||||||
sudo darwin-rebuild switch --flake ${builtins.toString ../.}
|
else
|
||||||
else
|
doas nixos-rebuild switch --flake ${builtins.toString ../.}
|
||||||
doas nixos-rebuild switch --flake ${builtins.toString ../.}
|
fi
|
||||||
fi
|
'');
|
||||||
''
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
@ -1,27 +1,27 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
# nix run github:nmasur/dotfiles#reencrypt-secrets ./private
|
# nix run github:nmasur/dotfiles#reencrypt-secrets ./private
|
||||||
|
|
||||||
type = "app";
|
type = "app";
|
||||||
|
|
||||||
program = builtins.toString (
|
program = builtins.toString (pkgs.writeShellScript "reencrypt-secrets" ''
|
||||||
pkgs.writeShellScript "reencrypt-secrets" ''
|
if [ $# -eq 0 ]; then
|
||||||
if [ $# -eq 0 ]; then
|
echo "Must provide directory to reencrypt."
|
||||||
echo "Must provide directory to reencrypt."
|
exit 1
|
||||||
exit 1
|
fi
|
||||||
fi
|
encrypted=$1
|
||||||
encrypted=$1
|
for encryptedfile in ''${1}/*; do
|
||||||
for encryptedfile in ''${1}/*; do
|
tmpfile=$(mktemp)
|
||||||
tmpfile=$(mktemp)
|
echo "Decrypting ''${encryptedfile}..."
|
||||||
echo "Decrypting ''${encryptedfile}..."
|
${pkgs.age}/bin/age --decrypt \
|
||||||
${pkgs.age}/bin/age --decrypt \
|
--identity ~/.ssh/id_ed25519 $encryptedfile > $tmpfile
|
||||||
--identity ~/.ssh/id_ed25519 $encryptedfile > $tmpfile
|
echo "Encrypting ''${encryptedfile}..."
|
||||||
echo "Encrypting ''${encryptedfile}..."
|
${pkgs.age}/bin/age --encrypt --armor --recipients-file ${
|
||||||
${pkgs.age}/bin/age --encrypt --armor --recipients-file ${builtins.toString ../misc/public-keys} $tmpfile > $encryptedfile
|
builtins.toString ../misc/public-keys
|
||||||
rm $tmpfile
|
} $tmpfile > $encryptedfile
|
||||||
done
|
rm $tmpfile
|
||||||
echo "Finished."
|
done
|
||||||
''
|
echo "Finished."
|
||||||
);
|
'');
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,9 @@
|
|||||||
base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
|
base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
|
||||||
base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
|
base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
|
||||||
base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
|
base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
|
||||||
base0E = "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
|
base0E =
|
||||||
base0F = "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
|
"#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
|
||||||
|
base0F =
|
||||||
|
"#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
name = "gruvbox-dark"; # Dark, Medium
|
name = "gruvbox-dark"; # Dark, Medium
|
||||||
author = "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox), ElRastaOk (https://www.reddit.com/user/ElRastaOk)";
|
author =
|
||||||
|
"Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox), ElRastaOk (https://www.reddit.com/user/ElRastaOk)";
|
||||||
dark = {
|
dark = {
|
||||||
base00 = "#1D2122"; # ---- This is the change from normal gruvbox
|
base00 = "#1D2122"; # ---- This is the change from normal gruvbox
|
||||||
base01 = "#3c3836"; # ---
|
base01 = "#3c3836"; # ---
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
name = "gruvbox"; # Dark, Medium
|
name = "gruvbox"; # Dark, Medium
|
||||||
author = "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)";
|
author =
|
||||||
|
"Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)";
|
||||||
dark = {
|
dark = {
|
||||||
base00 = "#282828"; # ----
|
base00 = "#282828"; # ----
|
||||||
base01 = "#3c3836"; # ---
|
base01 = "#3c3836"; # ---
|
||||||
|
@ -1,38 +1,41 @@
|
|||||||
{ disk, ... }:
|
{ disk, ... }: {
|
||||||
{
|
|
||||||
disk = {
|
disk = {
|
||||||
boot = {
|
boot = {
|
||||||
type = "disk";
|
type = "disk";
|
||||||
device = disk;
|
device = disk;
|
||||||
content = {
|
content = {
|
||||||
type = "gpt";
|
type = "table";
|
||||||
partitions = {
|
format = "gpt";
|
||||||
|
partitions = [
|
||||||
# Boot partition
|
# Boot partition
|
||||||
ESP = rec {
|
{
|
||||||
size = "512MiB";
|
name = "ESP";
|
||||||
type = "EF00";
|
start = "0";
|
||||||
label = "boot";
|
end = "512MiB";
|
||||||
device = "/dev/disk/by-label/${label}";
|
fs-type = "fat32";
|
||||||
|
bootable = true;
|
||||||
content = {
|
content = {
|
||||||
type = "filesystem";
|
type = "filesystem";
|
||||||
format = "vfat";
|
format = "vfat";
|
||||||
mountpoint = "/boot";
|
mountpoint = "/boot";
|
||||||
extraArgs = [ "-n ${label}" ];
|
extraArgs = [ "-n boot" ];
|
||||||
};
|
};
|
||||||
};
|
}
|
||||||
# Root partition ext4
|
# Root partition ext4
|
||||||
root = rec {
|
{
|
||||||
size = "100%";
|
name = "root";
|
||||||
label = "nixos";
|
start = "512MiB";
|
||||||
device = "/dev/disk/by-label/${label}";
|
end = "100%";
|
||||||
|
part-type = "primary";
|
||||||
|
bootable = true;
|
||||||
content = {
|
content = {
|
||||||
type = "filesystem";
|
type = "filesystem";
|
||||||
format = "ext4";
|
format = "ext4";
|
||||||
mountpoint = "/";
|
mountpoint = "/";
|
||||||
extraArgs = [ "-L ${label}" ];
|
extraArgs = [ "-L nixos" ];
|
||||||
};
|
};
|
||||||
};
|
}
|
||||||
};
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ pool, disks, ... }:
|
{ pool, disks, ... }: {
|
||||||
{
|
|
||||||
disk = lib.genAttrs disks (disk: {
|
disk = lib.genAttrs disks (disk: {
|
||||||
"${disk}" = {
|
"${disk}" = {
|
||||||
type = "disk";
|
type = "disk";
|
||||||
@ -7,18 +6,16 @@
|
|||||||
content = {
|
content = {
|
||||||
type = "table";
|
type = "table";
|
||||||
format = "gpt";
|
format = "gpt";
|
||||||
partitions = [
|
partitions = [{
|
||||||
{
|
type = "partition";
|
||||||
type = "partition";
|
name = "zfs";
|
||||||
name = "zfs";
|
start = "128MiB";
|
||||||
start = "128MiB";
|
end = "100%";
|
||||||
end = "100%";
|
content = {
|
||||||
content = {
|
type = "zfs";
|
||||||
type = "zfs";
|
pool = pool;
|
||||||
pool = pool;
|
};
|
||||||
};
|
}];
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
@ -57,7 +57,6 @@ Launch a new shell. Then use Nix to switch to the macOS configuration:
|
|||||||
```bash
|
```bash
|
||||||
sudo rm /etc/bashrc
|
sudo rm /etc/bashrc
|
||||||
sudo rm /etc/nix/nix.conf
|
sudo rm /etc/nix/nix.conf
|
||||||
export NIX_SSL_CERT_FILE="$HOME/Documents/t2-ca-bundle.pem"
|
|
||||||
nix \
|
nix \
|
||||||
--extra-experimental-features flakes \
|
--extra-experimental-features flakes \
|
||||||
--extra-experimental-features nix-command \
|
--extra-experimental-features nix-command \
|
||||||
|
@ -63,20 +63,3 @@ Use this mysqldump command:
|
|||||||
sudo -u nextcloud mysqldump -S /run/mysqld/mysqld.sock --default-character-set=utf8mb4 nextcloud > backup.sql
|
sudo -u nextcloud mysqldump -S /run/mysqld/mysqld.sock --default-character-set=utf8mb4 nextcloud > backup.sql
|
||||||
```
|
```
|
||||||
|
|
||||||
## Converting to Postgres
|
|
||||||
|
|
||||||
Same as MySQL, but run this command instead:
|
|
||||||
|
|
||||||
```
|
|
||||||
sudo -u nextcloud nextcloud-occ db:convert-type pgsql nextcloud /run/postgresql/ nextcloud
|
|
||||||
```
|
|
||||||
|
|
||||||
Then set the `dbtype` to `pgsql`.
|
|
||||||
|
|
||||||
## Backing Up Postgres Database
|
|
||||||
|
|
||||||
Use this pg_dump command:
|
|
||||||
|
|
||||||
```
|
|
||||||
sudo -u nextcloud pg_dump nextcloud > backup.sql
|
|
||||||
```
|
|
||||||
|
488
flake.lock
generated
488
flake.lock
generated
@ -1,77 +1,79 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"baleia-nvim-src": {
|
"Comment-nvim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721805312,
|
"lastModified": 1681214440,
|
||||||
"narHash": "sha256-qA1x5kplP2I8bURO0I4R0gt/zeznu9hQQ+XHptLGuwc=",
|
"narHash": "sha256-48hy+hiaDJLlgWqC7IeZI3dT+VwWkRo4atQbyPxu/ys=",
|
||||||
"owner": "m00qek",
|
"owner": "numToStr",
|
||||||
"repo": "baleia.nvim",
|
"repo": "Comment.nvim",
|
||||||
"rev": "1b25eac3ac03659c3d3af75c7455e179e5f197f7",
|
"rev": "e51f2b142d88bb666dcaa77d93a07f4b419aca70",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "m00qek",
|
"owner": "numToStr",
|
||||||
"repo": "baleia.nvim",
|
"ref": "v0.8.0",
|
||||||
|
"repo": "Comment.nvim",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"base16-nvim-src": {
|
"baleia-nvim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716483968,
|
"lastModified": 1704551058,
|
||||||
"narHash": "sha256-GRF/6AobXHamw8TZ3FjL7SI6ulcpwpcohsIuZeCSh2A=",
|
"narHash": "sha256-0NmiGzMFvL1awYOVtiaSd+O4sAR524x68xwWLgArlqs=",
|
||||||
"owner": "RRethy",
|
"owner": "m00qek",
|
||||||
"repo": "base16-nvim",
|
"repo": "baleia.nvim",
|
||||||
"rev": "6ac181b5733518040a33017dde654059cd771b7c",
|
"rev": "6d9cbdaca3a428bc7296f838fdfce3ad01ee7495",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "RRethy",
|
"owner": "m00qek",
|
||||||
"repo": "base16-nvim",
|
"repo": "baleia.nvim",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"bufferline-nvim-src": {
|
"bufferline-nvim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716555412,
|
"lastModified": 1706180994,
|
||||||
"narHash": "sha256-8PCkY1zrlMrPGnQOb7MjqDXNlkeX46jrT4ScIL+MOwM=",
|
"narHash": "sha256-/iGzUDJaodkUyWpwim8UtwaRuarfu/Nk6wxVApk+QxY=",
|
||||||
"owner": "akinsho",
|
"owner": "akinsho",
|
||||||
"repo": "bufferline.nvim",
|
"repo": "bufferline.nvim",
|
||||||
"rev": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe",
|
"rev": "d6cb9b7cac52887bcac65f8698e67479553c0748",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "akinsho",
|
"owner": "akinsho",
|
||||||
"ref": "v4.6.1",
|
"ref": "v4.5.0",
|
||||||
"repo": "bufferline.nvim",
|
"repo": "bufferline.nvim",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"cl-nix-lite": {
|
"bypass-paywalls-clean": {
|
||||||
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717972076,
|
"lastModified": 1706880406,
|
||||||
"narHash": "sha256-hnZEsDInTcsVSL5LBGDAZegAxVLBus/wiJh+sNM15zU=",
|
"narHash": "sha256-8z2Gc3ITluXXbDij4Ltahpkxs7zdnMITvIAjotab/QU=",
|
||||||
"owner": "hraban",
|
"owner": "magnolia1234",
|
||||||
"repo": "cl-nix-lite",
|
"repo": "bpc-uploads",
|
||||||
"rev": "cc920bfb0a6402d3871f470c98d65266126973e4",
|
"rev": "c91cfd510390ab5a138f412ad2890b2cb2a2eafd",
|
||||||
"type": "github"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "hraban",
|
"owner": "magnolia1234",
|
||||||
"repo": "cl-nix-lite",
|
"repo": "bpc-uploads",
|
||||||
"type": "github"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"cmp-nvim-lsp-src": {
|
"cmp-nvim-lsp-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715931395,
|
"lastModified": 1702205473,
|
||||||
"narHash": "sha256-CT1+Z4XJBVsl/RqvJeGmyitD6x7So0ylXvvef5jh7I8=",
|
"narHash": "sha256-/0sh9vJBD9pUuD7q3tNSQ1YLvxFMNykdg5eG+LjZAA8=",
|
||||||
"owner": "hrsh7th",
|
"owner": "hrsh7th",
|
||||||
"repo": "cmp-nvim-lsp",
|
"repo": "cmp-nvim-lsp",
|
||||||
"rev": "39e2eda76828d88b773cc27a3f61d2ad782c922d",
|
"rev": "5af77f54de1b16c34b23cba810150689a3a90312",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -87,11 +89,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728385805,
|
"lastModified": 1706833576,
|
||||||
"narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=",
|
"narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc",
|
"rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -108,11 +110,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728687662,
|
"lastModified": 1706491084,
|
||||||
"narHash": "sha256-D9TChzb00eTG1YWBx8eN2s6lJJnBjB5Y7RpxkAzGvyQ=",
|
"narHash": "sha256-eaEv+orTmr2arXpoE4aFZQMVPOYXCBEbLgK22kOtkhs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "bdbdb725d632863bdedb80baabf21327614dd237",
|
"rev": "f67ba6552845ea5d7f596a24d57c33a8a9dc8de9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -124,16 +126,16 @@
|
|||||||
"fidget-nvim-src": {
|
"fidget-nvim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716093309,
|
"lastModified": 1704696337,
|
||||||
"narHash": "sha256-Gpk/G0ByOAIE8uX4Xr94CvAjJBSJMEOwBuvrhmYYGsg=",
|
"narHash": "sha256-uAX/RGfOmsUIUaDepNwUpK8MBaTMBJ4rLZ69y0MwpNE=",
|
||||||
"owner": "j-hui",
|
"owner": "j-hui",
|
||||||
"repo": "fidget.nvim",
|
"repo": "fidget.nvim",
|
||||||
"rev": "ef99df04a1c53a453602421bc0f756997edc8289",
|
"rev": "3a93300c076109d86c7ce35ec67a8034ae6ba9db",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "j-hui",
|
"owner": "j-hui",
|
||||||
"ref": "v1.4.5",
|
"ref": "v1.2.0",
|
||||||
"repo": "fidget.nvim",
|
"repo": "fidget.nvim",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@ -145,11 +147,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728694479,
|
"lastModified": 1707007453,
|
||||||
"narHash": "sha256-NFFW6RrOTBuIk29LKtAO3MU5Y0ll7zAp9Skd9HvCGfs=",
|
"narHash": "sha256-vs7uACn2/8GOApZJv52gAVsLfpjQWFgkHN2QJ7aVkl8=",
|
||||||
"owner": "bandithedoge",
|
"owner": "bandithedoge",
|
||||||
"repo": "nixpkgs-firefox-darwin",
|
"repo": "nixpkgs-firefox-darwin",
|
||||||
"rev": "8a3143c1ce147481db4463e71bc3b7002e6ebc56",
|
"rev": "d839feb516758ad28bc1cef43008d55e749c1d6a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -159,23 +161,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1697816753,
|
|
||||||
"narHash": "sha256-40to80AEIyKCQI0xMKCeF5ePoIKTYgjVVCZeu4CnTxM=",
|
|
||||||
"owner": "hraban",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"rev": "6025bade1336a36014639bc3f67eacc853dab78f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hraban",
|
|
||||||
"ref": "fixed-output",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat_2": {
|
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696426674,
|
"lastModified": 1696426674,
|
||||||
@ -196,16 +181,17 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1705309234,
|
||||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "flake-utils",
|
"owner": "numtide",
|
||||||
"type": "indirect"
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_2": {
|
"flake-utils_2": {
|
||||||
@ -226,48 +212,14 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_3": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_3"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1726560853,
|
|
||||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"gh-collaborators": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1717117275,
|
|
||||||
"narHash": "sha256-x3p2bHL6U8gWanXnTTJGgA9x4Ixy9AOZiBbfcfn5VVw=",
|
|
||||||
"owner": "katiem0",
|
|
||||||
"repo": "gh-collaborators",
|
|
||||||
"rev": "4dfcd0b5c2e31f2d0fbfd4b83fdfae787a5e6ff8",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "katiem0",
|
|
||||||
"repo": "gh-collaborators",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"hmts-nvim-src": {
|
"hmts-nvim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727357627,
|
"lastModified": 1706900289,
|
||||||
"narHash": "sha256-8FJlLw5LApQs7S8xEh2UE9wdYCAweZTbvgozCGPfQJc=",
|
"narHash": "sha256-kw3YJ21nhs/x9Jp7kvnL+9FuiSgLB1hO/ON3QeeZx9g=",
|
||||||
"owner": "calops",
|
"owner": "calops",
|
||||||
"repo": "hmts.nvim",
|
"repo": "hmts.nvim",
|
||||||
"rev": "1ecb68b9f89abdb23d2754f9d69f90eab2d33eaa",
|
"rev": "ba1239972a1f56b94252d4f85a43e777ac419662",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -283,11 +235,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728685293,
|
"lastModified": 1706985585,
|
||||||
"narHash": "sha256-1WowL96pksT/XCi+ZXHgqiQ9NiU5oxWuNIQYWqOoEYc=",
|
"narHash": "sha256-ptshv4qXiC6V0GCfpABz88UGGPNwqs5tAxaRUKbk1Qo=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "2b13611eaed8326789f76f70d21d06fbb14e3e47",
|
"rev": "1ca210648a6ca9b957efde5da957f3de6b1f0c45",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -297,94 +249,87 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"mac-app-util": {
|
"kitty-scrollback-nvim-src": {
|
||||||
"inputs": {
|
"flake": false,
|
||||||
"cl-nix-lite": "cl-nix-lite",
|
|
||||||
"flake-compat": "flake-compat",
|
|
||||||
"flake-utils": "flake-utils",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727470707,
|
"lastModified": 1706891759,
|
||||||
"narHash": "sha256-BqkwZ2mvzn+COdfIuzllSzWmiaBwQktt4sw9slfwM70=",
|
"narHash": "sha256-p7RPqLHO6D5CCTDQzUrEqTu9+jg+V7wtYfGbY4qjE9A=",
|
||||||
"owner": "hraban",
|
"owner": "mikesmithgh",
|
||||||
"repo": "mac-app-util",
|
"repo": "kitty-scrollback.nvim",
|
||||||
"rev": "9c6bbe2a6a7ec647d03f64f0fadb874284f59eac",
|
"rev": "12f7687ac049d46a987c39b2b4f657fdf540fa4e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "hraban",
|
"owner": "mikesmithgh",
|
||||||
"repo": "mac-app-util",
|
"repo": "kitty-scrollback.nvim",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nextcloud-cookbook": {
|
"nextcloud-cookbook": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719431638,
|
"lastModified": 1702545935,
|
||||||
"narHash": "sha256-a8ekMnEzudHGiqHF53jPtgsVTOTc2QLuPg6YtTw5h68=",
|
"narHash": "sha256-19LN1nYJJ0RMWj6DrYPvHzocTyhMfYdpdhBFch3fpHE=",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
|
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
|
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nextcloud-external": {
|
"nextcloud-external": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710338675,
|
"lastModified": 1699624334,
|
||||||
"narHash": "sha256-bJJ/dVmE1o04QCyrxD0sko0okRsnxJmT6sOTOmBiifs=",
|
"narHash": "sha256-RCL2RP5twRDLxI/KfAX6QLYQOzqZmSWsfrC5ZQIwTD4=",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
|
"url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
|
"url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nextcloud-news": {
|
"nextcloud-news": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718102703,
|
"lastModified": 1703426420,
|
||||||
"narHash": "sha256-XNGjf7SWgJYFdVNOh3ED0jxSG0GJwWImVQq4cJT1Lo4=",
|
"narHash": "sha256-AENBJH/bEob5JQvw4WEi864mdLYJ5Mqe78HJH6ceCpI=",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
|
"url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
|
"url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nextcloud-snappymail": {
|
"nextcloud-snappymail": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728704544,
|
"lastModified": 1707018069,
|
||||||
"narHash": "sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q=",
|
"narHash": "sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo=",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz"
|
"url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz"
|
"url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix2vim": {
|
"nix2vim": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727867024,
|
"lastModified": 1706886721,
|
||||||
"narHash": "sha256-yimXLupF3hG57imRMpqWho/Wstcj7P8Yh8t0SBiX+dQ=",
|
"narHash": "sha256-iDYxsE5xYoK8Ww2TYZDmgRQNIZl+QHJfChOxWh45g0k=",
|
||||||
"owner": "gytis-ivaskevicius",
|
"owner": "gytis-ivaskevicius",
|
||||||
"repo": "nix2vim",
|
"repo": "nix2vim",
|
||||||
"rev": "da26caae6c7776eedbc6514a0f57f1ccd6a759ed",
|
"rev": "29253dcf0f645a44847006d436b096369ef42fd8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -395,11 +340,11 @@
|
|||||||
},
|
},
|
||||||
"nixlib": {
|
"nixlib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728176478,
|
"lastModified": 1693701915,
|
||||||
"narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=",
|
"narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c",
|
"rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -416,11 +361,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728522165,
|
"lastModified": 1706085261,
|
||||||
"narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=",
|
"narHash": "sha256-7PgpHRHyShINcqgevPP1fJ6N8kM5ZSOJnk3QZBrOCQ0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixos-generators",
|
"repo": "nixos-generators",
|
||||||
"rev": "40c8d30c490414910fc63626ad1b67af7db40cd3",
|
"rev": "896f6589db5b25023b812bbb6c1f5d3a499b1132",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -431,11 +376,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728492678,
|
"lastModified": 1706732774,
|
||||||
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
|
"narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
|
"rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -445,45 +390,29 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-caddy": {
|
"null-ls-nvim-src": {
|
||||||
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699107987,
|
"lastModified": 1691810493,
|
||||||
"narHash": "sha256-nWXETr4Oqy/vOfzgWyMY04qzEN2iREFJc5ycQ3XNu0A=",
|
"narHash": "sha256-cWA0rzkOp/ekVKaFee7iea1lhnqKtWUIU+fW5M950wI=",
|
||||||
"owner": "jpds",
|
"owner": "jose-elias-alvarez",
|
||||||
"repo": "nixpkgs",
|
"repo": "null-ls.nvim",
|
||||||
"rev": "a33b02fa9d664f31dadc8a874eb1a5dbaa9f4ecf",
|
"rev": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "jpds",
|
"owner": "jose-elias-alvarez",
|
||||||
"ref": "caddy-external-plugins",
|
"repo": "null-ls.nvim",
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-stable": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1728627514,
|
|
||||||
"narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixos-24.05",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728704557,
|
"lastModified": 1707013032,
|
||||||
"narHash": "sha256-HnYBB+oE+03rNDzTTVazBcysPOu5udRpTOGpP7/A5Ow=",
|
"narHash": "sha256-9kEY/D0Q6sF+p6vJRefVXDK4QQdwK4Q0lSQdsYICad0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "1d143f52b0a046924ee7fe74bce0bd2e10e07c3d",
|
"rev": "ab432acea15134873882610c0e936a882319bc8a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -492,35 +421,19 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nvim-lint-src": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1728582620,
|
|
||||||
"narHash": "sha256-wfui4kE3oxveCJPjJfkJSbE69zVTeAsasDdfJkElmn8=",
|
|
||||||
"owner": "mfussenegger",
|
|
||||||
"repo": "nvim-lint",
|
|
||||||
"rev": "f707b3ae50417067fa63fdfe179b0bff6b380da1",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "mfussenegger",
|
|
||||||
"repo": "nvim-lint",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nvim-lspconfig-src": {
|
"nvim-lspconfig-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716281382,
|
"lastModified": 1701687137,
|
||||||
"narHash": "sha256-foJ7a59N0a3QaBW24PtwbyYDQVlIsFxiatADLO/hQvc=",
|
"narHash": "sha256-qFjFofA2LoD4yRfx4KGfSCpR3mDkpFaagcm+TVNPqco=",
|
||||||
"owner": "neovim",
|
"owner": "neovim",
|
||||||
"repo": "nvim-lspconfig",
|
"repo": "nvim-lspconfig",
|
||||||
"rev": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98",
|
"rev": "cf3dd4a290084a868fac0e2e876039321d57111c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "neovim",
|
"owner": "neovim",
|
||||||
"ref": "v0.1.8",
|
"ref": "v0.1.7",
|
||||||
"repo": "nvim-lspconfig",
|
"repo": "nvim-lspconfig",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@ -528,11 +441,11 @@
|
|||||||
"nvim-tree-lua-src": {
|
"nvim-tree-lua-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728614821,
|
"lastModified": 1706571452,
|
||||||
"narHash": "sha256-WYtu+jtsQSFqruTxdzkHE9UQJBE2TGoNoFar36AAoqo=",
|
"narHash": "sha256-b0LIqLC8cCRX1NyJx4eH5c4v5Fqqw5mMleAnQ2VRctM=",
|
||||||
"owner": "kyazdani42",
|
"owner": "kyazdani42",
|
||||||
"repo": "nvim-tree.lua",
|
"repo": "nvim-tree.lua",
|
||||||
"rev": "5ad87620ec9d1190d15c88171a3f0122bc16b0fe",
|
"rev": "f39f7b6fcd3865ac2146de4cb4045286308f2935",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -544,20 +457,33 @@
|
|||||||
"nvim-treesitter-src": {
|
"nvim-treesitter-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1705679158,
|
"lastModified": 1706952848,
|
||||||
"narHash": "sha256-zAyiitJIgOCZTB0CmgNt0MHENM70SOHLIoWrVwOJKFg=",
|
"narHash": "sha256-pNjEODR+QJPDL58O4NM7SjzZEN8D3bXDHbKLNOS3fL8=",
|
||||||
"owner": "nvim-treesitter",
|
"owner": "nvim-treesitter",
|
||||||
"repo": "nvim-treesitter",
|
"repo": "nvim-treesitter",
|
||||||
"rev": "f197a15b0d1e8d555263af20add51450e5aaa1f0",
|
"rev": "4fbf150a1621d52f17b099506e1a32f107079210",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nvim-treesitter",
|
"owner": "nvim-treesitter",
|
||||||
"ref": "v0.9.2",
|
"ref": "master",
|
||||||
"repo": "nvim-treesitter",
|
"repo": "nvim-treesitter",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"proton-ge": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1700610476,
|
||||||
|
"narHash": "sha256-IoClZ6hl2lsz9OGfFgnz7vEAGlSY2+1K2lDEEsJQOfU=",
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-25/GE-Proton8-25.tar.gz"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-25/GE-Proton8-25.tar.gz"
|
||||||
|
}
|
||||||
|
},
|
||||||
"ren": {
|
"ren": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@ -577,11 +503,11 @@
|
|||||||
"rep": {
|
"rep": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1707216692,
|
"lastModified": 1705833236,
|
||||||
"narHash": "sha256-/dH+mNtNHaYFndVhoqmz4Sc3HeemoQt1HGD98mb9Qhw=",
|
"narHash": "sha256-hm+v+b97z1HnY/7QHZxc0GygCq9W0mJauyjnz48ddaM=",
|
||||||
"owner": "robenkleene",
|
"owner": "robenkleene",
|
||||||
"repo": "rep-grep",
|
"repo": "rep-grep",
|
||||||
"rev": "10510d47e392cb9d30a861c69f702fd194b3fa88",
|
"rev": "365acc5d599934e94dc066eb85b7ddd684ba508b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -592,18 +518,18 @@
|
|||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"Comment-nvim-src": "Comment-nvim-src",
|
||||||
"baleia-nvim-src": "baleia-nvim-src",
|
"baleia-nvim-src": "baleia-nvim-src",
|
||||||
"base16-nvim-src": "base16-nvim-src",
|
|
||||||
"bufferline-nvim-src": "bufferline-nvim-src",
|
"bufferline-nvim-src": "bufferline-nvim-src",
|
||||||
|
"bypass-paywalls-clean": "bypass-paywalls-clean",
|
||||||
"cmp-nvim-lsp-src": "cmp-nvim-lsp-src",
|
"cmp-nvim-lsp-src": "cmp-nvim-lsp-src",
|
||||||
"darwin": "darwin",
|
"darwin": "darwin",
|
||||||
"disko": "disko",
|
"disko": "disko",
|
||||||
"fidget-nvim-src": "fidget-nvim-src",
|
"fidget-nvim-src": "fidget-nvim-src",
|
||||||
"firefox-darwin": "firefox-darwin",
|
"firefox-darwin": "firefox-darwin",
|
||||||
"gh-collaborators": "gh-collaborators",
|
|
||||||
"hmts-nvim-src": "hmts-nvim-src",
|
"hmts-nvim-src": "hmts-nvim-src",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"mac-app-util": "mac-app-util",
|
"kitty-scrollback-nvim-src": "kitty-scrollback-nvim-src",
|
||||||
"nextcloud-cookbook": "nextcloud-cookbook",
|
"nextcloud-cookbook": "nextcloud-cookbook",
|
||||||
"nextcloud-external": "nextcloud-external",
|
"nextcloud-external": "nextcloud-external",
|
||||||
"nextcloud-news": "nextcloud-news",
|
"nextcloud-news": "nextcloud-news",
|
||||||
@ -611,19 +537,16 @@
|
|||||||
"nix2vim": "nix2vim",
|
"nix2vim": "nix2vim",
|
||||||
"nixos-generators": "nixos-generators",
|
"nixos-generators": "nixos-generators",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-caddy": "nixpkgs-caddy",
|
"null-ls-nvim-src": "null-ls-nvim-src",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"nvim-lint-src": "nvim-lint-src",
|
|
||||||
"nvim-lspconfig-src": "nvim-lspconfig-src",
|
"nvim-lspconfig-src": "nvim-lspconfig-src",
|
||||||
"nvim-tree-lua-src": "nvim-tree-lua-src",
|
"nvim-tree-lua-src": "nvim-tree-lua-src",
|
||||||
"nvim-treesitter-src": "nvim-treesitter-src",
|
"nvim-treesitter-src": "nvim-treesitter-src",
|
||||||
|
"proton-ge": "proton-ge",
|
||||||
"ren": "ren",
|
"ren": "ren",
|
||||||
"rep": "rep",
|
"rep": "rep",
|
||||||
"snipe-nvim-src": "snipe-nvim-src",
|
|
||||||
"telescope-nvim-src": "telescope-nvim-src",
|
"telescope-nvim-src": "telescope-nvim-src",
|
||||||
"telescope-project-nvim-src": "telescope-project-nvim-src",
|
"telescope-project-nvim-src": "telescope-project-nvim-src",
|
||||||
"tiny-inline-diagnostic-nvim-src": "tiny-inline-diagnostic-nvim-src",
|
|
||||||
"toggleterm-nvim-src": "toggleterm-nvim-src",
|
"toggleterm-nvim-src": "toggleterm-nvim-src",
|
||||||
"tree-sitter-bash": "tree-sitter-bash",
|
"tree-sitter-bash": "tree-sitter-bash",
|
||||||
"tree-sitter-ini": "tree-sitter-ini",
|
"tree-sitter-ini": "tree-sitter-ini",
|
||||||
@ -637,22 +560,6 @@
|
|||||||
"zenyd-mpv-scripts": "zenyd-mpv-scripts"
|
"zenyd-mpv-scripts": "zenyd-mpv-scripts"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"snipe-nvim-src": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1724418876,
|
|
||||||
"narHash": "sha256-G4g/OzyXhDhX84HkxlhFSy6E+EAGxH+HL1Bw5s5FWHE=",
|
|
||||||
"owner": "leath-dub",
|
|
||||||
"repo": "snipe.nvim",
|
|
||||||
"rev": "f1abd4aaaef6398b45dcddc9f1a40dd982f732b0",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "leath-dub",
|
|
||||||
"repo": "snipe.nvim",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems": {
|
"systems": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
@ -683,34 +590,19 @@
|
|||||||
"type": "github"
|
"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"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"telescope-nvim-src": {
|
"telescope-nvim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716532947,
|
"lastModified": 1701167040,
|
||||||
"narHash": "sha256-e1ulhc4IIvUgpjKQrSqPY4WpXuez6wlxL6Min9U0o5Q=",
|
"narHash": "sha256-H5RpyWMluE+Yxg7xFX43AZTVW+Yg70DF3FmEGXBUSNg=",
|
||||||
"owner": "nvim-telescope",
|
"owner": "nvim-telescope",
|
||||||
"repo": "telescope.nvim",
|
"repo": "telescope.nvim",
|
||||||
"rev": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026",
|
"rev": "d90956833d7c27e73c621a61f20b29fdb7122709",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nvim-telescope",
|
"owner": "nvim-telescope",
|
||||||
"ref": "0.1.8",
|
"ref": "0.1.5",
|
||||||
"repo": "telescope.nvim",
|
"repo": "telescope.nvim",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@ -718,11 +610,11 @@
|
|||||||
"telescope-project-nvim-src": {
|
"telescope-project-nvim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725880250,
|
"lastModified": 1701464478,
|
||||||
"narHash": "sha256-wO/cm5PT1L0hFr/CX466w0UimoFg/tWrDK8T0QeKZMU=",
|
"narHash": "sha256-touMCltcnqkrQYV1NtNeWLQeFVGt+WM3aIWIdKilA7w=",
|
||||||
"owner": "nvim-telescope",
|
"owner": "nvim-telescope",
|
||||||
"repo": "telescope-project.nvim",
|
"repo": "telescope-project.nvim",
|
||||||
"rev": "796200876bb0fe8157b8eb1ce03d927d3827a052",
|
"rev": "1aaf16580a614601a7f7077d9639aeb457dc5559",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -731,35 +623,19 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"tiny-inline-diagnostic-nvim-src": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1726582328,
|
|
||||||
"narHash": "sha256-NBcUVUSnk2TlbSr/vFTbp3Rh35ms8lAcfDqpmE1KTq4=",
|
|
||||||
"owner": "rachartier",
|
|
||||||
"repo": "tiny-inline-diagnostic.nvim",
|
|
||||||
"rev": "1a83e7ce5c9d0ae4d89fc5c812b55ff8ed1d39e7",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "rachartier",
|
|
||||||
"repo": "tiny-inline-diagnostic.nvim",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"toggleterm-nvim-src": {
|
"toggleterm-nvim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721232722,
|
"lastModified": 1701858874,
|
||||||
"narHash": "sha256-hJ6nBCgSyYF1pY4lX+b8WZd49i5F6BwOmrl7xVSIwRw=",
|
"narHash": "sha256-vJApw7XY2wOX9InfWcah+hkNxBfS1+kQUWr4ITxRmgA=",
|
||||||
"owner": "akinsho",
|
"owner": "akinsho",
|
||||||
"repo": "toggleterm.nvim",
|
"repo": "toggleterm.nvim",
|
||||||
"rev": "48be57eaba817f038d61bbf64d2c597f578c0827",
|
"rev": "cbd041d91b90cd3c02df03fe6133208888f8e008",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "akinsho",
|
"owner": "akinsho",
|
||||||
"ref": "v2.12.0",
|
"ref": "v2.9.0",
|
||||||
"repo": "toggleterm.nvim",
|
"repo": "toggleterm.nvim",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@ -767,11 +643,11 @@
|
|||||||
"tree-sitter-bash": {
|
"tree-sitter-bash": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725407033,
|
"lastModified": 1705686017,
|
||||||
"narHash": "sha256-xqiUJhl7nfOlS6wBYWpmrGLCvWoJCA5fz8DCX85Lxog=",
|
"narHash": "sha256-+Mpks0FyQLl26TX63J6WhaAl/QDUR1k9wSUY5SFwL+w=",
|
||||||
"owner": "tree-sitter",
|
"owner": "tree-sitter",
|
||||||
"repo": "tree-sitter-bash",
|
"repo": "tree-sitter-bash",
|
||||||
"rev": "c8713e50f0bd77d080832fc61ad128bc8f2934e9",
|
"rev": "f7239f638d3dc16762563a9027faeee518ce1bd9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -784,11 +660,11 @@
|
|||||||
"tree-sitter-ini": {
|
"tree-sitter-ini": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725233451,
|
"lastModified": 1699877527,
|
||||||
"narHash": "sha256-G11Aynq2rnkRwdkhspjYqtBD/h5k4aD+NvuE0QfploU=",
|
"narHash": "sha256-dYPeVTNWO4apY5dsjsKViavU7YtLeGTp6BzEemXhsEU=",
|
||||||
"owner": "justinmk",
|
"owner": "justinmk",
|
||||||
"repo": "tree-sitter-ini",
|
"repo": "tree-sitter-ini",
|
||||||
"rev": "962568c9efa71d25720ab42c5d36e222626ef3a6",
|
"rev": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -800,11 +676,11 @@
|
|||||||
"tree-sitter-lua": {
|
"tree-sitter-lua": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725894603,
|
"lastModified": 1694072484,
|
||||||
"narHash": "sha256-Q2LtrifoKf16N1dRBf2xLi12kpMkcFncZL4jaVbtK3M=",
|
"narHash": "sha256-5t5w8KqbefInNbA12/jpNzmky/uOUhsLjKdEqpl1GEc=",
|
||||||
"owner": "MunifTanjim",
|
"owner": "MunifTanjim",
|
||||||
"repo": "tree-sitter-lua",
|
"repo": "tree-sitter-lua",
|
||||||
"rev": "99fc677e6971c425e8d407f59c77ab897e585c92",
|
"rev": "9668709211b2e683f27f414454a8b51bf0a6bda1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -817,11 +693,11 @@
|
|||||||
"tree-sitter-puppet": {
|
"tree-sitter-puppet": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713617121,
|
"lastModified": 1690231696,
|
||||||
"narHash": "sha256-+zMgzyuGerJ8l+i5ZtWnmGr3i4fFiSLD5FssyKESsmI=",
|
"narHash": "sha256-YEjjy9WLwITERYqoeSVrRYnwVBIAwdc4o0lvAK9wizw=",
|
||||||
"owner": "amaanq",
|
"owner": "amaanq",
|
||||||
"repo": "tree-sitter-puppet",
|
"repo": "tree-sitter-puppet",
|
||||||
"rev": "584522f32495d648b18a53ccb52d988e60de127d",
|
"rev": "9ce9a5f7d64528572aaa8d59459ba869e634086b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -833,11 +709,11 @@
|
|||||||
"tree-sitter-python": {
|
"tree-sitter-python": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725324041,
|
"lastModified": 1700218345,
|
||||||
"narHash": "sha256-8mdBN1vP64PJKxN2y0GoaObLs6j/lcsU47sr+8/8oTQ=",
|
"narHash": "sha256-hXNxa895SyNOG7PH2vAIkWbcMjZDjWYDsCafBZuvnT0=",
|
||||||
"owner": "tree-sitter",
|
"owner": "tree-sitter",
|
||||||
"repo": "tree-sitter-python",
|
"repo": "tree-sitter-python",
|
||||||
"rev": "8c65e256f971812276ff2a69a2f515c218ed7f82",
|
"rev": "4bfdd9033a2225cc95032ce77066b7aeca9e2efc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -850,11 +726,11 @@
|
|||||||
"tree-sitter-rasi": {
|
"tree-sitter-rasi": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716296585,
|
"lastModified": 1678701563,
|
||||||
"narHash": "sha256-sPrIVgGGaBaXeqHNxjcdJ/S2FvxyV6rD9UPKU/tpspw=",
|
"narHash": "sha256-2nYZoLcrxxxiOJEySwHUm93lzMg8mU+V7LIP63ntFdA=",
|
||||||
"owner": "Fymyte",
|
"owner": "Fymyte",
|
||||||
"repo": "tree-sitter-rasi",
|
"repo": "tree-sitter-rasi",
|
||||||
"rev": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa",
|
"rev": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -866,11 +742,11 @@
|
|||||||
"tree-sitter-vimdoc": {
|
"tree-sitter-vimdoc": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717834376,
|
"lastModified": 1705491128,
|
||||||
"narHash": "sha256-v+XSWGm2Wdn9/rxNFMqXYACkGn6AvxZdxkClLuKnWGU=",
|
"narHash": "sha256-q5Ln8WPFrtKBfZnaAAlMh3Q/eczEt6wCMZAtx+ISCKg=",
|
||||||
"owner": "neovim",
|
"owner": "neovim",
|
||||||
"repo": "tree-sitter-vimdoc",
|
"repo": "tree-sitter-vimdoc",
|
||||||
"rev": "2249c44ecd3f5cf22da3dcccfb74f816ddb29245",
|
"rev": "ed8695ad8de39c3f073da130156f00b1148e2891",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -897,18 +773,18 @@
|
|||||||
},
|
},
|
||||||
"wsl": {
|
"wsl": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_2",
|
"flake-compat": "flake-compat",
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_2",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728588346,
|
"lastModified": 1706867893,
|
||||||
"narHash": "sha256-P1j+Nf+pzxPYK2Qe7lF2yB0vR3YvW8Td5sD0ZvrKIq8=",
|
"narHash": "sha256-c5bADvtL35S3vsJaXR5YWTXe08W0gSwOrTOXfpJB4Ac=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NixOS-WSL",
|
"repo": "NixOS-WSL",
|
||||||
"rev": "0fc8d9bb51cc46b31d950513df6d088905c8fe55",
|
"rev": "bcae8dc73b931b7f0fc65f1f1ef93dc379dfd66b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -920,11 +796,11 @@
|
|||||||
"zenyd-mpv-scripts": {
|
"zenyd-mpv-scripts": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1707704915,
|
"lastModified": 1706283438,
|
||||||
"narHash": "sha256-9P/8q/OZXfaJMS08acQP4h3/zUA5mKRQee0JmkXcz1w=",
|
"narHash": "sha256-hpLZDtt5q18aZ8d9LHfT852wtBosKUTJ7Bx+cbjBLcg=",
|
||||||
"owner": "zenyd",
|
"owner": "zenyd",
|
||||||
"repo": "mpv-scripts",
|
"repo": "mpv-scripts",
|
||||||
"rev": "9bdce0050144cb24f92475f7bdd77180e0e4c26b",
|
"rev": "7100d19d18d111ce77fc9e6e8947c0d542a86397",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
333
flake.nix
333
flake.nix
@ -7,12 +7,6 @@
|
|||||||
# Used for system packages
|
# Used for system packages
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
# Used for specific stable packages
|
|
||||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
|
|
||||||
|
|
||||||
# Used for caddy plugins
|
|
||||||
nixpkgs-caddy.url = "github:jpds/nixpkgs/caddy-external-plugins";
|
|
||||||
|
|
||||||
# Used for MacOS system config
|
# Used for MacOS system config
|
||||||
darwin = {
|
darwin = {
|
||||||
url = "github:lnl7/nix-darwin/master";
|
url = "github:lnl7/nix-darwin/master";
|
||||||
@ -28,7 +22,8 @@
|
|||||||
# Used for user packages and dotfiles
|
# Used for user packages and dotfiles
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/master";
|
url = "github:nix-community/home-manager/master";
|
||||||
inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list for their inputs
|
inputs.nixpkgs.follows =
|
||||||
|
"nixpkgs"; # Use system packages list for their inputs
|
||||||
};
|
};
|
||||||
|
|
||||||
# Community packages; used for Firefox extensions
|
# Community packages; used for Firefox extensions
|
||||||
@ -40,12 +35,6 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Better App install management in macOS
|
|
||||||
mac-app-util = {
|
|
||||||
url = "github:hraban/mac-app-util";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list for their inputs
|
|
||||||
};
|
|
||||||
|
|
||||||
# Manage disk format and partitioning
|
# Manage disk format and partitioning
|
||||||
disko = {
|
disko = {
|
||||||
url = "github:nix-community/disko";
|
url = "github:nix-community/disko";
|
||||||
@ -71,32 +60,37 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
# Neovim plugins
|
# Neovim plugins
|
||||||
base16-nvim-src = {
|
|
||||||
url = "github:RRethy/base16-nvim";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
nvim-lspconfig-src = {
|
nvim-lspconfig-src = {
|
||||||
# https://github.com/neovim/nvim-lspconfig/tags
|
# https://github.com/neovim/nvim-lspconfig/tags
|
||||||
url = "github:neovim/nvim-lspconfig/v0.1.8";
|
url = "github:neovim/nvim-lspconfig/v0.1.7";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
cmp-nvim-lsp-src = {
|
cmp-nvim-lsp-src = {
|
||||||
url = "github:hrsh7th/cmp-nvim-lsp";
|
url = "github:hrsh7th/cmp-nvim-lsp";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
null-ls-nvim-src = {
|
||||||
|
url = "github:jose-elias-alvarez/null-ls.nvim";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
baleia-nvim-src = {
|
baleia-nvim-src = {
|
||||||
# https://github.com/m00qek/baleia.nvim/tags
|
# https://github.com/m00qek/baleia.nvim/tags
|
||||||
url = "github:m00qek/baleia.nvim";
|
url = "github:m00qek/baleia.nvim";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
Comment-nvim-src = {
|
||||||
|
# https://github.com/numToStr/Comment.nvim/releases
|
||||||
|
url = "github:numToStr/Comment.nvim/v0.8.0";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
nvim-treesitter-src = {
|
nvim-treesitter-src = {
|
||||||
# https://github.com/nvim-treesitter/nvim-treesitter/tags
|
# https://github.com/nvim-treesitter/nvim-treesitter/tags
|
||||||
url = "github:nvim-treesitter/nvim-treesitter/v0.9.2";
|
url = "github:nvim-treesitter/nvim-treesitter/master";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
telescope-nvim-src = {
|
telescope-nvim-src = {
|
||||||
# https://github.com/nvim-telescope/telescope.nvim/releases
|
# https://github.com/nvim-telescope/telescope.nvim/releases
|
||||||
url = "github:nvim-telescope/telescope.nvim/0.1.8";
|
url = "github:nvim-telescope/telescope.nvim/0.1.5";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
telescope-project-nvim-src = {
|
telescope-project-nvim-src = {
|
||||||
@ -105,12 +99,12 @@
|
|||||||
};
|
};
|
||||||
toggleterm-nvim-src = {
|
toggleterm-nvim-src = {
|
||||||
# https://github.com/akinsho/toggleterm.nvim/tags
|
# https://github.com/akinsho/toggleterm.nvim/tags
|
||||||
url = "github:akinsho/toggleterm.nvim/v2.12.0";
|
url = "github:akinsho/toggleterm.nvim/v2.9.0";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
bufferline-nvim-src = {
|
bufferline-nvim-src = {
|
||||||
# https://github.com/akinsho/bufferline.nvim/releases
|
# https://github.com/akinsho/bufferline.nvim/releases
|
||||||
url = "github:akinsho/bufferline.nvim/v4.6.1";
|
url = "github:akinsho/bufferline.nvim/v4.5.0";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
nvim-tree-lua-src = {
|
nvim-tree-lua-src = {
|
||||||
@ -123,19 +117,11 @@
|
|||||||
};
|
};
|
||||||
fidget-nvim-src = {
|
fidget-nvim-src = {
|
||||||
# https://github.com/j-hui/fidget.nvim/tags
|
# https://github.com/j-hui/fidget.nvim/tags
|
||||||
url = "github:j-hui/fidget.nvim/v1.4.5";
|
url = "github:j-hui/fidget.nvim/v1.2.0";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
nvim-lint-src = {
|
kitty-scrollback-nvim-src = {
|
||||||
url = "github:mfussenegger/nvim-lint";
|
url = "github:mikesmithgh/kitty-scrollback.nvim";
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
tiny-inline-diagnostic-nvim-src = {
|
|
||||||
url = "github:rachartier/tiny-inline-diagnostic.nvim";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
snipe-nvim-src = {
|
|
||||||
url = "github:leath-dub/snipe.nvim";
|
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -185,108 +171,109 @@
|
|||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
gh-collaborators = {
|
# GE version of Proton for game compatibility
|
||||||
url = "github:katiem0/gh-collaborators";
|
# Alternatively, could consider using https://github.com/fufexan/nix-gaming
|
||||||
|
proton-ge = {
|
||||||
|
# https://github.com/GloriousEggroll/proton-ge-custom/releases
|
||||||
|
url =
|
||||||
|
"https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-25/GE-Proton8-25.tar.gz";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Firefox addon from outside the extension store
|
||||||
|
bypass-paywalls-clean = {
|
||||||
|
# https://gitlab.com/magnolia1234/bpc-uploads/-/commits/master/?ref_type=HEADS
|
||||||
|
url = "gitlab:magnolia1234/bpc-uploads";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Nextcloud Apps
|
# Nextcloud Apps
|
||||||
nextcloud-news = {
|
nextcloud-news = {
|
||||||
# https://github.com/nextcloud/news/releases
|
# https://github.com/nextcloud/news/releases
|
||||||
url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz";
|
url =
|
||||||
|
"https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
nextcloud-external = {
|
nextcloud-external = {
|
||||||
# https://github.com/nextcloud-releases/external/releases
|
# https://github.com/nextcloud-releases/external/releases
|
||||||
url = "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz";
|
url =
|
||||||
|
"https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
nextcloud-cookbook = {
|
nextcloud-cookbook = {
|
||||||
# https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
|
# https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
|
||||||
url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz";
|
url =
|
||||||
|
"https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
nextcloud-snappymail = {
|
nextcloud-snappymail = {
|
||||||
# https://github.com/the-djmaze/snappymail/releases
|
# https://github.com/the-djmaze/snappymail/releases
|
||||||
# https://snappymail.eu/repository/nextcloud
|
url =
|
||||||
url = "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz";
|
"https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz";
|
||||||
# url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
|
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs = { nixpkgs, ... }@inputs:
|
||||||
{ nixpkgs, ... }@inputs:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
# Global configuration for my systems
|
# Global configuration for my systems
|
||||||
globals =
|
globals = let baseName = "masu.rs";
|
||||||
let
|
in rec {
|
||||||
baseName = "masu.rs";
|
user = "noah";
|
||||||
in
|
fullName = "Noah Masur";
|
||||||
rec {
|
gitName = fullName;
|
||||||
user = "noah";
|
gitEmail = "7386960+nmasur@users.noreply.github.com";
|
||||||
fullName = "Noah Masur";
|
mail.server = "noahmasur.com";
|
||||||
gitName = fullName;
|
mail.imapHost = "imap.purelymail.com";
|
||||||
gitEmail = "7386960+nmasur@users.noreply.github.com";
|
mail.smtpHost = "smtp.purelymail.com";
|
||||||
mail.server = "noahmasur.com";
|
dotfilesRepo = "https://github.com/nmasur/dotfiles";
|
||||||
mail.imapHost = "imap.purelymail.com";
|
hostnames = {
|
||||||
mail.smtpHost = "smtp.purelymail.com";
|
git = "git.${baseName}";
|
||||||
dotfilesRepo = "https://github.com/nmasur/dotfiles";
|
influxdb = "influxdb.${baseName}";
|
||||||
hostnames = {
|
metrics = "metrics.${baseName}";
|
||||||
audiobooks = "read.${baseName}";
|
prometheus = "prom.${baseName}";
|
||||||
files = "files.${baseName}";
|
paperless = "paper.${baseName}";
|
||||||
git = "git.${baseName}";
|
secrets = "vault.${baseName}";
|
||||||
influxdb = "influxdb.${baseName}";
|
stream = "stream.${baseName}";
|
||||||
irc = "irc.${baseName}";
|
content = "cloud.${baseName}";
|
||||||
metrics = "metrics.${baseName}";
|
books = "books.${baseName}";
|
||||||
minecraft = "minecraft.${baseName}";
|
download = "download.${baseName}";
|
||||||
n8n = "n8n.${baseName}";
|
|
||||||
notifications = "ntfy.${baseName}";
|
|
||||||
prometheus = "prom.${baseName}";
|
|
||||||
paperless = "paper.${baseName}";
|
|
||||||
secrets = "vault.${baseName}";
|
|
||||||
stream = "stream.${baseName}";
|
|
||||||
content = "cloud.${baseName}";
|
|
||||||
books = "books.${baseName}";
|
|
||||||
download = "download.${baseName}";
|
|
||||||
status = "status.${baseName}";
|
|
||||||
transmission = "transmission.${baseName}";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# Common overlays to always use
|
# Common overlays to always use
|
||||||
overlays = [
|
overlays = [
|
||||||
inputs.nur.overlay
|
inputs.nur.overlay
|
||||||
inputs.nix2vim.overlay
|
inputs.nix2vim.overlay
|
||||||
(import ./overlays/neovim-plugins.nix inputs)
|
(import ./overlays/neovim-plugins.nix inputs)
|
||||||
|
(import ./overlays/calibre-web.nix)
|
||||||
(import ./overlays/disko.nix inputs)
|
(import ./overlays/disko.nix inputs)
|
||||||
(import ./overlays/tree-sitter.nix inputs)
|
(import ./overlays/tree-sitter.nix inputs)
|
||||||
|
(import ./overlays/caddy.nix inputs)
|
||||||
(import ./overlays/mpv-scripts.nix inputs)
|
(import ./overlays/mpv-scripts.nix inputs)
|
||||||
(import ./overlays/nextcloud-apps.nix inputs)
|
(import ./overlays/nextcloud-apps.nix inputs)
|
||||||
(import ./overlays/betterlockscreen.nix)
|
(import ./overlays/betterlockscreen.nix)
|
||||||
(import ./overlays/gh-collaborators.nix inputs)
|
(import ./overlays/proton-ge.nix inputs)
|
||||||
|
(import ./overlays/gh-collaborators.nix)
|
||||||
|
(import ./overlays/bypass-paywalls-clean.nix inputs)
|
||||||
(import ./overlays/ren-rep.nix inputs)
|
(import ./overlays/ren-rep.nix inputs)
|
||||||
];
|
];
|
||||||
|
|
||||||
# System types to support.
|
# System types to support.
|
||||||
supportedSystems = [
|
supportedSystems =
|
||||||
"x86_64-linux"
|
[ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
|
||||||
"x86_64-darwin"
|
|
||||||
"aarch64-linux"
|
|
||||||
"aarch64-darwin"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
|
# Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
|
||||||
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
|
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
|
||||||
in
|
|
||||||
rec {
|
in rec {
|
||||||
|
|
||||||
# Contains my full system builds, including home-manager
|
# Contains my full system builds, including home-manager
|
||||||
# nixos-rebuild switch --flake .#tempest
|
# nixos-rebuild switch --flake .#tempest
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
arrow = import ./hosts/arrow { inherit inputs globals overlays; };
|
|
||||||
tempest = import ./hosts/tempest { inherit inputs globals overlays; };
|
tempest = import ./hosts/tempest { inherit inputs globals overlays; };
|
||||||
hydra = import ./hosts/hydra { inherit inputs globals overlays; };
|
hydra = import ./hosts/hydra { inherit inputs globals overlays; };
|
||||||
flame = import ./hosts/flame { inherit inputs globals overlays; };
|
flame = import ./hosts/flame { inherit inputs globals overlays; };
|
||||||
@ -296,143 +283,78 @@
|
|||||||
# Contains my full Mac system builds, including home-manager
|
# Contains my full Mac system builds, including home-manager
|
||||||
# darwin-rebuild switch --flake .#lookingglass
|
# darwin-rebuild switch --flake .#lookingglass
|
||||||
darwinConfigurations = {
|
darwinConfigurations = {
|
||||||
lookingglass = import ./hosts/lookingglass { inherit inputs globals overlays; };
|
lookingglass =
|
||||||
|
import ./hosts/lookingglass { inherit inputs globals overlays; };
|
||||||
};
|
};
|
||||||
|
|
||||||
# For quickly applying home-manager settings with:
|
# For quickly applying home-manager settings with:
|
||||||
# home-manager switch --flake .#tempest
|
# home-manager switch --flake .#tempest
|
||||||
homeConfigurations = {
|
homeConfigurations = {
|
||||||
tempest = nixosConfigurations.tempest.config.home-manager.users.${globals.user}.home;
|
tempest =
|
||||||
lookingglass = darwinConfigurations.lookingglass.config.home-manager.users."Noah.Masur".home;
|
nixosConfigurations.tempest.config.home-manager.users.${globals.user}.home;
|
||||||
|
lookingglass =
|
||||||
|
darwinConfigurations.lookingglass.config.home-manager.users."Noah.Masur".home;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Disk formatting, only used once
|
# Disk formatting, only used once
|
||||||
diskoConfigurations = {
|
diskoConfigurations = { root = import ./disks/root.nix; };
|
||||||
root = import ./disks/root.nix;
|
|
||||||
|
packages = let
|
||||||
|
aws = system:
|
||||||
|
import ./hosts/aws { inherit inputs globals overlays system; };
|
||||||
|
staff = system:
|
||||||
|
import ./hosts/staff { inherit inputs globals overlays system; };
|
||||||
|
neovim = system:
|
||||||
|
let pkgs = import nixpkgs { inherit system overlays; };
|
||||||
|
in import ./modules/common/neovim/package {
|
||||||
|
inherit pkgs;
|
||||||
|
colors = (import ./colorscheme/gruvbox-dark).dark;
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
x86_64-linux.aws = aws "x86_64-linux";
|
||||||
|
x86_64-linux.staff = staff "x86_64-linux";
|
||||||
|
|
||||||
|
# Package Neovim config into standalone package
|
||||||
|
x86_64-linux.neovim = neovim "x86_64-linux";
|
||||||
|
x86_64-darwin.neovim = neovim "x86_64-darwin";
|
||||||
|
aarch64-linux.neovim = neovim "aarch64-linux";
|
||||||
|
aarch64-darwin.neovim = neovim "aarch64-darwin";
|
||||||
};
|
};
|
||||||
|
|
||||||
packages =
|
|
||||||
let
|
|
||||||
staff =
|
|
||||||
system:
|
|
||||||
import ./hosts/staff {
|
|
||||||
inherit
|
|
||||||
inputs
|
|
||||||
globals
|
|
||||||
overlays
|
|
||||||
system
|
|
||||||
;
|
|
||||||
};
|
|
||||||
neovim =
|
|
||||||
system:
|
|
||||||
let
|
|
||||||
pkgs = import nixpkgs { inherit system overlays; };
|
|
||||||
in
|
|
||||||
import ./modules/common/neovim/package {
|
|
||||||
inherit pkgs;
|
|
||||||
colors = (import ./colorscheme/gruvbox-dark).dark;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
x86_64-linux.staff = staff "x86_64-linux";
|
|
||||||
x86_64-linux.arrow = inputs.nixos-generators.nixosGenerate rec {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
format = "iso";
|
|
||||||
specialArgs = {
|
|
||||||
pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
|
|
||||||
pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
|
|
||||||
};
|
|
||||||
modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; };
|
|
||||||
};
|
|
||||||
x86_64-linux.arrow-aws = inputs.nixos-generators.nixosGenerate rec {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
format = "amazon";
|
|
||||||
specialArgs = {
|
|
||||||
pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
|
|
||||||
pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
|
|
||||||
};
|
|
||||||
modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; } ++ [
|
|
||||||
(
|
|
||||||
{ ... }:
|
|
||||||
{
|
|
||||||
boot.kernelPackages = inputs.nixpkgs.legacyPackages.x86_64-linux.linuxKernel.packages.linux_6_6;
|
|
||||||
amazonImage.sizeMB = 16 * 1024;
|
|
||||||
permitRootLogin = "prohibit-password";
|
|
||||||
boot.loader.systemd-boot.enable = inputs.nixpkgs.lib.mkForce false;
|
|
||||||
boot.loader.efi.canTouchEfiVariables = inputs.nixpkgs.lib.mkForce false;
|
|
||||||
services.amazon-ssm-agent.enable = true;
|
|
||||||
users.users.ssm-user.extraGroups = [ "wheel" ];
|
|
||||||
}
|
|
||||||
)
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Package Neovim config into standalone package
|
|
||||||
x86_64-linux.neovim = neovim "x86_64-linux";
|
|
||||||
x86_64-darwin.neovim = neovim "x86_64-darwin";
|
|
||||||
aarch64-linux.neovim = neovim "aarch64-linux";
|
|
||||||
aarch64-darwin.neovim = neovim "aarch64-darwin";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Programs that can be run by calling this flake
|
# Programs that can be run by calling this flake
|
||||||
apps = forAllSystems (
|
apps = forAllSystems (system:
|
||||||
system:
|
let pkgs = import nixpkgs { inherit system overlays; };
|
||||||
let
|
in import ./apps { inherit pkgs; });
|
||||||
pkgs = import nixpkgs { inherit system overlays; };
|
|
||||||
in
|
|
||||||
import ./apps { inherit pkgs; }
|
|
||||||
);
|
|
||||||
|
|
||||||
# Development environments
|
# Development environments
|
||||||
devShells = forAllSystems (
|
devShells = forAllSystems (system:
|
||||||
system:
|
let pkgs = import nixpkgs { inherit system overlays; };
|
||||||
let
|
in {
|
||||||
pkgs = import nixpkgs { inherit system overlays; };
|
|
||||||
in
|
|
||||||
{
|
|
||||||
|
|
||||||
# Used to run commands and edit files in this repo
|
# Used to run commands and edit files in this repo
|
||||||
default = pkgs.mkShell {
|
default = pkgs.mkShell {
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [ git stylua nixfmt shfmt shellcheck ];
|
||||||
git
|
|
||||||
stylua
|
|
||||||
nixfmt-rfc-style
|
|
||||||
shfmt
|
|
||||||
shellcheck
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
checks = forAllSystems (
|
});
|
||||||
system:
|
|
||||||
let
|
|
||||||
pkgs = import nixpkgs { inherit system overlays; };
|
|
||||||
in
|
|
||||||
{
|
|
||||||
neovim =
|
|
||||||
pkgs.runCommand "neovim-check-health" { buildInputs = [ inputs.self.packages.${system}.neovim ]; }
|
|
||||||
''
|
|
||||||
mkdir -p $out
|
|
||||||
export HOME=$TMPDIR
|
|
||||||
nvim -c "checkhealth" -c "write $out/health.log" -c "quitall"
|
|
||||||
|
|
||||||
# Check for errors inside the health log
|
checks = forAllSystems (system:
|
||||||
if $(grep "ERROR" $out/health.log); then
|
let pkgs = import nixpkgs { inherit system overlays; };
|
||||||
cat $out/health.log
|
in {
|
||||||
exit 1
|
neovim = pkgs.runCommand "neovim-check-health" {
|
||||||
fi
|
buildInputs = [ inputs.self.packages.${system}.neovim ];
|
||||||
'';
|
} ''
|
||||||
}
|
mkdir -p $out
|
||||||
);
|
export HOME=$TMPDIR
|
||||||
|
nvim -c "checkhealth" -c "write $out/health.log" -c "quitall"
|
||||||
|
|
||||||
formatter = forAllSystems (
|
# Check for errors inside the health log
|
||||||
system:
|
if $(grep "ERROR" $out/health.log); then
|
||||||
let
|
cat $out/health.log
|
||||||
pkgs = import nixpkgs { inherit system overlays; };
|
exit 1
|
||||||
in
|
fi
|
||||||
pkgs.nixfmt-rfc-style
|
'';
|
||||||
);
|
});
|
||||||
|
|
||||||
# Templates for starting other projects quickly
|
# Templates for starting other projects quickly
|
||||||
templates = rec {
|
templates = rec {
|
||||||
@ -453,10 +375,7 @@
|
|||||||
path = ./templates/haskell;
|
path = ./templates/haskell;
|
||||||
description = "Haskell template";
|
description = "Haskell template";
|
||||||
};
|
};
|
||||||
rust = {
|
|
||||||
path = ./templates/rust;
|
|
||||||
description = "Rust template";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,98 +0,0 @@
|
|||||||
resource "aws_instance" "instance" {
|
|
||||||
ami = aws_ami.image.id
|
|
||||||
iam_instance_profile = aws_iam_instance_profile.instance.name
|
|
||||||
instance_type = var.ec2_size
|
|
||||||
vpc_security_group_ids = [aws_security_group.instance.id]
|
|
||||||
|
|
||||||
tags = {
|
|
||||||
Name = "aws-nixos"
|
|
||||||
}
|
|
||||||
|
|
||||||
lifecycle {
|
|
||||||
create_before_destroy = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "aws_ec2_instance_state" "instance" {
|
|
||||||
instance_id = aws_instance.instance.id
|
|
||||||
state = "running"
|
|
||||||
}
|
|
||||||
|
|
||||||
data "aws_vpc" "vpc" {
|
|
||||||
default = true
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "aws_security_group" "instance" {
|
|
||||||
name = "aws-nixos"
|
|
||||||
description = "Allow SSH and HTTPS"
|
|
||||||
vpc_id = data.aws_vpc.vpc.id
|
|
||||||
|
|
||||||
ingress {
|
|
||||||
description = "Ping"
|
|
||||||
from_port = -1
|
|
||||||
to_port = -1
|
|
||||||
protocol = "icmp"
|
|
||||||
cidr_blocks = ["0.0.0.0/0"]
|
|
||||||
}
|
|
||||||
|
|
||||||
ingress {
|
|
||||||
description = "SSH"
|
|
||||||
from_port = 22
|
|
||||||
to_port = 22
|
|
||||||
protocol = "tcp"
|
|
||||||
cidr_blocks = ["0.0.0.0/0"]
|
|
||||||
}
|
|
||||||
|
|
||||||
ingress {
|
|
||||||
description = "HTTPS"
|
|
||||||
from_port = 443
|
|
||||||
to_port = 443
|
|
||||||
protocol = "tcp"
|
|
||||||
cidr_blocks = ["0.0.0.0/0"]
|
|
||||||
}
|
|
||||||
|
|
||||||
egress {
|
|
||||||
from_port = 0
|
|
||||||
to_port = 0
|
|
||||||
protocol = "-1"
|
|
||||||
cidr_blocks = ["0.0.0.0/0"]
|
|
||||||
ipv6_cidr_blocks = ["::/0"]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Setup IAM for the instance to use SSM
|
|
||||||
data "aws_iam_policy_document" "ec2_assume_role" {
|
|
||||||
statement {
|
|
||||||
actions = ["sts:AssumeRole"]
|
|
||||||
principals {
|
|
||||||
type = "Service"
|
|
||||||
identifiers = ["ec2.amazonaws.com"]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data "aws_iam_policy_document" "instance_profile" {
|
|
||||||
statement {
|
|
||||||
actions = [
|
|
||||||
"s3:ListAllMyBuckets",
|
|
||||||
]
|
|
||||||
resources = ["*"]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "aws_iam_role" "instance_profile" {
|
|
||||||
name = "nixos"
|
|
||||||
assume_role_policy = data.aws_iam_policy_document.ec2_assume_role.json
|
|
||||||
inline_policy {
|
|
||||||
name = "instance-profile"
|
|
||||||
policy = data.aws_iam_policy_document.instance_profile.json
|
|
||||||
}
|
|
||||||
}
|
|
||||||
resource "aws_iam_role_policy_attachment" "instance_ssm" {
|
|
||||||
role = aws_iam_role.instance_profile.name
|
|
||||||
policy_arn = "arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"
|
|
||||||
}
|
|
||||||
resource "aws_iam_instance_profile" "instance" {
|
|
||||||
name = "nixos"
|
|
||||||
role = aws_iam_role.instance_profile.name
|
|
||||||
}
|
|
@ -1,13 +0,0 @@
|
|||||||
terraform {
|
|
||||||
backend "s3" {
|
|
||||||
region = "us-east-1"
|
|
||||||
dynamodb_table = "terraform-state-lock"
|
|
||||||
}
|
|
||||||
required_version = ">= 1.0.0"
|
|
||||||
required_providers {
|
|
||||||
aws = {
|
|
||||||
source = "hashicorp/aws"
|
|
||||||
version = "5.42.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,3 +0,0 @@
|
|||||||
output "host_ip" {
|
|
||||||
value = aws_instance.instance.public_ip
|
|
||||||
}
|
|
@ -1,10 +0,0 @@
|
|||||||
variable "ec2_size" {
|
|
||||||
type = string
|
|
||||||
description = "Size of instance to launch"
|
|
||||||
default = "t3a.small" # 2 GB RAM ($14/mo)
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "images_bucket" {
|
|
||||||
description = "Name of the bucket in which to store the NixOS VM images."
|
|
||||||
type = string
|
|
||||||
}
|
|
@ -1,41 +0,0 @@
|
|||||||
# The Arrow
|
|
||||||
# System configuration for temporary VM
|
|
||||||
|
|
||||||
{
|
|
||||||
inputs,
|
|
||||||
globals,
|
|
||||||
overlays,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
inputs.nixpkgs.lib.nixosSystem rec {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
specialArgs = {
|
|
||||||
pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
|
|
||||||
};
|
|
||||||
modules = import ./modules.nix { inherit inputs globals overlays; } ++ [
|
|
||||||
{
|
|
||||||
# This is the root filesystem containing NixOS
|
|
||||||
fileSystems."/" = {
|
|
||||||
device = "/dev/disk/by-label/nixos";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
|
|
||||||
# This is the boot filesystem for Grub
|
|
||||||
fileSystems."/boot" = {
|
|
||||||
device = "/dev/disk/by-label/boot";
|
|
||||||
fsType = "vfat";
|
|
||||||
};
|
|
||||||
|
|
||||||
virtualisation.vmVariant = {
|
|
||||||
virtualisation.forwardPorts = [
|
|
||||||
{
|
|
||||||
from = "host";
|
|
||||||
host.port = 2222;
|
|
||||||
guest.port = 22;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
@ -1,32 +0,0 @@
|
|||||||
{
|
|
||||||
inputs,
|
|
||||||
globals,
|
|
||||||
overlays,
|
|
||||||
}:
|
|
||||||
|
|
||||||
[
|
|
||||||
globals
|
|
||||||
inputs.home-manager.nixosModules.home-manager
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = overlays;
|
|
||||||
networking.hostName = "arrow";
|
|
||||||
physical = false;
|
|
||||||
server = true;
|
|
||||||
gui.enable = false;
|
|
||||||
theme.colors = (import ../../colorscheme/gruvbox).dark;
|
|
||||||
publicKeys = [
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s personal"
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKpPU2G9rSF8Q6waH62IJexDCQ6lY+8ZyVufGE3xMDGw deploy"
|
|
||||||
];
|
|
||||||
identityFile = "/home/${globals.user}/.ssh/id_ed25519";
|
|
||||||
cloudflare.enable = true;
|
|
||||||
services.openssh.enable = true;
|
|
||||||
services.caddy.enable = true;
|
|
||||||
services.n8n.enable = true;
|
|
||||||
|
|
||||||
# nix-index seems to eat up too much memory for Vultr
|
|
||||||
home-manager.users.${globals.user}.programs.nix-index.enable = inputs.nixpkgs.lib.mkForce false;
|
|
||||||
}
|
|
||||||
../../modules/common
|
|
||||||
../../modules/nixos
|
|
||||||
]
|
|
@ -1,78 +0,0 @@
|
|||||||
terraform {
|
|
||||||
backend "s3" {
|
|
||||||
bucket = "noahmasur-terraform"
|
|
||||||
key = "arrow.tfstate"
|
|
||||||
region = "auto"
|
|
||||||
skip_credentials_validation = true
|
|
||||||
skip_metadata_api_check = true
|
|
||||||
skip_region_validation = true
|
|
||||||
skip_requesting_account_id = true
|
|
||||||
skip_s3_checksum = true
|
|
||||||
use_path_style = true
|
|
||||||
/*
|
|
||||||
ENVIRONMENT VARIABLES
|
|
||||||
---------------------
|
|
||||||
AWS_ACCESS_KEY_ID - R2 token
|
|
||||||
AWS_SECRET_ACCESS_KEY - R2 secret
|
|
||||||
AWS_ENDPOINT_URL_S3 - R2 location: https://ACCOUNT_ID.r2.cloudflarestorage.com
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
required_version = ">= 1.0.0"
|
|
||||||
required_providers {
|
|
||||||
aws = {
|
|
||||||
source = "hashicorp/aws"
|
|
||||||
version = "5.42.0"
|
|
||||||
}
|
|
||||||
vultr = {
|
|
||||||
source = "vultr/vultr"
|
|
||||||
version = "2.19.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "vultr_api_key" {
|
|
||||||
type = string
|
|
||||||
description = "API key for Vultr management"
|
|
||||||
sensitive = true
|
|
||||||
}
|
|
||||||
|
|
||||||
# https://api.vultr.com/v2/plans
|
|
||||||
variable "vultr_plan" {
|
|
||||||
type = string
|
|
||||||
description = "Size of instance to launch"
|
|
||||||
default = "vc2-1c-2gb" # 55 GB SSD ($10/mo)
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "aws" {
|
|
||||||
region = "auto"
|
|
||||||
skip_credentials_validation = true
|
|
||||||
skip_metadata_api_check = true
|
|
||||||
skip_region_validation = true
|
|
||||||
skip_requesting_account_id = true
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "vultr" {
|
|
||||||
api_key = var.vultr_api_key
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "vultr_iso_private" "image" {
|
|
||||||
# url = "https://${var.cloudflare_account_id}.r2.cloudflarestorage.com/${data.aws_s3_bucket.images.id}/${aws_s3_object.image.key}"
|
|
||||||
url = "https://arrow-images.masu.rs/arrow.iso"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "vultr_instance" "arrow" {
|
|
||||||
plan = var.vultr_plan
|
|
||||||
region = "ewr"
|
|
||||||
iso_id = vultr_iso_private.image.id
|
|
||||||
label = "arrow"
|
|
||||||
tags = ["arrow"]
|
|
||||||
enable_ipv6 = false
|
|
||||||
disable_public_ipv4 = false
|
|
||||||
backups = "disabled"
|
|
||||||
ddos_protection = false
|
|
||||||
activation_email = false
|
|
||||||
}
|
|
||||||
|
|
||||||
output "host_ip" {
|
|
||||||
value = vultr_instance.arrow.main_ip
|
|
||||||
}
|
|
27
hosts/aws/default.nix
Normal file
27
hosts/aws/default.nix
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
{ inputs, system, globals, overlays, ... }:
|
||||||
|
|
||||||
|
inputs.nixos-generators.nixosGenerate {
|
||||||
|
inherit system;
|
||||||
|
format = "amazon";
|
||||||
|
modules = [
|
||||||
|
globals
|
||||||
|
inputs.home-manager.nixosModules.home-manager
|
||||||
|
{
|
||||||
|
nixpkgs.overlays = overlays;
|
||||||
|
networking.hostName = "sheep";
|
||||||
|
gui.enable = false;
|
||||||
|
theme.colors = (import ../../colorscheme/gruvbox).dark;
|
||||||
|
passwordHash = null;
|
||||||
|
publicKey =
|
||||||
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
|
||||||
|
# AWS settings require this
|
||||||
|
permitRootLogin = "prohibit-password";
|
||||||
|
}
|
||||||
|
../../modules/common
|
||||||
|
../../modules/nixos
|
||||||
|
../../modules/nixos/services/sshd.nix
|
||||||
|
] ++ [
|
||||||
|
# Required to fix diskSize errors during build
|
||||||
|
({ ... }: { amazonImage.sizeMB = 16 * 1024; })
|
||||||
|
];
|
||||||
|
}
|
@ -1,23 +1,13 @@
|
|||||||
# locals {
|
locals {
|
||||||
# image_file = one(fileset(path.root, "../../../result/nixos-amazon-image-*.vhd"))
|
image_file = one(fileset(path.root, "result/nixos-amazon-image-*.vhd"))
|
||||||
# }
|
|
||||||
#
|
|
||||||
# # Upload image to S3
|
|
||||||
# resource "aws_s3_object" "image" {
|
|
||||||
# bucket = var.images_bucket
|
|
||||||
# key = basename(local.image_file)
|
|
||||||
# source = local.image_file
|
|
||||||
# etag = filemd5(local.image_file)
|
|
||||||
# }
|
|
||||||
|
|
||||||
# Use existing image in S3
|
|
||||||
data "aws_s3_object" "image" {
|
|
||||||
bucket = var.images_bucket
|
|
||||||
key = "arrow.vhd"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "terraform_data" "image_replacement" {
|
# Upload to S3
|
||||||
input = data.aws_s3_object.image.etag
|
resource "aws_s3_object" "image" {
|
||||||
|
bucket = "your_bucket_name"
|
||||||
|
key = basename(local.image_file)
|
||||||
|
source = local.image_file
|
||||||
|
etag = filemd5(local.image_file)
|
||||||
}
|
}
|
||||||
|
|
||||||
# Setup IAM access for the VM Importer
|
# Setup IAM access for the VM Importer
|
||||||
@ -36,11 +26,11 @@ data "aws_iam_policy_document" "vmimport" {
|
|||||||
actions = [
|
actions = [
|
||||||
"s3:GetBucketLocation",
|
"s3:GetBucketLocation",
|
||||||
"s3:GetObject",
|
"s3:GetObject",
|
||||||
"s3:ListBucket",
|
"s3:ListBucket",
|
||||||
]
|
]
|
||||||
resources = [
|
resources = [
|
||||||
"arn:aws:s3:::${data.aws_s3_object.image.bucket}",
|
"arn:aws:s3:::${aws_s3_object.image.bucket}",
|
||||||
"arn:aws:s3:::${data.aws_s3_object.image.bucket}/*",
|
"arn:aws:s3:::${aws_s3_object.image.bucket}/*",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
statement {
|
statement {
|
||||||
@ -68,28 +58,23 @@ resource "aws_ebs_snapshot_import" "image" {
|
|||||||
disk_container {
|
disk_container {
|
||||||
format = "VHD"
|
format = "VHD"
|
||||||
user_bucket {
|
user_bucket {
|
||||||
s3_bucket = data.aws_s3_object.image.bucket
|
s3_bucket = aws_s3_object.image.bucket
|
||||||
s3_key = data.aws_s3_object.image.key
|
s3_key = aws_s3_object.image.key
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
role_name = aws_iam_role.vmimport.name
|
role_name = aws_iam_role.vmimport.name
|
||||||
lifecycle {
|
|
||||||
replace_triggered_by = [terraform_data.image_replacement]
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Convert to AMI
|
# Convert to AMI
|
||||||
resource "aws_ami" "image" {
|
resource "aws_ami" "image" {
|
||||||
description = "Created with NixOS."
|
description = "Created with NixOS."
|
||||||
name = replace(basename(data.aws_s3_object.image.key), "/\\.vhd$/", "")
|
name = replace(basename(local.image_file), "/\\.vhd$/", "")
|
||||||
virtualization_type = "hvm"
|
virtualization_type = "hvm"
|
||||||
root_device_name = "/dev/xvda"
|
|
||||||
ena_support = true
|
|
||||||
|
|
||||||
ebs_block_device {
|
ebs_block_device {
|
||||||
device_name = "/dev/xvda"
|
device_name = "/dev/xvda"
|
||||||
snapshot_id = aws_ebs_snapshot_import.image.id
|
snapshot_id = aws_ebs_snapshot_import.image.id
|
||||||
volume_size = 17
|
volume_size = 8
|
||||||
}
|
}
|
||||||
}
|
}
|
280
hosts/aws/workflow.yml
Normal file
280
hosts/aws/workflow.yml
Normal file
@ -0,0 +1,280 @@
|
|||||||
|
name: 'Terraform'
|
||||||
|
env:
|
||||||
|
|
||||||
|
AWS_ACCOUNT_NUMBER: ''
|
||||||
|
AWS_PLAN_ROLE_NAME: github_actions_plan
|
||||||
|
AWS_APPLY_ROLE_NAME: github_actions_admin
|
||||||
|
|
||||||
|
# Always required. Used for authenticating to AWS, but can also act as your
|
||||||
|
# default region if you don't want to specify in the provider configuration.
|
||||||
|
AWS_REGION: us-east-1
|
||||||
|
|
||||||
|
# You must change these to fit your project.
|
||||||
|
TF_VAR_project: change-me
|
||||||
|
TF_VAR_label: change-me
|
||||||
|
TF_VAR_owner: Your Name Here
|
||||||
|
|
||||||
|
# If storing Terraform in a subdirectory, specify it here.
|
||||||
|
TERRAFORM_DIRECTORY: .
|
||||||
|
|
||||||
|
# Pinned versions of tools to use.
|
||||||
|
# Check for new releases:
|
||||||
|
# - https://github.com/hashicorp/terraform/releases
|
||||||
|
# - https://github.com/fugue/regula/releases
|
||||||
|
# - https://github.com/terraform-linters/tflint/releases
|
||||||
|
TERRAFORM_VERSION: 1.2.6
|
||||||
|
REGULA_VERSION: 2.9.0
|
||||||
|
TFLINT_VERSION: 0.39.1
|
||||||
|
|
||||||
|
# Terraform configuration options
|
||||||
|
TERRAFORM_PARALLELISM: 10
|
||||||
|
|
||||||
|
# These variables are passed to Terraform based on GitHub information.
|
||||||
|
TF_VAR_repo: ${{ github.repository }}
|
||||||
|
|
||||||
|
# This workflow is triggered in the following ways.
|
||||||
|
on:
|
||||||
|
|
||||||
|
# Any push or merge to these branches.
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- dev
|
||||||
|
- prod
|
||||||
|
|
||||||
|
# Any pull request targeting these branches (plan only).
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- dev
|
||||||
|
- prod
|
||||||
|
|
||||||
|
|
||||||
|
# Any manual trigger on these branches.
|
||||||
|
workflow_dispatch:
|
||||||
|
branches:
|
||||||
|
- dev
|
||||||
|
- prod
|
||||||
|
|
||||||
|
# -------------------------------------------------------------------
|
||||||
|
# The rest of this workflow can operate without adjustments. Edit the
|
||||||
|
# below content at your own risk!
|
||||||
|
# -------------------------------------------------------------------
|
||||||
|
|
||||||
|
# Used to connect to AWS IAM
|
||||||
|
permissions:
|
||||||
|
id-token: write
|
||||||
|
contents: read
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
|
# Only run one workflow at a time for each Terraform state. This prevents
|
||||||
|
# lockfile conflicts, especially during PR vs push.
|
||||||
|
concurrency: terraform-${{ github.base_ref || github.ref }}
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
terraform:
|
||||||
|
|
||||||
|
name: 'Terraform'
|
||||||
|
|
||||||
|
# Change this if you need to run your deployment on-prem.
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
|
||||||
|
# Downloads the current repo code to the runner.
|
||||||
|
- name: Checkout Repo Code
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
|
# Enable access to KVM, required to build an image
|
||||||
|
- name: Enable KVM group perms
|
||||||
|
run: |
|
||||||
|
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
|
||||||
|
sudo udevadm control --reload-rules
|
||||||
|
sudo udevadm trigger --name-match=kvm
|
||||||
|
|
||||||
|
# Login to AWS
|
||||||
|
- name: AWS Assume Role
|
||||||
|
uses: aws-actions/configure-aws-credentials@v1.6.1
|
||||||
|
with:
|
||||||
|
role-to-assume: ${{ env.AWS_ROLE_ARN }}
|
||||||
|
aws-region: ${{ env.AWS_REGION }}
|
||||||
|
|
||||||
|
# Install Nix
|
||||||
|
- name: Install Nix
|
||||||
|
uses: cachix/install-nix-action@v17
|
||||||
|
with:
|
||||||
|
extra_nix_config: |
|
||||||
|
substituters = s3://insert-cache-bucket https://cache.nixos.org/
|
||||||
|
trusted-public-keys = insert-cache-bucket:M6PsZjHXcLvbQyPUBLICKEYGVoNwI84g1FBQzouRU= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
|
||||||
|
|
||||||
|
# Build the image
|
||||||
|
- name: Build Image
|
||||||
|
run: nix build .#aws
|
||||||
|
|
||||||
|
# Copy the image to S3
|
||||||
|
- name: Upload Image to Cache
|
||||||
|
env:
|
||||||
|
NIX_CACHE_PRIVATE_KEY: ${{ secrets.NIX_CACHE_PRIVATE_KEY }}
|
||||||
|
run: |
|
||||||
|
echo "$NIX_CACHE_PRIVATE_KEY" > cache.key
|
||||||
|
nix store sign --key-file cache.key $(readlink result)
|
||||||
|
nix copy --to s3://t2-aws-nixos-test $(readlink result)
|
||||||
|
rm cache.key
|
||||||
|
|
||||||
|
# Exports all GitHub Secrets as environment variables prefixed by
|
||||||
|
# "TF_VAR_", which exposes them to Terraform. The name of each GitHub
|
||||||
|
# Secret must match its Terraform variable name exactly.
|
||||||
|
- name: Export Secrets to Terraform Variables
|
||||||
|
env:
|
||||||
|
ALL_SECRETS: ${{ toJson(secrets) }}
|
||||||
|
run: |
|
||||||
|
echo "$ALL_SECRETS" \
|
||||||
|
| jq "to_entries | .[] | \"TF_VAR_\" + ( .key | ascii_downcase ) + \"=\" + .value" \
|
||||||
|
| tr -d \" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
# Installs the Terraform binary and some other accessory functions.
|
||||||
|
- name: Setup Terraform
|
||||||
|
uses: hashicorp/setup-terraform@v2
|
||||||
|
with:
|
||||||
|
terraform_version: ${{ env.TERRAFORM_VERSION }}
|
||||||
|
|
||||||
|
# Checks whether Terraform is formatted properly. If this fails, you
|
||||||
|
# should install the pre-commit hook.
|
||||||
|
- name: Check Formatting
|
||||||
|
run: |
|
||||||
|
terraform fmt -no-color -check -diff -recursive
|
||||||
|
|
||||||
|
# Downloads a Terraform code lint test.
|
||||||
|
- uses: terraform-linters/setup-tflint@v1
|
||||||
|
name: Setup TFLint
|
||||||
|
with:
|
||||||
|
tflint_version: v${{ env.TFLINT_VERSION }}
|
||||||
|
|
||||||
|
# Sets up linting with this codebase.
|
||||||
|
- name: Init TFLint
|
||||||
|
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
||||||
|
run: tflint --init
|
||||||
|
|
||||||
|
# Lints the current code.
|
||||||
|
- name: Run TFLint
|
||||||
|
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
||||||
|
run: |
|
||||||
|
tflint -f compact
|
||||||
|
find ./modules/* -type d -maxdepth 0 | xargs -I __ tflint -f compact --disable-rule=terraform_required_providers --disable-rule=terraform_required_version __
|
||||||
|
|
||||||
|
# Connects to remote state backend and download providers.
|
||||||
|
- name: Terraform Init
|
||||||
|
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
||||||
|
run: |
|
||||||
|
terraform init \
|
||||||
|
-backend-config="role_arn=${{ env.AWS_STATE_ROLE_ARN }}" \
|
||||||
|
-backend-config="region=us-east-1" \
|
||||||
|
-backend-config="workspace_key_prefix=accounts/${{ env.AWS_ACCOUNT_NUMBER }}/${{ github.repository }}" \
|
||||||
|
-backend-config="key=state.tfstate" \
|
||||||
|
-backend-config="dynamodb_table=global-tf-state-lock"
|
||||||
|
|
||||||
|
# Set the Terraform Workspace to the current branch name.
|
||||||
|
- name: Set Terraform Workspace
|
||||||
|
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
export WORKSPACE=${{ github.base_ref || github.ref_name }}
|
||||||
|
terraform workspace select ${WORKSPACE} || terraform workspace new $WORKSPACE
|
||||||
|
echo "TF_WORKSPACE=$(echo ${WORKSPACE} | sed 's/\//_/g')" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
# Checks differences between current code and infrastructure state.
|
||||||
|
- name: Terraform Plan
|
||||||
|
id: plan
|
||||||
|
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
||||||
|
run: |
|
||||||
|
terraform plan \
|
||||||
|
-input=false \
|
||||||
|
-no-color \
|
||||||
|
-out=tfplan \
|
||||||
|
-parallelism=${TERRAFORM_PARALLELISM} \
|
||||||
|
-var-file=variables-${TF_WORKSPACE}.tfvars
|
||||||
|
|
||||||
|
# Gets the results of the plan for pull requests.
|
||||||
|
- name: Terraform Show Plan
|
||||||
|
id: show
|
||||||
|
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
||||||
|
run: terraform show -no-color tfplan
|
||||||
|
|
||||||
|
# Adds the results of the plan to the pull request.
|
||||||
|
- name: Comment Plan
|
||||||
|
uses: actions/github-script@v6
|
||||||
|
if: github.event_name == 'pull_request'
|
||||||
|
env:
|
||||||
|
STDOUT: "```terraform\n${{ steps.show.outputs.stdout }}```"
|
||||||
|
with:
|
||||||
|
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
script: |
|
||||||
|
// 1. Retrieve existing bot comments for the PR
|
||||||
|
const { data: comments } = await github.rest.issues.listComments({
|
||||||
|
owner: context.repo.owner,
|
||||||
|
repo: context.repo.repo,
|
||||||
|
issue_number: context.issue.number,
|
||||||
|
})
|
||||||
|
const botComment = comments.find(comment => {
|
||||||
|
return comment.user.type === 'Bot' && comment.body.includes('Terraform Format and Style')
|
||||||
|
})
|
||||||
|
|
||||||
|
// 2. Prepare format of the comment
|
||||||
|
const output = `#### Terraform Format and Style 🖌\`${{ steps.fmt.outcome }}\`
|
||||||
|
#### Terraform Initialization ⚙️\`${{ steps.init.outcome }}\`
|
||||||
|
#### Terraform Validation 🤖\`${{ steps.validate.outcome }}\`
|
||||||
|
<details><summary>Validation Output</summary>
|
||||||
|
|
||||||
|
\`\`\`\n
|
||||||
|
${{ steps.validate.outputs.stdout }}
|
||||||
|
\`\`\`
|
||||||
|
|
||||||
|
</details>
|
||||||
|
|
||||||
|
#### Terraform Plan 📖\`${{ steps.plan.outcome }}\`
|
||||||
|
|
||||||
|
<details><summary>Show Plan</summary>
|
||||||
|
|
||||||
|
\`\`\`\n
|
||||||
|
${process.env.PLAN}
|
||||||
|
\`\`\`
|
||||||
|
|
||||||
|
</details>
|
||||||
|
|
||||||
|
*Pusher: @${{ github.actor }}, Action: \`${{ github.event_name }}\`, Working Directory: \`${{ env.tf_actions_working_dir }}\`, Workflow: \`${{ github.workflow }}\`*`;
|
||||||
|
|
||||||
|
// 3. If we have a comment, update it, otherwise create a new one
|
||||||
|
if (botComment) {
|
||||||
|
github.rest.issues.updateComment({
|
||||||
|
owner: context.repo.owner,
|
||||||
|
repo: context.repo.repo,
|
||||||
|
comment_id: botComment.id,
|
||||||
|
body: output
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
github.rest.issues.createComment({
|
||||||
|
issue_number: context.issue.number,
|
||||||
|
owner: context.repo.owner,
|
||||||
|
repo: context.repo.repo,
|
||||||
|
body: output
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
# Downloads Regula and checks whether the plan meets compliance requirements.
|
||||||
|
- name: Regula Compliance Check
|
||||||
|
shell: bash
|
||||||
|
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
||||||
|
run: |
|
||||||
|
REGULA_URL="https://github.com/fugue/regula/releases/download/v${REGULA_VERSION}/regula_${REGULA_VERSION}_Linux_x86_64.tar.gz"
|
||||||
|
curl -sL "$REGULA_URL" -o regula.tar.gz
|
||||||
|
tar xzf regula.tar.gz
|
||||||
|
terraform show -json tfplan | ./regula run
|
||||||
|
|
||||||
|
# Deploys infrastructure or changes to infrastructure.
|
||||||
|
- name: Terraform Apply
|
||||||
|
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
|
||||||
|
working-directory: ${{ env.TERRAFORM_DIRECTORY }}
|
||||||
|
run: |
|
||||||
|
terraform apply \
|
||||||
|
-auto-approve \
|
||||||
|
-input=false \
|
||||||
|
-parallelism=${TERRAFORM_PARALLELISM} \
|
||||||
|
tfplan
|
@ -7,19 +7,11 @@
|
|||||||
# https://blog.korfuri.fr/posts/2022/08/nixos-on-an-oracle-free-tier-ampere-machine/
|
# https://blog.korfuri.fr/posts/2022/08/nixos-on-an-oracle-free-tier-ampere-machine/
|
||||||
# These days, probably use nixos-anywhere instead.
|
# These days, probably use nixos-anywhere instead.
|
||||||
|
|
||||||
{
|
{ inputs, globals, overlays, ... }:
|
||||||
inputs,
|
|
||||||
globals,
|
|
||||||
overlays,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
inputs.nixpkgs.lib.nixosSystem rec {
|
inputs.nixpkgs.lib.nixosSystem {
|
||||||
system = "aarch64-linux";
|
system = "aarch64-linux";
|
||||||
specialArgs = {
|
specialArgs = { };
|
||||||
pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
|
|
||||||
pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
|
|
||||||
};
|
|
||||||
modules = [
|
modules = [
|
||||||
globals
|
globals
|
||||||
inputs.home-manager.nixosModules.home-manager
|
inputs.home-manager.nixosModules.home-manager
|
||||||
@ -34,11 +26,7 @@ inputs.nixpkgs.lib.nixosSystem rec {
|
|||||||
|
|
||||||
# Not sure what's necessary but too afraid to remove anything
|
# Not sure what's necessary but too afraid to remove anything
|
||||||
imports = [ (inputs.nixpkgs + "/nixos/modules/profiles/qemu-guest.nix") ];
|
imports = [ (inputs.nixpkgs + "/nixos/modules/profiles/qemu-guest.nix") ];
|
||||||
boot.initrd.availableKernelModules = [
|
boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "usbhid" ];
|
||||||
"xhci_pci"
|
|
||||||
"virtio_pci"
|
|
||||||
"usbhid"
|
|
||||||
];
|
|
||||||
|
|
||||||
# File systems must be declared in order to boot
|
# File systems must be declared in order to boot
|
||||||
|
|
||||||
@ -61,9 +49,7 @@ inputs.nixpkgs.lib.nixosSystem rec {
|
|||||||
gui.enable = false;
|
gui.enable = false;
|
||||||
|
|
||||||
# Still require colors for programs like Neovim, K9S
|
# Still require colors for programs like Neovim, K9S
|
||||||
theme = {
|
theme = { colors = (import ../../colorscheme/gruvbox).dark; };
|
||||||
colors = (import ../../colorscheme/gruvbox).dark;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Programs and services
|
# Programs and services
|
||||||
atuin.enable = true;
|
atuin.enable = true;
|
||||||
@ -73,24 +59,20 @@ inputs.nixpkgs.lib.nixosSystem rec {
|
|||||||
giteaRunner.enable = true;
|
giteaRunner.enable = true;
|
||||||
services.caddy.enable = true;
|
services.caddy.enable = true;
|
||||||
services.grafana.enable = true;
|
services.grafana.enable = true;
|
||||||
services.thelounge.enable = true;
|
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
services.victoriametrics.enable = true;
|
services.victoriametrics.enable = true;
|
||||||
services.influxdb2.enable = true;
|
services.influxdb2.enable = true;
|
||||||
services.gitea.enable = true;
|
services.gitea.enable = true;
|
||||||
services.vaultwarden.enable = true;
|
services.vaultwarden.enable = true;
|
||||||
services.minecraft-server.enable = true; # Setup Minecraft server
|
services.minecraft-server.enable = true; # Setup Minecraft server
|
||||||
services.n8n.enable = true;
|
|
||||||
services.ntfy-sh.enable = true;
|
|
||||||
services.uptime-kuma.enable = true;
|
|
||||||
system.autoUpgrade.enable = true;
|
|
||||||
|
|
||||||
# Allows private remote access over the internet
|
# Allows private remote access over the internet
|
||||||
cloudflareTunnel = {
|
cloudflareTunnel = {
|
||||||
enable = true;
|
enable = true;
|
||||||
id = "bd250ee1-ed2e-42d2-b627-039f1eb5a4d2";
|
id = "bd250ee1-ed2e-42d2-b627-039f1eb5a4d2";
|
||||||
credentialsFile = ../../private/cloudflared-flame.age;
|
credentialsFile = ../../private/cloudflared-flame.age;
|
||||||
ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
|
ca =
|
||||||
|
"ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Nextcloud backup config
|
# Nextcloud backup config
|
||||||
@ -101,9 +83,8 @@ inputs.nixpkgs.lib.nixosSystem rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
# Disable passwords, only use SSH key
|
# Disable passwords, only use SSH key
|
||||||
publicKeys = [
|
publicKey =
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s personal"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
|
||||||
];
|
|
||||||
|
|
||||||
# # Wireguard config for Transmission
|
# # Wireguard config for Transmission
|
||||||
# wireguard.enable = true;
|
# wireguard.enable = true;
|
||||||
@ -133,6 +114,7 @@ inputs.nixpkgs.lib.nixosSystem rec {
|
|||||||
|
|
||||||
# # VPN port forwarding
|
# # VPN port forwarding
|
||||||
# services.transmission.settings.peer-port = 57599;
|
# services.transmission.settings.peer-port = 57599;
|
||||||
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -3,12 +3,7 @@
|
|||||||
|
|
||||||
# See [readme](../README.md) to explain how this file works.
|
# See [readme](../README.md) to explain how this file works.
|
||||||
|
|
||||||
{
|
{ inputs, globals, overlays, ... }:
|
||||||
inputs,
|
|
||||||
globals,
|
|
||||||
overlays,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
inputs.nixpkgs.lib.nixosSystem {
|
inputs.nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
@ -37,7 +32,8 @@ inputs.nixpkgs.lib.nixosSystem {
|
|||||||
startMenuLaunchers = true;
|
startMenuLaunchers = true;
|
||||||
nativeSystemd = true;
|
nativeSystemd = true;
|
||||||
wslConf.network.generateResolvConf = true; # Turn off if it breaks VPN
|
wslConf.network.generateResolvConf = true; # Turn off if it breaks VPN
|
||||||
interop.includePath = false; # Including Windows PATH will slow down Neovim command mode
|
interop.includePath =
|
||||||
|
false; # Including Windows PATH will slow down Neovim command mode
|
||||||
};
|
};
|
||||||
|
|
||||||
neovim.enable = true;
|
neovim.enable = true;
|
||||||
@ -45,6 +41,7 @@ inputs.nixpkgs.lib.nixosSystem {
|
|||||||
mail.aerc.enable = true;
|
mail.aerc.enable = true;
|
||||||
mail.himalaya.enable = true;
|
mail.himalaya.enable = true;
|
||||||
dotfiles.enable = true;
|
dotfiles.enable = true;
|
||||||
|
nixlang.enable = true;
|
||||||
lua.enable = true;
|
lua.enable = true;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
@ -1,12 +1,7 @@
|
|||||||
# The Looking Glass
|
# The Looking Glass
|
||||||
# System configuration for my work Macbook
|
# System configuration for my work Macbook
|
||||||
|
|
||||||
{
|
{ inputs, globals, overlays, ... }:
|
||||||
inputs,
|
|
||||||
globals,
|
|
||||||
overlays,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
inputs.darwin.lib.darwinSystem {
|
inputs.darwin.lib.darwinSystem {
|
||||||
system = "aarch64-darwin";
|
system = "aarch64-darwin";
|
||||||
@ -14,16 +9,12 @@ inputs.darwin.lib.darwinSystem {
|
|||||||
modules = [
|
modules = [
|
||||||
../../modules/common
|
../../modules/common
|
||||||
../../modules/darwin
|
../../modules/darwin
|
||||||
(
|
(globals // rec {
|
||||||
globals
|
user = "Noah.Masur";
|
||||||
// rec {
|
gitName = "Noah-Masur_1701";
|
||||||
user = "Noah.Masur";
|
gitEmail = "${user}@take2games.com";
|
||||||
gitName = "Noah-Masur_1701";
|
})
|
||||||
gitEmail = "${user}@take2games.com";
|
|
||||||
}
|
|
||||||
)
|
|
||||||
inputs.home-manager.darwinModules.home-manager
|
inputs.home-manager.darwinModules.home-manager
|
||||||
inputs.mac-app-util.darwinModules.default
|
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays;
|
nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays;
|
||||||
networking.hostName = "lookingglass";
|
networking.hostName = "lookingglass";
|
||||||
@ -44,6 +35,7 @@ inputs.darwin.lib.darwinSystem {
|
|||||||
discord.enable = true;
|
discord.enable = true;
|
||||||
firefox.enable = true;
|
firefox.enable = true;
|
||||||
dotfiles.enable = true;
|
dotfiles.enable = true;
|
||||||
|
nixlang.enable = true;
|
||||||
terraform.enable = true;
|
terraform.enable = true;
|
||||||
python.enable = true;
|
python.enable = true;
|
||||||
rust.enable = true;
|
rust.enable = true;
|
||||||
@ -52,8 +44,6 @@ inputs.darwin.lib.darwinSystem {
|
|||||||
kubernetes.enable = true;
|
kubernetes.enable = true;
|
||||||
_1password.enable = true;
|
_1password.enable = true;
|
||||||
slack.enable = true;
|
slack.enable = true;
|
||||||
wezterm.enable = true;
|
|
||||||
yt-dlp.enable = true;
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -1,53 +1,43 @@
|
|||||||
# The Staff
|
# The Staff
|
||||||
# ISO configuration for my USB drive
|
# ISO configuration for my USB drive
|
||||||
|
|
||||||
{
|
{ inputs, system, overlays, ... }:
|
||||||
inputs,
|
|
||||||
system,
|
|
||||||
overlays,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
inputs.nixos-generators.nixosGenerate {
|
inputs.nixos-generators.nixosGenerate {
|
||||||
inherit system;
|
inherit system;
|
||||||
format = "install-iso";
|
format = "install-iso";
|
||||||
modules = [
|
modules = [{
|
||||||
{
|
nixpkgs.overlays = overlays;
|
||||||
nixpkgs.overlays = overlays;
|
networking.hostName = "staff";
|
||||||
networking.hostName = "staff";
|
users.extraUsers.root.openssh.authorizedKeys.keys = [
|
||||||
users.extraUsers.root.openssh.authorizedKeys.keys = [
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s"
|
];
|
||||||
];
|
services.openssh = {
|
||||||
services.openssh = {
|
enable = true;
|
||||||
enable = true;
|
ports = [ 22 ];
|
||||||
ports = [ 22 ];
|
allowSFTP = true;
|
||||||
allowSFTP = true;
|
settings = {
|
||||||
settings = {
|
GatewayPorts = "no";
|
||||||
GatewayPorts = "no";
|
X11Forwarding = false;
|
||||||
X11Forwarding = false;
|
PasswordAuthentication = false;
|
||||||
PasswordAuthentication = false;
|
PermitRootLogin = "yes";
|
||||||
PermitRootLogin = "yes";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
environment.systemPackages =
|
};
|
||||||
let
|
environment.systemPackages =
|
||||||
pkgs = import inputs.nixpkgs { inherit system overlays; };
|
let pkgs = import inputs.nixpkgs { inherit system overlays; };
|
||||||
in
|
in with pkgs; [
|
||||||
with pkgs;
|
git
|
||||||
[
|
vim
|
||||||
git
|
wget
|
||||||
vim
|
curl
|
||||||
wget
|
(import ../../modules/common/neovim/package {
|
||||||
curl
|
inherit pkgs;
|
||||||
(import ../../modules/common/neovim/package {
|
colors = (import ../../colorscheme/gruvbox).dark;
|
||||||
inherit pkgs;
|
})
|
||||||
colors = (import ../../colorscheme/gruvbox).dark;
|
];
|
||||||
})
|
nix.extraOptions = ''
|
||||||
];
|
experimental-features = nix-command flakes
|
||||||
nix.extraOptions = ''
|
warn-dirty = false
|
||||||
experimental-features = nix-command flakes
|
'';
|
||||||
warn-dirty = false
|
}];
|
||||||
'';
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
@ -1,19 +1,13 @@
|
|||||||
# The Swan
|
# The Swan
|
||||||
# System configuration for my home NAS server
|
# System configuration for my home NAS server
|
||||||
|
|
||||||
{
|
# See [readme](../README.md) to explain how this file works.
|
||||||
inputs,
|
|
||||||
globals,
|
|
||||||
overlays,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
inputs.nixpkgs.lib.nixosSystem rec {
|
{ inputs, globals, overlays, ... }:
|
||||||
|
|
||||||
|
inputs.nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = {
|
specialArgs = { };
|
||||||
pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
|
|
||||||
pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
|
|
||||||
};
|
|
||||||
modules = [
|
modules = [
|
||||||
globals
|
globals
|
||||||
inputs.home-manager.nixosModules.home-manager
|
inputs.home-manager.nixosModules.home-manager
|
||||||
@ -29,13 +23,8 @@ inputs.nixpkgs.lib.nixosSystem rec {
|
|||||||
networking.hostName = "swan";
|
networking.hostName = "swan";
|
||||||
|
|
||||||
# Not sure what's necessary but too afraid to remove anything
|
# Not sure what's necessary but too afraid to remove anything
|
||||||
boot.initrd.availableKernelModules = [
|
boot.initrd.availableKernelModules =
|
||||||
"xhci_pci"
|
[ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
|
||||||
"ahci"
|
|
||||||
"nvme"
|
|
||||||
"usb_storage"
|
|
||||||
"sd_mod"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Required for transcoding
|
# Required for transcoding
|
||||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||||
@ -67,27 +56,8 @@ inputs.nixpkgs.lib.nixosSystem rec {
|
|||||||
devices = (import ../../disks/root.nix { disk = "/dev/nvme0n1"; });
|
devices = (import ../../disks/root.nix { disk = "/dev/nvme0n1"; });
|
||||||
};
|
};
|
||||||
|
|
||||||
zramSwap.enable = true;
|
# Automatically load the ZFS pool on boot
|
||||||
swapDevices = [
|
boot.zfs.extraPools = [ "tank" ];
|
||||||
{
|
|
||||||
device = "/swapfile";
|
|
||||||
size = 4 * 1024; # 4 GB
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
boot.zfs = {
|
|
||||||
# Automatically load the ZFS pool on boot
|
|
||||||
extraPools = [ "tank" ];
|
|
||||||
# Only try to decrypt datasets with keyfiles
|
|
||||||
requestEncryptionCredentials = [
|
|
||||||
"tank/archive"
|
|
||||||
"tank/generic"
|
|
||||||
"tank/nextcloud"
|
|
||||||
"tank/generic/git"
|
|
||||||
];
|
|
||||||
# If password is requested and fails, continue to boot eventually
|
|
||||||
passwordTimeout = 300;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Theming
|
# Theming
|
||||||
|
|
||||||
@ -95,9 +65,7 @@ inputs.nixpkgs.lib.nixosSystem rec {
|
|||||||
gui.enable = false;
|
gui.enable = false;
|
||||||
|
|
||||||
# Still require colors for programs like Neovim, K9S
|
# Still require colors for programs like Neovim, K9S
|
||||||
theme = {
|
theme = { colors = (import ../../colorscheme/gruvbox).dark; };
|
||||||
colors = (import ../../colorscheme/gruvbox-dark).dark;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Programs and services
|
# Programs and services
|
||||||
atuin.enable = true;
|
atuin.enable = true;
|
||||||
@ -105,8 +73,6 @@ inputs.nixpkgs.lib.nixosSystem rec {
|
|||||||
cloudflare.enable = true;
|
cloudflare.enable = true;
|
||||||
dotfiles.enable = true;
|
dotfiles.enable = true;
|
||||||
arrs.enable = true;
|
arrs.enable = true;
|
||||||
filebrowser.enable = true;
|
|
||||||
services.audiobookshelf.enable = true;
|
|
||||||
services.bind.enable = true;
|
services.bind.enable = true;
|
||||||
services.caddy.enable = true;
|
services.caddy.enable = true;
|
||||||
services.jellyfin.enable = true;
|
services.jellyfin.enable = true;
|
||||||
@ -118,14 +84,14 @@ inputs.nixpkgs.lib.nixosSystem rec {
|
|||||||
services.samba.enable = true;
|
services.samba.enable = true;
|
||||||
services.paperless.enable = true;
|
services.paperless.enable = true;
|
||||||
services.postgresql.enable = true;
|
services.postgresql.enable = true;
|
||||||
system.autoUpgrade.enable = false;
|
|
||||||
|
|
||||||
# Allows private remote access over the internet
|
# Allows private remote access over the internet
|
||||||
cloudflareTunnel = {
|
cloudflareTunnel = {
|
||||||
enable = true;
|
enable = true;
|
||||||
id = "646754ac-2149-4a58-b51a-e1d0a1f3ade2";
|
id = "646754ac-2149-4a58-b51a-e1d0a1f3ade2";
|
||||||
credentialsFile = ../../private/cloudflared-swan.age;
|
credentialsFile = ../../private/cloudflared-swan.age;
|
||||||
ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCHF/UMtJqPFrf6f6GRY0ZFnkCW7b6sYgUTjTtNfRj1RdmNic1NoJZql7y6BrqQinZvy7nsr1UFDNWoHn6ah3tg= open-ssh-ca@cloudflareaccess.org";
|
ca =
|
||||||
|
"ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCHF/UMtJqPFrf6f6GRY0ZFnkCW7b6sYgUTjTtNfRj1RdmNic1NoJZql7y6BrqQinZvy7nsr1UFDNWoHn6ah3tg= open-ssh-ca@cloudflareaccess.org";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Send regular backups and litestream for DBs to an S3-like bucket
|
# Send regular backups and litestream for DBs to an S3-like bucket
|
||||||
@ -136,9 +102,8 @@ inputs.nixpkgs.lib.nixosSystem rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
# Disable passwords, only use SSH key
|
# Disable passwords, only use SSH key
|
||||||
publicKeys = [
|
publicKey =
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s personal"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
|
||||||
];
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -1,19 +1,12 @@
|
|||||||
# The Tempest
|
# The Tempest
|
||||||
# System configuration for my desktop
|
# System configuration for my desktop
|
||||||
|
|
||||||
{
|
# See [readme](../README.md) to explain how this file works.
|
||||||
inputs,
|
|
||||||
globals,
|
|
||||||
overlays,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
inputs.nixpkgs.lib.nixosSystem rec {
|
{ inputs, globals, overlays, ... }:
|
||||||
|
|
||||||
|
inputs.nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = {
|
|
||||||
pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
|
|
||||||
pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
|
|
||||||
};
|
|
||||||
modules = [
|
modules = [
|
||||||
globals
|
globals
|
||||||
inputs.home-manager.nixosModules.home-manager
|
inputs.home-manager.nixosModules.home-manager
|
||||||
@ -27,14 +20,8 @@ inputs.nixpkgs.lib.nixosSystem rec {
|
|||||||
networking.hostName = "tempest";
|
networking.hostName = "tempest";
|
||||||
|
|
||||||
# Not sure what's necessary but too afraid to remove anything
|
# Not sure what's necessary but too afraid to remove anything
|
||||||
boot.initrd.availableKernelModules = [
|
boot.initrd.availableKernelModules =
|
||||||
"nvme"
|
[ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||||
"xhci_pci"
|
|
||||||
"ahci"
|
|
||||||
"usb_storage"
|
|
||||||
"usbhid"
|
|
||||||
"sd_mod"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Graphics and VMs
|
# Graphics and VMs
|
||||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||||
@ -114,34 +101,36 @@ inputs.nixpkgs.lib.nixosSystem rec {
|
|||||||
mail.himalaya.enable = true;
|
mail.himalaya.enable = true;
|
||||||
keybase.enable = true;
|
keybase.enable = true;
|
||||||
mullvad.enable = false;
|
mullvad.enable = false;
|
||||||
|
nixlang.enable = true;
|
||||||
rust.enable = true;
|
rust.enable = true;
|
||||||
terraform.enable = true;
|
|
||||||
wezterm.enable = true;
|
|
||||||
yt-dlp.enable = true;
|
yt-dlp.enable = true;
|
||||||
gaming = {
|
gaming = {
|
||||||
dwarf-fortress.enable = true;
|
dwarf-fortress.enable = true;
|
||||||
enable = true;
|
enable = true;
|
||||||
steam.enable = true;
|
steam.enable = true;
|
||||||
moonlight.enable = true;
|
|
||||||
legendary.enable = true;
|
legendary.enable = true;
|
||||||
lutris.enable = true;
|
lutris.enable = true;
|
||||||
|
leagueoflegends.enable = true;
|
||||||
ryujinx.enable = true;
|
ryujinx.enable = true;
|
||||||
};
|
};
|
||||||
services.vmagent.enable = true; # Enables Prometheus metrics
|
services.vmagent.enable = true; # Enables Prometheus metrics
|
||||||
services.openssh.enable = true; # Required for Cloudflare tunnel and identity file
|
services.openssh.enable =
|
||||||
|
true; # Required for Cloudflare tunnel and identity file
|
||||||
|
|
||||||
# Allows private remote access over the internet
|
# Allows private remote access over the internet
|
||||||
cloudflareTunnel = {
|
cloudflareTunnel = {
|
||||||
enable = true;
|
enable = true;
|
||||||
id = "ac133a82-31fb-480c-942a-cdbcd4c58173";
|
id = "ac133a82-31fb-480c-942a-cdbcd4c58173";
|
||||||
credentialsFile = ../../private/cloudflared-tempest.age;
|
credentialsFile = ../../private/cloudflared-tempest.age;
|
||||||
ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPY6C0HmdFCaxYtJxFr3qV4/1X4Q8KrYQ1hlme3u1hJXK+xW+lc9Y9glWHrhiTKilB7carYTB80US0O47gI5yU4= open-ssh-ca@cloudflareaccess.org";
|
ca =
|
||||||
|
"ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPY6C0HmdFCaxYtJxFr3qV4/1X4Q8KrYQ1hlme3u1hJXK+xW+lc9Y9glWHrhiTKilB7carYTB80US0O47gI5yU4= open-ssh-ca@cloudflareaccess.org";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Allows requests to force machine to wake up
|
# Allows requests to force machine to wake up
|
||||||
# This network interface might change, needs to be set specifically for each machine.
|
# This network interface might change, needs to be set specifically for each machine.
|
||||||
# Or set usePredictableInterfaceNames = false
|
# Or set usePredictableInterfaceNames = false
|
||||||
networking.interfaces.enp5s0.wakeOnLan.enable = true;
|
networking.interfaces.enp5s0.wakeOnLan.enable = true;
|
||||||
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -4,4 +4,3 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s
|
|||||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHVknmPi7sG6ES0G0jcsvebzKGWWaMfJTYgvOue6EULI flame
|
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHVknmPi7sG6ES0G0jcsvebzKGWWaMfJTYgvOue6EULI flame
|
||||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ9mwXlZnIALt9SnH3FOZvdgHLM5ZqwYUERXBbM7Rwh6 swan
|
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ9mwXlZnIALt9SnH3FOZvdgHLM5ZqwYUERXBbM7Rwh6 swan
|
||||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC3yHivgEXr2ecwe58h9bkhwTYivf3GwL8xenQKMeiUb tempest
|
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC3yHivgEXr2ecwe58h9bkhwTYivf3GwL8xenQKMeiUb tempest
|
||||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICmGHIWBZzRx35/yFgnPJSHN2+35WJ30G9c5tDhPsCrl arrow
|
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
{
|
|
||||||
# AWS settings require this
|
|
||||||
permitRootLogin = "prohibit-password";
|
|
||||||
|
|
||||||
# Make sure disk size is large enough
|
|
||||||
# https://github.com/nix-community/nixos-generators/issues/150
|
|
||||||
amazonImage.sizeMB = 16 * 1024;
|
|
||||||
}
|
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
_1password = {
|
_1password = {
|
||||||
@ -16,15 +10,9 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf (config.gui.enable && config._1password.enable) {
|
config = lib.mkIf (config.gui.enable && config._1password.enable) {
|
||||||
unfreePackages = [
|
unfreePackages = [ "1password" "_1password-gui" "1password-cli" ];
|
||||||
"1password"
|
|
||||||
"_1password-gui"
|
|
||||||
"1password-cli"
|
|
||||||
];
|
|
||||||
home-manager.users.${config.user} = {
|
home-manager.users.${config.user} = {
|
||||||
home.packages = [
|
home.packages = with pkgs; [ _1password-gui _1password ];
|
||||||
pkgs._1password
|
|
||||||
] ++ (if pkgs.stdenv.isLinux then [ pkgs._1password-gui ] else [ ]);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# https://1password.community/discussion/135462/firefox-extension-does-not-connect-to-linux-app
|
# https://1password.community/discussion/135462/firefox-extension-does-not-connect-to-linux-app
|
||||||
@ -38,4 +26,5 @@
|
|||||||
firefox
|
firefox
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
alacritty = {
|
alacritty = {
|
||||||
@ -34,9 +28,7 @@
|
|||||||
opacity = 1.0;
|
opacity = 1.0;
|
||||||
};
|
};
|
||||||
scrolling.history = 10000;
|
scrolling.history = 10000;
|
||||||
font = {
|
font = { size = 14.0; };
|
||||||
size = 14.0;
|
|
||||||
};
|
|
||||||
key_bindings = [
|
key_bindings = [
|
||||||
# Used for word completion in fish_user_key_bindings
|
# Used for word completion in fish_user_key_bindings
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ ... }:
|
{ ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./1password.nix
|
./1password.nix
|
||||||
@ -11,7 +10,7 @@
|
|||||||
./obsidian.nix
|
./obsidian.nix
|
||||||
./qbittorrent.nix
|
./qbittorrent.nix
|
||||||
./slack.nix
|
./slack.nix
|
||||||
./wezterm.nix
|
|
||||||
./yt-dlp.nix
|
./yt-dlp.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
discord = {
|
discord = {
|
||||||
|
@ -1,9 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }:
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -21,13 +16,15 @@
|
|||||||
unfreePackages = [
|
unfreePackages = [
|
||||||
(lib.mkIf config._1password.enable "onepassword-password-manager")
|
(lib.mkIf config._1password.enable "onepassword-password-manager")
|
||||||
"okta-browser-plugin"
|
"okta-browser-plugin"
|
||||||
|
"wappalyzer"
|
||||||
];
|
];
|
||||||
|
|
||||||
home-manager.users.${config.user} = {
|
home-manager.users.${config.user} = {
|
||||||
|
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = if pkgs.stdenv.isDarwin then pkgs.firefox-bin else pkgs.firefox;
|
package =
|
||||||
|
if pkgs.stdenv.isDarwin then pkgs.firefox-bin else pkgs.firefox;
|
||||||
profiles.default = {
|
profiles.default = {
|
||||||
id = 0;
|
id = 0;
|
||||||
name = "default";
|
name = "default";
|
||||||
@ -35,6 +32,7 @@
|
|||||||
# https://nur.nix-community.org/repos/rycee/
|
# https://nur.nix-community.org/repos/rycee/
|
||||||
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||||
(lib.mkIf config._1password.enable onepassword-password-manager)
|
(lib.mkIf config._1password.enable onepassword-password-manager)
|
||||||
|
pkgs.bypass-paywalls-clean
|
||||||
darkreader
|
darkreader
|
||||||
don-t-fuck-with-paste
|
don-t-fuck-with-paste
|
||||||
facebook-container
|
facebook-container
|
||||||
@ -43,36 +41,44 @@
|
|||||||
okta-browser-plugin
|
okta-browser-plugin
|
||||||
reddit-enhancement-suite
|
reddit-enhancement-suite
|
||||||
return-youtube-dislikes
|
return-youtube-dislikes
|
||||||
|
snowflake
|
||||||
sponsorblock
|
sponsorblock
|
||||||
ublock-origin
|
ublock-origin
|
||||||
ublacklist
|
ublacklist
|
||||||
vimium
|
vimium
|
||||||
|
wappalyzer
|
||||||
];
|
];
|
||||||
settings = {
|
settings = {
|
||||||
"app.update.auto" = false;
|
"app.update.auto" = false;
|
||||||
"browser.aboutConfig.showWarning" = false;
|
"browser.aboutConfig.showWarning" = false;
|
||||||
"browser.warnOnQuit" = false;
|
"browser.warnOnQuit" = false;
|
||||||
"browser.quitShortcut.disabled" = if pkgs.stdenv.isLinux then true else false;
|
"browser.quitShortcut.disabled" =
|
||||||
|
if pkgs.stdenv.isLinux then true else false;
|
||||||
"browser.theme.dark-private-windows" = true;
|
"browser.theme.dark-private-windows" = true;
|
||||||
"browser.toolbars.bookmarks.visibility" = false;
|
"browser.toolbars.bookmarks.visibility" = false;
|
||||||
"browser.startup.page" = 3; # Restore previous session
|
"browser.startup.page" = 3; # Restore previous session
|
||||||
"browser.newtabpage.enabled" = false; # Make new tabs blank
|
"browser.newtabpage.enabled" = false; # Make new tabs blank
|
||||||
"trailhead.firstrun.didSeeAboutWelcome" = true; # Disable welcome splash
|
"trailhead.firstrun.didSeeAboutWelcome" =
|
||||||
|
true; # Disable welcome splash
|
||||||
"dom.forms.autocomplete.formautofill" = false; # Disable autofill
|
"dom.forms.autocomplete.formautofill" = false; # Disable autofill
|
||||||
"extensions.formautofill.creditCards.enabled" = false; # Disable credit cards
|
"extensions.formautofill.creditCards.enabled" =
|
||||||
|
false; # Disable credit cards
|
||||||
"dom.payments.defaults.saveAddress" = false; # Disable address save
|
"dom.payments.defaults.saveAddress" = false; # Disable address save
|
||||||
"general.autoScroll" = true; # Drag middle-mouse to scroll
|
"general.autoScroll" = true; # Drag middle-mouse to scroll
|
||||||
"services.sync.prefs.sync.general.autoScroll" = false; # Prevent disabling autoscroll
|
"services.sync.prefs.sync.general.autoScroll" =
|
||||||
|
false; # Prevent disabling autoscroll
|
||||||
"extensions.pocket.enabled" = false;
|
"extensions.pocket.enabled" = false;
|
||||||
"toolkit.legacyUserProfileCustomizations.stylesheets" = true; # Allow userChrome.css
|
"toolkit.legacyUserProfileCustomizations.stylesheets" =
|
||||||
|
true; # Allow userChrome.css
|
||||||
"layout.css.color-mix.enabled" = true;
|
"layout.css.color-mix.enabled" = true;
|
||||||
"ui.systemUsesDarkTheme" = if config.theme.dark == true then 1 else 0;
|
"ui.systemUsesDarkTheme" =
|
||||||
"media.ffmpeg.vaapi.enabled" = true; # Enable hardware video acceleration
|
if config.theme.dark == true then 1 else 0;
|
||||||
|
"media.ffmpeg.vaapi.enabled" =
|
||||||
|
true; # Enable hardware video acceleration
|
||||||
"cookiebanners.ui.desktop.enabled" = true; # Reject cookie popups
|
"cookiebanners.ui.desktop.enabled" = true; # Reject cookie popups
|
||||||
"devtools.command-button-screenshot.enabled" = true; # Scrolling screenshot of entire page
|
"devtools.command-button-screenshot.enabled" =
|
||||||
|
true; # Scrolling screenshot of entire page
|
||||||
"svg.context-properties.content.enabled" = true; # Sidebery styling
|
"svg.context-properties.content.enabled" = true; # Sidebery styling
|
||||||
"browser.tabs.hoverPreview.enabled" = false; # Disable tab previews
|
|
||||||
"browser.tabs.hoverPreview.showThumbnails" = false; # Disable tab previews
|
|
||||||
};
|
};
|
||||||
userChrome = ''
|
userChrome = ''
|
||||||
:root {
|
:root {
|
||||||
@ -157,47 +163,28 @@
|
|||||||
|
|
||||||
extraConfig = "";
|
extraConfig = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Mimic nixpkgs package environment for read-only profiles.ini management
|
xsession.windowManager.i3.config.keybindings =
|
||||||
# From: https://github.com/booxter/home-manager/commit/dd1602e306fec366280f5953c5e1b553e3d9672a
|
lib.mkIf pkgs.stdenv.isLinux {
|
||||||
home.sessionVariables = {
|
"${
|
||||||
MOZ_LEGACY_PROFILES = 1;
|
config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
|
||||||
MOZ_ALLOW_DOWNGRADE = 1;
|
}+Shift+b" = "exec ${
|
||||||
};
|
# Don't name the script `firefox` or it will affect grep
|
||||||
|
builtins.toString (pkgs.writeShellScript "focus-ff.sh" ''
|
||||||
# launchd.user.envVariables = config.home-manager.users.${config.user}.home.sessionVariables;
|
count=$(ps aux | grep -c firefox)
|
||||||
|
if [ "$count" -eq 1 ]; then
|
||||||
xdg.mimeApps = {
|
i3-msg "exec --no-startup-id firefox"
|
||||||
associations.added = {
|
sleep 0.5
|
||||||
"text/html" = [ "firefox.desktop" ];
|
fi
|
||||||
};
|
i3-msg "[class=firefox] focus"
|
||||||
defaultApplications = {
|
'')
|
||||||
"text/html" = [ "firefox.desktop" ];
|
}";
|
||||||
};
|
|
||||||
associations.removed = {
|
|
||||||
"text/html" = [ "wine-extension-htm.desktop" ];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
|
|
||||||
"${
|
|
||||||
config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
|
|
||||||
}+Shift+b" = "exec ${
|
|
||||||
# Don't name the script `firefox` or it will affect grep
|
|
||||||
builtins.toString (
|
|
||||||
pkgs.writeShellScript "focus-ff.sh" ''
|
|
||||||
count=$(ps aux | grep -c firefox)
|
|
||||||
if [ "$count" -eq 1 ]; then
|
|
||||||
i3-msg "exec --no-startup-id firefox"
|
|
||||||
sleep 0.5
|
|
||||||
fi
|
|
||||||
i3-msg "[class=firefox] focus"
|
|
||||||
''
|
|
||||||
)
|
|
||||||
}";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
kitty = {
|
kitty = {
|
||||||
@ -19,28 +13,26 @@
|
|||||||
|
|
||||||
# Set the Rofi-Systemd terminal for viewing logs
|
# Set the Rofi-Systemd terminal for viewing logs
|
||||||
# Using optionalAttrs because only available in NixOS
|
# Using optionalAttrs because only available in NixOS
|
||||||
environment =
|
environment = { } // lib.attrsets.optionalAttrs
|
||||||
{ }
|
(builtins.hasAttr "sessionVariables" config.environment) {
|
||||||
// lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
|
sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.kitty}/bin/kitty";
|
||||||
sessionVariables.ROFI_SYSTEMD_TERM = lib.mkDefault "${pkgs.kitty}/bin/kitty";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.${config.user} = {
|
home-manager.users.${config.user} = {
|
||||||
|
|
||||||
# Set the i3 terminal
|
# Set the i3 terminal
|
||||||
xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "kitty";
|
xsession.windowManager.i3.config.terminal =
|
||||||
|
lib.mkIf pkgs.stdenv.isLinux "kitty";
|
||||||
|
|
||||||
# Set the Rofi terminal for running programs
|
# Set the Rofi terminal for running programs
|
||||||
programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty");
|
programs.rofi.terminal =
|
||||||
|
lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty";
|
||||||
|
|
||||||
# Display images in the terminal
|
# Display images in the terminal
|
||||||
programs.fish.interactiveShellInit = # fish
|
programs.fish.shellAliases = {
|
||||||
''
|
icat = "kitty +kitten icat";
|
||||||
if test "$TERM" = "xterm-kitty"
|
ssh = "kitty +kitten ssh";
|
||||||
alias icat="kitty +kitten icat"
|
};
|
||||||
alias ssh="kitty +kitten ssh"
|
|
||||||
end
|
|
||||||
'';
|
|
||||||
|
|
||||||
programs.kitty = {
|
programs.kitty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -53,9 +45,20 @@
|
|||||||
|
|
||||||
# Easy fullscreen toggle (for macOS)
|
# Easy fullscreen toggle (for macOS)
|
||||||
"super+f" = "toggle_fullscreen";
|
"super+f" = "toggle_fullscreen";
|
||||||
|
|
||||||
|
# Kitty scrollback nvim
|
||||||
|
"kitty_mod+h" = "kitty_scrollback_nvim";
|
||||||
|
"kitty_mod+g" =
|
||||||
|
"kitty_scrollback_nvim --config ksb_builtin_last_cmd_output";
|
||||||
};
|
};
|
||||||
settings = {
|
settings = {
|
||||||
|
|
||||||
|
# Required for kitty-scrollback.nvim
|
||||||
|
allow_remote_control = "socket-only";
|
||||||
|
listen_on = "unix:/tmp/kitty";
|
||||||
|
action_alias =
|
||||||
|
"kitty_scrollback_nvim kitten ${pkgs.kitty-scrollback-nvim}/python/kitty_scrollback_nvim.py";
|
||||||
|
|
||||||
# Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache)
|
# Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache)
|
||||||
background = config.theme.colors.base00;
|
background = config.theme.colors.base00;
|
||||||
foreground = config.theme.colors.base05;
|
foreground = config.theme.colors.base05;
|
||||||
@ -100,8 +103,8 @@
|
|||||||
color21 = config.theme.colors.base06;
|
color21 = config.theme.colors.base06;
|
||||||
|
|
||||||
# Scrollback
|
# Scrollback
|
||||||
scrollback_lines = 10000;
|
scrolling_lines = 10000;
|
||||||
scrollback_pager_history_size = 300; # MB
|
scrollback_pager_history_size = 10; # MB
|
||||||
|
|
||||||
# Window
|
# Window
|
||||||
window_padding_width = 6;
|
window_padding_width = 6;
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
media = {
|
media = {
|
||||||
@ -50,10 +44,7 @@
|
|||||||
"image/*" = [ "nsxiv.desktop" ];
|
"image/*" = [ "nsxiv.desktop" ];
|
||||||
};
|
};
|
||||||
associations.removed = {
|
associations.removed = {
|
||||||
"application/pdf" = [
|
"application/pdf" = [ "mupdf.desktop" "wine-extension-pdf.desktop" ];
|
||||||
"mupdf.desktop"
|
|
||||||
"wine-extension-pdf.desktop"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
defaultApplications = {
|
defaultApplications = {
|
||||||
"application/pdf" = [ "pwmt.zathura-cb.desktop" ];
|
"application/pdf" = [ "pwmt.zathura-cb.desktop" ];
|
||||||
@ -62,6 +53,9 @@
|
|||||||
"image/*" = [ "nsxiv.desktop" ];
|
"image/*" = [ "nsxiv.desktop" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
obsidian = {
|
obsidian = {
|
||||||
@ -24,5 +18,7 @@
|
|||||||
# Broken on 2023-12-11
|
# Broken on 2023-12-11
|
||||||
# https://forum.obsidian.md/t/electron-25-is-now-eol-please-upgrade-to-a-newer-version/72878/8
|
# https://forum.obsidian.md/t/electron-25-is-now-eol-please-upgrade-to-a-newer-version/72878/8
|
||||||
nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ];
|
nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
qbittorrent = {
|
qbittorrent = {
|
||||||
@ -20,6 +14,8 @@
|
|||||||
home-manager.users.${config.user} = {
|
home-manager.users.${config.user} = {
|
||||||
|
|
||||||
home.packages = with pkgs; [ qbittorrent ];
|
home.packages = with pkgs; [ qbittorrent ];
|
||||||
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
slack = {
|
slack = {
|
||||||
@ -21,4 +15,5 @@
|
|||||||
home.packages = with pkgs; [ slack ];
|
home.packages = with pkgs; [ slack ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,238 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options = {
|
|
||||||
wezterm = {
|
|
||||||
enable = lib.mkEnableOption {
|
|
||||||
description = "Enable WezTerm terminal.";
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config =
|
|
||||||
let
|
|
||||||
font = config.home-manager.users.${config.user}.programs.kitty.font.name;
|
|
||||||
in
|
|
||||||
lib.mkIf (config.gui.enable && config.wezterm.enable) {
|
|
||||||
|
|
||||||
# Set the Rofi-Systemd terminal for viewing logs
|
|
||||||
# Using optionalAttrs because only available in NixOS
|
|
||||||
environment =
|
|
||||||
{ }
|
|
||||||
// lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
|
|
||||||
sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.wezterm}/bin/wezterm";
|
|
||||||
};
|
|
||||||
|
|
||||||
home-manager.users.${config.user} = {
|
|
||||||
|
|
||||||
# Set the i3 terminal
|
|
||||||
xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "wezterm";
|
|
||||||
|
|
||||||
# Set the Rofi terminal for running programs
|
|
||||||
programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux "${pkgs.wezterm}/bin/wezterm";
|
|
||||||
|
|
||||||
# Display images in the terminal
|
|
||||||
programs.fish.shellAliases = {
|
|
||||||
icat = lib.mkForce "wezterm imgcat";
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.wezterm = {
|
|
||||||
enable = true;
|
|
||||||
colorSchemes = {
|
|
||||||
myTheme = {
|
|
||||||
background = config.theme.colors.base00;
|
|
||||||
foreground = config.theme.colors.base05;
|
|
||||||
cursor_bg = config.theme.colors.base05;
|
|
||||||
cursor_fg = config.theme.colors.base00;
|
|
||||||
cursor_border = config.theme.colors.base05;
|
|
||||||
selection_bg = config.theme.colors.base05;
|
|
||||||
selection_fg = config.theme.colors.base00;
|
|
||||||
scrollbar_thumb = config.theme.colors.base03;
|
|
||||||
ansi = [
|
|
||||||
config.theme.colors.base01 # black
|
|
||||||
config.theme.colors.base0F # maroon
|
|
||||||
config.theme.colors.base0B # green
|
|
||||||
config.theme.colors.base0A # olive
|
|
||||||
config.theme.colors.base0D # navy
|
|
||||||
config.theme.colors.base0E # purple
|
|
||||||
config.theme.colors.base0C # teal
|
|
||||||
config.theme.colors.base06 # silver
|
|
||||||
];
|
|
||||||
brights = [
|
|
||||||
config.theme.colors.base03 # grey
|
|
||||||
config.theme.colors.base08 # red
|
|
||||||
config.theme.colors.base0B # lime
|
|
||||||
config.theme.colors.base0A # yellow
|
|
||||||
config.theme.colors.base0D # blue
|
|
||||||
config.theme.colors.base0E # fuchsia
|
|
||||||
config.theme.colors.base0C # aqua
|
|
||||||
config.theme.colors.base07 # white
|
|
||||||
];
|
|
||||||
compose_cursor = config.theme.colors.base09; # orange
|
|
||||||
copy_mode_active_highlight_bg = {
|
|
||||||
Color = config.theme.colors.base03;
|
|
||||||
};
|
|
||||||
copy_mode_active_highlight_fg = {
|
|
||||||
Color = config.theme.colors.base07;
|
|
||||||
};
|
|
||||||
copy_mode_inactive_highlight_bg = {
|
|
||||||
Color = config.theme.colors.base02;
|
|
||||||
};
|
|
||||||
copy_mode_inactive_highlight_fg = {
|
|
||||||
Color = config.theme.colors.base06;
|
|
||||||
};
|
|
||||||
quick_select_label_bg = {
|
|
||||||
Color = config.theme.colors.base02;
|
|
||||||
};
|
|
||||||
quick_select_label_fg = {
|
|
||||||
Color = config.theme.colors.base06;
|
|
||||||
};
|
|
||||||
quick_select_match_bg = {
|
|
||||||
Color = config.theme.colors.base03;
|
|
||||||
};
|
|
||||||
quick_select_match_fg = {
|
|
||||||
Color = config.theme.colors.base07;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
extraConfig = ''
|
|
||||||
return {
|
|
||||||
color_scheme = "myTheme",
|
|
||||||
|
|
||||||
-- Scrollback
|
|
||||||
scrollback_lines = 10000,
|
|
||||||
|
|
||||||
-- Window
|
|
||||||
window_padding = {
|
|
||||||
left = 10,
|
|
||||||
right = 10,
|
|
||||||
top = 10,
|
|
||||||
bottom = 10,
|
|
||||||
},
|
|
||||||
|
|
||||||
font = wezterm.font('${font}', { weight = 'Bold'}),
|
|
||||||
font_size = ${if pkgs.stdenv.isLinux then "14.0" else "18.0"},
|
|
||||||
|
|
||||||
-- Fix color blocks instead of text
|
|
||||||
front_end = "WebGpu",
|
|
||||||
|
|
||||||
-- Tab Bar
|
|
||||||
hide_tab_bar_if_only_one_tab = true,
|
|
||||||
window_frame = {
|
|
||||||
font = wezterm.font('${font}', { weight = 'Bold'}),
|
|
||||||
font_size = ${if pkgs.stdenv.isLinux then "12.0" else "16.0"},
|
|
||||||
},
|
|
||||||
|
|
||||||
colors = {
|
|
||||||
tab_bar = {
|
|
||||||
active_tab = {
|
|
||||||
bg_color = '${config.theme.colors.base00}',
|
|
||||||
fg_color = '${config.theme.colors.base04}',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
-- Disable audio
|
|
||||||
audible_bell = "Disabled",
|
|
||||||
|
|
||||||
initial_rows = 80,
|
|
||||||
initial_cols = 200,
|
|
||||||
|
|
||||||
keys = {
|
|
||||||
-- sends completion string for fish autosuggestions
|
|
||||||
{
|
|
||||||
key = 'Enter',
|
|
||||||
mods = 'SHIFT',
|
|
||||||
action = wezterm.action.SendString '\x1F'
|
|
||||||
},
|
|
||||||
-- ctrl-shift-h was "hide"
|
|
||||||
{
|
|
||||||
key = 'H',
|
|
||||||
mods = 'SHIFT|CTRL',
|
|
||||||
action = wezterm.action.DisableDefaultAssignment
|
|
||||||
},
|
|
||||||
-- alt-enter was "fullscreen"
|
|
||||||
{
|
|
||||||
key = 'Enter',
|
|
||||||
mods = 'ALT',
|
|
||||||
action = wezterm.action.DisableDefaultAssignment
|
|
||||||
},
|
|
||||||
-- make super-f "fullscreen"
|
|
||||||
{
|
|
||||||
key = 'f',
|
|
||||||
mods = 'SUPER',
|
|
||||||
action = wezterm.action.ToggleFullScreen
|
|
||||||
},
|
|
||||||
-- super-t open new tab in new dir
|
|
||||||
{
|
|
||||||
key = 't',
|
|
||||||
mods = ${if pkgs.stdenv.isDarwin then "'SUPER'" else "'ALT'"},
|
|
||||||
action = wezterm.action.SpawnCommandInNewTab {
|
|
||||||
cwd = wezterm.home_dir,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- shift-super-t open new tab in same dir
|
|
||||||
{
|
|
||||||
key = 't',
|
|
||||||
mods = 'SUPER|SHIFT',
|
|
||||||
action = wezterm.action.SpawnTab 'CurrentPaneDomain'
|
|
||||||
},
|
|
||||||
-- project switcher
|
|
||||||
{
|
|
||||||
key = 'P',
|
|
||||||
mods = 'SUPER',
|
|
||||||
action = wezterm.action_callback(function(window, pane)
|
|
||||||
local choices = {}
|
|
||||||
|
|
||||||
wezterm.log_info "working?"
|
|
||||||
|
|
||||||
function scandir(directory)
|
|
||||||
local i, t, popen = 0, {}, io.popen
|
|
||||||
local pfile = popen('${pkgs.fd}/bin/fd --search-path "'..directory..'" --type directory --exact-depth 2 | ${pkgs.proximity-sort}/bin/proximity-sort "'..os.getenv("HOME").."/dev/work"..'"')
|
|
||||||
for filename in pfile:lines() do
|
|
||||||
i = i + 1
|
|
||||||
t[i] = filename
|
|
||||||
end
|
|
||||||
pfile:close()
|
|
||||||
return t
|
|
||||||
end
|
|
||||||
|
|
||||||
for _, v in pairs(scandir(os.getenv("HOME").."/dev")) do
|
|
||||||
table.insert(choices, { label = v })
|
|
||||||
end
|
|
||||||
|
|
||||||
window:perform_action(
|
|
||||||
wezterm.action.InputSelector {
|
|
||||||
action = wezterm.action_callback(function(window, pane, id, label)
|
|
||||||
if not id and not label then
|
|
||||||
wezterm.log_info "cancelled"
|
|
||||||
else
|
|
||||||
window:perform_action(
|
|
||||||
wezterm.action.SpawnCommandInNewTab {
|
|
||||||
cwd = label,
|
|
||||||
},
|
|
||||||
pane
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end),
|
|
||||||
fuzzy = true,
|
|
||||||
title = "Select Project",
|
|
||||||
choices = choices,
|
|
||||||
},
|
|
||||||
pane
|
|
||||||
)
|
|
||||||
end),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
yt-dlp = {
|
yt-dlp = {
|
||||||
@ -33,6 +27,9 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
programs.fish.shellAbbrs.yt = "yt-dlp";
|
programs.fish.shellAbbrs.yt = "yt-dlp";
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,19 +1,7 @@
|
|||||||
{
|
{ config, lib, pkgs, ... }: {
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
imports = [
|
imports =
|
||||||
./applications
|
[ ./applications ./mail ./neovim ./programming ./repositories ./shell ];
|
||||||
./mail
|
|
||||||
./neovim
|
|
||||||
./programming
|
|
||||||
./repositories
|
|
||||||
./shell
|
|
||||||
];
|
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
user = lib.mkOption {
|
user = lib.mkOption {
|
||||||
@ -29,7 +17,8 @@
|
|||||||
download = lib.mkOption {
|
download = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
description = "XDG directory for downloads";
|
description = "XDG directory for downloads";
|
||||||
default = if pkgs.stdenv.isDarwin then "$HOME/Downloads" else "$HOME/downloads";
|
default =
|
||||||
|
if pkgs.stdenv.isDarwin then "$HOME/Downloads" else "$HOME/downloads";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
identityFile = lib.mkOption {
|
identityFile = lib.mkOption {
|
||||||
@ -58,9 +47,10 @@
|
|||||||
homePath = lib.mkOption {
|
homePath = lib.mkOption {
|
||||||
type = lib.types.path;
|
type = lib.types.path;
|
||||||
description = "Path of user's home directory.";
|
description = "Path of user's home directory.";
|
||||||
default = builtins.toPath (
|
default = builtins.toPath (if pkgs.stdenv.isDarwin then
|
||||||
if pkgs.stdenv.isDarwin then "/Users/${config.user}" else "/home/${config.user}"
|
"/Users/${config.user}"
|
||||||
);
|
else
|
||||||
|
"/home/${config.user}");
|
||||||
};
|
};
|
||||||
dotfilesPath = lib.mkOption {
|
dotfilesPath = lib.mkOption {
|
||||||
type = lib.types.path;
|
type = lib.types.path;
|
||||||
@ -77,10 +67,6 @@
|
|||||||
default = [ ];
|
default = [ ];
|
||||||
};
|
};
|
||||||
hostnames = {
|
hostnames = {
|
||||||
files = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
description = "Hostname for files server (Filebrowser).";
|
|
||||||
};
|
|
||||||
git = lib.mkOption {
|
git = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
description = "Hostname for git server (Gitea).";
|
description = "Hostname for git server (Gitea).";
|
||||||
@ -89,10 +75,6 @@
|
|||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
description = "Hostname for metrics server.";
|
description = "Hostname for metrics server.";
|
||||||
};
|
};
|
||||||
minecraft = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
description = "Hostname for Minecraft server.";
|
|
||||||
};
|
|
||||||
paperless = lib.mkOption {
|
paperless = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
description = "Hostname for document server (paperless-ngx).";
|
description = "Hostname for document server (paperless-ngx).";
|
||||||
@ -125,56 +107,63 @@
|
|||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
description = "Hostname for download services.";
|
description = "Hostname for download services.";
|
||||||
};
|
};
|
||||||
irc = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
description = "Hostname for IRC services.";
|
|
||||||
};
|
|
||||||
n8n = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
description = "Hostname for n8n automation.";
|
|
||||||
};
|
|
||||||
notifications = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
description = "Hostname for push notification services (ntfy).";
|
|
||||||
};
|
|
||||||
status = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
description = "Hostname for status page (Uptime-Kuma).";
|
|
||||||
};
|
|
||||||
transmission = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
description = "Hostname for peer2peer downloads (Transmission).";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config =
|
config = let stateVersion = "23.05";
|
||||||
let
|
in {
|
||||||
stateVersion = "23.05";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
|
|
||||||
# Basic common system packages for all devices
|
nix = {
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
git
|
|
||||||
vim
|
|
||||||
wget
|
|
||||||
curl
|
|
||||||
];
|
|
||||||
|
|
||||||
# Use the system-level nixpkgs instead of Home Manager's
|
# Enable features in Nix commands
|
||||||
home-manager.useGlobalPkgs = true;
|
extraOptions = ''
|
||||||
|
experimental-features = nix-command flakes
|
||||||
|
warn-dirty = false
|
||||||
|
'';
|
||||||
|
|
||||||
# Install packages to /etc/profiles instead of ~/.nix-profile, useful when
|
gc = {
|
||||||
# using multiple profiles for one user
|
automatic = true;
|
||||||
home-manager.useUserPackages = true;
|
options = "--delete-older-than 7d";
|
||||||
|
};
|
||||||
|
|
||||||
# Allow specified unfree packages (identified elsewhere)
|
settings = {
|
||||||
# Retrieves package object based on string name
|
|
||||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.unfreePackages;
|
# Add community Cachix to binary cache
|
||||||
|
# Don't use with macOS because blocked by corporate firewall
|
||||||
|
builders-use-substitutes = true;
|
||||||
|
substituters = lib.mkIf (!pkgs.stdenv.isDarwin)
|
||||||
|
[ "https://nix-community.cachix.org" ];
|
||||||
|
trusted-public-keys = lib.mkIf (!pkgs.stdenv.isDarwin) [
|
||||||
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
|
];
|
||||||
|
|
||||||
|
# Scans and hard links identical files in the store
|
||||||
|
# Not working with macOS: https://github.com/NixOS/nix/issues/7273
|
||||||
|
auto-optimise-store = lib.mkIf (!pkgs.stdenv.isDarwin) true;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
# Pin a state version to prevent warnings
|
|
||||||
home-manager.users.${config.user}.home.stateVersion = stateVersion;
|
|
||||||
home-manager.users.root.home.stateVersion = stateVersion;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Basic common system packages for all devices
|
||||||
|
environment.systemPackages = with pkgs; [ git vim wget curl ];
|
||||||
|
|
||||||
|
# Use the system-level nixpkgs instead of Home Manager's
|
||||||
|
home-manager.useGlobalPkgs = true;
|
||||||
|
|
||||||
|
# Install packages to /etc/profiles instead of ~/.nix-profile, useful when
|
||||||
|
# using multiple profiles for one user
|
||||||
|
home-manager.useUserPackages = true;
|
||||||
|
|
||||||
|
# Allow specified unfree packages (identified elsewhere)
|
||||||
|
# Retrieves package object based on string name
|
||||||
|
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||||
|
builtins.elem (lib.getName pkg) config.unfreePackages;
|
||||||
|
|
||||||
|
# Pin a state version to prevent warnings
|
||||||
|
home-manager.users.${config.user}.home.stateVersion = stateVersion;
|
||||||
|
home-manager.users.root.home.stateVersion = stateVersion;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options.mail.aerc.enable = lib.mkEnableOption "Aerc email.";
|
options.mail.aerc.enable = lib.mkEnableOption "Aerc email.";
|
||||||
|
|
||||||
@ -81,9 +75,7 @@
|
|||||||
"<Esc>" = ":clear<Enter>";
|
"<Esc>" = ":clear<Enter>";
|
||||||
};
|
};
|
||||||
|
|
||||||
"messages:folder=Drafts" = {
|
"messages:folder=Drafts" = { "<Enter>" = ":recall<Enter>"; };
|
||||||
"<Enter>" = ":recall<Enter>";
|
|
||||||
};
|
|
||||||
|
|
||||||
view = {
|
view = {
|
||||||
"/" = ":toggle-key-passthrough <Enter> /";
|
"/" = ":toggle-key-passthrough <Enter> /";
|
||||||
@ -156,23 +148,21 @@
|
|||||||
"<C-p>" = ":prev-tab<Enter>";
|
"<C-p>" = ":prev-tab<Enter>";
|
||||||
"<C-n>" = ":next-tab<Enter>";
|
"<C-n>" = ":next-tab<Enter>";
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
general = {
|
general.unsafe-accounts-conf = true;
|
||||||
unsafe-accounts-conf = true;
|
viewer = { pager = "${pkgs.less}/bin/less -R"; };
|
||||||
# log-file = "~/.cache/aerc.log";
|
|
||||||
# log-level = "debug";
|
|
||||||
};
|
|
||||||
viewer = {
|
|
||||||
pager = "${pkgs.less}/bin/less -R";
|
|
||||||
};
|
|
||||||
filters = {
|
filters = {
|
||||||
"text/plain" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
|
"text/plain" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
|
||||||
"text/calendar" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/libexec/aerc/filters/calendar";
|
"text/calendar" =
|
||||||
"text/html" = "${pkgs.aerc}/libexec/aerc/filters/html | ${pkgs.aerc}/libexec/aerc/filters/colorize"; # Requires w3m, dante
|
"${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/libexec/aerc/filters/calendar";
|
||||||
|
"text/html" =
|
||||||
|
"${pkgs.aerc}/libexec/aerc/filters/html | ${pkgs.aerc}/libexec/aerc/filters/colorize"; # Requires w3m, dante
|
||||||
# "text/*" =
|
# "text/*" =
|
||||||
# ''${pkgs.bat}/bin/bat -fP --file-name="$AERC_FILENAME "'';
|
# ''${pkgs.bat}/bin/bat -fP --file-name="$AERC_FILENAME "'';
|
||||||
"message/delivery-status" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
|
"message/delivery-status" =
|
||||||
|
"${pkgs.aerc}/libexec/aerc/filters/colorize";
|
||||||
"message/rfc822" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
|
"message/rfc822" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
|
||||||
"application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
|
"application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
|
||||||
"application/pdf" = "${pkgs.zathura}/bin/zathura -";
|
"application/pdf" = "${pkgs.zathura}/bin/zathura -";
|
||||||
@ -186,7 +176,6 @@
|
|||||||
extraAccounts = {
|
extraAccounts = {
|
||||||
check-mail = "5m";
|
check-mail = "5m";
|
||||||
check-mail-cmd = "${pkgs.isync}/bin/mbsync -a";
|
check-mail-cmd = "${pkgs.isync}/bin/mbsync -a";
|
||||||
check-mail-timeout = "15s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -194,27 +183,26 @@
|
|||||||
name = "aerc";
|
name = "aerc";
|
||||||
exec = "kitty aerc %u";
|
exec = "kitty aerc %u";
|
||||||
};
|
};
|
||||||
xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
|
xsession.windowManager.i3.config.keybindings =
|
||||||
"${
|
lib.mkIf pkgs.stdenv.isLinux {
|
||||||
config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
|
"${
|
||||||
}+Shift+e" = "exec ${
|
config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
|
||||||
# Don't name the script `aerc` or it will affect grep
|
}+Shift+e" = "exec ${
|
||||||
builtins.toString (
|
# Don't name the script `aerc` or it will affect grep
|
||||||
pkgs.writeShellScript "focus-mail.sh" ''
|
builtins.toString (pkgs.writeShellScript "focus-mail.sh" ''
|
||||||
count=$(ps aux | grep -c aerc)
|
count=$(ps aux | grep -c aerc)
|
||||||
if [ "$count" -eq 1 ]; then
|
if [ "$count" -eq 1 ]; then
|
||||||
i3-msg "exec --no-startup-id kitty --class aerc aerc"
|
i3-msg "exec --no-startup-id kitty --class aerc aerc"
|
||||||
sleep 0.25
|
sleep 0.25
|
||||||
fi
|
fi
|
||||||
i3-msg "[class=aerc] focus"
|
i3-msg "[class=aerc] focus"
|
||||||
''
|
'')
|
||||||
)
|
}";
|
||||||
}";
|
};
|
||||||
};
|
|
||||||
|
programs.fish.shellAbbrs = { ae = "aerc"; };
|
||||||
|
|
||||||
programs.fish.shellAbbrs = {
|
|
||||||
ae = "aerc";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,16 +1,6 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
imports = [
|
imports = [ ./himalaya.nix ./aerc.nix ./system.nix ];
|
||||||
./himalaya.nix
|
|
||||||
./aerc.nix
|
|
||||||
./system.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
mail.enable = lib.mkEnableOption "Mail service.";
|
mail.enable = lib.mkEnableOption "Mail service.";
|
||||||
@ -36,9 +26,7 @@
|
|||||||
config = lib.mkIf config.mail.enable {
|
config = lib.mkIf config.mail.enable {
|
||||||
|
|
||||||
home-manager.users.${config.user} = {
|
home-manager.users.${config.user} = {
|
||||||
programs.mbsync = {
|
programs.mbsync = { enable = true; };
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Automatically check for mail and keep files synced locally
|
# Automatically check for mail and keep files synced locally
|
||||||
services.mbsync = lib.mkIf pkgs.stdenv.isLinux {
|
services.mbsync = lib.mkIf pkgs.stdenv.isLinux {
|
||||||
@ -56,11 +44,8 @@
|
|||||||
# Better local mail search
|
# Better local mail search
|
||||||
programs.notmuch = {
|
programs.notmuch = {
|
||||||
enable = true;
|
enable = true;
|
||||||
new.ignore = [
|
new.ignore =
|
||||||
".mbsyncstate.lock"
|
[ ".mbsyncstate.lock" ".mbsyncstate.journal" ".mbsyncstate.new" ];
|
||||||
".mbsyncstate.journal"
|
|
||||||
".mbsyncstate.new"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
accounts.email = {
|
accounts.email = {
|
||||||
@ -69,71 +54,72 @@
|
|||||||
maildirBasePath = "${config.homePath}/mail";
|
maildirBasePath = "${config.homePath}/mail";
|
||||||
|
|
||||||
accounts = {
|
accounts = {
|
||||||
home =
|
home = let address = "${config.mail.user}@${config.mail.server}";
|
||||||
let
|
in {
|
||||||
address = "${config.mail.user}@${config.mail.server}";
|
userName = address;
|
||||||
in
|
realName = config.fullName;
|
||||||
{
|
primary = true;
|
||||||
userName = address;
|
inherit address;
|
||||||
realName = config.fullName;
|
aliases = map (user: "${user}@${config.mail.server}") [
|
||||||
primary = true;
|
"me"
|
||||||
inherit address;
|
"hey"
|
||||||
aliases = map (user: "${user}@${config.mail.server}") [
|
"admin"
|
||||||
"me"
|
];
|
||||||
"hey"
|
|
||||||
"admin"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Options for contact completion
|
# Options for contact completion
|
||||||
alot = { };
|
alot = { };
|
||||||
|
|
||||||
imap = {
|
imap = {
|
||||||
host = config.mail.imapHost;
|
host = config.mail.imapHost;
|
||||||
port = 993;
|
port = 993;
|
||||||
tls.enable = true;
|
tls.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Watch for mail and run notifications or sync
|
# Watch for mail and run notifications or sync
|
||||||
imapnotify = {
|
imapnotify = {
|
||||||
enable = true;
|
enable = true;
|
||||||
boxes = [ "Inbox" ];
|
boxes = [ "Inbox" ];
|
||||||
onNotify = "${pkgs.isync}/bin/mbsync -a";
|
onNotify = "${pkgs.isync}/bin/mbsync -a";
|
||||||
onNotifyPost =
|
onNotifyPost = lib.mkIf
|
||||||
lib.mkIf config.home-manager.users.${config.user}.services.dunst.enable
|
config.home-manager.users.${config.user}.services.dunst.enable
|
||||||
"${pkgs.libnotify}/bin/notify-send 'New mail arrived'";
|
"${pkgs.libnotify}/bin/notify-send 'New mail arrived'";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Name of the directory in maildir for this account
|
# Name of the directory in maildir for this account
|
||||||
maildir = {
|
maildir = { path = "main"; };
|
||||||
path = "main";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Bi-directional syncing options for local files
|
# Bi-directional syncing options for local files
|
||||||
mbsync = {
|
mbsync = {
|
||||||
enable = true;
|
enable = true;
|
||||||
create = "both";
|
create = "both";
|
||||||
expunge = "both";
|
expunge = "both";
|
||||||
remove = "both";
|
remove = "both";
|
||||||
patterns = [ "*" ];
|
patterns = [ "*" ];
|
||||||
extraConfig.channel = {
|
extraConfig.channel = {
|
||||||
CopyArrivalDate = "yes"; # Sync time of original message
|
CopyArrivalDate = "yes"; # Sync time of original message
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable indexing
|
|
||||||
notmuch.enable = true;
|
|
||||||
|
|
||||||
# Used to login and send and receive emails
|
|
||||||
passwordCommand = "${pkgs.age}/bin/age --decrypt --identity ~/.ssh/id_ed25519 ${pkgs.writeText "mailpass.age" (builtins.readFile ../../../private/mailpass.age)}";
|
|
||||||
|
|
||||||
smtp = {
|
|
||||||
host = config.mail.smtpHost;
|
|
||||||
port = 465;
|
|
||||||
tls.enable = true;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Enable indexing
|
||||||
|
notmuch.enable = true;
|
||||||
|
|
||||||
|
# Used to login and send and receive emails
|
||||||
|
passwordCommand =
|
||||||
|
"${pkgs.age}/bin/age --decrypt --identity ~/.ssh/id_ed25519 ${
|
||||||
|
pkgs.writeText "mailpass.age"
|
||||||
|
(builtins.readFile ../../../private/mailpass.age)
|
||||||
|
}";
|
||||||
|
|
||||||
|
smtp = {
|
||||||
|
host = config.mail.smtpHost;
|
||||||
|
port = 465;
|
||||||
|
tls.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ config, lib, ... }:
|
{ config, lib, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
options.mail.himalaya.enable = lib.mkEnableOption "Himalaya email.";
|
options.mail.himalaya.enable = lib.mkEnableOption "Himalaya email.";
|
||||||
|
|
||||||
@ -7,20 +6,20 @@
|
|||||||
|
|
||||||
home-manager.users.${config.user} = {
|
home-manager.users.${config.user} = {
|
||||||
|
|
||||||
programs.himalaya = {
|
programs.himalaya = { enable = true; };
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
accounts.email.accounts.home.himalaya = {
|
accounts.email.accounts.home.himalaya = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
backend = "imap";
|
||||||
|
sender = "smtp";
|
||||||
settings = {
|
settings = {
|
||||||
downloads-dir = config.userDirs.download;
|
downloads-dir = config.userDirs.download;
|
||||||
smtp-insecure = true;
|
smtp-insecure = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.fish.shellAbbrs = {
|
programs.fish.shellAbbrs = { hi = "himalaya"; };
|
||||||
hi = "himalaya";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
config = lib.mkIf (config.mail.enable || config.server) {
|
config = lib.mkIf (config.mail.enable || config.server) {
|
||||||
|
|
||||||
@ -14,15 +8,17 @@
|
|||||||
|
|
||||||
# The system user for sending automatic notifications
|
# The system user for sending automatic notifications
|
||||||
accounts.email.accounts.system =
|
accounts.email.accounts.system =
|
||||||
let
|
let address = "system@${config.mail.server}";
|
||||||
address = "system@${config.mail.server}";
|
in {
|
||||||
in
|
|
||||||
{
|
|
||||||
userName = address;
|
userName = address;
|
||||||
realName = "NixOS System";
|
realName = "NixOS System";
|
||||||
primary = !config.mail.enable; # Only primary if mail not enabled
|
primary = !config.mail.enable; # Only primary if mail not enabled
|
||||||
inherit address;
|
inherit address;
|
||||||
passwordCommand = "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${pkgs.writeText "mailpass-system.age" (builtins.readFile ../../../private/mailpass-system.age)}";
|
passwordCommand =
|
||||||
|
"${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${
|
||||||
|
pkgs.writeText "mailpass-system.age"
|
||||||
|
(builtins.readFile ../../../private/mailpass-system.age)
|
||||||
|
}";
|
||||||
msmtp.enable = true;
|
msmtp.enable = true;
|
||||||
smtp = {
|
smtp = {
|
||||||
host = config.mail.smtpHost;
|
host = config.mail.smtpHost;
|
||||||
@ -30,6 +26,9 @@
|
|||||||
tls.enable = true;
|
tls.enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
# Plugin for aligning text programmatically
|
# Plugin for aligning text programmatically
|
||||||
|
|
||||||
|
@ -1,22 +1,19 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
# Shows buffers in a VSCode-style tab layout
|
# Shows buffers in a VSCode-style tab layout
|
||||||
|
|
||||||
plugins = [
|
plugins = [
|
||||||
pkgs.vimPlugins.bufferline-nvim
|
pkgs.vimPlugins.bufferline-nvim
|
||||||
pkgs.vimPlugins.vim-bbye # Better closing of buffers
|
pkgs.vimPlugins.vim-bbye # Better closing of buffers
|
||||||
pkgs.vimPlugins.snipe-nvim # Jump between open buffers
|
|
||||||
];
|
];
|
||||||
setup.bufferline = {
|
setup.bufferline = {
|
||||||
options = {
|
options = {
|
||||||
diagnostics = "nvim_lsp";
|
diagnostics = "nvim_lsp";
|
||||||
always_show_bufferline = false;
|
always_show_bufferline = false;
|
||||||
separator_style = "slant";
|
separator_style = "slant";
|
||||||
offsets = [ { filetype = "NvimTree"; } ];
|
offsets = [{ filetype = "NvimTree"; }];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
setup.snipe = { };
|
|
||||||
lua = ''
|
lua = ''
|
||||||
-- Move buffers
|
-- Move buffers
|
||||||
vim.keymap.set("n", "L", ":BufferLineCycleNext<CR>", { silent = true })
|
vim.keymap.set("n", "L", ":BufferLineCycleNext<CR>", { silent = true })
|
||||||
@ -24,7 +21,5 @@
|
|||||||
|
|
||||||
-- Kill buffer
|
-- Kill buffer
|
||||||
vim.keymap.set("n", "<Leader>x", " :Bdelete<CR>", { silent = true })
|
vim.keymap.set("n", "<Leader>x", " :Bdelete<CR>", { silent = true })
|
||||||
|
'';
|
||||||
-- Jump to buffer
|
|
||||||
vim.keymap.set("n", "gb", require("snipe").open_buffer_menu, { silent = true }) '';
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ pkgs, lib, config, ... }: {
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
# Sets Neovim colors based on Nix colorscheme
|
# Sets Neovim colors based on Nix colorscheme
|
||||||
|
|
||||||
@ -14,7 +8,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
plugins = [ pkgs.vimPlugins.base16-nvim ];
|
plugins = [ pkgs.vimPlugins.nvim-base16 ];
|
||||||
setup.base16-colorscheme = config.colors;
|
setup.base16-colorscheme = config.colors;
|
||||||
|
|
||||||
# Telescope isn't working, shut off for now
|
# Telescope isn't working, shut off for now
|
||||||
@ -24,4 +18,5 @@
|
|||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ pkgs, dsl, ... }:
|
{ pkgs, dsl, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
plugins = [
|
plugins = [
|
||||||
pkgs.vimPlugins.cmp-nvim-lsp
|
pkgs.vimPlugins.cmp-nvim-lsp
|
||||||
@ -26,15 +25,21 @@
|
|||||||
|
|
||||||
# Basic completion keybinds
|
# Basic completion keybinds
|
||||||
mapping = {
|
mapping = {
|
||||||
"['<C-n>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })";
|
"['<C-n>']" = dsl.rawLua
|
||||||
"['<C-p>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })";
|
"require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert })";
|
||||||
"['<Down>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
|
"['<C-p>']" = dsl.rawLua
|
||||||
"['<Up>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
|
"require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert })";
|
||||||
|
"['<Down>']" = dsl.rawLua
|
||||||
|
"require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select })";
|
||||||
|
"['<Up>']" = dsl.rawLua
|
||||||
|
"require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select })";
|
||||||
"['<C-d>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(-4)";
|
"['<C-d>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(-4)";
|
||||||
"['<C-f>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(4)";
|
"['<C-f>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(4)";
|
||||||
"['<C-e>']" = dsl.rawLua "require('cmp').mapping.abort()";
|
"['<C-e>']" = dsl.rawLua "require('cmp').mapping.abort()";
|
||||||
"['<C-y>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })";
|
"['<CR>']" = dsl.rawLua
|
||||||
"['<C-r>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, }, { 'i', 'c' })";
|
"require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, })";
|
||||||
|
"['<C-r>']" = dsl.rawLua
|
||||||
|
"require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, })";
|
||||||
"['<Esc>']" = dsl.rawLua ''
|
"['<Esc>']" = dsl.rawLua ''
|
||||||
function(_)
|
function(_)
|
||||||
cmp.mapping({
|
cmp.mapping({
|
||||||
@ -44,7 +49,7 @@
|
|||||||
vim.cmd("stopinsert") --- Abort and leave insert mode
|
vim.cmd("stopinsert") --- Abort and leave insert mode
|
||||||
end
|
end
|
||||||
'';
|
'';
|
||||||
"['<C-k>']" = dsl.rawLua ''
|
"['<C-l>']" = dsl.rawLua ''
|
||||||
cmp.mapping(function(_)
|
cmp.mapping(function(_)
|
||||||
if require("luasnip").expand_or_jumpable() then
|
if require("luasnip").expand_or_jumpable() then
|
||||||
require("luasnip").expand_or_jump()
|
require("luasnip").expand_or_jump()
|
||||||
@ -67,19 +72,13 @@
|
|||||||
name = "rg"; # Grep for text from the current directory
|
name = "rg"; # Grep for text from the current directory
|
||||||
keyword_length = 6;
|
keyword_length = 6;
|
||||||
max_item_count = 10;
|
max_item_count = 10;
|
||||||
option = {
|
option = { additional_arguments = "--ignore-case"; };
|
||||||
additional_arguments = "--ignore-case";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
# Styling of the completion menu
|
# Styling of the completion menu
|
||||||
formatting = {
|
formatting = {
|
||||||
fields = [
|
fields = [ "kind" "abbr" "menu" ];
|
||||||
"kind"
|
|
||||||
"abbr"
|
|
||||||
"menu"
|
|
||||||
];
|
|
||||||
format = dsl.rawLua ''
|
format = dsl.rawLua ''
|
||||||
function(entry, vim_item)
|
function(entry, vim_item)
|
||||||
local kind_icons = {
|
local kind_icons = {
|
||||||
@ -126,46 +125,19 @@
|
|||||||
native_menu = false; # Use cmp menu instead of Vim menu
|
native_menu = false; # Use cmp menu instead of Vim menu
|
||||||
ghost_text = true; # Show preview auto-completion
|
ghost_text = true; # Show preview auto-completion
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
lua = ''
|
lua = ''
|
||||||
-- Use buffer source for `/`
|
-- Use buffer source for `/`
|
||||||
require('cmp').setup.cmdline("/", {
|
require('cmp').setup.cmdline("/", {
|
||||||
mapping = {
|
sources = {
|
||||||
['<C-n>'] = {
|
|
||||||
c = require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
|
|
||||||
},
|
|
||||||
['<C-p>'] = {
|
|
||||||
c = require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
|
|
||||||
},
|
|
||||||
['<C-y>'] = {
|
|
||||||
c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })
|
|
||||||
},
|
|
||||||
['<C-r>'] = {
|
|
||||||
c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, }, { 'i', 'c' })
|
|
||||||
},
|
|
||||||
},
|
|
||||||
sources = require('cmp').config.sources({
|
|
||||||
{ name = "buffer", keyword_length = 5 },
|
{ name = "buffer", keyword_length = 5 },
|
||||||
}),
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Use cmdline & path source for ':'
|
-- Use cmdline & path source for ':'
|
||||||
require('cmp').setup.cmdline(":", {
|
require('cmp').setup.cmdline(":", {
|
||||||
mapping = {
|
|
||||||
['<C-n>'] = {
|
|
||||||
c = require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
|
|
||||||
},
|
|
||||||
['<C-p>'] = {
|
|
||||||
c = require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
|
|
||||||
},
|
|
||||||
['<C-y>'] = {
|
|
||||||
c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })
|
|
||||||
},
|
|
||||||
['<C-r>'] = {
|
|
||||||
c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, }, { 'i', 'c' })
|
|
||||||
},
|
|
||||||
},
|
|
||||||
sources = require('cmp').config.sources({
|
sources = require('cmp').config.sources({
|
||||||
{ name = "path" },
|
{ name = "path" },
|
||||||
}, {
|
}, {
|
||||||
@ -173,4 +145,5 @@
|
|||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
'';
|
'';
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -2,11 +2,8 @@
|
|||||||
vim.keymap.set("n", "<Leader>gr", ":!gh browse %<CR><CR>", { silent = true })
|
vim.keymap.set("n", "<Leader>gr", ":!gh browse %<CR><CR>", { silent = true })
|
||||||
|
|
||||||
-- Pop a terminal to watch the current run
|
-- Pop a terminal to watch the current run
|
||||||
local gitwatch = require("toggleterm.terminal").Terminal:new({
|
local gitwatch =
|
||||||
cmd = "fish --interactive --init-command 'gh run watch'",
|
require("toggleterm.terminal").Terminal:new({ cmd = "fish --interactive --init-command 'gh run watch'" })
|
||||||
hidden = true,
|
|
||||||
direction = "float",
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Set a toggle for this terminal
|
-- Set a toggle for this terminal
|
||||||
function GITWATCH_TOGGLE()
|
function GITWATCH_TOGGLE()
|
||||||
@ -14,4 +11,4 @@ function GITWATCH_TOGGLE()
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- Keymap to toggle the run
|
-- Keymap to toggle the run
|
||||||
vim.keymap.set("n", "<Leader>W", GITWATCH_TOGGLE)
|
vim.keymap.set("n", "<Leader>gw", GITWATCH_TOGGLE)
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
plugins = [ pkgs.vimPlugins.gitsigns-nvim ];
|
plugins = [ pkgs.vimPlugins.gitsigns-nvim ];
|
||||||
setup.gitsigns = { };
|
setup.gitsigns = { };
|
||||||
lua = builtins.readFile ./gitsigns.lua;
|
lua = builtins.readFile ./gitsigns.lua;
|
||||||
|
@ -1,166 +1,120 @@
|
|||||||
{
|
{ pkgs, lib, config, dsl, ... }: {
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
dsl,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
# Terraform optional because non-free
|
# Terraform optional because non-free
|
||||||
options.terraform = lib.mkEnableOption "Whether to enable Terraform LSP";
|
|
||||||
options.github = lib.mkEnableOption "Whether to enable GitHub features";
|
options.github = lib.mkEnableOption "Whether to enable GitHub features";
|
||||||
options.kubernetes = lib.mkEnableOption "Whether to enable Kubernetes features";
|
options.kubernetes =
|
||||||
options.nixosConfiguration = lib.mkOption {
|
lib.mkEnableOption "Whether to enable Kubernetes features";
|
||||||
type = lib.types.str;
|
options.python = lib.mkEnableOption "Whether to enable Python LSP";
|
||||||
description = "Configuration to use for nixd options checking";
|
options.terraform = lib.mkEnableOption "Whether to enable Terraform LSP";
|
||||||
default = "default";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = {
|
config =
|
||||||
plugins = [
|
|
||||||
pkgs.vimPlugins.nvim-lspconfig
|
|
||||||
pkgs.vimPlugins.conform-nvim
|
|
||||||
pkgs.vimPlugins.fidget-nvim
|
|
||||||
pkgs.vimPlugins.nvim-lint
|
|
||||||
pkgs.vimPlugins.vim-table-mode
|
|
||||||
pkgs.vimPlugins.tiny-inline-diagnostic-nvim
|
|
||||||
];
|
|
||||||
|
|
||||||
setup.fidget = { };
|
let
|
||||||
setup.tiny-inline-diagnostic = { };
|
|
||||||
|
|
||||||
use.lspconfig.lua_ls.setup = dsl.callWith {
|
terraformFormat = if config.terraform then ''
|
||||||
settings = {
|
require("null-ls").builtins.formatting.terraform_fmt.with({
|
||||||
Lua = {
|
command = "${pkgs.terraform}/bin/terraform",
|
||||||
diagnostics = {
|
extra_filetypes = { "hcl" },
|
||||||
globals = [
|
}),
|
||||||
"vim"
|
'' else
|
||||||
"hs"
|
"";
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
|
|
||||||
cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
use.lspconfig.nixd.setup = dsl.callWith {
|
pythonFormat = if config.python then ''
|
||||||
cmd = [ "${pkgs.nixd}/bin/nixd" ];
|
require("null-ls").builtins.formatting.black.with({ command = "${pkgs.black}/bin/black" }),
|
||||||
capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
|
require("null-ls").builtins.diagnostics.ruff.with({ command = "${pkgs.ruff}/bin/ruff" }),
|
||||||
# settings = {
|
'' else
|
||||||
# nixd = {
|
"";
|
||||||
# options = {
|
|
||||||
# nixos = {
|
|
||||||
# expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).nixosConfigurations.${config.nixosConfiguration}.options";
|
|
||||||
# };
|
|
||||||
# home-manager = {
|
|
||||||
# expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).homeConfigurations.${config.nixosConfiguration}.options";
|
|
||||||
# };
|
|
||||||
# darwin = {
|
|
||||||
# expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).darwinConfigurations.${config.nixosConfiguration}.options";
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
};
|
|
||||||
|
|
||||||
use.lspconfig.pyright.setup = dsl.callWith {
|
in {
|
||||||
cmd = [
|
plugins = [
|
||||||
"${pkgs.pyright}/bin/pyright-langserver"
|
pkgs.vimPlugins.nvim-lspconfig
|
||||||
"--stdio"
|
pkgs.vimPlugins.null-ls-nvim
|
||||||
|
pkgs.vimPlugins.fidget-nvim
|
||||||
];
|
];
|
||||||
};
|
|
||||||
|
|
||||||
use.lspconfig.terraformls.setup = dsl.callWith {
|
setup.fidget = { };
|
||||||
cmd =
|
|
||||||
if config.terraform then
|
use.lspconfig.lua_ls.setup = dsl.callWith {
|
||||||
[
|
settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
|
||||||
"${pkgs.terraform-ls}/bin/terraform-ls"
|
capabilities =
|
||||||
"serve"
|
dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
|
||||||
]
|
cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
|
||||||
else
|
};
|
||||||
|
|
||||||
|
use.lspconfig.nil_ls.setup = dsl.callWith {
|
||||||
|
cmd = [ "${pkgs.nil}/bin/nil" ];
|
||||||
|
capabilities =
|
||||||
|
dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
|
||||||
|
};
|
||||||
|
|
||||||
|
use.lspconfig.pyright.setup = dsl.callWith {
|
||||||
|
cmd = if config.python then [
|
||||||
|
"${pkgs.pyright}/bin/pyright-langserver"
|
||||||
|
"--stdio"
|
||||||
|
] else
|
||||||
[ "echo" ];
|
[ "echo" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
use.lspconfig.rust_analyzer.setup = dsl.callWith {
|
use.lspconfig.terraformls.setup = dsl.callWith {
|
||||||
cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ];
|
cmd = if config.terraform then [
|
||||||
settings = {
|
"${pkgs.terraform-ls}/bin/terraform-ls"
|
||||||
"['rust-analyzer']" = {
|
"serve"
|
||||||
check = {
|
] else
|
||||||
command = "clippy";
|
[ "echo" ];
|
||||||
};
|
};
|
||||||
files = {
|
|
||||||
excludeDirs = [ ".direnv" ];
|
use.lspconfig.rust_analyzer.setup = dsl.callWith {
|
||||||
};
|
cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ];
|
||||||
cargo = {
|
settings = {
|
||||||
features = "all";
|
"['rust-analyzer']" = { check = { command = "clippy"; }; };
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];
|
||||||
|
|
||||||
|
lua = ''
|
||||||
|
${builtins.readFile ./lsp.lua}
|
||||||
|
|
||||||
|
-- Prevent infinite log size (change this when debugging)
|
||||||
|
vim.lsp.set_log_level("off")
|
||||||
|
|
||||||
|
require("null-ls").setup({
|
||||||
|
sources = {
|
||||||
|
require("null-ls").builtins.formatting.stylua.with({ command = "${pkgs.stylua}/bin/stylua" }),
|
||||||
|
require("null-ls").builtins.formatting.fish_indent.with({ command = "${pkgs.fish}/bin/fish_indent" }),
|
||||||
|
require("null-ls").builtins.formatting.nixfmt.with({ command = "${pkgs.nixfmt}/bin/nixfmt" }),
|
||||||
|
require("null-ls").builtins.formatting.rustfmt.with({ command = "${pkgs.rustfmt}/bin/rustfmt" }),
|
||||||
|
require("null-ls").builtins.diagnostics.shellcheck.with({ command = "${pkgs.shellcheck}/bin/shellcheck" }),
|
||||||
|
require("null-ls").builtins.formatting.shfmt.with({
|
||||||
|
command = "${pkgs.shfmt}/bin/shfmt",
|
||||||
|
extra_args = { "-i", "4", "-ci" },
|
||||||
|
}),
|
||||||
|
${pythonFormat}
|
||||||
|
${terraformFormat}
|
||||||
|
},
|
||||||
|
|
||||||
|
on_attach = function(client, bufnr)
|
||||||
|
if client.supports_method("textDocument/formatting") then
|
||||||
|
-- Auto-format on save
|
||||||
|
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
|
||||||
|
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||||
|
group = augroup,
|
||||||
|
buffer = bufnr,
|
||||||
|
callback = function()
|
||||||
|
vim.lsp.buf.format({ bufnr = bufnr })
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
-- Use internal formatting for bindings like gq.
|
||||||
|
vim.api.nvim_create_autocmd("LspAttach", {
|
||||||
|
callback = function(args)
|
||||||
|
vim.bo[args.buf].formatexpr = nil
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
'';
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
setup.conform = {
|
|
||||||
format_on_save = {
|
|
||||||
# These options will be passed to conform.format()
|
|
||||||
timeout_ms = 1500;
|
|
||||||
lsp_fallback = true;
|
|
||||||
};
|
|
||||||
formatters_by_ft = {
|
|
||||||
lua = [ "stylua" ];
|
|
||||||
python = [ "black" ];
|
|
||||||
fish = [ "fish_indent" ];
|
|
||||||
nix = [ "nixfmt" ];
|
|
||||||
rust = [ "rustfmt" ];
|
|
||||||
sh = [ "shfmt" ];
|
|
||||||
terraform = if config.terraform then [ "terraform_fmt" ] else [ ];
|
|
||||||
hcl = [ "hcl" ];
|
|
||||||
};
|
|
||||||
formatters = {
|
|
||||||
lua.command = "${pkgs.stylua}/bin/stylua";
|
|
||||||
black.command = "${pkgs.black}/bin/black";
|
|
||||||
fish_indent.command = "${pkgs.fish}/bin/fish_indent";
|
|
||||||
nixfmt.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
|
|
||||||
rustfmt.command = "${pkgs.rustfmt}/bin/rustfmt";
|
|
||||||
shfmt = {
|
|
||||||
command = "${pkgs.shfmt}/bin/shfmt";
|
|
||||||
prepend_args = [
|
|
||||||
"-i"
|
|
||||||
"4"
|
|
||||||
"-ci"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
terraform_fmt.command = if config.terraform then "${pkgs.terraform}/bin/terraform" else "";
|
|
||||||
hcl.command = "${pkgs.hclfmt}/bin/hclfmt";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
use.lint = {
|
|
||||||
linters_by_ft = dsl.toTable {
|
|
||||||
python = [ "ruff" ];
|
|
||||||
sh = [ "shellcheck" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd = dsl.callWith [
|
|
||||||
(dsl.toTable [
|
|
||||||
"BufEnter"
|
|
||||||
"BufWritePost"
|
|
||||||
])
|
|
||||||
(dsl.rawLua "{ callback = function() require('lint').try_lint() end }")
|
|
||||||
];
|
|
||||||
|
|
||||||
lua = ''
|
|
||||||
${builtins.readFile ./lsp.lua}
|
|
||||||
|
|
||||||
local ruff = require('lint').linters.ruff; ruff.cmd = "${pkgs.ruff}/bin/ruff"
|
|
||||||
local shellcheck = require('lint').linters.shellcheck; shellcheck.cmd = "${pkgs.shellcheck}/bin/shellcheck"
|
|
||||||
|
|
||||||
-- Prevent infinite log size (change this when debugging)
|
|
||||||
vim.lsp.set_log_level("off")
|
|
||||||
|
|
||||||
-- Hide buffer diagnostics (use tiny-inline-diagnostic.nvim instead)
|
|
||||||
vim.diagnostic.config({ virtual_text = false })
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
@ -1,29 +1,22 @@
|
|||||||
{
|
{ pkgs, dsl, lib, ... }: {
|
||||||
pkgs,
|
|
||||||
dsl,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
plugins = [
|
plugins = [
|
||||||
pkgs.vimPlugins.vim-surround # Keybinds for surround characters
|
pkgs.vimPlugins.vim-surround # Keybinds for surround characters
|
||||||
pkgs.vimPlugins.vim-eunuch # File manipulation commands
|
pkgs.vimPlugins.vim-eunuch # File manipulation commands
|
||||||
pkgs.vimPlugins.vim-fugitive # Git commands
|
pkgs.vimPlugins.vim-fugitive # Git commands
|
||||||
pkgs.vimPlugins.vim-repeat # Better repeat using .
|
pkgs.vimPlugins.vim-repeat # Better repeat using .
|
||||||
pkgs.vimPlugins.vim-abolish # Keep capitalization in substitute (Subvert)
|
pkgs.vimPlugins.comment-nvim # Smart comment commands
|
||||||
pkgs.vimPlugins.markview-nvim # Markdown preview
|
pkgs.vimPlugins.glow-nvim # Markdown preview popup
|
||||||
pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
|
pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
|
||||||
pkgs.vimPlugins.which-key-nvim # Keybind helper
|
pkgs.vimPlugins.which-key-nvim # Keybind helper
|
||||||
|
pkgs.kitty-scrollback-nvim # Scrollback pager for kitty
|
||||||
];
|
];
|
||||||
|
|
||||||
# Initialize some plugins
|
# Initialize some plugins
|
||||||
setup.colorizer = {
|
setup.Comment = { };
|
||||||
user_default_options = {
|
setup.colorizer = { user_default_options = { names = false; }; };
|
||||||
names = false;
|
setup.glow = { };
|
||||||
};
|
|
||||||
};
|
|
||||||
setup.markview = { };
|
|
||||||
setup.which-key = { };
|
setup.which-key = { };
|
||||||
|
setup.kitty-scrollback = { };
|
||||||
|
|
||||||
vim.o = {
|
vim.o = {
|
||||||
termguicolors = true; # Set to truecolor
|
termguicolors = true; # Set to truecolor
|
||||||
@ -41,6 +34,7 @@
|
|||||||
scrolloff = 3; # Margin of lines to see while scrolling
|
scrolloff = 3; # Margin of lines to see while scrolling
|
||||||
splitright = true; # Vertical splits on the right side
|
splitright = true; # Vertical splits on the right side
|
||||||
splitbelow = true; # Horizontal splits on the bottom side
|
splitbelow = true; # Horizontal splits on the bottom side
|
||||||
|
pastetoggle = "<F3>"; # Use F3 to enter raw paste mode
|
||||||
clipboard = "unnamedplus"; # Uses system clipboard for yanking
|
clipboard = "unnamedplus"; # Uses system clipboard for yanking
|
||||||
updatetime = 300; # Faster diagnostics
|
updatetime = 300; # Faster diagnostics
|
||||||
mouse = "nv"; # Mouse interaction / scrolling
|
mouse = "nv"; # Mouse interaction / scrolling
|
||||||
@ -58,17 +52,14 @@
|
|||||||
|
|
||||||
# Better backup, swap and undo storage
|
# Better backup, swap and undo storage
|
||||||
vim.o.backup = true; # Easier to recover and more secure
|
vim.o.backup = true; # Easier to recover and more secure
|
||||||
vim.opt.undofile = true; # Keeps undos after quit
|
vim.bo.swapfile = false; # Instead of swaps, create backups
|
||||||
vim.opt.swapfile = false; # Instead of swaps, create backups
|
vim.bo.undofile = true; # Keeps undos after quit
|
||||||
vim.o.backupdir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/backup//")'';
|
vim.o.backupdir =
|
||||||
|
dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/backup//")'';
|
||||||
vim.o.undodir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/undo//")'';
|
vim.o.undodir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/undo//")'';
|
||||||
|
|
||||||
# Required for nvim-cmp completion
|
# Required for nvim-cmp completion
|
||||||
vim.opt.completeopt = [
|
vim.opt.completeopt = [ "menu" "menuone" "noselect" ];
|
||||||
"menu"
|
|
||||||
"menuone"
|
|
||||||
"noselect"
|
|
||||||
];
|
|
||||||
|
|
||||||
lua = lib.mkBefore ''
|
lua = lib.mkBefore ''
|
||||||
vim.loader.enable()
|
vim.loader.enable()
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
plugins = [ pkgs.vimPlugins.lualine-nvim ];
|
plugins = [ pkgs.vimPlugins.lualine-nvim ];
|
||||||
setup.lualine = {
|
setup.lualine = {
|
||||||
options = {
|
options = {
|
||||||
|
@ -1,13 +1,12 @@
|
|||||||
{ pkgs, lib, ... }:
|
{ pkgs, lib, config, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
plugins = [
|
plugins = [
|
||||||
(pkgs.vimPlugins.nvim-treesitter.withPlugins (
|
(pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
|
||||||
_plugins: with pkgs.tree-sitter-grammars; [
|
with pkgs.tree-sitter-grammars;
|
||||||
|
[
|
||||||
tree-sitter-bash
|
tree-sitter-bash
|
||||||
tree-sitter-c
|
tree-sitter-c
|
||||||
tree-sitter-fish
|
tree-sitter-fish
|
||||||
tree-sitter-hcl
|
|
||||||
tree-sitter-ini
|
tree-sitter-ini
|
||||||
tree-sitter-json
|
tree-sitter-json
|
||||||
tree-sitter-lua
|
tree-sitter-lua
|
||||||
@ -15,35 +14,28 @@
|
|||||||
tree-sitter-markdown-inline
|
tree-sitter-markdown-inline
|
||||||
tree-sitter-nix
|
tree-sitter-nix
|
||||||
tree-sitter-puppet
|
tree-sitter-puppet
|
||||||
tree-sitter-python
|
|
||||||
tree-sitter-rasi
|
tree-sitter-rasi
|
||||||
tree-sitter-toml
|
tree-sitter-toml
|
||||||
tree-sitter-vimdoc
|
tree-sitter-vimdoc
|
||||||
tree-sitter-yaml
|
tree-sitter-yaml
|
||||||
]
|
] ++ (if config.python.enable then [ tree-sitter-python ] else [ ])
|
||||||
))
|
++ (if config.terraform.enable then [ tree-sitter-hcl ] else [ ])))
|
||||||
pkgs.vimPlugins.vim-matchup # Better % jumping in languages
|
pkgs.vimPlugins.vim-matchup # Better % jumping in languages
|
||||||
pkgs.vimPlugins.playground # Tree-sitter experimenting
|
pkgs.vimPlugins.playground # Tree-sitter experimenting
|
||||||
pkgs.vimPlugins.nginx-vim
|
pkgs.vimPlugins.nginx-vim
|
||||||
pkgs.vimPlugins.vim-helm
|
pkgs.baleia-nvim # Clean ANSI from kitty scrollback
|
||||||
# pkgs.vimPlugins.hmts-nvim # Tree-sitter injections for home-manager
|
# pkgs.hmts-nvim # Tree-sitter injections for home-manager
|
||||||
(pkgs.vimUtils.buildVimPlugin {
|
(pkgs.vimUtils.buildVimPlugin {
|
||||||
pname = "nmasur";
|
pname = "nmasur";
|
||||||
version = "0.1";
|
version = "0.1";
|
||||||
src = ../plugin;
|
src = ../plugin;
|
||||||
})
|
})
|
||||||
];
|
] ++ (if config.kubernetes.enable then [ pkgs.vimPlugins.vim-helm ] else [ ]);
|
||||||
|
|
||||||
setup."nvim-treesitter.configs" = {
|
setup."nvim-treesitter.configs" = {
|
||||||
highlight = {
|
highlight = { enable = true; };
|
||||||
enable = true;
|
indent = { enable = true; };
|
||||||
};
|
matchup = { enable = true; }; # Uses vim-matchup
|
||||||
indent = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
matchup = {
|
|
||||||
enable = true;
|
|
||||||
}; # Uses vim-matchup
|
|
||||||
|
|
||||||
textobjects = {
|
textobjects = {
|
||||||
select = {
|
select = {
|
||||||
@ -77,4 +69,5 @@
|
|||||||
-- Use HCL parser with .tf files
|
-- Use HCL parser with .tf files
|
||||||
vim.treesitter.language.register('hcl', 'terraform')
|
vim.treesitter.language.register('hcl', 'terraform')
|
||||||
'';
|
'';
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ pkgs, dsl, ... }:
|
{ pkgs, dsl, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
# Telescope is a fuzzy finder that can work with different sub-plugins
|
# Telescope is a fuzzy finder that can work with different sub-plugins
|
||||||
|
|
||||||
@ -21,15 +20,9 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
pickers = {
|
pickers = {
|
||||||
find_files = {
|
find_files = { theme = "ivy"; };
|
||||||
theme = "ivy";
|
oldfiles = { theme = "ivy"; };
|
||||||
};
|
buffers = { theme = "dropdown"; };
|
||||||
oldfiles = {
|
|
||||||
theme = "ivy";
|
|
||||||
};
|
|
||||||
buffers = {
|
|
||||||
theme = "dropdown";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
extensions = {
|
extensions = {
|
||||||
fzy_native = { };
|
fzy_native = { };
|
||||||
@ -40,4 +33,5 @@
|
|||||||
setup.project_nvim = { };
|
setup.project_nvim = { };
|
||||||
|
|
||||||
lua = builtins.readFile ./telescope.lua;
|
lua = builtins.readFile ./telescope.lua;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ pkgs, dsl, config, ... }: {
|
||||||
pkgs,
|
|
||||||
dsl,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
# Toggleterm provides a floating terminal inside the editor for quick access
|
# Toggleterm provides a floating terminal inside the editor for quick access
|
||||||
|
|
||||||
@ -21,4 +15,5 @@
|
|||||||
${if config.github then (builtins.readFile ./github.lua) else ""}
|
${if config.github then (builtins.readFile ./github.lua) else ""}
|
||||||
${if config.kubernetes then (builtins.readFile ./kubernetes.lua) else ""}
|
${if config.kubernetes then (builtins.readFile ./kubernetes.lua) else ""}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,8 @@
|
|||||||
{ pkgs, dsl, ... }:
|
{ pkgs, dsl, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
# This plugin creates a side drawer for navigating the current project
|
# This plugin creates a side drawer for navigating the current project
|
||||||
|
|
||||||
plugins = [
|
plugins = [ pkgs.vimPlugins.nvim-tree-lua pkgs.vimPlugins.nvim-web-devicons ];
|
||||||
pkgs.vimPlugins.nvim-tree-lua
|
|
||||||
pkgs.vimPlugins.nvim-web-devicons
|
|
||||||
];
|
|
||||||
|
|
||||||
# Disable netrw eagerly
|
# Disable netrw eagerly
|
||||||
# https://github.com/kyazdani42/nvim-tree.lua/commit/fb8735e96cecf004fbefb086ce85371d003c5129
|
# https://github.com/kyazdani42/nvim-tree.lua/commit/fb8735e96cecf004fbefb086ce85371d003c5129
|
||||||
@ -20,14 +16,12 @@
|
|||||||
hijack_netrw = true; # Works as the file manager
|
hijack_netrw = true; # Works as the file manager
|
||||||
sync_root_with_cwd = true; # Change project whenever currend dir changes
|
sync_root_with_cwd = true; # Change project whenever currend dir changes
|
||||||
respect_buf_cwd = true; # Change to exact location of focused buffer
|
respect_buf_cwd = true; # Change to exact location of focused buffer
|
||||||
update_focused_file = {
|
update_focused_file = { # Change project based on the focused buffer
|
||||||
# Change project based on the focused buffer
|
|
||||||
enable = true;
|
enable = true;
|
||||||
update_root = true;
|
update_root = true;
|
||||||
ignore_list = { };
|
ignore_list = { };
|
||||||
};
|
};
|
||||||
diagnostics = {
|
diagnostics = { # Enable LSP and linter integration
|
||||||
# Enable LSP and linter integration
|
|
||||||
enable = true;
|
enable = true;
|
||||||
icons = {
|
icons = {
|
||||||
hint = "";
|
hint = "";
|
||||||
@ -36,8 +30,7 @@
|
|||||||
error = "";
|
error = "";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
renderer = {
|
renderer = { # Show files with changes vs. current commit
|
||||||
# Show files with changes vs. current commit
|
|
||||||
icons = {
|
icons = {
|
||||||
glyphs = {
|
glyphs = {
|
||||||
git = {
|
git = {
|
||||||
@ -68,8 +61,7 @@
|
|||||||
vim.keymap.set('n', 'v', api.node.open.vertical, opts('Open: Vertical Split'))
|
vim.keymap.set('n', 'v', api.node.open.vertical, opts('Open: Vertical Split'))
|
||||||
end
|
end
|
||||||
'';
|
'';
|
||||||
view = {
|
view = { # Set look and feel
|
||||||
# Set look and feel
|
|
||||||
width = 30;
|
width = 30;
|
||||||
side = "left";
|
side = "left";
|
||||||
number = false;
|
number = false;
|
||||||
@ -81,4 +73,5 @@
|
|||||||
lua = ''
|
lua = ''
|
||||||
vim.keymap.set("n", "<Leader>e", ":NvimTreeFindFileToggle<CR>", { silent = true })
|
vim.keymap.set("n", "<Leader>e", ":NvimTreeFindFileToggle<CR>", { silent = true })
|
||||||
'';
|
'';
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,22 +1,18 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }:
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
neovim = import ./package {
|
neovim = import ./package {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
colors = config.theme.colors;
|
colors = config.theme.colors;
|
||||||
terraform = config.terraform.enable;
|
c = config.c.enable;
|
||||||
github = true;
|
github = true;
|
||||||
kubernetes = config.kubernetes.enable;
|
kubernetes = config.kubernetes.enable;
|
||||||
nixosConfiguration = config.networking.hostName; # Used for Nixd
|
python = config.python.enable;
|
||||||
|
terraform = config.terraform.enable;
|
||||||
};
|
};
|
||||||
in
|
|
||||||
{
|
in {
|
||||||
|
|
||||||
options.neovim.enable = lib.mkEnableOption "Neovim.";
|
options.neovim.enable = lib.mkEnableOption "Neovim.";
|
||||||
|
|
||||||
@ -39,9 +35,7 @@ in
|
|||||||
|
|
||||||
# Create quick aliases for launching Neovim
|
# Create quick aliases for launching Neovim
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
shellAliases = {
|
shellAliases = { vim = "nvim"; };
|
||||||
vim = "nvim";
|
|
||||||
};
|
|
||||||
shellAbbrs = {
|
shellAbbrs = {
|
||||||
v = lib.mkForce "nvim";
|
v = lib.mkForce "nvim";
|
||||||
vl = lib.mkForce "nvim -c 'normal! `0' -c 'bdelete 1'";
|
vl = lib.mkForce "nvim -c 'normal! `0' -c 'bdelete 1'";
|
||||||
@ -49,20 +43,27 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Set Neovim as the kitty terminal "scrollback" (vi mode) option.
|
||||||
|
# Requires removing some of the ANSI escape codes that are sent to the
|
||||||
|
# scrollback using sed and baleia, as well as removing several
|
||||||
|
# unnecessary features.
|
||||||
|
programs.kitty.settings.scrollback_pager =
|
||||||
|
"${neovim}/bin/nvim --headless +'KittyScrollbackGenerateKittens' +'set nonumber' +'set norelativenumber' +'%print' +'quit!' 2>&1";
|
||||||
|
|
||||||
# Create a desktop option for launching Neovim from a file manager
|
# Create a desktop option for launching Neovim from a file manager
|
||||||
# (Requires launching the terminal and then executing Neovim)
|
# (Requires launching the terminal and then executing Neovim)
|
||||||
xdg.desktopEntries.nvim = lib.mkIf (pkgs.stdenv.isLinux && config.gui.enable) {
|
xdg.desktopEntries.nvim = lib.mkIf pkgs.stdenv.isLinux {
|
||||||
name = "Neovim wrapper";
|
name = "Neovim wrapper";
|
||||||
exec = "${config.home-manager.users.${config.user}.programs.rofi.terminal} nvim %F";
|
exec = "kitty nvim %F";
|
||||||
mimeType = [
|
mimeType = [ "text/plain" "text/markdown" ];
|
||||||
"text/plain"
|
|
||||||
"text/markdown"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
xdg.mimeApps.defaultApplications = lib.mkIf pkgs.stdenv.isLinux {
|
xdg.mimeApps.defaultApplications = lib.mkIf pkgs.stdenv.isLinux {
|
||||||
"text/plain" = [ "nvim.desktop" ];
|
"text/plain" = [ "nvim.desktop" ];
|
||||||
"text/markdown" = [ "nvim.desktop" ];
|
"text/markdown" = [ "nvim.desktop" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -71,8 +71,8 @@ key("n", "co", ":copen<CR>")
|
|||||||
key("n", "cq", ":cclose<CR>")
|
key("n", "cq", ":cclose<CR>")
|
||||||
|
|
||||||
-- Other
|
-- Other
|
||||||
key("n", "<A-CR>", ":noh<CR>", { silent = true }) --- Clear search in VimWiki
|
key("n", "<A-CR>", ":noh<CR>", { silent = true }) --- Clear search in VimWiki
|
||||||
key("n", "Y", "y$") --- Copy to end of line
|
key("n", "Y", "y$") --- Copy to end of line
|
||||||
key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected
|
key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected
|
||||||
key("v", "D", "y'>gp") --- Duplicate selected
|
key("v", "D", "y'>gp") --- Duplicate selected
|
||||||
key("x", "<Leader>p", '"_dP') --- Paste but keep register
|
key("x", "<Leader>p", '"_dP') --- Paste but keep register
|
||||||
|
@ -11,20 +11,8 @@ vim.filetype.add({
|
|||||||
})
|
})
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd("FileType", {
|
vim.api.nvim_create_autocmd("FileType", {
|
||||||
pattern = "mail",
|
pattern = "*.eml",
|
||||||
callback = function()
|
callback = function()
|
||||||
vim.o.wrapmargin = 79 -- Wrap text automatically
|
vim.o.wrapmargin = 79 -- Wrap text automatically
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd("FileType", {
|
|
||||||
pattern = "markdown",
|
|
||||||
command = "TableModeEnable",
|
|
||||||
})
|
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd("FileType", {
|
|
||||||
pattern = "terraform",
|
|
||||||
callback = function()
|
|
||||||
vim.bo.commentstring = "# %s"
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
@ -26,27 +26,13 @@
|
|||||||
# ] ++ extraConfig;
|
# ] ++ extraConfig;
|
||||||
# }
|
# }
|
||||||
|
|
||||||
{
|
{ pkgs, colors, terraform ? false, github ? false, kubernetes ? false, ... }:
|
||||||
pkgs,
|
|
||||||
colors,
|
|
||||||
terraform ? false,
|
|
||||||
github ? false,
|
|
||||||
kubernetes ? false,
|
|
||||||
nixosConfiguration ? "default",
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
# Comes from nix2vim overlay:
|
# Comes from nix2vim overlay:
|
||||||
# https://github.com/gytis-ivaskevicius/nix2vim/blob/master/lib/neovim-builder.nix
|
# https://github.com/gytis-ivaskevicius/nix2vim/blob/master/lib/neovim-builder.nix
|
||||||
pkgs.neovimBuilder {
|
pkgs.neovimBuilder {
|
||||||
package = pkgs.neovim-unwrapped;
|
package = pkgs.neovim-unwrapped;
|
||||||
inherit
|
inherit colors terraform github kubernetes;
|
||||||
colors
|
|
||||||
terraform
|
|
||||||
github
|
|
||||||
kubernetes
|
|
||||||
nixosConfiguration
|
|
||||||
;
|
|
||||||
imports = [
|
imports = [
|
||||||
../config/align.nix
|
../config/align.nix
|
||||||
../config/bufferline.nix
|
../config/bufferline.nix
|
||||||
|
1
modules/common/programming/c.nix
Normal file
1
modules/common/programming/c.nix
Normal file
@ -0,0 +1 @@
|
|||||||
|
{ lib, ... }: { options.c.enable = lib.mkEnableOption "C language tools."; }
|
@ -1,12 +1,13 @@
|
|||||||
{ ... }:
|
{ ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./haskell.nix
|
./haskell.nix
|
||||||
./kubernetes.nix
|
./kubernetes.nix
|
||||||
./lua.nix
|
./lua.nix
|
||||||
|
./nix.nix
|
||||||
./python.nix
|
./python.nix
|
||||||
./rust.nix
|
./rust.nix
|
||||||
./terraform.nix
|
./terraform.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,14 @@
|
|||||||
{ config, lib, ... }:
|
{ config, lib, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
options.haskell.enable = lib.mkEnableOption "Haskell programming language.";
|
options.haskell.enable = lib.mkEnableOption "Haskell programming language.";
|
||||||
|
|
||||||
config = lib.mkIf config.haskell.enable {
|
config = lib.mkIf config.haskell.enable {
|
||||||
|
|
||||||
# Binary Cache for Haskell.nix
|
# Binary Cache for Haskell.nix
|
||||||
nix.settings.trusted-public-keys = [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
|
nix.settings.trusted-public-keys =
|
||||||
|
[ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
|
||||||
nix.settings.substituters = [ "https://cache.iog.io" ];
|
nix.settings.substituters = [ "https://cache.iog.io" ];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options.kubernetes.enable = lib.mkEnableOption "Kubernetes tools.";
|
options.kubernetes.enable = lib.mkEnableOption "Kubernetes tools.";
|
||||||
|
|
||||||
@ -105,16 +99,12 @@
|
|||||||
views = {
|
views = {
|
||||||
charts = {
|
charts = {
|
||||||
bgColor = "default";
|
bgColor = "default";
|
||||||
defaultDialColors = [
|
defaultDialColors =
|
||||||
config.theme.colors.base0D
|
[ config.theme.colors.base0D config.theme.colors.base08 ];
|
||||||
config.theme.colors.base08
|
|
||||||
];
|
|
||||||
# - *blue
|
# - *blue
|
||||||
# - *red
|
# - *red
|
||||||
defaultChartColors = [
|
defaultChartColors =
|
||||||
config.theme.colors.base0D
|
[ config.theme.colors.base0D config.theme.colors.base08 ];
|
||||||
config.theme.colors.base08
|
|
||||||
];
|
|
||||||
# - *blue
|
# - *blue
|
||||||
# - *red
|
# - *red
|
||||||
};
|
};
|
||||||
@ -159,6 +149,9 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options.lua.enable = lib.mkEnableOption "Lua programming language.";
|
options.lua.enable = lib.mkEnableOption "Lua programming language.";
|
||||||
|
|
||||||
@ -14,4 +8,5 @@
|
|||||||
sumneko-lua-language-server # Lua LSP
|
sumneko-lua-language-server # Lua LSP
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
18
modules/common/programming/nix.nix
Normal file
18
modules/common/programming/nix.nix
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{ config, pkgs, lib, ... }: {
|
||||||
|
|
||||||
|
options.nixlang.enable = lib.mkEnableOption "Nix programming language.";
|
||||||
|
|
||||||
|
config = lib.mkIf config.nixlang.enable {
|
||||||
|
|
||||||
|
home-manager.users.${config.user} = {
|
||||||
|
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
nixfmt # Nix file formatter
|
||||||
|
nil # Nix language server
|
||||||
|
];
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options.python.enable = lib.mkEnableOption "Python programming language.";
|
options.python.enable = lib.mkEnableOption "Python programming language.";
|
||||||
|
|
||||||
@ -14,14 +8,15 @@
|
|||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
# python310 # Standard Python interpreter
|
# python310 # Standard Python interpreter
|
||||||
pyright # Python language server
|
nodePackages.pyright # Python language server
|
||||||
black # Python formatter
|
black # Python formatter
|
||||||
python310Packages.flake8 # Python linter
|
python310Packages.flake8 # Python linter
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.fish.shellAbbrs = {
|
programs.fish.shellAbbrs = { py = "python3"; };
|
||||||
py = "python3";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options.rust.enable = lib.mkEnableOption "Rust programming language.";
|
options.rust.enable = lib.mkEnableOption "Rust programming language.";
|
||||||
|
|
||||||
@ -12,16 +6,12 @@
|
|||||||
|
|
||||||
home-manager.users.${config.user} = {
|
home-manager.users.${config.user} = {
|
||||||
|
|
||||||
programs.fish.shellAbbrs = {
|
programs.fish.shellAbbrs = { ca = "cargo"; };
|
||||||
ca = "cargo";
|
|
||||||
};
|
home.packages = with pkgs; [ cargo rustc clippy gcc ];
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
cargo
|
|
||||||
rustc
|
|
||||||
clippy
|
|
||||||
gcc
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
options.terraform.enable = lib.mkEnableOption "Terraform tools.";
|
options.terraform.enable = lib.mkEnableOption "Terraform tools.";
|
||||||
|
|
||||||
@ -21,6 +15,9 @@
|
|||||||
terraform-ls # Language server
|
terraform-ls # Language server
|
||||||
tflint # Linter
|
tflint # Linter
|
||||||
];
|
];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
{ ... }:
|
{ ... }: {
|
||||||
{
|
|
||||||
|
imports = [ ./dotfiles.nix ./notes.nix ];
|
||||||
|
|
||||||
imports = [
|
|
||||||
./dotfiles.nix
|
|
||||||
./notes.nix
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
# Allows me to make sure I can work on my dotfiles locally
|
# Allows me to make sure I can work on my dotfiles locally
|
||||||
|
|
||||||
@ -17,17 +11,23 @@
|
|||||||
home.activation = {
|
home.activation = {
|
||||||
|
|
||||||
# Always clone dotfiles repository if it doesn't exist
|
# Always clone dotfiles repository if it doesn't exist
|
||||||
cloneDotfiles = config.home-manager.users.${config.user}.lib.dag.entryAfter [ "writeBoundary" ] ''
|
cloneDotfiles =
|
||||||
if [ ! -d "${config.dotfilesPath}" ]; then
|
config.home-manager.users.${config.user}.lib.dag.entryAfter
|
||||||
$DRY_RUN_CMD mkdir --parents $VERBOSE_ARG $(dirname "${config.dotfilesPath}")
|
[ "writeBoundary" ] ''
|
||||||
$DRY_RUN_CMD ${pkgs.git}/bin/git \
|
if [ ! -d "${config.dotfilesPath}" ]; then
|
||||||
clone ${config.dotfilesRepo} "${config.dotfilesPath}"
|
$DRY_RUN_CMD mkdir --parents $VERBOSE_ARG $(dirname "${config.dotfilesPath}")
|
||||||
fi
|
$DRY_RUN_CMD ${pkgs.git}/bin/git \
|
||||||
'';
|
clone ${config.dotfilesRepo} "${config.dotfilesPath}"
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Set a variable for dotfiles repo, not necessary but convenient
|
# Set a variable for dotfiles repo, not necessary but convenient
|
||||||
home.sessionVariables.DOTS = config.dotfilesPath;
|
home.sessionVariables.DOTS = config.dotfilesPath;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
# This is just a placeholder as I expect to interact with my notes in a
|
# This is just a placeholder as I expect to interact with my notes in a
|
||||||
# certain location
|
# certain location
|
||||||
@ -15,22 +9,6 @@
|
|||||||
NOTES_PATH = "${config.homePath}/dev/personal/notes/content";
|
NOTES_PATH = "${config.homePath}/dev/personal/notes/content";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Sync notes for Nextcloud automatically
|
|
||||||
systemd.user.timers.refresh-notes = lib.mkIf config.services.nextcloud.enable {
|
|
||||||
Timer = {
|
|
||||||
OnCalendar = "*-*-* *:0/10:50"; # Every 10 minutes
|
|
||||||
Unit = "refresh-notes.service";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
systemd.user.services.refresh-notes = {
|
|
||||||
Unit.Description = "Get latest notes.";
|
|
||||||
Service = {
|
|
||||||
Type = "oneshot";
|
|
||||||
ExecStartPre = "${pkgs.git}/bin/git -C /data/git/notes reset --hard master";
|
|
||||||
ExecStart = "${pkgs.git}/bin/git -C /data/git/notes pull";
|
|
||||||
WorkingDirectory = config.homePath;
|
|
||||||
Environment = "PATH=${pkgs.openssh}/bin";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ config, lib, ... }:
|
{ config, lib, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
# Shell history sync
|
# Shell history sync
|
||||||
|
|
||||||
@ -11,10 +10,7 @@
|
|||||||
|
|
||||||
programs.atuin = {
|
programs.atuin = {
|
||||||
enable = true;
|
enable = true;
|
||||||
flags = [
|
flags = [ "--disable-up-arrow" "--disable-ctrl-r" ];
|
||||||
"--disable-up-arrow"
|
|
||||||
"--disable-ctrl-r"
|
|
||||||
];
|
|
||||||
settings = {
|
settings = {
|
||||||
auto_sync = true;
|
auto_sync = true;
|
||||||
update_check = false;
|
update_check = false;
|
||||||
@ -31,9 +27,13 @@
|
|||||||
keymap_mode = "vim-normal";
|
keymap_mode = "vim-normal";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Give root user the same setup
|
# Give root user the same setup
|
||||||
home-manager.users.root.programs.atuin = config.home-manager.users.${config.user}.programs.atuin;
|
home-manager.users.root.programs.atuin =
|
||||||
|
config.home-manager.users.${config.user}.programs.atuin;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,17 +1,12 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
home-manager.users.${config.user} = {
|
home-manager.users.${config.user} = {
|
||||||
|
|
||||||
programs.bash = {
|
programs.bash = {
|
||||||
enable = true;
|
enable = true;
|
||||||
shellAliases = config.home-manager.users.${config.user}.programs.fish.shellAliases;
|
shellAliases =
|
||||||
|
config.home-manager.users.${config.user}.programs.fish.shellAliases;
|
||||||
initExtra = "";
|
initExtra = "";
|
||||||
profileExtra = "";
|
profileExtra = "";
|
||||||
};
|
};
|
||||||
@ -19,6 +14,7 @@
|
|||||||
programs.starship.enableBashIntegration = false;
|
programs.starship.enableBashIntegration = false;
|
||||||
programs.zoxide.enableBashIntegration = true;
|
programs.zoxide.enableBashIntegration = true;
|
||||||
programs.fzf.enableBashIntegration = true;
|
programs.fzf.enableBashIntegration = true;
|
||||||
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
# Retrieve list of AWS instances
|
|
||||||
# Use enter to jump into their sessions with SSM
|
|
||||||
|
|
||||||
# Specify AWS_PROFILE and AWS_REGION before running this script
|
|
||||||
|
|
||||||
aws ec2 describe-instances \
|
|
||||||
--filters "Name=instance-state-name,Values=running" |
|
|
||||||
jq -r \
|
|
||||||
'.Reservations[]
|
|
||||||
| .Instances[]
|
|
||||||
| .InstanceId + " - " +
|
|
||||||
(.PrivateIpAddress // "n/a") + " - " +
|
|
||||||
(.PublicIpAddress // "n/a") + " - " +
|
|
||||||
(.Tags // [] | from_entries | .Name // "n/a")' |
|
|
||||||
fzf \
|
|
||||||
--height 100% \
|
|
||||||
--layout reverse \
|
|
||||||
--header $'Press Enter to start SSM session\nInstance ID - Private IP - Public IP - Name' \
|
|
||||||
--preview "aws ec2 describe-instances --instance-ids \"\$(echo {} | cut -d' ' -f1)\" | jq -r '.Reservations[].Instances[0]'" \
|
|
||||||
--bind "enter:become(aws ssm start-session --target \$(echo {} | cut -d' ' -f1))"
|
|
@ -31,10 +31,6 @@ STATUS=$?
|
|||||||
# because tesseract adds .txt to the given file path anyways. So if we were to
|
# because tesseract adds .txt to the given file path anyways. So if we were to
|
||||||
# specify /tmp/ocr.txt as the file path, tesseract would out the text to
|
# specify /tmp/ocr.txt as the file path, tesseract would out the text to
|
||||||
# /tmp/ocr.txt.txt
|
# /tmp/ocr.txt.txt
|
||||||
cd /tmp || {
|
|
||||||
echo "Failed to jump to directory."
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
tesseract "$IMAGE_FILE" "${TEXT_FILE//\.txt/}"
|
tesseract "$IMAGE_FILE" "${TEXT_FILE//\.txt/}"
|
||||||
|
|
||||||
# Check if the text was detected by checking number
|
# Check if the text was detected by checking number
|
||||||
|
@ -1,55 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
export AWS_PROFILE="gs"
|
|
||||||
|
|
||||||
BUCKET_NAME_PART_1="t2"
|
|
||||||
BUCKET_NAME_PART_2="global"
|
|
||||||
BUCKET_NAME_PART_3="terraformstate"
|
|
||||||
|
|
||||||
PROJECT_ROOT=$(git rev-parse --show-toplevel)
|
|
||||||
WORKFLOW_FILE="${PROJECT_ROOT}/.github/workflows/terraform.yml"
|
|
||||||
|
|
||||||
if [ ! -f "$WORKFLOW_FILE" ]; then
|
|
||||||
WORKFLOW_FILE="${PROJECT_ROOT}/.github/workflows/apply.yml"
|
|
||||||
fi
|
|
||||||
|
|
||||||
AWS_ACCOUNT_NUMBER=$(
|
|
||||||
awk '/aws_account_number: .*/ {print $2}' "$WORKFLOW_FILE" | # Grab account number
|
|
||||||
echo "$(
|
|
||||||
read -r s
|
|
||||||
s=${s//\'/}
|
|
||||||
echo "$s"
|
|
||||||
)" # Remove single quote if it exists
|
|
||||||
)
|
|
||||||
|
|
||||||
if [ -z "${AWS_ACCOUNT_NUMBER}" ]; then
|
|
||||||
AWS_ACCOUNT_NUMBER=$(
|
|
||||||
awk '/AWS_ACCOUNT_NUMBER: .*/ {print $2}' "$WORKFLOW_FILE" | # Grab account number
|
|
||||||
echo "$(
|
|
||||||
read -r s
|
|
||||||
s=${s//\'/}
|
|
||||||
echo "$s"
|
|
||||||
)" # Remove single quote if it exists
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
REPOSITORY=$(
|
|
||||||
git remote get-url origin |
|
|
||||||
awk -F'/' -v OFS='/' '{print $(NF-1),$NF }' |
|
|
||||||
echo "$(
|
|
||||||
read -r s
|
|
||||||
s=${s%.git}
|
|
||||||
echo "$s"
|
|
||||||
)" # Remove .git suffix if it exists
|
|
||||||
)
|
|
||||||
BRANCH=$(git branch --show-current)
|
|
||||||
|
|
||||||
terraform init \
|
|
||||||
-backend-config="region=us-east-1" \
|
|
||||||
-backend-config="bucket=${BUCKET_NAME_PART_1}${BUCKET_NAME_PART_2}${BUCKET_NAME_PART_3}" \
|
|
||||||
-backend-config="workspace_key_prefix=accounts/${AWS_ACCOUNT_NUMBER}/${REPOSITORY}" \
|
|
||||||
-backend-config="key=state.tfstate" \
|
|
||||||
-backend-config="dynamodb_table=global-tf-state-lock" \
|
|
||||||
-upgrade
|
|
||||||
|
|
||||||
terraform workspace select "$BRANCH"
|
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
# Convenience utilities from charm.sh
|
# Convenience utilities from charm.sh
|
||||||
|
|
||||||
@ -18,5 +12,7 @@
|
|||||||
charm # Manage account and filesystem
|
charm # Manage account and filesystem
|
||||||
pop # Send emails from a TUI
|
pop # Send emails from a TUI
|
||||||
];
|
];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ ... }:
|
{ ... }: {
|
||||||
{
|
|
||||||
imports = [
|
imports = [
|
||||||
./atuin.nix
|
./atuin.nix
|
||||||
./bash
|
./bash
|
||||||
@ -13,6 +12,5 @@
|
|||||||
./nixpkgs.nix
|
./nixpkgs.nix
|
||||||
./starship.nix
|
./starship.nix
|
||||||
./utilities.nix
|
./utilities.nix
|
||||||
./work.nix
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -1,15 +1,10 @@
|
|||||||
{ config, ... }:
|
{ config, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
# Enables quickly entering Nix shells when changing directories
|
# Enables quickly entering Nix shells when changing directories
|
||||||
home-manager.users.${config.user}.programs.direnv = {
|
home-manager.users.${config.user}.programs.direnv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
nix-direnv.enable = true;
|
nix-direnv.enable = true;
|
||||||
config = {
|
config = { whitelist = { prefix = [ config.dotfilesPath ]; }; };
|
||||||
whitelist = {
|
|
||||||
prefix = [ config.dotfilesPath ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# programs.direnv.direnvrcExtra = ''
|
# programs.direnv.direnvrcExtra = ''
|
||||||
@ -33,4 +28,5 @@
|
|||||||
keep-outputs = true
|
keep-outputs = true
|
||||||
keep-derivations = true
|
keep-derivations = true
|
||||||
'';
|
'';
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
|
|
||||||
users.users.${config.user}.shell = pkgs.fish;
|
users.users.${config.user}.shell = pkgs.fish;
|
||||||
programs.fish.enable = true; # Needed for LightDM to remember username
|
programs.fish.enable = true; # Needed for LightDM to remember username
|
||||||
@ -52,9 +46,7 @@
|
|||||||
fish_user_key_bindings = {
|
fish_user_key_bindings = {
|
||||||
body = builtins.readFile ./functions/fish_user_key_bindings.fish;
|
body = builtins.readFile ./functions/fish_user_key_bindings.fish;
|
||||||
};
|
};
|
||||||
ip = {
|
ip = { body = builtins.readFile ./functions/ip.fish; };
|
||||||
body = builtins.readFile ./functions/ip.fish;
|
|
||||||
};
|
|
||||||
json = {
|
json = {
|
||||||
description = "Tidy up JSON using jq";
|
description = "Tidy up JSON using jq";
|
||||||
body = "pbpaste | jq '.' | pbcopy"; # Need to fix for non-macOS
|
body = "pbpaste | jq '.' | pbcopy"; # Need to fix for non-macOS
|
||||||
@ -76,10 +68,6 @@
|
|||||||
description = "Full git commit on notes";
|
description = "Full git commit on notes";
|
||||||
body = builtins.readFile ./functions/syncnotes.fish;
|
body = builtins.readFile ./functions/syncnotes.fish;
|
||||||
};
|
};
|
||||||
_which = {
|
|
||||||
description = "Identify the path to a program in the shell";
|
|
||||||
body = "command --search (string sub --start=2 $argv)";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
interactiveShellInit = ''
|
interactiveShellInit = ''
|
||||||
fish_vi_key_bindings
|
fish_vi_key_bindings
|
||||||
@ -105,18 +93,10 @@
|
|||||||
"-" = "cd -";
|
"-" = "cd -";
|
||||||
mkd = "mkdir -pv";
|
mkd = "mkdir -pv";
|
||||||
|
|
||||||
# Convert a program into its full path
|
|
||||||
"=" = {
|
|
||||||
position = "anywhere";
|
|
||||||
regex = "=\\w+";
|
|
||||||
function = "_which";
|
|
||||||
};
|
|
||||||
|
|
||||||
# System
|
# System
|
||||||
s = "sudo";
|
s = "sudo";
|
||||||
sc = "systemctl";
|
sc = "systemctl";
|
||||||
scs = "systemctl status";
|
scs = "systemctl status";
|
||||||
sca = "systemctl cat";
|
|
||||||
m = "make";
|
m = "make";
|
||||||
t = "trash";
|
t = "trash";
|
||||||
|
|
||||||
@ -132,7 +112,8 @@
|
|||||||
moon = "curl wttr.in/Moon";
|
moon = "curl wttr.in/Moon";
|
||||||
|
|
||||||
# Cheat Sheets
|
# Cheat Sheets
|
||||||
ssl = "openssl req -new -newkey rsa:2048 -nodes -keyout server.key -out server.csr";
|
ssl =
|
||||||
|
"openssl req -new -newkey rsa:2048 -nodes -keyout server.key -out server.csr";
|
||||||
fingerprint = "ssh-keyscan myhost.com | ssh-keygen -lf -";
|
fingerprint = "ssh-keyscan myhost.com | ssh-keygen -lf -";
|
||||||
publickey = "ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub";
|
publickey = "ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub";
|
||||||
forloop = "for i in (seq 1 100)";
|
forloop = "for i in (seq 1 100)";
|
||||||
@ -141,6 +122,7 @@
|
|||||||
dc = "$DOTS/bin/docker_cleanup";
|
dc = "$DOTS/bin/docker_cleanup";
|
||||||
dr = "docker run --rm -it";
|
dr = "docker run --rm -it";
|
||||||
db = "docker build . -t";
|
db = "docker build . -t";
|
||||||
|
|
||||||
};
|
};
|
||||||
shellInit = "";
|
shellInit = "";
|
||||||
};
|
};
|
||||||
@ -150,5 +132,6 @@
|
|||||||
programs.starship.enableFishIntegration = true;
|
programs.starship.enableFishIntegration = true;
|
||||||
programs.zoxide.enableFishIntegration = true;
|
programs.zoxide.enableFishIntegration = true;
|
||||||
programs.fzf.enableFishIntegration = true;
|
programs.fzf.enableFishIntegration = true;
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -18,5 +18,5 @@ bind -M insert \cn 'commandline -r "nix shell nixpkgs#"'
|
|||||||
bind -M default \cn 'commandline -r "nix shell nixpkgs#"'
|
bind -M default \cn 'commandline -r "nix shell nixpkgs#"'
|
||||||
bind -M insert \x11F nix-fzf
|
bind -M insert \x11F nix-fzf
|
||||||
bind -M default \x11F nix-fzf
|
bind -M default \x11F nix-fzf
|
||||||
bind -M insert \ch '_atuin_search --filter-mode global'
|
bind -M insert \ch _atuin_search --filter-mode global
|
||||||
bind -M default \ch '_atuin_search --filter-mode global'
|
bind -M default \ch _atuin_search --filter-mode global
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user