Skip to content

Commit

Permalink
A "few" changes
Browse files Browse the repository at this point in the history
  • Loading branch information
rasmus-kirk committed Sep 20, 2024
1 parent b0bef0c commit ff0d105
Show file tree
Hide file tree
Showing 39 changed files with 2,920 additions and 451 deletions.
31 changes: 31 additions & 0 deletions .github/actions/download-artifact/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Download artifact
description: Wrapper around GitHub's official action, with additional extraction before download

# https://github.com/actions/download-artifact/blob/main/action.yml
inputs:
name:
description: Artifact name
required: true
path:
description: Destination path
required: false
default: .

runs:
using: composite
steps:
- name: Download artifacts
uses: actions/download-artifact@v3
with:
name: ${{ inputs.name }}
path: ${{ inputs.path }}

- name: Extract artifacts
run: tar -xvf ${{ inputs.name }}.tar
shell: bash
working-directory: ${{ inputs.path }}

- name: Remove archive
run: rm -f ${{ inputs.name }}.tar
shell: bash
working-directory: ${{ inputs.path }}
46 changes: 46 additions & 0 deletions .github/actions/upload-artifact/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Upload artifact
description: Wrapper around GitHub's official action, with additional archiving before upload

# https://github.com/actions/upload-artifact/blob/main/action.yml
inputs:
name:
description: Artifact name
required: true
path:
description: One or more files, directories or wildcard pattern that describes what to upload
required: true
if-no-files-found:
description: >
The desired behavior if no files are found using the provided path.
Available Options:
warn: Output a warning but do not fail the action
error: Fail the action with an error message
ignore: Do not output any warnings or errors, the action does not fail
required: false
default: warn
retention-days:
description: >
Duration after which artifact will expire in days. 0 means using default retention.
Minimum 1 day.
Maximum 90 days unless changed from the repository settings page.
required: false
default: '0'

runs:
using: composite
steps:
- name: Archive artifacts
run: tar -hcvf ${{ inputs.name }}.tar $(echo "${{ inputs.path }}" | tr '\n' ' ')
shell: bash

- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
if-no-files-found: ${{ inputs.if-no-files-found }}
name: ${{ inputs.name }}
path: ${{ inputs.name }}.tar
retention-days: ${{ inputs.retention-days }}

- name: Remove archive
run: rm -f ${{ inputs.name }}.tar
shell: bash
72 changes: 72 additions & 0 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Deploy

on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [main, release**]
pull_request:
branches: [main, release**]
# Don't run on draft PR's, see: https://github.com/orgs/community/discussions/25722#discussioncomment-3248917
types: [opened, synchronize, reopened, ready_for_review]
# Allows us to run the workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
generate-doc-options:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
submodules: recursive

- name: Install Nix
uses: DeterminateSystems/nix-installer-action@main

- run: nix build .#docs

- run: mkdir -p out && cp -r ./result/* out

- name: Store docs
uses: ./.github/actions/upload-artifact
with:
name: docs
path: ./out

deploy-docs:
needs: generate-doc-options
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Get nix build output
uses: ./.github/actions/download-artifact
with:
name: docs

- name: Setup Pages
uses: actions/configure-pages@v3

- name: Upload GH pages artifact
uses: actions/upload-pages-artifact@v1
with:
path: './out'

- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
146 changes: 74 additions & 72 deletions configurations/home-manager/deck/home.nix
Original file line number Diff line number Diff line change
@@ -1,85 +1,87 @@
# My home manager config
{ pkgs, config, ... }:
let
username = "user";
machine = "deck";
dataDir = "/data";
configDir = "${dataDir}/.system-configuration";
secretDir = "${dataDir}/.secret";
{
pkgs,
...
}: let
username = "user";
machine = "deck";
dataDir = "/data";
configDir = "${dataDir}/.system-configuration";
secretDir = "${dataDir}/.secret";
in {
kirk = {
terminalTools.enable = true;
foot.enable = true;
fzf.enable = true;
git = {
enable = true;
userEmail = "[email protected]";
userName = "rasmus-kirk";
};
helix.enable = true;
homeManagerScripts = {
enable = true;
configDir = configDir;
machine = machine;
};
jiten.enable = false;
joshuto.enable = true;
kakoune.enable = true;
ssh = {
enable = true;
identityPath = "${secretDir}/deck/ssh/id_ed25519";
};
userDirs = {
enable = true;
autoSortDownloads = true;
};
zathura.enable = true;
zsh.enable = true;
fonts.enable = true;
};
kirk = {
terminalTools.enable = true;
foot.enable = true;
fzf.enable = true;
git = {
enable = true;
userEmail = "[email protected]";
userName = "rasmus-kirk";
};
helix.enable = true;
homeManagerScripts = {
enable = true;
configDir = configDir;
machine = machine;
};
jiten.enable = false;
joshuto.enable = true;
kakoune.enable = true;
ssh = {
enable = true;
identityPath = "${secretDir}/deck/ssh/id_ed25519";
};
userDirs = {
enable = true;
autoSortDownloads = true;
};
zathura.enable = true;
zsh.enable = true;
fonts.enable = true;
};

home.username = username;
home.homeDirectory = "/home/${username}";
home.username = username;
home.homeDirectory = "/home/${username}";

home.stateVersion = "22.11";
home.stateVersion = "22.11";

# Let Home Manager install and manage itself.
programs.home-manager.enable = true;

targets.genericLinux.enable = true;
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;

nix = {
package = pkgs.nix;
settings.experimental-features = [ "nix-command" "flakes" ];
};
targets.genericLinux.enable = true;

programs.bash = {
enable = true;
profileExtra = ''
# Fix programs not showing up
export XDG_DATA_DIRS="$HOME/.nix-profile/share:$XDG_DATA_DIRS"
'';
nix = {
package = pkgs.nix;
settings.experimental-features = ["nix-command" "flakes"];
};

initExtra = "exec zsh";
};
programs.bash = {
enable = true;
profileExtra = ''
# Fix programs not showing up
export XDG_DATA_DIRS="$HOME/.nix-profile/share:$XDG_DATA_DIRS"
'';

home.packages = with pkgs; [
# Misc
freetube
jellyfin
mpv

# Browsers
librewolf
initExtra = "exec zsh";
};

# Chat
signal-desktop
home.packages = with pkgs; [
# Misc
freetube
jellyfin
mpv

# Fonts
(nerdfonts.override { fonts = [ "FiraCode" ]; })
fira-code
# Browsers
librewolf

# Misc Terminal Tools
wl-clipboard
];
# Chat
signal-desktop

# Fonts
(nerdfonts.override {fonts = ["FiraCode"];})
fira-code

# Misc Terminal Tools
wl-clipboard
];
}
80 changes: 41 additions & 39 deletions configurations/home-manager/pi/home.nix
Original file line number Diff line number Diff line change
@@ -1,45 +1,47 @@
# My home manager config
{ pkgs, ... }:
let
secretDir = "/data/.secret";
configDir = "/data/.system-configuration";
machine = "pi";
username = "user";
{pkgs, ...}: let
secretDir = "/data/.secret";
configDir = "/data/.system-configuration";
machine = "pi";
username = "user";
in {
kirk = {
terminalTools.enable = true;
fzf.enable = true;
git = {
enable = true;
userEmail = "[email protected]";
userName = "rasmus-kirk";
};
helix = {
enable = true;
installMostLsps = false;
extraPackages = with pkgs; [ nil marksman nodePackages_latest.bash-language-server ];
};
homeManagerScripts = {
enable = true;
configDir = configDir;
machine = machine;
};
userDirs = { enable = true; autoSortDownloads = true; };
joshuto.enable = true;
kakoune.enable = true;
ssh = {
enable = true;
identityPath = "${secretDir}/ssh/id_rsa";
};
zsh.enable = true;
fonts.enable = true;
};
kirk = {
terminalTools.enable = true;
fzf.enable = true;
git = {
enable = true;
userEmail = "[email protected]";
userName = "rasmus-kirk";
};
helix = {
enable = true;
installMostLsps = false;
extraPackages = with pkgs; [nil marksman nodePackages_latest.bash-language-server];
};
homeManagerScripts = {
enable = true;
configDir = configDir;
machine = machine;
};
userDirs = {
enable = true;
autoSortDownloads = true;
};
joshuto.enable = true;
kakoune.enable = true;
ssh = {
enable = true;
identityPath = "${secretDir}/ssh/id_rsa";
};
zsh.enable = true;
fonts.enable = true;
};

home.username = username;
home.homeDirectory = "/home/${username}";
home.username = username;
home.homeDirectory = "/home/${username}";

home.stateVersion = "22.11";
home.stateVersion = "22.11";

# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
}
Loading

0 comments on commit ff0d105

Please sign in to comment.