diff --git a/flake.lock b/flake.lock
index e8bb57e..1eec196 100644
--- a/flake.lock
+++ b/flake.lock
@@ -238,11 +238,11 @@
"draupnirSrc": {
"flake": false,
"locked": {
- "lastModified": 1760365474,
- "narHash": "sha256-PJg+ybWe7mtLgqrBZP0xKeKWc2FPv7koyjsHyK5uRKs=",
+ "lastModified": 1762518508,
+ "narHash": "sha256-pasjHbYZzfAPwy0EstSdw1C7x9lcOYL7F5IAA6QTY6I=",
"owner": "the-draupnir-project",
"repo": "Draupnir",
- "rev": "cb86d6d0cd4c7a529cfbdefbf8e607630a6b6662",
+ "rev": "8def00c2ed0a589be43ce9d381b6b366a8e0de8f",
"type": "github"
},
"original": {
@@ -582,11 +582,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
- "lastModified": 1761584077,
- "narHash": "sha256-dISPEZahlfs5K6d58zR4akRRyogfE9P4WSyPPNT7HiE=",
+ "lastModified": 1762787259,
+ "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "e82585308aef3d4cc2c36c7b6946051c8cdf24ef",
+ "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e",
"type": "github"
},
"original": {
@@ -882,11 +882,11 @@
"lix": {
"flake": false,
"locked": {
- "lastModified": 1761581267,
- "narHash": "sha256-/bKYOXEodgpnj9UHSFc6qOhSWoKc/XNZYksnZijqkgg=",
- "rev": "73c019c57b902043c57a7b15f5682ef34ffdcd2b",
+ "lastModified": 1762523642,
+ "narHash": "sha256-N176NqnIhym6Ki8G13heS73I4b30ZJ2QGYhP9eL0+Zs=",
+ "rev": "3ad1af8a9883986eb95744e088eab15c752c339c",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/73c019c57b902043c57a7b15f5682ef34ffdcd2b.tar.gz?rev=73c019c57b902043c57a7b15f5682ef34ffdcd2b"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/3ad1af8a9883986eb95744e088eab15c752c339c.tar.gz?rev=3ad1af8a9883986eb95744e088eab15c752c339c"
},
"original": {
"type": "tarball",
@@ -905,11 +905,11 @@
]
},
"locked": {
- "lastModified": 1759851320,
- "narHash": "sha256-n5dRAIC3/78drQtFxmQRrBLd6TKfotUnX7GWu0mAcSg=",
- "rev": "7c31a18259b8358ac196cf803a26967c0fa1d3e4",
+ "lastModified": 1761960361,
+ "narHash": "sha256-FvuAw56NIVJpS3Kr8Wv9PpU4eehZMcdIVkxjStuYmqc=",
+ "rev": "c47f62187601ea2991b79a9bacdbfdf76cd29fbe",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/7c31a18259b8358ac196cf803a26967c0fa1d3e4.tar.gz?rev=7c31a18259b8358ac196cf803a26967c0fa1d3e4"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c47f62187601ea2991b79a9bacdbfdf76cd29fbe.tar.gz?rev=c47f62187601ea2991b79a9bacdbfdf76cd29fbe"
},
"original": {
"type": "tarball",
@@ -919,11 +919,11 @@
"matrixSpecSrc": {
"flake": false,
"locked": {
- "lastModified": 1761301159,
- "narHash": "sha256-T4NHwHxasuyfFDUOZF+bBE67jAmwCl5vDKqLeTCkkoM=",
+ "lastModified": 1761918735,
+ "narHash": "sha256-pEUslae5h8yjS/T3dWHTII+TpMbf8d1SucGb93yTsiI=",
"owner": "matrix-org",
"repo": "matrix-spec",
- "rev": "74a0d5f289c0db13108596f8436b35f0c9bea05a",
+ "rev": "fe3f43a905cff0406650002540a26874bf985dd6",
"type": "github"
},
"original": {
@@ -953,11 +953,11 @@
"nhekoSrc": {
"flake": false,
"locked": {
- "lastModified": 1757886200,
- "narHash": "sha256-FU73Pb47e6Q0qEAJcxDVhVLmL+hJ4gXvssRD9NcUNkM=",
+ "lastModified": 1762138523,
+ "narHash": "sha256-93M4T6peRRMq0uL0X955+N0KnU1t/0AAyVQ/TV2zpQs=",
"owner": "Nheko-reborn",
"repo": "nheko",
- "rev": "2769642d3c7bd3c0d830b2f18ef6b3bf6a710bf4",
+ "rev": "1bd2970c4dd69daa87d906f63d869d56cf5d4915",
"type": "github"
},
"original": {
@@ -1060,11 +1060,11 @@
},
"nixpkgs-RoryNix": {
"locked": {
- "lastModified": 1761583645,
- "narHash": "sha256-YquXS0bfdVVJ2voO+IOPrMkgKGQAI/7Vrakv+UwRZBI=",
+ "lastModified": 1762957445,
+ "narHash": "sha256-i73KajsTkhkDfnyZY9Ur9VvfteXAAJTvPscO3FLQNN0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a0ae3bbb074ff8bdcd23c57645347631906be3a8",
+ "rev": "5c4fa39baf2f4d707a3a2928f1363af044c96e2a",
"type": "github"
},
"original": {
@@ -1076,11 +1076,11 @@
},
"nixpkgs-master": {
"locked": {
- "lastModified": 1761583645,
- "narHash": "sha256-YquXS0bfdVVJ2voO+IOPrMkgKGQAI/7Vrakv+UwRZBI=",
+ "lastModified": 1762957445,
+ "narHash": "sha256-i73KajsTkhkDfnyZY9Ur9VvfteXAAJTvPscO3FLQNN0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a0ae3bbb074ff8bdcd23c57645347631906be3a8",
+ "rev": "5c4fa39baf2f4d707a3a2928f1363af044c96e2a",
"type": "github"
},
"original": {
@@ -1092,16 +1092,16 @@
},
"nixpkgs-override-draupnir": {
"locked": {
- "lastModified": 1760290852,
- "narHash": "sha256-b7FppR+lLLQ8V2lnuW5H+nNmJzl7ktc99A6URXDUF+Y=",
- "owner": "r-ryantm",
+ "lastModified": 1762957445,
+ "narHash": "sha256-i73KajsTkhkDfnyZY9Ur9VvfteXAAJTvPscO3FLQNN0=",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a058526cbf2632de95c1567d63cfdf02918caa48",
+ "rev": "5c4fa39baf2f4d707a3a2928f1363af044c96e2a",
"type": "github"
},
"original": {
- "owner": "r-ryantm",
- "ref": "auto-update/draupnir",
+ "owner": "NixOS",
+ "ref": "master",
"repo": "nixpkgs",
"type": "github"
}
@@ -1140,11 +1140,11 @@
},
"nixpkgs-stable_3": {
"locked": {
- "lastModified": 1761468971,
- "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
+ "lastModified": 1762756533,
+ "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e",
+ "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d",
"type": "github"
},
"original": {
@@ -1156,11 +1156,11 @@
},
"nixpkgs_10": {
"locked": {
- "lastModified": 1760596604,
- "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
+ "lastModified": 1762361079,
+ "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43",
+ "rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5",
"type": "github"
},
"original": {
@@ -1236,11 +1236,11 @@
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1760878510,
- "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
+ "lastModified": 1762111121,
+ "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
+ "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
"type": "github"
},
"original": {
@@ -1268,11 +1268,11 @@
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1761373498,
- "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
+ "lastModified": 1762844143,
+ "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
+ "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4",
"type": "github"
},
"original": {
@@ -1422,11 +1422,11 @@
"nixpkgs": "nixpkgs_10"
},
"locked": {
- "lastModified": 1760998189,
- "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
+ "lastModified": 1762812535,
+ "narHash": "sha256-A91a+K0Q9wfdPLwL06e/kbHeAWSzPYy2EGdTDsyfb+s=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
+ "rev": "d75e4f89e58fdda39e4809f8c52013caa22483b7",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index b6dce49..ad657e1 100755
--- a/flake.nix
+++ b/flake.nix
@@ -25,8 +25,9 @@
# Draupnir module/package
#nixpkgs-override-synapse.url = "github:teutat3s/nixpkgs/matrix-synapse-1.136.0";
- #nixpkgs-override-draupnir.url = "github:NixOS/nixpkgs/master";
- nixpkgs-override-draupnir.url = "github:r-ryantm/nixpkgs/auto-update/draupnir";
+ nixpkgs-override-draupnir.url = "github:NixOS/nixpkgs/master";
+# nixpkgs-override-draupnir.url = "github:r-ryantm/nixpkgs/auto-update/draupnir";
+# nixpkgs-override-jetbrains.url = "github:TheArcaneBrony/nixpkgs/jetbrains-2025-4";
# Base modules
home-manager.url = "github:nix-community/home-manager/master";
@@ -211,7 +212,7 @@
modules = [
./host/Rory-desktop/configuration.nix
./hardware-configuration.nix
- ./packages/overlays/jetbrains-plugins.nix
+ # ./packages/overlays/jetbrains-plugins.nix
home-manager.nixosModules.home-manager
lix-module.nixosModules.default
sops-nix.nixosModules.sops
@@ -229,6 +230,7 @@
{
nixpkgs.overlays = [
(final: prev: {
+ jetbrains = self.packages.${pkgs.stdenv.hostPlatform.system}.jetbrains;
# jetbrains = (prev.jetbrains // {
# plugins = (prev.jetbrains.plugins // {
# addPlugins = (pkgs.callPackage "${inputs.nixpkgs-JetbrainsPlugins}/pkgs/applications/editors/jetbrains/plugins/default.nix" { }).addPlugins;
@@ -394,6 +396,7 @@
system:
let
pkgs = import nixpkgs { inherit system; };
+ pkgs-jetbrains = import nixpkgs-override-jetbrains { inherit system; config.allowUnfree = true; };
in
{
packages.nheko-git = (
@@ -431,6 +434,9 @@
});
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 = pkgs-jetbrains.jetbrains;
}
);
}
diff --git a/modules/software-templates/devenv/dotnet.nix b/modules/software-templates/devenv/dotnet.nix
index 20c7d34..8e1ee0c 100644
--- a/modules/software-templates/devenv/dotnet.nix
+++ b/modules/software-templates/devenv/dotnet.nix
@@ -8,18 +8,18 @@
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;
- };
+ #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"
+# jetbrains.plugins.github-copilot-fixed
+ "github-copilot"
"nixidea"
])
dotnetCorePackages.sdk_10_0
diff --git a/modules/software-templates/devenv/javascript.nix b/modules/software-templates/devenv/javascript.nix
index 66a98c9..ff28dbb 100644
--- a/modules/software-templates/devenv/javascript.nix
+++ b/modules/software-templates/devenv/javascript.nix
@@ -3,8 +3,8 @@
{
environment.systemPackages = with pkgs; [
(jetbrains.plugins.addPlugins jetbrains.webstorm [
- jetbrains.plugins.github-copilot-fixed
- #"github-copilot"
+# jetbrains.plugins.github-copilot-fixed
+ "github-copilot"
])
nodejs_24
];
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index cac733f..c56c3ed 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -75,6 +75,7 @@
user.name = "Rory&";
user.email = "root@rory.gay";
safe.directory = "/";
+ advice.defaultBranchName = false;
};
};
zsh = {
|
