Compare commits

...

4 Commits

Author SHA1 Message Date
Noah Masur
9ebdfa1071
fix: tf backend can't be a variable 2024-05-05 16:36:34 -04:00
Noah Masur
5bd81813cb
switch to my own fork of gh-collaborators to fix go 2024-05-05 16:17:06 -04:00
Noah Masur
69b2332700
fix: xserver libinput renamed without xserver 2024-05-05 15:54:12 -04:00
Noah Masur
d4708cd5f6
revert to earliest go module for gh-collaborator compatibility
even though should be built with buildGo120Module
2024-05-05 15:48:49 -04:00
5 changed files with 10 additions and 20 deletions

View File

@ -91,15 +91,16 @@ jobs:
# Connects to remote state backend and download providers. # Connects to remote state backend and download providers.
- name: Terraform Init - name: Terraform Init
working-directory: ${{ env.TERRAFORM_DIRECTORY }} working-directory: ${{ env.TERRAFORM_DIRECTORY }}
run: terraform init run: |
terraform init \
-backend-config="bucket=${{ secrets.TERRAFORM_STATE_BUCKET }}" \
-backend-config="key=arrow.tfstate"
# Deploys infrastructure or changes to infrastructure. # Deploys infrastructure or changes to infrastructure.
- name: Terraform Apply - name: Terraform Apply
if: inputs.action == 'create' if: inputs.action == 'create'
working-directory: ${{ env.TERRAFORM_DIRECTORY }} working-directory: ${{ env.TERRAFORM_DIRECTORY }}
env: env:
TF_VAR_terraform_state_bucket: ${{ secrets.TERRAFORM_STATE_BUCKET }}
TF_VAR_terraform_state_key: arrow.tfstate
TF_VAR_ec2_size: ${{ inputs.size }} TF_VAR_ec2_size: ${{ inputs.size }}
run: | run: |
terraform apply \ terraform apply \

View File

@ -1,7 +1,5 @@
terraform { terraform {
backend "s3" { backend "s3" {
bucket = var.terraform_state_bucket
key = var.terraform_state_key
region = "us-east-1" region = "us-east-1"
dynamodb_table = "terraform-state-lock" dynamodb_table = "terraform-state-lock"
} }

View File

@ -8,13 +8,3 @@ variable "images_bucket" {
description = "Name of the bucket in which to store the NixOS VM images." description = "Name of the bucket in which to store the NixOS VM images."
type = string type = string
} }
variable "terraform_state_bucket" {
description = "Name of the bucket in which to store the Terraform state information."
type = string
}
variable "terraform_state_key" {
description = "Path of the file in which to store the Terraform state information."
type = string
}

View File

@ -16,7 +16,7 @@
piper # Mouse adjustments GUI piper # Mouse adjustments GUI
]; ];
services.xserver.libinput.mouse = { services.libinput.mouse = {
# Disable mouse acceleration # Disable mouse acceleration
accelProfile = "flat"; accelProfile = "flat";
accelSpeed = "1.15"; accelSpeed = "1.15";

View File

@ -2,16 +2,17 @@ _final: prev: {
gh-collaborators = prev.buildGoModule rec { gh-collaborators = prev.buildGoModule rec {
pname = "gh-collaborators"; pname = "gh-collaborators";
version = "2.0.2"; version = "v2.0.3";
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
owner = "katiem0"; owner = "nmasur";
repo = "gh-collaborators"; repo = "gh-collaborators";
rev = version; rev = version;
sha256 = "sha256-sz5LHkwZ28aA2vbMnFMzAlyGiJBDZm7jwDQYxgKBPLU="; sha256 = "sha256-XgAZ/+7QxIRKiAZ4Gp/rLgTABSXkVjFQ8TbXOFj9vpM=";
}; };
vendorHash = "sha256-rsRDOgJBa8T6+bC/APcmuRmg6ykbIp9pwRnJ9rrfHEs="; # vendorHash = "sha256-rsRDOgJBa8T6+bC/APcmuRmg6ykbIp9pwRnJ9rrfHEs=";
vendorHash = "sha256-fykxRb2U9DDsXorRTLiVWmhMY89N7RS07sal8ww6gz4=";
ldflags = [ ldflags = [
"-s" "-s"