Merge pull request #15 from isabelroses/refactor

refactor

.editorconfig

@@ -1,7 +1,39 @@
 root = true
 
 [*]
+charset = utf-8
 end_of_line = lf
+indent_style = tab
+indent_size = 4
 insert_final_newline = true
+tab_width = 4
+trim_trailing_whitespace = false
+
+[*.md]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = false
+
+[*.{nix,yml,yaml}]
 indent_style = space
-indent_size = 2
+indent_size = 2
+tab_width = 2
+
+[*.yuck]
+indent_style = spaces
+indent_size = 4
+
+[*.{js, sh}]
+indent_style = spaces
+indent_size = 2
+
+[*.{diff,patch}]
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+
+[secrets.yaml]
+indent_size = unset
+
+[*.lock]
+indent_size = unset

.envrc

@@ -1 +1,2 @@
 use flake
+export DIRENV_WARN_TIMEOUT=5m

.gitattributes

@@ -0,0 +1 @@
+flake/templates/* linguist-vendored

.github/CODEOWNERS

@@ -1 +1 @@
-* @isabelroses
+* @isabelroses

.github/README.md

@@ -10,40 +10,45 @@
 
 ### config layout
 
-- 🏠 [home](../home)
+- 🏠 [home](../home/)
 - 🖥️ [hosts](../hosts/)
-  - 🐉 [hydra](../hosts/hydra/) A super mid spec laptop
   - ☀️ [amatarasu](../hosts/amatarasu/) My high end gameing machine
+  - 👴 [bernie](../hosts/bernie/) A server configuration for some of my infastrucior
+  - 🇧[beta](../hosts/beta/) A consept configuration for a new local server
+  - 🐉 [hydra](../hosts/hydra/) A super mid spec laptop
+  - ⚸ [lilith](../hosts/lilith/) A nixos iso image that can be qickly deployed and acessed via ssh
+- 📖 [lib](../lib/) Useful repeated functions
+- 🧩 [parts](../parts/) Nixos parts breaking down the complex confiuration into smaller more managable chuncks
 - 🔌 [modules](../modules/)
   - [common](../modules/common/) Common configuration settings
     - [core](../modules/common/core/) Core parts of the configuration
-    - [options](../modules/common/options/) Selecteable settings that can be used to toggle certain settings
-    - [system](../modules/common/system/) System configurations
+    - [secrets](../modules/common/secrets/) Sops secured system secrets
+    - [types](../modules/common/types/) System type configurations (e.g. laptop, servers, desktop)
   - [extra](../modules/extra/) Prebuilt configrations & spare parts
-    - [desktop](../modules/extra/desktop/) Default desktop config
-    - [server](../modules/extra/server/) Deafult server config
-    - [virtualization](../modules/extra/virtualization/) Settings for virtualization
+  - [options](../modules/common/options/) Selecteable settings that can be used to toggle certain settings
 
 <details>
 <summary> Hyprland Shortcuts </summary>
 
-| Shortcut | What it does |
-|---|---|
-| <kbd>SUPER+RETURN</kbd> | open terminal |
-| <kbd>SUPER+B</kbd> | open browser |
-| <kbd>SUPER+C</kbd> | open editor |
-| <kbd>SUPER+O</kbd> | open notes |
-| <kbd>SUPER+E</kbd> | open file manager |
-| <kbd>SUPER+Q</kbd> | quit |
-| <kbd>SUPER+D</kbd> | launcher |
-| <kbd>SUPER+F</kbd> | fullscreen |
-| <kbd>SUPER+[number]</kbd> | open workspace [number] |
+| Shortcut                        | What it does               |
+| ------------------------------- | -------------------------- |
+| <kbd>SUPER+RETURN</kbd>         | open terminal              |
+| <kbd>SUPER+B</kbd>              | open browser               |
+| <kbd>SUPER+C</kbd>              | open editor                |
+| <kbd>SUPER+O</kbd>              | open notes                 |
+| <kbd>SUPER+E</kbd>              | open file manager          |
+| <kbd>SUPER+Q</kbd>              | quit                       |
+| <kbd>SUPER+D</kbd>              | launcher                   |
+| <kbd>SUPER+F</kbd>              | fullscreen                 |
+| <kbd>SUPER+[number]</kbd>       | open workspace [number]    |
 | <kbd>SUPER+SHIFT+[number]</kbd> | move to workspace [number] |
 
 </details>
 
 ### credits
 
-- [numtide/srvos](https://github.com/numtide/srvos)
-- [nullishamy](https://github.com/nullishamy/derivation-station/)
-- [nekowinston](https://github.com/nekowinston/dotfiles)
+- [NotAShelf](https://github.com/notashelf/nyx) - The carry (and basicly half this repo)
+- [numtide/srvos](https://github.com/numtide/srvos) - Server stuff
+- [nullishamy](https://github.com/nullishamy/derivation-station) - Home-Manager Stuff
+- [nekowinston](https://github.com/nekowinston/dotfiles) - Basicly answers all my questions
+- [getchoo](https://github.com/getchoo) - For several things here and there

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "03:00"
+    open-pull-requests-limit: 10
+    reviewers:
+      - isabelroses
+    assignees:
+      - isabelroses

.github/workflows/build.yml

@@ -0,0 +1,57 @@
+name: Build and populate cache
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - .github/**
+      - assets/**
+      - .gitignore
+      - docs/**
+      - README.md
+  schedule:
+    - cron: "25 1 * * *"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        package:
+          - bellado
+          - catppuccinifier-cli
+          - lutgen-rs
+          - patched-gjs
+          - ags
+          - plymouth-theme-catppuccin
+
+    steps:
+      - uses: easimon/maximize-build-space@v8
+        with:
+          overprovision-lvm: true
+          remove-android: true
+          remove-dotnet: true
+          remove-haskell: true
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
+        with:
+          logger: pretty
+
+      - name: Setup cachix
+        uses: cachix/cachix-action@v12
+        with:
+          name: isabelroses
+          signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
+          authToken: "${{ secrets.CACHIX_TOKEN }}"
+
+      - name: Set default git branch (to reduce log spam)
+        run: git config --global init.defaultBranch main
+
+      - name: Build from the matrix
+        run: nix build -L .#${{ matrix.package }}

.github/workflows/check.yml

@@ -1,19 +1,25 @@
-name: Nix Flake Check
+name: Validate Nix Flake
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - "**.nix"
+      - "**.lock"
+      - ".github/workflows/check.yml"
 
 jobs:
-  checks:
-    name: Check expressions
+  check-flake:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v18
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
         with:
-          install_url: https://nixos.org/nix/install
-          extra_nix_config: |
-            auto-optimise-store = true
-            experimental-features = nix-command flakes
-            access-tokens = ${{ secrets.AUTH_TOKEN }}
-      - run: nix flake check
+          logger: pretty
+
+      - name: Check Flake
+        run: nix flake check --accept-flake-config

.github/workflows/fmt.yml

@@ -1,18 +1,17 @@
-name: Formatting Check
+name: Validate Flake Formatting
 
-on: [push, pull_request, workflow_dispatch]
+on: [push, workflow_dispatch]
 
 jobs:
-  checks:
-    name: Check expressions
+  check-formatting:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v18
+      - uses: actions/checkout@v4
+
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
         with:
-          install_url: https://nixos.org/nix/install
-          extra_nix_config: |
-            auto-optimise-store = true
-            experimental-features = nix-command flakes
+          logger: pretty
+          github_access_token: ${{ secrets.GITHUB_TOKEN }}
       - run: nix run nixpkgs#alejandra -- -c .

.github/workflows/update.yml

@@ -0,0 +1,29 @@
+name: Bump Flake Inputs
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  update-lockfile:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4.1.0
+
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
+        with:
+          logger: pretty
+
+      - name: Update Lockfile
+        uses: DeterminateSystems/update-flake-lock@main
+        id: update
+        with:
+          pr-title: "CI: bump flake inputs"
+
+      - name: Merge Changes
+        run: |
+          gh pr merge ${{ steps.update.outputs.pull-request-number }} --squash --delete-branch
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,2 +1,6 @@
+# Ingore nixos build outputs
 result
 .direnv/
+
+# Ignore pre-commit config
+.pre-commit-config.yaml

.sops.yaml

@@ -3,5 +3,5 @@ keys:
 creation_rules:
   - path_regex: modules/common/secrets/[^/]+\.yaml$
   - key_groups:
-    - age:
-      - *isabel
+      - age:
+          - *isabel