diff --git a/build.sh b/build.sh
index 1f70971..5420f90 100755
--- a/build.sh
+++ b/build.sh
@@ -13,12 +13,13 @@ CONFIG=$2
DERIVATION=".#nixosConfigurations.${CONFIG}.config.system.build.toplevel"
EXTRA_NIX_FLAGS="-L --accept-flake-config"
+EXTRA_NIXOS_REBUILD_FLAGS="--use-remote-sudo --offline --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
git add -f hardware-configuration.nix
- nom build $DERIVATION $EXTRA_NIX_FLAGS && nixos-rebuild switch --flake .#${CONFIG} --upgrade-all $EXTRA_NIX_FLAGS --use-remote-sudo || exit 1
+ nom build $DERIVATION $EXTRA_NIX_FLAGS && 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
git rm --cached hardware-configuration.nix
diff --git a/flake.lock b/flake.lock
index ae66c91..136a973 100644
--- a/flake.lock
+++ b/flake.lock
@@ -428,6 +428,39 @@
"type": "github"
}
},
+ "flake-utils_6": {
+ "inputs": {
+ "systems": "systems_5"
+ },
+ "locked": {
+ "lastModified": 1726560853,
+ "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "flakey-profile": {
+ "locked": {
+ "lastModified": 1712898590,
+ "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
+ "owner": "lf-",
+ "repo": "flakey-profile",
+ "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "lf-",
+ "repo": "flakey-profile",
+ "type": "github"
+ }
+ },
"grapevine": {
"inputs": {
"attic": "attic_2",
@@ -475,6 +508,41 @@
"type": "github"
}
},
+ "lix": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1729298361,
+ "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
+ "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
+ "type": "tarball",
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
+ },
+ "original": {
+ "type": "tarball",
+ "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
+ }
+ },
+ "lix-module": {
+ "inputs": {
+ "flake-utils": "flake-utils_5",
+ "flakey-profile": "flakey-profile",
+ "lix": "lix",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1732605668,
+ "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=",
+ "rev": "f19bd752910bbe3a861c9cad269bd078689d50fe",
+ "type": "tarball",
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz"
+ },
+ "original": {
+ "type": "tarball",
+ "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"
+ }
+ },
"mtxclientSrc": {
"flake": false,
"locked": {
@@ -565,7 +633,7 @@
"nixos-wsl": {
"inputs": {
"flake-compat": "flake-compat_5",
- "flake-utils": "flake-utils_5",
+ "flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_6"
},
"locked": {
@@ -694,6 +762,22 @@
"type": "github"
}
},
+ "nixpkgs-stable_3": {
+ "locked": {
+ "lastModified": 1732749044,
+ "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-24.05",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"nixpkgs_2": {
"locked": {
"lastModified": 1709479366,
@@ -831,6 +915,7 @@
"flake-utils": "flake-utils_3",
"grapevine": "grapevine",
"home-manager": "home-manager",
+ "lix-module": "lix-module",
"mtxclientSrc": "mtxclientSrc",
"nhekoSrc": "nhekoSrc",
"nixos-wsl": "nixos-wsl",
@@ -839,6 +924,7 @@
"nixpkgs-RoryNix": "nixpkgs-RoryNix",
"nixpkgs-keydb": "nixpkgs-keydb",
"nixpkgs-master": "nixpkgs-master",
+ "nixpkgs-stable": "nixpkgs-stable_3",
"sops-nix": "sops-nix"
}
},
@@ -965,6 +1051,21 @@
"repo": "default",
"type": "github"
}
+ },
+ "systems_5": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index d670894..7365834 100755
--- a/flake.nix
+++ b/flake.nix
@@ -13,6 +13,10 @@
url = "github:NixOS/nixpkgs/nixos-unstable";
};
+ nixpkgs-stable = {
+ url = "github:NixOS/nixpkgs/nixos-24.05";
+ };
+
nixpkgs-master = {
url = "github:NixOS/nixpkgs/master";
};
@@ -38,6 +42,11 @@
#conduwuit.url = "github:girlbossceo/conduwuit";
nixos-wsl.url = "github:nix-community/NixOS-WSL";
+ lix-module = {
+ url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+
# Own projects
botcore-v4 = {
url = "gitlab:BotCore-Devs/BotCore-v4/staging";
@@ -49,6 +58,7 @@
url = "github:Nheko-reborn/nheko/master";
flake = false;
};
+
mtxclientSrc = {
url = "github:Nheko-reborn/mtxclient/master";
flake = false;
@@ -112,6 +122,7 @@
./host/Rory-nginx/configuration.nix
./hardware-configuration.nix
home-manager.nixosModules.home-manager
+ lix-module.nixosModules.default
grapevine.nixosModules.default
#MatrixContentFilter.modules.default
@@ -170,6 +181,7 @@
./host/Rory-desktop/configuration.nix
./hardware-configuration.nix
home-manager.nixosModules.home-manager
+ lix-module.nixosModules.default
sops-nix.nixosModules.sops
(
{ ... }:
@@ -185,6 +197,7 @@
inherit home-manager;
inherit (inputs) mtxclientSrc;
inherit (inputs) nhekoSrc;
+ inherit nixpkgs-stable;
};
};
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index 465936c..80ef09d 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -15,6 +15,8 @@ args@{
../../modules/packages/vim.nix
# ../../modules/environments/home.nix
../../modules/software-templates/profilers.nix
+ ../../modules/software-templates/dotnet.client.nix
+
./postgres.nix
./nginx.nix
@@ -138,7 +140,7 @@ args@{
# - IDEs
#jetbrains-toolbox
- jetbrains.rider
+ #jetbrains.rider
jetbrains.webstorm
#jetbrains.clion
#github-copilot-intellij-agent
@@ -198,6 +200,7 @@ args@{
opensc
eid-mw
jitsi-meet-electron
+ nixd
];
environment.etc."pkcs11/modules/opensc-pkcs11".text = ''
module: ${pkgs.opensc}/lib/opensc-pkcs11.so
diff --git a/modules/software-templates/dotnet.client.nix b/modules/software-templates/dotnet.client.nix
index fa0082b..e25282e 100644
--- a/modules/software-templates/dotnet.client.nix
+++ b/modules/software-templates/dotnet.client.nix
@@ -1,9 +1,14 @@
-{ pkgs, ... }:
+{ config, pkgs, nixpkgs-stable, ... }:
+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 [ "github-copilot" ])
+ (stablePkgs.jetbrains.plugins.addPlugins stablePkgs.jetbrains.rider [ "github-copilot" ])
];
}
|
