diff --git a/configuration.nix b/configuration.nix index 251f719..f59a9e2 100644 --- a/configuration.nix +++ b/configuration.nix @@ -9,6 +9,7 @@ in imports = [ (import ./home-manager/home.nix {inherit systemSettings userSettings;}) ./nixos + ./scripts ]; system.stateVersion = stateVersion; time.timeZone = "${systemSettings.timeZone}"; @@ -23,12 +24,28 @@ in sops.age.keyFile = "${userSettings.adHome}/.config/sops/age/keys.txt"; environment.systemPackages = with pkgs; [ - (pkgs.writeShellScriptBin "nrbs" "sudo nixos-rebuild switch") - (pkgs.writeShellScriptBin "nrbsu" "sudo nix-channel --update && sudo nixos-rebuild switch") - (pkgs.writeShellScriptBin "nfs" '' - sudo nixos-rebuild switch --flake $(readlink -f /etc/nixos)#${systemSettings.hostName} - '') - (pkgs.writeShellScriptBin "ads" "nix develop --no-pure-eval $(readlink -f /etc/nixos)") + # (pkgs.writeShellScriptBin "nrbs" "sudo nixos-rebuild switch") + # (pkgs.writeShellScriptBin "nrbsu" "sudo nix-channel --update && sudo nixos-rebuild switch") + # (pkgs.writeShellScriptBin "nfs" '' + # sudo nixos-rebuild switch --flake $(readlink -f /etc/nixos)#${systemSettings.hostName} + # '') + # (pkgs.writeShellScriptBin "ads" "nix develop --no-pure-eval $(readlink -f /etc/nixos)") + # (pkgs.writeShellScriptBin "link-nix" '' + # set -e + + # if [ "$#" -eq 0 ]; then + # echo "Error: No arguments provided." + # echo "Usage: $0 " + # exit 1 + # fi + + # CURRENT=$(readlink -f /etc/nixos) + # sudo rm /etc/nixos + # echo "Unlinked $CURRENT" + + # sudo ln -s $1 /etc/nixos + # echo "Linked $(readlink -f /etc/nixos)" + # '') bash git eza @@ -43,11 +60,11 @@ in services.openssh.enable = true; services.tailscale.enable = true; - system.activationScripts.ensureDirectory = '' - if [ ! -d /conf ]; then - mkdir /conf - chmod 0755 /conf - chown 1000:100 /conf - fi - ''; + # system.activationScripts.ensureDirectory = '' + # if [ ! -d /conf ]; then + # mkdir /conf + # chmod 0755 /conf + # chown 1000:100 /conf + # fi + # ''; } diff --git a/scripts/default.nix b/scripts/default.nix new file mode 100644 index 0000000..6ce33b9 --- /dev/null +++ b/scripts/default.nix @@ -0,0 +1,12 @@ +{ pkgs, systemSettings, ... }: +{ + environment.systemPackages = with pkgs; [ + (pkgs.writeShellScriptBin "nrbs" "sudo nixos-rebuild switch") + (pkgs.writeShellScriptBin "nrbsu" "sudo nix-channel --update && sudo nixos-rebuild switch") + (pkgs.writeShellScriptBin "nfs" '' + sudo nixos-rebuild switch --flake $(readlink -f /etc/nixos)#${systemSettings.hostName} + '') + (pkgs.writeShellScriptBin "ads" "nix develop --no-pure-eval $(readlink -f /etc/nixos)") + (pkgs.writeShellScriptBin "link-nix" "${builtins.readFile ./link-nix.sh}") + ]; +} \ No newline at end of file diff --git a/scripts/link-nix.sh b/scripts/link-nix.sh new file mode 100644 index 0000000..c860de1 --- /dev/null +++ b/scripts/link-nix.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +set -e + +if [ "$#" -eq 0 ]; then +echo "Error: No arguments provided." +echo "Usage: $0 " +exit 1 +fi + +CURRENT=$(readlink -f /etc/nixos) +sudo rm /etc/nixos +echo "Unlinked $CURRENT" + +sudo ln -s $1 /etc/nixos +echo "Linked $(readlink -f /etc/nixos)"