From ea955536e1721c65b9afe57f6d570d132df0e592 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Sat, 19 Oct 2024 00:34:06 -0400 Subject: [PATCH] Update the readme again --- README.md | 15 ++++++++------- modules/home/sway/hotkeys/default.nix | 4 ++-- .../services/server/icecast/nginx/default.nix | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index eb6c96b..cd9bda2 100644 --- a/README.md +++ b/README.md @@ -4,16 +4,17 @@ Thanks for taking a look at my Nix* configs! While this is primarily organized for my use only, you may find each individual service file or user config to be a good starting point, or something to take and adapt into your own config. ### Installation -Installing any of my flakes onto a system should be done after any initial install. I would opt to do a minimal install, but this is up to you. After installing NixOS, backup your hardware-config.nix file, so you can adapt it to fit the format of ``nixos/hardware/machines``, then adjusting the other referenced files in the flake.nix file to reference your specific computer. +Installing my flake has to be done from an existing system. A minimal install is fastest, but is up to you. After installing NixOS, backup your hardware-config.nix file, so you can adapt it to fit the format of ``/hosts``, adjusting other referenced files in the flake.nix file to reference your specific system. -An initial install will have to be ran as ``nixos-rebuild switch --flake /etc/nixos/.#HOSTNAME``, where HOSTNAME is a hostname defined in your flake. You may also have to enable "experimental" features with a flag, such as nix-command and flakes. Home-Manager is handled separately, despite being in the same folder. A rebuild of a user's home would have to be done with ``home-manager switch --flake /etc/nixos``. This will pull the config as defined in the flake as ``USER@HOSTNAME``, where USER is the user running the ``home-manager`` command. +An initial install will can be done with ``nixos-rebuild switch --flake /etc/nixos/.#host``, where ``host`` is a hostname defined in your flake. You may also have to enable "experimental" features with a flag, such as nix-command and flakes. +Home-Manager is handled separately, despite being in the same folder. A rebuild of a user's home is done with ``home-manager switch --flake /etc/nixos``. This will pull the config as defined in the flake as ``user@host``, where ``user`` is the user running the ``home-manager`` command. ### Usage My config uses these tools: -`Sway` - Window manager / Desktop -`Foot` - Terminal emulator -`Rofi` - App launcher and menu system -`ZSH` - Primary shell +``Sway`` - Window manager / Desktop +``ZSH`` - Primary shell +``Foot`` - Terminal emulator +``Rofi`` - App launcher and menu system I have made shell aliases in ZSH for rebuilding the system. They are as follows: `flakedate` - Update the flake.lock, which renews the sources of nixpkgs. This is needed to update the system. @@ -22,7 +23,7 @@ I have made shell aliases in ZSH for rebuilding the system. They are as follows: `nixswitch` = Switch to new config for both user and system. `nixdate` = Same as before, but updating flake.nix before doing so. This is essentially a full system update. -My config heavily references a gnupg-protected secrets file. These will have to be adapted and rewritten if anyone is to use my config for themselves. +My config heavily references a gnupg-protected secrets file. These will have to be adapted and rewritten if anyone is to use my config directly. For my use, unlocking secrets can be done with this command: ``gpg --pinentry-mode loopback --decrypt local.key.asc | git-crypt unlock -`` diff --git a/modules/home/sway/hotkeys/default.nix b/modules/home/sway/hotkeys/default.nix index 5c69ddb..b11dfa2 100644 --- a/modules/home/sway/hotkeys/default.nix +++ b/modules/home/sway/hotkeys/default.nix @@ -127,8 +127,8 @@ "${primeMod}+Ctrl+Return" = ''exec foot ssh ${config.ips.server}''; # Display Brightness and Keyboard Brightness - "XF86MonBrightnessUp" = ''exec light -A 5''; - "XF86MonBrightnessDown" = ''exec light -U 5''; + "${secMod}+equal" = ''exec light -A 5''; + "${secMod}+minus" = ''exec light -U 5''; "XF86KbdBrightnessUp" = ''exec light -s sysfs/leds/smc::kbd_backlight -A 5''; "XF86KbdBrightnessDown" = ''exec light -s sysfs/leds/smc::kbd_backlight -U 5''; diff --git a/modules/system/services/server/icecast/nginx/default.nix b/modules/system/services/server/icecast/nginx/default.nix index 8e77e35..968b4d7 100644 --- a/modules/system/services/server/icecast/nginx/default.nix +++ b/modules/system/services/server/icecast/nginx/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ config, ... }: { services.nginx.virtualHosts."icecast.${config.secrets.jimDomain}" = { enableACME = true;