Skip to content

Commit

Permalink
[pull] main from ublue-os:main (#28)
Browse files Browse the repository at this point in the history
Co-authored-by: Noel Miller <[email protected]>
Co-authored-by: Hikari <[email protected]>
Co-authored-by: Jorge O. Castro <[email protected]>
Co-authored-by: Dylan M. Taylor <[email protected]>
Co-authored-by: Brian Ketelsen <[email protected]>
  • Loading branch information
6 people authored Feb 29, 2024
1 parent 9375d8e commit 8806eb4
Show file tree
Hide file tree
Showing 19 changed files with 31 additions and 6 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build_iso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,18 @@ jobs:
steps:
- name: Build ISOs
#if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
uses: ublue-os/[email protected].7
uses: ublue-os/[email protected].8
with:
ARCH: x86_64
IMAGE_NAME: ${{ matrix.image_name }}
IMAGE_REPO: ghcr.io/ublue-os
VARIANT: 'Silverblue'
VERSION: ${{ matrix.major_version }}
IMAGE_TAG: ${{ matrix.image_tag }}
SECURE_BOOT_KEY_URL: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
ENROLLMENT_PASSWORD: 'ublue-os'
ACTION_REPO: ublue-os/isogenerator
ACTION_REF: 1.0.5
ACTION_REF: 1.0.8
- name: Upload ISOs and SHA Checksum Files to R2
shell: bash
run: |
Expand Down
4 changes: 3 additions & 1 deletion dx/usr/etc/zsh/zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
#

if [[ -o interactive ]]; then
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
if command -v brew >/dev/null 2>&1; then
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
fi
fi

autoload -U compinit
Expand Down
2 changes: 1 addition & 1 deletion dx/usr/share/fish/vendor_conf.d/brew.fish
Original file line number Diff line number Diff line change
@@ -1 +1 @@
status --is-interactive && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
command -v brew >/dev/null 2>&1 && status --is-interactive && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
2 changes: 1 addition & 1 deletion usr/etc/dconf/db/local.d/01-ublue
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ name='mission-center'

[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom3]
binding='<Control><Alt>Return'
command="ptyxis --tab-with-profile=a21a910811504857bea4c96b3d937b93 --new-window"
command="ptyxis --new-window"
name='Bluefin Ptyxis'

[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom4]
Expand Down
2 changes: 1 addition & 1 deletion usr/etc/profile.d/brew.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[ $- == *i* ]] && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
[[ $(command -v brew >/dev/null 2>&1) && $- == *i* ]] && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
8 changes: 8 additions & 0 deletions usr/etc/security/limits.d/30-brew-limits.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#This file sets the resource limits for the users logged in via PAM.
#It does not affect resource limits of the system services.
#This file overrides defaults set in /etc/security/limits.conf

* soft nofile 4096
* hard nofile 8192
root soft nofile 4096
root hard nofile 8192
13 changes: 13 additions & 0 deletions usr/share/fonts/MesloLGS NF/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Copyright 2009, 2010, 2013 André Berg

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 8806eb4

Please sign in to comment.