From b0f696ca7f5173955f7179c5d3393fb3a36d4cd5 Mon Sep 17 00:00:00 2001
From: "leonv@willem" <leonvatthauer@outlook.com>
Date: Wed, 20 Mar 2024 16:14:35 +0100
Subject: [PATCH 1/3] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'homebrew-cask':
'github:homebrew/homebrew-cask/32ec3450608d2ca898cd37e3e3fa83911787bde1' (2024-03-19)
→ 'github:homebrew/homebrew-cask/f64faa9f28c817a82d1ca35a5cee57a27ffa976f' (2024-03-20)
• Updated input 'homebrew-core':
'github:homebrew/homebrew-core/e0a91487110b6f86ca1624896f9fdf953ca4e9f6' (2024-03-19)
→ 'github:homebrew/homebrew-core/96519c4f2bd6f1b894e3ca263b57a0c49a39aaaf' (2024-03-20)
• Updated input 'hyprland-contrib':
'github:hyprwm/contrib/75420d09f93346d9d23d5a1e26b42699f6b66cd6' (2024-03-14)
→ 'github:hyprwm/contrib/4ee76323053bfae15cc05c294c7fda9997ca7fc3' (2024-03-19)
• Updated input 'unstable':
'github:nixos/nixpkgs/c75037bbf9093a2acb617804ee46320d6d1fea5a' (2024-03-16)
→ 'github:nixos/nixpkgs/b06025f1533a1e07b6db3e75151caa155d1c7eb3' (2024-03-19)
---
flake.lock | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/flake.lock b/flake.lock
index 7e75e31..58c9e60 100644
--- a/flake.lock
+++ b/flake.lock
@@ -144,11 +144,11 @@
"homebrew-cask": {
"flake": false,
"locked": {
- "lastModified": 1710831589,
- "narHash": "sha256-p5yFVctZiDgDgUJMUQDql3rjq5Ub3F5f34isKU6ljjs=",
+ "lastModified": 1710943557,
+ "narHash": "sha256-ThfEzbwCvcbpDD3wS7rNBGDh9ZuU64eI1UVnjg8caWc=",
"owner": "homebrew",
"repo": "homebrew-cask",
- "rev": "32ec3450608d2ca898cd37e3e3fa83911787bde1",
+ "rev": "f64faa9f28c817a82d1ca35a5cee57a27ffa976f",
"type": "github"
},
"original": {
@@ -160,11 +160,11 @@
"homebrew-core": {
"flake": false,
"locked": {
- "lastModified": 1710832165,
- "narHash": "sha256-RKztyDRLe7Glow4i4MHrsvzgL2ZAQcsZ7ygKcwhMyBU=",
+ "lastModified": 1710945599,
+ "narHash": "sha256-vsI5xKmPdSuG/bEimbkVlueupkByrRzEFHp5fEMY7ms=",
"owner": "homebrew",
"repo": "homebrew-core",
- "rev": "e0a91487110b6f86ca1624896f9fdf953ca4e9f6",
+ "rev": "96519c4f2bd6f1b894e3ca263b57a0c49a39aaaf",
"type": "github"
},
"original": {
@@ -180,11 +180,11 @@
]
},
"locked": {
- "lastModified": 1710415616,
- "narHash": "sha256-1qVByzzCcKoCmP8ReUSAjKU5V9pfTLHQIM4WI1tvQ9E=",
+ "lastModified": 1710868143,
+ "narHash": "sha256-U5DLWla6nNiomFyCskYn6QfNCpVyQTeyG6FOAuEKHRg=",
"owner": "hyprwm",
"repo": "contrib",
- "rev": "75420d09f93346d9d23d5a1e26b42699f6b66cd6",
+ "rev": "4ee76323053bfae15cc05c294c7fda9997ca7fc3",
"type": "github"
},
"original": {
@@ -341,11 +341,11 @@
},
"unstable": {
"locked": {
- "lastModified": 1710631334,
- "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=",
+ "lastModified": 1710806803,
+ "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a",
+ "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3",
"type": "github"
},
"original": {
From aae238f2bb286b599acb9ee5df71bd7ab2c18a0c Mon Sep 17 00:00:00 2001
From: "leonv@willem" <leonvatthauer@outlook.com>
Date: Wed, 20 Mar 2024 16:21:45 +0100
Subject: [PATCH 2/3] Pin willem to 23.11
---
flake.lock | 44 +++++++++++++++++++++++++++++++++++++++++---
flake.nix | 8 ++++++--
2 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/flake.lock b/flake.lock
index 58c9e60..a90c8f8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -141,14 +141,34 @@
"type": "github"
}
},
+ "home-manager-stable": {
+ "inputs": {
+ "nixpkgs": [
+ "stable"
+ ]
+ },
+ "locked": {
+ "lastModified": 1710820906,
+ "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=",
+ "owner": "nix-community",
+ "repo": "home-manager",
+ "rev": "022464438a85450abb23d93b91aa82e0addd71fb",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "home-manager",
+ "type": "github"
+ }
+ },
"homebrew-cask": {
"flake": false,
"locked": {
- "lastModified": 1710943557,
- "narHash": "sha256-ThfEzbwCvcbpDD3wS7rNBGDh9ZuU64eI1UVnjg8caWc=",
+ "lastModified": 1710947875,
+ "narHash": "sha256-eZJDqqGxF68UMvbi6jD2EMl096OJfqgMM3K6dPd4OF8=",
"owner": "homebrew",
"repo": "homebrew-cask",
- "rev": "f64faa9f28c817a82d1ca35a5cee57a27ffa976f",
+ "rev": "d252a7a4de3076466ef05581fa9137a6d06b7265",
"type": "github"
},
"original": {
@@ -301,14 +321,32 @@
"cask-fonts": "cask-fonts",
"darwin": "darwin",
"home-manager": "home-manager",
+ "home-manager-stable": "home-manager-stable",
"homebrew-cask": "homebrew-cask",
"homebrew-core": "homebrew-core",
"hyprland-contrib": "hyprland-contrib",
"mac-app-util": "mac-app-util",
"nix-homebrew": "nix-homebrew",
+ "stable": "stable",
"unstable": "unstable"
}
},
+ "stable": {
+ "locked": {
+ "lastModified": 1710838473,
+ "narHash": "sha256-RLvwdQSENKOaLdKhNie8XqHmTXzNm00/M/THj6zplQo=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "fa9f817df522ac294016af3d40ccff82f5fd3a63",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-23.11",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"systems": {
"locked": {
"lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index 09bc8c6..fb66484 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,6 +2,7 @@
description = "Master flake for all my setups";
inputs = {
+ stable.url = "github:nixos/nixpkgs/nixos-23.11";
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
darwin.url = "github:lnl7/nix-darwin/master";
@@ -20,6 +21,9 @@
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "unstable";
+
+ home-manager-stable.url = "github:nix-community/home-manager";
+ home-manager-stable.inputs.nixpkgs.follows = "stable";
hyprland-contrib.url = "github:hyprwm/contrib";
hyprland-contrib.inputs.nixpkgs.follows = "unstable";
@@ -28,7 +32,7 @@
mac-app-util.url = "github:hraban/mac-app-util";
};
- outputs = { unstable, home-manager, darwin, hyprland-contrib, nix-homebrew, homebrew-core, homebrew-cask, cask-fonts, ...}@inputs: {
+ outputs = { unstable, stable, home-manager, home-manager-stable, darwin, hyprland-contrib, nix-homebrew, homebrew-core, homebrew-cask, cask-fonts, ...}@inputs: {
nixosConfigurations = {
gunther = unstable.lib.nixosSystem {
system = "x86_64-linux";
@@ -52,7 +56,7 @@
./iso/configuration.nix
];
};
- willem = unstable.lib.nixosSystem {
+ willem = stable.lib.nixosSystem {
system = "aarch64-linux";
modules = [ ./willem/configuration.nix ];
};
From d60f3b50d7e027e3f8383fee8dcd21a0dbeaca1e Mon Sep 17 00:00:00 2001
From: "leonv@willem" <leonvatthauer@outlook.com>
Date: Thu, 21 Mar 2024 08:27:51 +0100
Subject: [PATCH 3/3] undo changes to repair forgejo
---
flake.lock | 50 +++++-----------------------------------
flake.nix | 8 ++-----
willem/configuration.nix | 5 ----
3 files changed, 8 insertions(+), 55 deletions(-)
diff --git a/flake.lock b/flake.lock
index a90c8f8..06d5058 100644
--- a/flake.lock
+++ b/flake.lock
@@ -141,34 +141,14 @@
"type": "github"
}
},
- "home-manager-stable": {
- "inputs": {
- "nixpkgs": [
- "stable"
- ]
- },
- "locked": {
- "lastModified": 1710820906,
- "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=",
- "owner": "nix-community",
- "repo": "home-manager",
- "rev": "022464438a85450abb23d93b91aa82e0addd71fb",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "home-manager",
- "type": "github"
- }
- },
"homebrew-cask": {
"flake": false,
"locked": {
- "lastModified": 1710947875,
- "narHash": "sha256-eZJDqqGxF68UMvbi6jD2EMl096OJfqgMM3K6dPd4OF8=",
+ "lastModified": 1710949536,
+ "narHash": "sha256-bmhvsTerE7iAKC7aie7EQvXLgBIJBiPgly+++mwKvQY=",
"owner": "homebrew",
"repo": "homebrew-cask",
- "rev": "d252a7a4de3076466ef05581fa9137a6d06b7265",
+ "rev": "bfa49614bbffd0ca218b5274ef9369377878dd30",
"type": "github"
},
"original": {
@@ -180,11 +160,11 @@
"homebrew-core": {
"flake": false,
"locked": {
- "lastModified": 1710945599,
- "narHash": "sha256-vsI5xKmPdSuG/bEimbkVlueupkByrRzEFHp5fEMY7ms=",
+ "lastModified": 1710949664,
+ "narHash": "sha256-k2Iw82CSqvhPCb+jh045+0oWSZ/aejN4xeEFukqNPE0=",
"owner": "homebrew",
"repo": "homebrew-core",
- "rev": "96519c4f2bd6f1b894e3ca263b57a0c49a39aaaf",
+ "rev": "251c56155acaab9aed946c0de49ec9d923460d91",
"type": "github"
},
"original": {
@@ -321,32 +301,14 @@
"cask-fonts": "cask-fonts",
"darwin": "darwin",
"home-manager": "home-manager",
- "home-manager-stable": "home-manager-stable",
"homebrew-cask": "homebrew-cask",
"homebrew-core": "homebrew-core",
"hyprland-contrib": "hyprland-contrib",
"mac-app-util": "mac-app-util",
"nix-homebrew": "nix-homebrew",
- "stable": "stable",
"unstable": "unstable"
}
},
- "stable": {
- "locked": {
- "lastModified": 1710838473,
- "narHash": "sha256-RLvwdQSENKOaLdKhNie8XqHmTXzNm00/M/THj6zplQo=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "fa9f817df522ac294016af3d40ccff82f5fd3a63",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-23.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"systems": {
"locked": {
"lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index fb66484..a576014 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,6 @@
description = "Master flake for all my setups";
inputs = {
- stable.url = "github:nixos/nixpkgs/nixos-23.11";
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
darwin.url = "github:lnl7/nix-darwin/master";
@@ -22,9 +21,6 @@
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "unstable";
- home-manager-stable.url = "github:nix-community/home-manager";
- home-manager-stable.inputs.nixpkgs.follows = "stable";
-
hyprland-contrib.url = "github:hyprwm/contrib";
hyprland-contrib.inputs.nixpkgs.follows = "unstable";
@@ -32,7 +28,7 @@
mac-app-util.url = "github:hraban/mac-app-util";
};
- outputs = { unstable, stable, home-manager, home-manager-stable, darwin, hyprland-contrib, nix-homebrew, homebrew-core, homebrew-cask, cask-fonts, ...}@inputs: {
+ outputs = { unstable, home-manager, darwin, hyprland-contrib, nix-homebrew, homebrew-core, homebrew-cask, cask-fonts, ...}@inputs: {
nixosConfigurations = {
gunther = unstable.lib.nixosSystem {
system = "x86_64-linux";
@@ -56,7 +52,7 @@
./iso/configuration.nix
];
};
- willem = stable.lib.nixosSystem {
+ willem = unstable.lib.nixosSystem {
system = "aarch64-linux";
modules = [ ./willem/configuration.nix ];
};
diff --git a/willem/configuration.nix b/willem/configuration.nix
index 105d1e3..c89e381 100644
--- a/willem/configuration.nix
+++ b/willem/configuration.nix
@@ -59,11 +59,6 @@
"plexmediaserver"
];
- services.plex = {
- enable = true;
- openFirewall = true;
- };
-
services.jellyfin.enable = true;
system.stateVersion = "23.11"; # Did you read the comment?