diff --git a/ctl.sh b/ctl.sh index ae16b44..00e007d 100755 --- a/ctl.sh +++ b/ctl.sh @@ -7,6 +7,7 @@ ## ## test Rebuild and test OS without new generation ## rebuild Rebuild OS and create new generation +## channel Set release channel ## upgrade Upgrade channels and rebuild OS ## changes Show changes between generations ## gc Garbage collect old generations @@ -54,6 +55,14 @@ function os { sudo nix-channel --update sudo nixos-rebuild --upgrade --flake ./os#${1} switch } + function channel { + sudo nix-channel --list + if [ -n "${1}" ]; then + echo "Set channel to ${1}" + sudo nix-channel --remove nixos + sudo nix-channel --add https://nixos.org/channels/nixos-${1} nixos + fi + } function changes { nix profile diff-closures --profile /nix/var/nix/profiles/system } @@ -99,13 +108,13 @@ function shell { } function repl { - info - echo -e "\n${REDBOLD}Enter command...${EC}" - read -p '~> '; + info + echo -e "\n${REDBOLD}Enter command...${EC}" + read -p '~> ' clear - ./ctl.sh ${REPLY} + ./ctl.sh ${REPLY} read -p "Press any key to continue." - repl + repl } ${@:-info} diff --git a/os/configuration.nix b/os/configuration.nix index 7b8de4f..2b303e2 100644 --- a/os/configuration.nix +++ b/os/configuration.nix @@ -11,4 +11,8 @@ system.stateVersion = "23.05"; + nixpkgs.config.permittedInsecurePackages = [ + "electron-24.8.6" + ]; + } diff --git a/os/flake.lock b/os/flake.lock index 08b64a3..b0b4e32 100644 --- a/os/flake.lock +++ b/os/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688109178, - "narHash": "sha256-BSdeYp331G4b1yc7GIRgAnfUyaktW2nl7k0C577Tttk=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b72aa95f7f096382bff3aea5f8fde645bca07422", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { diff --git a/os/users/master.nix b/os/users/master.nix index cbb07a4..50f90dd 100644 --- a/os/users/master.nix +++ b/os/users/master.nix @@ -37,6 +37,8 @@ hunspell hunspellDicts.de_CH imagemagick + ledger-live-desktop + solana-cli ]; programs = { diff --git a/shell/python.nix b/shell/dev.nix similarity index 100% rename from shell/python.nix rename to shell/dev.nix