Skip to content

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
Kerwood committed Mar 17, 2024
1 parent d5e45d6 commit 9a71a69
Show file tree
Hide file tree
Showing 40 changed files with 65 additions and 150 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ jobs:
fail-fast: false # stop GH from cancelling all matrix builds if one fails
matrix:
recipe:
- recipe-main.yml
- recipe-dotnet.yml
- recipe.yml
steps:
# the build is fully handled by the reusable github action
- name: Build Custom Image
Expand Down
116 changes: 22 additions & 94 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ accidentally updated to the next major version.
- **Flameshot** - *Powerful, yet simple to use open-source screenshot software.*
- https://flameshot.org
- **JetBrains Toolbox** - *Manage your JetBrains IDEs the easy way.*
- https://www.jetbrains.com/toolbox-app :: [screenshot](#jetbrains-toolbox)
- https://www.jetbrains.com/toolbox-app
- **Ulauncher** - *Application launcher for Linux.*
- https://ulauncher.io :: [screenshot](#ulauncher-1)
- https://ulauncher.io
- **Visual Studio Code** - *Code editor.*
- https://code.visualstudio.com
- **Wireshark** - *Free and open-source packet analyzer.*
Expand All @@ -77,49 +77,49 @@ accidentally updated to the next major version.
- **azure-cli** - *Azure Cloud commandline tool.*
- https://learn.microsoft.com/en-us/cli/azure
- **bat** - *Modern cat replacement.*
- https://github.com/sharkdp/bat :: [screenshot](#bat-1)
- https://github.com/sharkdp/bat
- **btop** - *Resource monitor.*
- https://github.com/aristocratos/btop :: [screenshot](#btop)
- https://github.com/aristocratos/btop
- **distrobox** - *Use any Linux distribution inside your terminal.*
- https://distrobox.it
- **dive** - *A tool for exploring a docker image and its layer contents.*
- https://github.com/wagoodman/dive :: [screenshot](#dive)
- https://github.com/wagoodman/dive
- **docker** - *Container runtime.*
- https://www.docker.com
- **duf** - *Disk Usage/Free Utility.*
- https://github.com/muesli/duf :: [screenshot](#duf)
- https://github.com/muesli/duf
- **eza** - *Modern ls replacement.*
- https://github.com/eza-community/eza :: [screenshot](#eza-1)
- https://github.com/eza-community/eza
- **fzf** - *General-purpose command-line fuzzy finder.*
- https://github.com/junegunn/fzf :: [screenshot](#fzf)
- https://github.com/junegunn/fzf
- **git** - *Version control system.*
- https://git-scm.com
- **google-cloud-cli** - *Google Cloud commandline tool.*
- https://cloud.google.com/sdk/gcloud
- **gum** - *A tool for glamorous shell scripts.*
- https://github.com/charmbracelet/gum :: [screenshot](#gum)
- https://github.com/charmbracelet/gum
- **helm** - *Manage, template or install Helm packages.*
- https://github.com/helm/helm
- **httpie** - *Modern curl replacement.*
- https://httpie.io/cli :: [screenshot](#httpie)
- https://httpie.io/cli
- **just** - *Command runner with improvements over "make".*
- https://github.com/casey/just :: [screenshot](#just)
- https://github.com/casey/just
- **jq** - *Slice, filter, map and transform JSON data with ease.*
- https://jqlang.github.io/jq
- **k9s** - *Terminal UI to interact with your Kubernetes clusters.*
- https://github.com/derailed/K9s :: [screenshot](#k9s)
- https://github.com/derailed/K9s
- **kind** - *A tool for running local Kubernetes clusters using Docker container “nodes”.*
- https://github.com/kubernetes-sigs/kind :: [screenshot](#kind)
- https://github.com/kubernetes-sigs/kind
- **krew** - *Plugin manager for the kubectl command-line tool.*
- https://github.com/kubernetes-sigs/krew
- **kubectl** - *Tool for communicating with Kubernetes control plane*
- https://kubernetes.io/docs/reference/kubectl
- **kubectx/kubens** - *Switch between Kubenetes contexts or namespaces with ease.*
- https://github.com/ahmetb/kubectx :: [screenshot](#kubectxkubens)
- https://github.com/ahmetb/kubectx
- **lazydocker** - *A simple terminal UI for both docker and docker-compose*
- https://github.com/jesseduffield/lazydocker :: [screenshot](#lazydocker)
- https://github.com/jesseduffield/lazydocker
- **lazygit** - *A simple terminal UI for git commands.*
- https://github.com/jesseduffield/lazygit :: [screenshot](#lazygit-1)
- https://github.com/jesseduffield/lazygit
- **mirrord** - *Run local processes in the context of their Kubernetes environment.*
- https://github.com/metalbear-co/mirrord
- **mkcert** - *Simple tool for making locally-trusted development certificates.*
Expand All @@ -130,31 +130,31 @@ accidentally updated to the next major version.
- **paping** - *TCP port testing, emulating the functionality of ping (port ping)*
- https://code.google.com/archive/p/paping/
- **ripgrep** - *Alternative grep replacement.*
- https://github.com/BurntSushi/ripgrep :: [screenshot](#ripgrep-rg)
- https://github.com/BurntSushi/ripgrep
- **ShellCheck** - *A static analysis tool for shell scripts.*
- https://www.shellcheck.net/
- **sshs** - *Terminal user interface for SSH which uses `~/.ssh/config` to list and connect to hosts.*
- https://github.com/quantumsheep/sshs :: [screenshot](#sshs)
- https://github.com/quantumsheep/sshs
- **sslscan** - *Queries SSL services in order to determine the ciphers that are supported.*
- https://github.com/rbsec/sslscan
- **starship** - *The minimal, blazing-fast, and infinitely customizable prompt for any shell.*
- https://github.com/starship/starship :: [screenshot](#starship-1)
- https://github.com/starship/starship
- **stern** - *Tail multiple pods on Kubernetes and multiple containers within the pod.*
- https://github.com/stern/stern
- **stow** - *Symlink farm manager.*
- https://www.gnu.org/software/stow/manual/stow.html
- **syft** - *Generate Software Bill of Materials (SBOM) from container images and filesystems.*
- https://github.com/anchore/syft :: [screenshot](#syft)
- https://github.com/anchore/syft
- **tailscale** - *Zero config VPN for building secure networks.*
- https://tailscale.com/
- **terraform** - *Automate infrastructure on any cloud with Terraform*
- https://www.terraform.io/
- **trivy** - *Comprehensive and versatile security scanner.*
- https://github.com/aquasecurity/trivy
- **zellij** - *Modern terminal multiplexer (like tmux).*
- https://github.com/zellij-org/zellij :: [screenshot](#zellij-1)
- https://github.com/zellij-org/zellij
- **zoxide** - *Smarter cd command, inspired by z and autojump.*
- https://github.com/ajeetdsouza/zoxide :: [screenshot](#zoxide)
- https://github.com/ajeetdsouza/zoxide
- **zsh** - *A superior shell for your terminal needs. Unlock super powers by setting up Oh-my-zsh.*

## Tips
Expand Down Expand Up @@ -227,75 +227,3 @@ A base configuration for zellij can be found at `/usr/dotfiles/zellij`.
```
cp -a /usr/dotfiles/zellij ~/.config
```

## Screenshots

### Jetbrains Toolbox
![image](./images/toolbox.webp)

### Ulauncher
![image](./images/ulauncher.gif)

### Dive
![image](./images/dive.gif)

### k9s
![image](./images/k9s.png)

### kind
![image](./images/kind.png)

### kubectx/kubens
![image](./images/kubectx.gif)
![image](./images/kubens.gif)

### lazydocker
![image](./images/lazydocker.gif)

### syft
![image](./images/syft.gif)

### zellij
![image](./images/zellij.gif)

### starship
![image](./images/starship.gif)

### sshs
![image](./images/sshs.gif)

### gum
![image](./images/gum.gif)

### httpie
![image](./images/httpie.png)

### ripgrep (rg)
![image](./images/ripgrep.png)

### eza
![image](./images/eza.png)

### bat
![image](./images/bat.png)

### just
![image](./images/just.png)

### lazygit
![image](./images/lazygit.gif)

### fzf
![image](./images/fzf.png)

### btop
![image](./images/btop.png)

### zoxide
![image](./images/zoxide.webp)

### duf
![image](./images/duf.png)

### ncdu
![image](./images/ncdu.png)
File renamed without changes.
37 changes: 37 additions & 0 deletions config/gschema-overrides/zz1-defaults.gschema.override
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,40 @@
terminal='alacritty'
keybindings=''
new-tab=false

[org.gnome.settings-daemon.plugins.media-keys]
custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2/']

[org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/]
name='Toggle ULauncher'
binding='<Alt>space'
command='ulauncher-toggle'

[org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/]
name='Terminal'
binding='<Alt>Return'
command='alacritty'

[org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2/]
name='Flameshot'
binding='<Alt>p'
command='/usr/flameshot/flameshot-gui-workaround.sh'

[org.gnome.nautilus.preferences]
default-folder-viewer='list-view'

[org.gnome.nautilus.list-view]
default-zoom-level='small'

[org.gnome.desktop.wm.keybindings]
switch-windows=['<Alt>Tab']
switch-windows-backward=['<Shift><Alt>Tab']
switch-applications=[]
switch-applications-backward=[]

[org.gnome.desktop.session]
idle-delay=900

[org.gnome.desktop.interface]
color-scheme='prefer-dark'
icon-theme='Papirus-Dark'
37 changes: 0 additions & 37 deletions config/recipe-dotnet.yml

This file was deleted.

10 changes: 5 additions & 5 deletions config/recipe-main.yml → config/recipe.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# image will be published to ghcr.io/<user>/<name>
name: cloud-os-main
name: cloud-os
description: Fedora Silverblue image with a bunch of cloud native tools.

# the base image to build on top of (FROM) and the version tag to use
Expand All @@ -14,10 +14,10 @@ modules:
- usr: /usr
- etc: /etc

- from-file: modules-tools-cli.yml
- from-file: modules-tools-gui.yml
- from-file: modules-build-tools.yml
- from-file: modules-fonts.yml
- from-file: ./modules/tools-cli.yml
- from-file: ./modules/tools-gui.yml
- from-file: ./modules/build-tools.yml
- from-file: ./modules/fonts.yml

- type: gschema-overrides
include:
Expand Down
11 changes: 0 additions & 11 deletions config/scripts/install-lazydocker.sh

This file was deleted.

Binary file removed images/bat.png
Binary file not shown.
Binary file removed images/btop.png
Binary file not shown.
Binary file removed images/dive.gif
Binary file not shown.
Binary file removed images/duf.png
Binary file not shown.
Binary file removed images/eza.png
Binary file not shown.
Binary file removed images/flameshot.png
Binary file not shown.
Binary file removed images/fzf.png
Binary file not shown.
Binary file removed images/gum.gif
Binary file not shown.
Binary file removed images/httpie.png
Binary file not shown.
Binary file removed images/just.png
Binary file not shown.
Binary file removed images/k9s.png
Binary file not shown.
Binary file removed images/kind.png
Binary file not shown.
Binary file removed images/kubectx.gif
Binary file not shown.
Binary file removed images/kubens.gif
Binary file not shown.
Binary file removed images/lazydocker.gif
Binary file not shown.
Binary file removed images/lazygit.gif
Binary file not shown.
Binary file removed images/ncdu.png
Binary file not shown.
Binary file removed images/nvchad.webp
Binary file not shown.
Binary file removed images/oh-my-zsh.png
Binary file not shown.
Binary file removed images/ripgrep.png
Binary file not shown.
Binary file removed images/sshs.gif
Binary file not shown.
Binary file removed images/starship.gif
Binary file not shown.
Binary file removed images/syft.gif
Binary file not shown.
Binary file removed images/toolbox.webp
Binary file not shown.
Binary file removed images/ulauncher-keybinding.png
Binary file not shown.
Binary file removed images/ulauncher.gif
Binary file not shown.
Binary file removed images/zellij.gif
Binary file not shown.
Binary file removed images/zoxide.webp
Binary file not shown.
Empty file removed modules/.gitkeep
Empty file.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion config/modules-tools-cli.yml → modules/tools-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ modules:
- install-kubectl.sh
- install-kubectx.sh
- install-kubens.sh
- install-lazydocker.sh
- install-mirrord.sh
- install-mkcert.sh
- install-paping.sh
Expand Down
File renamed without changes.

0 comments on commit 9a71a69

Please sign in to comment.