diff options
| -rwxr-xr-x | install | 44 | ||||
| -rw-r--r-- | nixos/.flake/configuration.nix (renamed from nixos/flake/configuration.nix) | 0 | ||||
| -rw-r--r-- | nixos/.flake/flake.lock (renamed from nixos/flake/flake.lock) | 0 | ||||
| -rw-r--r-- | nixos/.flake/flake.nix (renamed from nixos/flake/flake.nix) | 0 | ||||
| -rw-r--r-- | nixos/.flake/hardware-configuration.nix (renamed from nixos/flake/hardware-configuration.nix) | 0 | ||||
| -rw-r--r-- | nixos/.flake/home.nix (renamed from nixos/flake/home.nix) | 0 | ||||
| -rw-r--r-- | nixos/clang-format.org | 9 |
7 files changed, 30 insertions, 23 deletions
@@ -52,29 +52,27 @@ if [ "$(uname)" = 'Linux' ] && grep -q 'ID=nixos' /etc/os-release; then fi fonts_changed=false -if [ "$(uname)" = 'Darwin' ]; then - echo 'installing fonts...' - mkdir -p ~/.local/share/fonts - if ! test -d ~/.local/share/fonts/ComputerModern; then - echo ' Computer Modern font missing. Installing...' - tar xf .local/share/fonts/ComputerModern.tar.gz -C ~/.local/share/fonts >> ~/.update-home.log 2>&1 - fonts_changed=true - fi - if ! test -f ~/.local/share/fonts/NFM.ttf; then - echo ' Nerd Font Mono font missing. Installing...' - tar xf .local/share/fonts/NFM.tar.gz -C ~/.local/share/fonts >> ~/.update-home.log 2>&1 - fonts_changed=true - fi - if ! test -d ~/.local/share/fonts/SauceCodePro; then - echo ' Source Code Pro Nerd Font missing. Installing...' - tar xf .local/share/fonts/SauceCodePro.tar.gz -C ~/.local/share/fonts >> ~/.update-home.log 2>&1 - fonts_changed=true - fi - - if [ $fonts_changed = true ]; then - echo ' updating the font cache...' - fc-cache -f >> ~/.update-home.log - fi +echo 'installing fonts...' +mkdir -p ~/.local/share/fonts +if ! test -d ~/.local/share/fonts/ComputerModern; then + echo ' Computer Modern font missing. Installing...' + tar xf .local/share/fonts/ComputerModern.tar.gz -C ~/.local/share/fonts >> ~/.update-home.log 2>&1 + fonts_changed=true +fi +if ! test -f ~/.local/share/fonts/NFM.ttf; then + echo ' Nerd Font Mono font missing. Installing...' + tar xf .local/share/fonts/NFM.tar.gz -C ~/.local/share/fonts >> ~/.update-home.log 2>&1 + fonts_changed=true +fi +if ! test -d ~/.local/share/fonts/SauceCodePro; then + echo ' Source Code Pro Nerd Font missing. Installing...' + tar xf .local/share/fonts/SauceCodePro.tar.gz -C ~/.local/share/fonts >> ~/.update-home.log 2>&1 + fonts_changed=true +fi + +if [ $fonts_changed = true ]; then + echo ' updating the font cache...' + fc-cache -f >> ~/.update-home.log fi cd "$CWD" || exit diff --git a/nixos/flake/configuration.nix b/nixos/.flake/configuration.nix index 0999475..0999475 100644 --- a/nixos/flake/configuration.nix +++ b/nixos/.flake/configuration.nix diff --git a/nixos/flake/flake.lock b/nixos/.flake/flake.lock index d863b13..d863b13 100644 --- a/nixos/flake/flake.lock +++ b/nixos/.flake/flake.lock diff --git a/nixos/flake/flake.nix b/nixos/.flake/flake.nix index da41906..da41906 100644 --- a/nixos/flake/flake.nix +++ b/nixos/.flake/flake.nix diff --git a/nixos/flake/hardware-configuration.nix b/nixos/.flake/hardware-configuration.nix index 74ef301..74ef301 100644 --- a/nixos/flake/hardware-configuration.nix +++ b/nixos/.flake/hardware-configuration.nix diff --git a/nixos/flake/home.nix b/nixos/.flake/home.nix index f619e99..f619e99 100644 --- a/nixos/flake/home.nix +++ b/nixos/.flake/home.nix diff --git a/nixos/clang-format.org b/nixos/clang-format.org new file mode 100644 index 0000000..6c38b3b --- /dev/null +++ b/nixos/clang-format.org @@ -0,0 +1,9 @@ +#+title: Clang-Format Settings +Use a style similar to Linux kernel style (but with 4-wide indents and spaces over tabs). +#+begin_src yaml :tangle ~/.clang-format +BasedOnStyle: LLVM +IndentWidth: 4 +BreakBeforeBraces: Linux +AllowShortIfStatementsOnASingleLine: false +IndentCaseLabels: false +#+end_src |