diff --git a/flake.lock b/flake.lock
index f0c3b8e..0d0becb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -132,11 +132,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1752688966,
- "narHash": "sha256-OfNybJnQLY9GTcNJ6P+NhUPcSTveF1kJqqpIQ9SvKeA=",
+ "lastModified": 1753467083,
+ "narHash": "sha256-/fHuZKDiw7C4n9V4sMiqJLVielqsVCSn8T5mDZZTzqk=",
"owner": "famedly",
"repo": "conduit",
- "rev": "ed5b0514f52f848e53785dee5fe8de63780cf092",
+ "rev": "a7513cef7f46a8756fb71cf3fe903f65000de9b2",
"type": "gitlab"
},
"original": {
@@ -550,11 +550,11 @@
},
"locked": {
"host": "gitlab.computer.surgery",
- "lastModified": 1748887641,
- "narHash": "sha256-dVq0DeK8jfixeubXxu1UWUYo3IpMyWzOwNaAoJ/zwPA=",
+ "lastModified": 1753060050,
+ "narHash": "sha256-8xC+MlNg6Xq9tX31fAjTG80KStl75HF+UJ/2xfOgydc=",
"owner": "matrix",
"repo": "grapevine-fork",
- "rev": "88ad596e8dafd31732e15aad938e575d3a28cd53",
+ "rev": "55a01e711320d49353af309c02beeb92d76c386e",
"type": "gitlab"
},
"original": {
@@ -569,11 +569,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
- "lastModified": 1753055793,
- "narHash": "sha256-hJIMlQDfUUb44VTH4F+21HGJsrNaWoBqDDnAH22kkd4=",
+ "lastModified": 1753595562,
+ "narHash": "sha256-Ci88mAdtiP5RQkYmVhRUq69iYPMM7/lS9/mw+FnC7DE=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "e0402627096f236943a6691fbe037b55dabef4d1",
+ "rev": "710771af3d1c8c3f86a9e5d562616973ed5f3f21",
"type": "github"
},
"original": {
@@ -869,11 +869,11 @@
"lix": {
"flake": false,
"locked": {
- "lastModified": 1753028704,
- "narHash": "sha256-kKueIZ35JZnEXPkRw/h0xXvZgBLSfFW1J9FfpCIz8WQ=",
- "rev": "2fc47b65b848aa1c2752b7b4eeb112c2cf3a240f",
+ "lastModified": 1753573361,
+ "narHash": "sha256-fCaJ29ZqevsIT1yqbpgdKeYr5GHF6sDhHlcXo2m+VuI=",
+ "rev": "ef94901156c0c688ffffaa2c5caf1498119f01d4",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2fc47b65b848aa1c2752b7b4eeb112c2cf3a240f.tar.gz?rev=2fc47b65b848aa1c2752b7b4eeb112c2cf3a240f"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ef94901156c0c688ffffaa2c5caf1498119f01d4.tar.gz?rev=ef94901156c0c688ffffaa2c5caf1498119f01d4"
},
"original": {
"type": "tarball",
@@ -906,11 +906,11 @@
"matrixSpecSrc": {
"flake": false,
"locked": {
- "lastModified": 1752954761,
- "narHash": "sha256-iIaqJfdyLETTl5Tx2+eq2kyhmDRLqCbqaTsvIylNt0U=",
+ "lastModified": 1753194208,
+ "narHash": "sha256-U5ErJ3oFXmGrQgXu06m1QCK6IPPvbErdHOWbhJWiDvA=",
"owner": "matrix-org",
"repo": "matrix-spec",
- "rev": "c8380d95529ce2a16967968d2ccdb9a2066e4111",
+ "rev": "fb4a0d8f66fb6263786ab7c4de3ef21517fcc64c",
"type": "github"
},
"original": {
@@ -1047,11 +1047,11 @@
},
"nixpkgs-RoryNix": {
"locked": {
- "lastModified": 1753055106,
- "narHash": "sha256-UfLYJQryJUSkWxZ1xCx6RqDmefLdQd7C+PalEyZOUVU=",
+ "lastModified": 1753611463,
+ "narHash": "sha256-LNauplBoXRuG2Kmdb1bqPpvXqD2BVwVYGI+Km4G1tM0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "76ad8f2d0d56f00dd5ed33d9939999eadaa4a5ea",
+ "rev": "c6e073de6e2b102dfc1625bc365d369c2bf0ba8a",
"type": "github"
},
"original": {
@@ -1063,11 +1063,11 @@
},
"nixpkgs-master": {
"locked": {
- "lastModified": 1753055106,
- "narHash": "sha256-UfLYJQryJUSkWxZ1xCx6RqDmefLdQd7C+PalEyZOUVU=",
+ "lastModified": 1753611463,
+ "narHash": "sha256-LNauplBoXRuG2Kmdb1bqPpvXqD2BVwVYGI+Km4G1tM0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "76ad8f2d0d56f00dd5ed33d9939999eadaa4a5ea",
+ "rev": "c6e073de6e2b102dfc1625bc365d369c2bf0ba8a",
"type": "github"
},
"original": {
@@ -1109,6 +1109,22 @@
"type": "github"
}
},
+ "nixpkgs-stable_3": {
+ "locked": {
+ "lastModified": 1753345091,
+ "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-25.05",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"nixpkgs_10": {
"locked": {
"lastModified": 1744868846,
@@ -1191,11 +1207,11 @@
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1752687322,
- "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
+ "lastModified": 1752950548,
+ "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
+ "rev": "c87b95e25065c028d31a94f06a62927d18763fdf",
"type": "github"
},
"original": {
@@ -1223,11 +1239,11 @@
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1752950548,
- "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
+ "lastModified": 1753590935,
+ "narHash": "sha256-+qBmgdTYy5f6v+5fJVGiWf5SySGsxVmJia+iB5L6nbU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c87b95e25065c028d31a94f06a62927d18763fdf",
+ "rev": "51a41ce9a1d46d9d1228edae97267519d42fdf28",
"type": "github"
},
"original": {
@@ -1330,6 +1346,7 @@
"nixpkgs": "nixpkgs_8",
"nixpkgs-RoryNix": "nixpkgs-RoryNix",
"nixpkgs-master": "nixpkgs-master",
+ "nixpkgs-stable": "nixpkgs-stable_3",
"ooye": "ooye",
"safeNSound": "safeNSound",
"sops-nix": "sops-nix",
diff --git a/flake.nix b/flake.nix
index d38e272..85b3760 100755
--- a/flake.nix
+++ b/flake.nix
@@ -18,9 +18,9 @@
url = "github:NixOS/nixpkgs/nixos-unstable";
};
- # nixpkgs-stable = {
- # url = "github:NixOS/nixpkgs/nixos-24.11";
- # };
+ nixpkgs-stable = {
+ url = "github:NixOS/nixpkgs/nixos-25.05";
+ };
nixpkgs-master = {
url = "github:NixOS/nixpkgs/master";
@@ -237,20 +237,21 @@
};
}
)
- #(
- # { pkgs, lib, ... }:
- # {
- # nixpkgs.overlays = [
- # (final: prev: {
+ (
+ { pkgs, lib, ... }:
+ {
+ nixpkgs.overlays = [
+ (final: prev: {
# jetbrains = (prev.jetbrains // {
# plugins = (prev.jetbrains.plugins // {
# addPlugins = (pkgs.callPackage "${inputs.nixpkgs-JetbrainsPlugins}/pkgs/applications/editors/jetbrains/plugins/default.nix" { }).addPlugins;
# });
# });
- # })
- # ];
- # }
- #)
+# rabbitmq-server = (pkgs.callPackage "${inputs.nixpkgs-stable}/pkgs/by-name/ra/rabbitmq-server/package.nix" { });
+ })
+ ];
+ }
+ )
];
specialArgs = {
inherit home-manager;
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index 814bc0f..8eb1a6e 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -85,8 +85,8 @@ args@{
i18n.defaultLocale = "en_US.UTF-8";
services = {
+ displayManager.gdm.enable = true;
xserver = {
- displayManager.gdm.enable = true;
displayManager.lightdm.enable = false;
enable = true;
updateDbusEnvironment = true;
|
