diff --git a/build.sh b/build.sh
index 4b4cfa5..f366fe5 100755
--- a/build.sh
+++ b/build.sh
@@ -16,12 +16,13 @@ EXTRA_NIX_FLAGS="-L --accept-flake-config --keep-going"
EXTRA_NIXOS_REBUILD_FLAGS="--sudo --no-reexec --offline" # legacy: --use-remote-sudo --fast
if [ "${ROOT}" = "/" ]; then
- [ -f "host/${CONFIG}/hooks/pre-rebuild.sh" ] && host/${CONFIG}/hooks/pre-rebuild.sh
- [ ! -f "hardware-configuration.nix" ] && nixos-generate-config --show-hardware-config > hardware-configuration.nix
+ [ -f "host/${CONFIG}/hooks/pre-rebuild.sh" ] && echo "<=== RUNNING PRE-REBUILD HOOK AT host/${CONFIG}/hooks/pre-rebuild.sh ===>" && host/${CONFIG}/hooks/pre-rebuild.sh
+ [ ! -f "hardware-configuration.nix" ] && echo "<=== GENERATING NEW HARDWARE CONFIG ===>" && nixos-generate-config --show-hardware-config > hardware-configuration.nix
git add -f hardware-configuration.nix
- nom build $DERIVATION $EXTRA_NIX_FLAGS && nixos-rebuild switch --flake .#${CONFIG} $EXTRA_NIX_FLAGS $EXTRA_NIXOS_REBUILD_FLAGS || exit 1
+ echo "<=== REBUILDING NIXOS CONFIGURATION FOR ${CONFIG} ===>"
+ nom build $DERIVATION $EXTRA_NIX_FLAGS && echo "<=== SWITCHING TO NEW CONFIGURATION ===>" && nixos-rebuild switch --flake .#${CONFIG} $EXTRA_NIX_FLAGS $EXTRA_NIXOS_REBUILD_FLAGS || exit 1
#nixos-rebuild switch --flake ".#${CONFIG}" -j`nproc` --upgrade-all -L || exit 1
- [ -f "host/${CONFIG}/hooks/post-rebuild.sh" ] && host/${CONFIG}/hooks/post-rebuild.sh
+ [ -f "host/${CONFIG}/hooks/post-rebuild.sh" ] && echo "<=== RUNNING POST-REBUILD HOOK AT host/${CONFIG}/hooks/post-rebuild.sh ===>" && host/${CONFIG}/hooks/post-rebuild.sh
git rm --cached hardware-configuration.nix
exit
else
diff --git a/flake.lock b/flake.lock
index f2b4e00..98d806d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -238,11 +238,11 @@
"draupnirSrc": {
"flake": false,
"locked": {
- "lastModified": 1763040560,
- "narHash": "sha256-pF6NgPdKz4/gErKFyGi0EDVkOsB/7d8HKTX6K5SEWOU=",
+ "lastModified": 1763229020,
+ "narHash": "sha256-AKSdUayEwyK8o8UjZLZf4IluJXwiYqjHRPzUxzfYw1I=",
"owner": "the-draupnir-project",
"repo": "Draupnir",
- "rev": "492f6816ed21d8c7d340f4c75f659b5ecd875485",
+ "rev": "e64c43698d7a611d0b7e6dd25cb74b1b68b77a51",
"type": "github"
},
"original": {
@@ -582,11 +582,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
- "lastModified": 1763198244,
- "narHash": "sha256-oLugbe2pJv39BjWg7kAljn6vUxjVr/ArkITDX8fFd2Y=",
+ "lastModified": 1763416652,
+ "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "c3bc79be5ee97455262c6c677bbf065eed07948c",
+ "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312",
"type": "github"
},
"original": {
@@ -882,11 +882,11 @@
"lix": {
"flake": false,
"locked": {
- "lastModified": 1763152608,
- "narHash": "sha256-1P9WlCxbBm88faT3M9u1eYDXtv14cCSqy9T29xk4zjg=",
- "rev": "5fd9c65a8f8d2dcfae1ef72d3c44ebd62b674950",
+ "lastModified": 1763570812,
+ "narHash": "sha256-A42G8ulTZ1MFCR0VsLF21CoKi0XKGUYwtVBHGm5mFgQ=",
+ "rev": "f3b2f3496bd6d346cba475d0ba152a9d3a83dec7",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5fd9c65a8f8d2dcfae1ef72d3c44ebd62b674950.tar.gz?rev=5fd9c65a8f8d2dcfae1ef72d3c44ebd62b674950"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f3b2f3496bd6d346cba475d0ba152a9d3a83dec7.tar.gz?rev=f3b2f3496bd6d346cba475d0ba152a9d3a83dec7"
},
"original": {
"type": "tarball",
@@ -905,11 +905,11 @@
]
},
"locked": {
- "lastModified": 1761960361,
- "narHash": "sha256-FvuAw56NIVJpS3Kr8Wv9PpU4eehZMcdIVkxjStuYmqc=",
- "rev": "c47f62187601ea2991b79a9bacdbfdf76cd29fbe",
+ "lastModified": 1763435414,
+ "narHash": "sha256-i2467FddWfd19q5Qoj+1/BAeg6LZmM5m4mYGRSQn/as=",
+ "rev": "192c92b603731fbc1bade6c1b18c8d8a0086f703",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c47f62187601ea2991b79a9bacdbfdf76cd29fbe.tar.gz?rev=c47f62187601ea2991b79a9bacdbfdf76cd29fbe"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/192c92b603731fbc1bade6c1b18c8d8a0086f703.tar.gz?rev=192c92b603731fbc1bade6c1b18c8d8a0086f703"
},
"original": {
"type": "tarball",
@@ -919,11 +919,11 @@
"matrixSpecSrc": {
"flake": false,
"locked": {
- "lastModified": 1761918735,
- "narHash": "sha256-pEUslae5h8yjS/T3dWHTII+TpMbf8d1SucGb93yTsiI=",
+ "lastModified": 1763482079,
+ "narHash": "sha256-d1x/qDdXiPO2mVa8oQmR8nxLTlVCPsU7jhchupMIwkg=",
"owner": "matrix-org",
"repo": "matrix-spec",
- "rev": "fe3f43a905cff0406650002540a26874bf985dd6",
+ "rev": "8ebf4a4789a973566557fa29df8bf979ba5b0722",
"type": "github"
},
"original": {
@@ -1060,11 +1060,11 @@
},
"nixpkgs-RoryNix": {
"locked": {
- "lastModified": 1763214734,
- "narHash": "sha256-3bpCgF2MKSZE8UFbA/nDOAPMJ0QnsTo5JLdB7qk/yyo=",
+ "lastModified": 1763572338,
+ "narHash": "sha256-nSOdcCno223WKi2+prD/gBN9+IsNpWjIVj+VW5Aekx8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "321f80c3e2a7ebefde46ef112e88e73774bc9fc7",
+ "rev": "a7e3137d88f4f0d72413f68e10fbf737ace2a2cf",
"type": "github"
},
"original": {
@@ -1076,11 +1076,11 @@
},
"nixpkgs-master": {
"locked": {
- "lastModified": 1763214734,
- "narHash": "sha256-3bpCgF2MKSZE8UFbA/nDOAPMJ0QnsTo5JLdB7qk/yyo=",
+ "lastModified": 1763572338,
+ "narHash": "sha256-nSOdcCno223WKi2+prD/gBN9+IsNpWjIVj+VW5Aekx8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "321f80c3e2a7ebefde46ef112e88e73774bc9fc7",
+ "rev": "a7e3137d88f4f0d72413f68e10fbf737ace2a2cf",
"type": "github"
},
"original": {
@@ -1092,11 +1092,11 @@
},
"nixpkgs-override-draupnir": {
"locked": {
- "lastModified": 1763214734,
- "narHash": "sha256-3bpCgF2MKSZE8UFbA/nDOAPMJ0QnsTo5JLdB7qk/yyo=",
+ "lastModified": 1763572338,
+ "narHash": "sha256-nSOdcCno223WKi2+prD/gBN9+IsNpWjIVj+VW5Aekx8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "321f80c3e2a7ebefde46ef112e88e73774bc9fc7",
+ "rev": "a7e3137d88f4f0d72413f68e10fbf737ace2a2cf",
"type": "github"
},
"original": {
@@ -1140,11 +1140,11 @@
},
"nixpkgs-stable_3": {
"locked": {
- "lastModified": 1763049705,
- "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=",
+ "lastModified": 1763334038,
+ "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c",
+ "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c",
"type": "github"
},
"original": {
@@ -1156,11 +1156,11 @@
},
"nixpkgs_10": {
"locked": {
- "lastModified": 1762361079,
- "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=",
+ "lastModified": 1763191728,
+ "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5",
+ "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c",
"type": "github"
},
"original": {
@@ -1268,11 +1268,11 @@
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1762977756,
- "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
+ "lastModified": 1763421233,
+ "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
+ "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648",
"type": "github"
},
"original": {
@@ -1422,11 +1422,11 @@
"nixpkgs": "nixpkgs_10"
},
"locked": {
- "lastModified": 1763069729,
- "narHash": "sha256-A91a+K0Q9wfdPLwL06e/kbHeAWSzPYy2EGdTDsyfb+s=",
+ "lastModified": 1763509310,
+ "narHash": "sha256-s2WzTAD3vJtPACBCZXezNUMTG/wC6SFsU9DxazB9wDI=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "a2bcd1c25c1d29e22756ccae094032ab4ada2268",
+ "rev": "3ee33c0ed7c5aa61b4e10484d2ebdbdc98afb03e",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index c7d1021..3c76ec7 100755
--- a/flake.nix
+++ b/flake.nix
@@ -396,7 +396,10 @@
system:
let
pkgs = import nixpkgs { inherit system; };
- pkgs-jetbrains = import nixpkgs-override-jetbrains { inherit system; config.allowUnfree = true; };
+ pkgs-jetbrains =
+ if inputs ? nixpkgs-override-jetbrains
+ then import nixpkgs-override-jetbrains { inherit system; config.allowUnfree = true; }
+ else import nixpkgs { inherit system; config.allowUnfree = true; };
in
{
packages.nheko-git = (
@@ -448,7 +451,7 @@
packages.draupnir = (self.inputs.nixpkgs-override-draupnir or self.inputs.nixpkgs-master).legacyPackages.${system}.draupnir;
-# packages.jetbrains = (self.inputs.nixpkgs-override-jetbrains or self.inputs.nixpkgs).legacyPackages.${system}.jetbrains;
+# packages.jetbrains = (self.inputs.jetbrains or self.inputs.nixpkgs).legacyPackages.${system}.jetbrains;
packages.jetbrains = pkgs-jetbrains.jetbrains;
}
);
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index e8a0f8f..7676452 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -40,6 +40,7 @@ args@{
boot = {
kernelPackages = pkgs.linuxPackages_latest;
+ binfmt.emulatedSystems = [ "aarch64-linux" "riscv64-linux" "riscv32-linux" ];
loader = {
grub = {
configurationLimit = 10;
diff --git a/host/Rory-laptop/configuration.nix b/host/Rory-laptop/configuration.nix
index ecb5713..6fafefb 100644
--- a/host/Rory-laptop/configuration.nix
+++ b/host/Rory-laptop/configuration.nix
@@ -135,7 +135,7 @@ args@{
(jetbrains.plugins.addPlugins jetbrains.clion [
jetbrains.plugins.github-copilot-fixed
#"github-copilot"
- "string-manipulation"
+ "stringmanipulation"
"nixidea"
"visual-studio-keymap"
])
diff --git a/modules/software-templates/devenv/c-cpp.nix b/modules/software-templates/devenv/c-cpp.nix
index d07191b..ca586b0 100644
--- a/modules/software-templates/devenv/c-cpp.nix
+++ b/modules/software-templates/devenv/c-cpp.nix
@@ -3,10 +3,10 @@
{
environment.systemPackages = with pkgs; [
(jetbrains.plugins.addPlugins jetbrains.clion [
- jetbrains.plugins.github-copilot-fixed
- #"github-copilot"
+ "17718" # github-copilot
"nixidea"
"visual-studio-keymap"
- ]) # "string-manipulation"
+ "stringmanipulation"
+ ])
];
}
\ No newline at end of file
diff --git a/modules/software-templates/devenv/dotnet.nix b/modules/software-templates/devenv/dotnet.nix
index 8e1ee0c..b819743 100644
--- a/modules/software-templates/devenv/dotnet.nix
+++ b/modules/software-templates/devenv/dotnet.nix
@@ -1,27 +1,14 @@
-{
- config,
- pkgs,
- nixpkgs-stable,
- ...
-}:
+{ pkgs, ... }:
-let
- # We have to specify config to set allowUnfree, as nixpkgs-stable.legacyPackages doesn't pass through config.
- # See: https://slab.midna.dev/public/posts/where-does-pkgs-come-from-xw6epo0t
- #stablePkgs = import nixpkgs-stable {
- # config = config.nixpkgs.config;
- # system = pkgs.stdenv.hostPlatform.system;
- #};
-in
{
- #imports = [ ./dotnet.nix ];
environment.systemPackages = with pkgs; [
- #`jetbrains.rider
(jetbrains.plugins.addPlugins jetbrains.rider [
-# jetbrains.plugins.github-copilot-fixed
- "github-copilot"
+ "17718" # github-copilot
"nixidea"
])
dotnetCorePackages.sdk_10_0
];
+ environment.sessionVariables = {
+ DOTNET_CLI_TELEMETRY_OPTOUT = "1";
+ };
}
diff --git a/modules/software-templates/devenv/java.nix b/modules/software-templates/devenv/java.nix
index 48613e1..09ea1fb 100644
--- a/modules/software-templates/devenv/java.nix
+++ b/modules/software-templates/devenv/java.nix
@@ -3,11 +3,11 @@
{
environment.systemPackages = with pkgs; [
(jetbrains.plugins.addPlugins jetbrains.idea-ultimate [
- jetbrains.plugins.github-copilot-fixed
- #"github-copilot"
+ "17718" # github-copilot
"nixidea"
"visual-studio-keymap"
- ]) # "string-manipulation"
+ "stringmanipulation"
+ ])
openjdk17
];
}
\ No newline at end of file
diff --git a/modules/software-templates/devenv/javascript.nix b/modules/software-templates/devenv/javascript.nix
index ff28dbb..b5b7da4 100644
--- a/modules/software-templates/devenv/javascript.nix
+++ b/modules/software-templates/devenv/javascript.nix
@@ -3,8 +3,10 @@
{
environment.systemPackages = with pkgs; [
(jetbrains.plugins.addPlugins jetbrains.webstorm [
-# jetbrains.plugins.github-copilot-fixed
- "github-copilot"
+ "17718" # github-copilot
+ "nixidea"
+ "visual-studio-keymap"
+ "stringmanipulation"
])
nodejs_24
];
diff --git a/update.sh b/update.sh
index f233b68..290a208 100755
--- a/update.sh
+++ b/update.sh
@@ -8,5 +8,6 @@ if [ -d "nixpkgs" ]; then
cd ..
fi
-nix flake update
+echo '<=== UPDATING FLAKE INPUTS ===>'
+nix flake update -vL
./build.sh / $HOSTNAME
|
