From 647497beb8b818a68da79fb863c031804da33a7e Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Tue, 7 Jan 2025 19:00:56 +0100
Subject: [PATCH 01/16] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'home-manager':
'github:nix-community/home-manager/172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196?narHash=sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4%3D' (2025-01-05)
→ 'github:nix-community/home-manager/20665c6efa83d71020c8730f26706258ba5c6b2a?narHash=sha256-CoBPRgkUex9Iz6qGSzi/BFVUQjndB0PmME2B6eEyeCs%3D' (2025-01-06)
---
flake.lock | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flake.lock b/flake.lock
index c72e507..9dec76e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
]
},
"locked": {
- "lastModified": 1736089250,
- "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=",
+ "lastModified": 1736204492,
+ "narHash": "sha256-CoBPRgkUex9Iz6qGSzi/BFVUQjndB0PmME2B6eEyeCs=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196",
+ "rev": "20665c6efa83d71020c8730f26706258ba5c6b2a",
"type": "github"
},
"original": {
From ccc3a2d6611842aaa9d2bb6388c46d873ec0d1ed Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sun, 12 Jan 2025 00:09:29 +0100
Subject: [PATCH 02/16] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'home-manager':
'github:nix-community/home-manager/20665c6efa83d71020c8730f26706258ba5c6b2a?narHash=sha256-CoBPRgkUex9Iz6qGSzi/BFVUQjndB0PmME2B6eEyeCs%3D' (2025-01-06)
→ 'github:nix-community/home-manager/2532b500c3ed2b8940e831039dcec5a5ea093afc?narHash=sha256-ZOaGwa%2BWnB7Zn3YXimqjmIugAnHePdXCmNu%2BAHkq808%3D' (2025-01-10)
• Updated input 'nix-index-database':
'github:nix-community/nix-index-database/816a6ae88774ba7e74314830546c29e134e0dffb?narHash=sha256-hutd85FA1jUJhhqBRRJ%2Bu7UHO9oFGD/RVm2x5w8WjVQ%3D' (2025-01-05)
→ 'github:nix-community/nix-index-database/a2200b499efa01ca8646173e94cdfcc93188f2b8?narHash=sha256-QJgTI//KEGuEJC6FDxuI9Dq8PewIpnxD2NVx2/OHbfc%3D' (2025-01-09)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d?narHash=sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs%2BrI%3D' (2025-01-04)
→ 'github:NixOS/nixpkgs/bffc22eb12172e6db3c5dde9e3e5628f8e3e7912?narHash=sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc%2Bc2c%3D' (2025-01-08)
• Updated input 'nixpkgs-update':
'github:ryantm/nixpkgs-update/7f089591e8f595011323c8a7370b195fa3dfe0b7?narHash=sha256-Jwvow0ri%2BZgCdP6jpNQVjxub14Pxs1kyjvDV3BbvNzE%3D' (2024-12-18)
→ 'github:ryantm/nixpkgs-update/cdc89d742137e1fd2dd23c82ae6fa9d0c2e3d302?narHash=sha256-btbfArUqew5zanxo01ypigjR32MILaePcVf%2BxUqrXSc%3D' (2025-01-08)
---
flake.lock | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/flake.lock b/flake.lock
index 9dec76e..4bdf1c1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
]
},
"locked": {
- "lastModified": 1736204492,
- "narHash": "sha256-CoBPRgkUex9Iz6qGSzi/BFVUQjndB0PmME2B6eEyeCs=",
+ "lastModified": 1736508663,
+ "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "20665c6efa83d71020c8730f26706258ba5c6b2a",
+ "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
"type": "github"
},
"original": {
@@ -213,11 +213,11 @@
]
},
"locked": {
- "lastModified": 1736047960,
- "narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=",
+ "lastModified": 1736440205,
+ "narHash": "sha256-QJgTI//KEGuEJC6FDxuI9Dq8PewIpnxD2NVx2/OHbfc=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "816a6ae88774ba7e74314830546c29e134e0dffb",
+ "rev": "a2200b499efa01ca8646173e94cdfcc93188f2b8",
"type": "github"
},
"original": {
@@ -271,11 +271,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1734559477,
- "narHash": "sha256-Jwvow0ri+ZgCdP6jpNQVjxub14Pxs1kyjvDV3BbvNzE=",
+ "lastModified": 1736377062,
+ "narHash": "sha256-btbfArUqew5zanxo01ypigjR32MILaePcVf+xUqrXSc=",
"owner": "ryantm",
"repo": "nixpkgs-update",
- "rev": "7f089591e8f595011323c8a7370b195fa3dfe0b7",
+ "rev": "cdc89d742137e1fd2dd23c82ae6fa9d0c2e3d302",
"type": "github"
},
"original": {
@@ -286,11 +286,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1736012469,
- "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
+ "lastModified": 1736344531,
+ "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
+ "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
"type": "github"
},
"original": {
From 3326d832869d8222cd2a0d78595b68a3e4dadf71 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Tue, 14 Jan 2025 01:03:02 +0100
Subject: [PATCH 03/16] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'home-manager':
'github:nix-community/home-manager/2532b500c3ed2b8940e831039dcec5a5ea093afc?narHash=sha256-ZOaGwa%2BWnB7Zn3YXimqjmIugAnHePdXCmNu%2BAHkq808%3D' (2025-01-10)
→ 'github:nix-community/home-manager/fc52a210b60f2f52c74eac41a8647c1573d2071d?narHash=sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m%2BYq%2B%2BC9AyE%3D' (2025-01-13)
• Updated input 'nix-index-database':
'github:nix-community/nix-index-database/a2200b499efa01ca8646173e94cdfcc93188f2b8?narHash=sha256-QJgTI//KEGuEJC6FDxuI9Dq8PewIpnxD2NVx2/OHbfc%3D' (2025-01-09)
→ 'github:nix-community/nix-index-database/271e5bd7c57e1f001693799518b10a02d1123b12?narHash=sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM%3D' (2025-01-12)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/bffc22eb12172e6db3c5dde9e3e5628f8e3e7912?narHash=sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc%2Bc2c%3D' (2025-01-08)
→ 'github:NixOS/nixpkgs/ed4a395ea001367c1f13d34b1e01aa10290f67d6?narHash=sha256-jG/%2BMvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA%3D' (2025-01-12)
---
flake.lock | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/flake.lock b/flake.lock
index 4bdf1c1..3d26c69 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
]
},
"locked": {
- "lastModified": 1736508663,
- "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
+ "lastModified": 1736785676,
+ "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
+ "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d",
"type": "github"
},
"original": {
@@ -213,11 +213,11 @@
]
},
"locked": {
- "lastModified": 1736440205,
- "narHash": "sha256-QJgTI//KEGuEJC6FDxuI9Dq8PewIpnxD2NVx2/OHbfc=",
+ "lastModified": 1736652904,
+ "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "a2200b499efa01ca8646173e94cdfcc93188f2b8",
+ "rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
"type": "github"
},
"original": {
@@ -286,11 +286,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1736344531,
- "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
+ "lastModified": 1736701207,
+ "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
+ "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6",
"type": "github"
},
"original": {
From 5655e841c4a04e7701a13a32975ec5f1d35078a7 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Tue, 14 Jan 2025 15:50:37 +0100
Subject: [PATCH 04/16] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/ed4a395ea001367c1f13d34b1e01aa10290f67d6?narHash=sha256-jG/%2BMvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA%3D' (2025-01-12)
→ 'github:NixOS/nixpkgs/9abb87b552b7f55ac8916b6fc9e5cb486656a2f3?narHash=sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ%3D' (2025-01-13)
---
flake.lock | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flake.lock b/flake.lock
index 3d26c69..afbf1c2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -286,11 +286,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1736701207,
- "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=",
+ "lastModified": 1736798957,
+ "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6",
+ "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
"type": "github"
},
"original": {
From 36d4d13488e0d7041f89aae8ebbde1948534379c Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Wed, 15 Jan 2025 22:37:24 +0100
Subject: [PATCH 05/16] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'dagger':
'github:dagger/nix/8f7e40ca59ad9f85d6dfe3de623fed9adf0d5bec?narHash=sha256-KqdRX%2BIGfD4PsPNu/0Uqda3JHBqqcY0LSt3dayY8voM%3D' (2024-12-12)
→ 'github:dagger/nix/113c1e24069523bb9d595c31398f84c86e11bd54?narHash=sha256-D41j29wFhKfTQHRy/lSxiZz2JGlXiRt3JAh22W9bJR0%3D' (2025-01-14)
• Updated input 'nix-alien':
'github:thiagokokada/nix-alien/a266d0f74dd4a82ec6a72b02fbf3fbc5f7105f15?narHash=sha256-iKY/OGNANXpd9hXBGfx8vObpHW4IcOH0MrerLCCc7hA%3D' (2024-12-15)
→ 'github:thiagokokada/nix-alien/7e687663d2054fa1708284bd42731c6be62b1667?narHash=sha256-zLhLqxc2JKvUtr0mSRRvOeKXN5dl5bn1e99z7EOp3bI%3D' (2025-01-15)
• Updated input 'nix-alien/nix-index-database':
'github:nix-community/nix-index-database/311d6cf3ad3f56cb051ffab1f480b2909b3f754d?narHash=sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8%3D' (2024-12-15)
→ 'github:nix-community/nix-index-database/271e5bd7c57e1f001693799518b10a02d1123b12?narHash=sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM%3D' (2025-01-12)
• Updated input 'nix-alien/nixpkgs':
'github:NixOS/nixpkgs/5d67ea6b4b63378b9c13be21e2ec9d1afc921713?narHash=sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g%3D' (2024-12-11)
→ 'github:NixOS/nixpkgs/9abb87b552b7f55ac8916b6fc9e5cb486656a2f3?narHash=sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ%3D' (2025-01-13)
---
flake.lock | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/flake.lock b/flake.lock
index afbf1c2..5426a20 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1734036866,
- "narHash": "sha256-KqdRX+IGfD4PsPNu/0Uqda3JHBqqcY0LSt3dayY8voM=",
+ "lastModified": 1736877484,
+ "narHash": "sha256-D41j29wFhKfTQHRy/lSxiZz2JGlXiRt3JAh22W9bJR0=",
"owner": "dagger",
"repo": "nix",
- "rev": "8f7e40ca59ad9f85d6dfe3de623fed9adf0d5bec",
+ "rev": "113c1e24069523bb9d595c31398f84c86e11bd54",
"type": "github"
},
"original": {
@@ -157,11 +157,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1734239219,
- "narHash": "sha256-iKY/OGNANXpd9hXBGfx8vObpHW4IcOH0MrerLCCc7hA=",
+ "lastModified": 1736952083,
+ "narHash": "sha256-zLhLqxc2JKvUtr0mSRRvOeKXN5dl5bn1e99z7EOp3bI=",
"owner": "thiagokokada",
"repo": "nix-alien",
- "rev": "a266d0f74dd4a82ec6a72b02fbf3fbc5f7105f15",
+ "rev": "7e687663d2054fa1708284bd42731c6be62b1667",
"type": "github"
},
"original": {
@@ -193,11 +193,11 @@
]
},
"locked": {
- "lastModified": 1734234111,
- "narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=",
+ "lastModified": 1736652904,
+ "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d",
+ "rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
"type": "github"
},
"original": {
@@ -249,11 +249,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1733940404,
- "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=",
+ "lastModified": 1736798957,
+ "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713",
+ "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
"type": "github"
},
"original": {
From f29b9284438589485cf424a8e9e9c4208a00dcd8 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Fri, 17 Jan 2025 00:19:40 +0100
Subject: [PATCH 06/16] several tower improvements
---
flake.lock | 21 ---------------------
flake.nix | 5 -----
home-manager/modules/packages.nix | 3 +++
home-manager/programs/topgrade.nix | 4 ++++
home-manager/programs/zsh.nix | 22 ++++++++--------------
5 files changed, 15 insertions(+), 40 deletions(-)
diff --git a/flake.lock b/flake.lock
index 5426a20..bcc2614 100644
--- a/flake.lock
+++ b/flake.lock
@@ -206,26 +206,6 @@
"type": "github"
}
},
- "nix-index-database_2": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1736652904,
- "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
- "owner": "nix-community",
- "repo": "nix-index-database",
- "rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "nix-index-database",
- "type": "github"
- }
- },
"nixgl": {
"inputs": {
"flake-utils": "flake-utils_2",
@@ -336,7 +316,6 @@
"home-manager": "home-manager",
"muse-sounds-manager": "muse-sounds-manager",
"nix-alien": "nix-alien",
- "nix-index-database": "nix-index-database_2",
"nixgl": "nixgl",
"nixpkgs": "nixpkgs_2",
"nixpkgs-update": "nixpkgs-update",
diff --git a/flake.nix b/flake.nix
index 9c5dfcc..199a5df 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,10 +28,6 @@
};
suyu.url = "github:Noodlez1232/suyu-flake";
nix-alien.url = "github:thiagokokada/nix-alien";
- nix-index-database = {
- url = "github:nix-community/nix-index-database";
- inputs.nixpkgs.follows = "nixpkgs";
- };
};
nixConfig = {
@@ -92,7 +88,6 @@
homeConfigurations."thilo@thilo-pc" = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
- inputs.nix-index-database.hmModules.nix-index
./configs/fedora/home.nix
];
extraSpecialArgs = {
diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index 9900086..371f0f3 100644
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -93,6 +93,9 @@ in
nextpnr
icestorm
icebreaker
+
+ php
+ (lib.hiPrio phpPackages.composer)
]
++ (
if (!config.machine.isGeneric) then
diff --git a/home-manager/programs/topgrade.nix b/home-manager/programs/topgrade.nix
index 66ccace..05ebd16 100644
--- a/home-manager/programs/topgrade.nix
+++ b/home-manager/programs/topgrade.nix
@@ -32,6 +32,10 @@ in
pre_commands = {
flakeUpgrade = "cd ${configPath} && ${pkgs.nixVersions.latest}/bin/nix flake update --commit-lock-file --verbose --repair";
};
+ post_commands = {
+ nixCollectGarbage = "nix-collect-garbage -d";
+ dockerPrune = "docker system prune -f";
+ };
};
};
}
diff --git a/home-manager/programs/zsh.nix b/home-manager/programs/zsh.nix
index 01e026d..9aba64e 100644
--- a/home-manager/programs/zsh.nix
+++ b/home-manager/programs/zsh.nix
@@ -18,21 +18,15 @@
update-local = "bash $HOME/.dotfiles/install";
sudo = "sudo --preserve-env=PATH env";
};
- initExtra = ''
+ antidote = {
+ enable = true;
+ plugins = [
+ "ohmyzsh/ohmyzsh path:plugins/dotenv"
+ ];
+ };
+ initExtraFirst = ''
+ ZSH_DOTENV_PROMPT=false
export PATH=~/.npm-global/bin:$PATH
- source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
'';
- plugins = [
- {
- name = "zsh-nix-shell";
- file = "nix-shell.plugin.zsh";
- src = pkgs.fetchFromGitHub {
- owner = "chisui";
- repo = "zsh-nix-shell";
- rev = "v0.8.0";
- sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
- };
- }
- ];
};
}
From 9975ca27e22e9c637654c14e508922e8ed4cdd6b Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sat, 18 Jan 2025 01:26:04 +0100
Subject: [PATCH 07/16] several improvements for desktop system
---
configs/thilo-pc/hardware-configuration.nix | 56 ++++-----
configs/thilo-pc/home.nix | 13 +-
configs/thilo-pc/nixos.nix | 132 +++++++++++++++++---
home-manager/modules/packages.nix | 21 ++--
home-manager/programs/chromium.nix | 8 +-
nixos/common.nix | 8 +-
6 files changed, 157 insertions(+), 81 deletions(-)
diff --git a/configs/thilo-pc/hardware-configuration.nix b/configs/thilo-pc/hardware-configuration.nix
index f4e12a5..30c4bb2 100644
--- a/configs/thilo-pc/hardware-configuration.nix
+++ b/configs/thilo-pc/hardware-configuration.nix
@@ -9,51 +9,47 @@
}:
{
- imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+ imports =
+ [ (modulesPath + "/installer/scan/not-detected.nix")
+ ];
- boot = {
- initrd = {
- availableKernelModules = [
- "nvme"
- "xhci_pci"
- "ahci"
- "usbhid"
- "uas"
- "usb_storage"
- "sd_mod"
- ];
- kernelModules = [ ];
+ boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+ boot.initrd.kernelModules = [ ];
+ boot.kernelModules = [ "kvm-amd" ];
+ boot.extraModulePackages = [ ];
+
+ fileSystems."/" =
+ { device = "/dev/disk/by-uuid/7b55546f-7bd5-4b46-b5b1-1c81fdd8509c";
+ fsType = "ext4";
};
- kernelModules = [ "kvm-amd" ];
- extraModulePackages = [ ];
- };
+
+ fileSystems."/boot" =
+ {
+ device = "/dev/disk/by-uuid/5A04-0844";
+ fsType = "vfat";
+ options = [ "fmask=0077" "dmask=0077" ];
+ };
+
fileSystems = {
- "/" = {
- device = "/dev/disk/by-uuid/34eb30d5-5faa-409f-81ee-7b996d37534a";
- fsType = "btrfs";
- options = [ "subvol=@" ];
- };
-
"/data" = {
- device = "/dev/disk/by-uuid/91f64815-1d3c-4032-960f-0a53eb3b01ab";
+ device = "/dev/disk/by-uuid/a13a2cfa-12af-463d-ae5c-d46c881fcdd6";
fsType = "btrfs";
- };
-
- "/boot" = {
- device = "/dev/disk/by-uuid/0EB3-BFB0";
- fsType = "vfat";
+ options = [ "nofail" ];
};
};
- swapDevices = [ ];
+ swapDevices =
+ [ { device = "/dev/disk/by-uuid/da98aab4-f3a5-439b-aab5-b78624c219d3"; }
+ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
- # networking.interfaces.enp8s0.useDHCP = lib.mkDefault true;
+ # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
+ # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/configs/thilo-pc/home.nix b/configs/thilo-pc/home.nix
index 691202e..9381004 100644
--- a/configs/thilo-pc/home.nix
+++ b/configs/thilo-pc/home.nix
@@ -1,6 +1,7 @@
{ inputs
, pkgs
, config
+, lib
, ...
}:
@@ -31,22 +32,12 @@
};
*/
- home.sessionVariables = {
- LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
- };
-
nix = {
- package = pkgs.lix;
- };
-
- qt = {
- enable = true;
- platformTheme.name = "kde";
+ package = lib.mkDefault pkgs.lix;
};
home.packages = with pkgs; [
lix
- papirus-icon-theme
];
};
};
diff --git a/configs/thilo-pc/nixos.nix b/configs/thilo-pc/nixos.nix
index fccf719..b835734 100644
--- a/configs/thilo-pc/nixos.nix
+++ b/configs/thilo-pc/nixos.nix
@@ -1,7 +1,7 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
-{ pkgs, ... }:
+{ pkgs, options, ... }:
{
imports = [
@@ -16,13 +16,13 @@
loader = {
systemd-boot = {
enable = true;
- extraInstallCommands = ''
- ${pkgs.gnused}/bin/sed -i "/default/c\default @saved" /boot/loader/loader.conf
- '';
+ # extraInstallCommands = ''
+ # ${pkgs.gnused}/bin/sed -i "/default/c\default @saved" /boot/loader/loader.conf
+ # '';
};
efi.canTouchEfiVariables = true;
};
- kernelPackages = pkgs.linuxPackages_latest;
+ # kernelPackages = pkgs.linuxPackages_latest;
binfmt.registrations.appimage = {
wrapInterpreterInShell = false;
interpreter = "${pkgs.appimage-run}/bin/appimage-run";
@@ -37,25 +37,121 @@
# Enable the X11 windowing system.
services = {
- xserver = {
- enable = true;
- displayManager.sddm.enable = true;
- displayManager.sddm.wayland.enable = true;
- xkb = {
- variant = "";
- layout = "us";
- };
+ xserver.enable = true;
+ displayManager.sddm.enable = true;
+ desktopManager.plasma6.enable = true;
+ xserver.xkb = {
+ layout = "us";
+ variant = "";
};
ollama = {
enable = false;
acceleration = "rocm";
};
- desktopManager.plasma6.enable = true;
blueman.enable = true;
};
programs.kdeconnect.enable = true;
- programs.nix-ld.enable = true;
+ programs.nix-ld = {
+ enable = true;
+ libraries = (pkgs.steam-run.args.multiPkgs pkgs) ++ (with pkgs; [
+ nss
+ sane-backends
+ nspr
+ zlib
+ libglvnd
+ qt5.qtbase
+ qt5.qtsvg
+ qt5.qtdeclarative
+ qt5.qtwayland
+ pkcs11helper
+ stdenv.cc.cc
+ freetype
+
+ stdenv.cc.cc
+ openssl
+ xorg.libXcomposite
+ xorg.libXtst
+ xorg.libXrandr
+ xorg.libXext
+ xorg.libX11
+ xorg.libXfixes
+ libGL
+ libva
+ xorg.libxcb
+ xorg.libXdamage
+ xorg.libxshmfence
+ xorg.libXxf86vm
+ libelf
+ glib
+ gtk3
+ bzip2
+ xorg.libXinerama
+ xorg.libXcursor
+ xorg.libXrender
+ xorg.libXScrnSaver
+ xorg.libXi
+ xorg.libSM
+ xorg.libICE
+ gnome2.GConf
+ nspr
+ nss
+ cups
+ libcap
+ SDL2
+ libusb1
+ dbus-glib
+ ffmpeg
+ libudev0-shim
+ xorg.libXt
+ xorg.libXmu
+ libogg
+ libvorbis
+ SDL
+ SDL2_image
+ glew110
+ libidn
+ tbb
+ flac
+ freeglut
+ libjpeg
+ libpng
+ libpng12
+ libsamplerate
+ libmikmod
+ libtheora
+ libtiff
+ pixman
+ speex
+ SDL_image
+ SDL_ttf
+ SDL_mixer
+ SDL2_ttf
+ SDL2_mixer
+ libappindicator-gtk2
+ libdbusmenu-gtk2
+ libindicator-gtk2
+ libcaca
+ libcanberra
+ libgcrypt
+ libvpx
+ librsvg
+ xorg.libXft
+ libvdpau
+ pango
+ cairo
+ atk
+ gdk-pixbuf
+ fontconfig
+ freetype
+ dbus
+ alsa-lib
+ expat
+ libdrm
+ mesa
+ libxkbcommon
+ ]);
+ };
hardware.opengl = {
extraPackages = with pkgs; [
@@ -66,7 +162,7 @@
hardware.bluetooth.enable = true;
programs.steam.gamescopeSession = {
- enable = true;
+ enable = false;
env = {
WLR_RENDERER = "vulkan";
DXVK_HDR = "1";
@@ -89,7 +185,5 @@
];
};
- nixpkgs.config.permittedInsecurePackages = [ "nix-2.16.2" ];
-
- system.stateVersion = "23.05";
+ system.stateVersion = "24.11";
}
diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index 371f0f3..fb1bc0c 100644
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -96,6 +96,8 @@ in
php
(lib.hiPrio phpPackages.composer)
+
+ nixfmt-rfc-style
]
++ (
if (!config.machine.isGeneric) then
@@ -120,22 +122,22 @@ in
++ (
if (config.machine.isGraphical && !config.machine.isGeneric) then
[
- jetbrains.webstorm
- jetbrains.phpstorm
- jetbrains.rust-rover
- jetbrains.goland
+ # jetbrains.webstorm
+ # jetbrains.phpstorm
+ # jetbrains.rust-rover
+ # jetbrains.goland
element-desktop
ludusavi
- dbeaver
+ dbeaver-bin
onlyoffice-bin
spotify
- vesktop
+ discord
(lutris.override {
- extraLibraries = _: [ gnome3.adwaita-icon-theme ];
+ extraLibraries = _: [ adwaita-icon-theme ];
extraPkgs = _: [
wineWowPackages.full
winetricks
- gnome3.adwaita-icon-theme
+ adwaita-icon-theme
];
})
bottles
@@ -151,7 +153,7 @@ in
mumble
prusa-slicer
trayscale
- gnome.gnome-disk-utility
+ gnome-disk-utility
inkscape
musescore
obsidian
@@ -162,6 +164,7 @@ in
inputs.nix-alien.packages.x86_64-linux.nix-alien
kdePackages.kdenlive
audacity
+ signal-desktop
]
else
[ ]
diff --git a/home-manager/programs/chromium.nix b/home-manager/programs/chromium.nix
index 426b71d..123d1f7 100644
--- a/home-manager/programs/chromium.nix
+++ b/home-manager/programs/chromium.nix
@@ -35,12 +35,8 @@ let
extensions = map (eid: { id = eid; }) chromium_extension;
in
{
- programs.chromium = {
- inherit dictionaries commandLineArgs extensions;
- enable = isEnabled;
- };
- programs.google-chrome = {
- inherit commandLineArgs;
+ programs.brave = {
+ # inherit commandLineArgs;
enable = isEnabled;
};
}
diff --git a/nixos/common.nix b/nixos/common.nix
index 5d516f3..99d9498 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -71,7 +71,7 @@
virtualisation = {
docker.enable = true;
- podman.enable = true;
+ podman.enable = false;
};
environment.sessionVariables.NIXOS_OZONE_WL = "1";
@@ -80,7 +80,7 @@
steam.enable = true;
zsh.enable = true;
adb.enable = true;
- noisetorch.enable = true;
+ noisetorch.enable = false;
dconf = {
enable = true;
};
@@ -89,8 +89,6 @@
environment.systemPackages = with pkgs; [
git
zsh
- kitty
- steamtinkerlaunch
];
networking.networkmanager.enable = true;
@@ -126,13 +124,11 @@
hardware = {
pulseaudio.enable = false;
opengl = {
- driSupport = true;
driSupport32Bit = true;
};
};
security.polkit.enable = true;
- sound.enable = true;
security.rtkit.enable = true;
time.hardwareClockInLocalTime = true;
From 4934d38771a62df7efd72445af99af8c44626f54 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sat, 18 Jan 2025 01:26:41 +0100
Subject: [PATCH 08/16] nixfmt
---
.../thilo-laptop/hardware-configuration.nix | 3 +-
configs/thilo-pc/hardware-configuration.nix | 44 +++++++++++--------
configs/thilo-pc/home.nix | 11 ++---
configs/thilo-pc/nixos.nix | 32 +++++++-------
flake.nix | 11 ++---
home-manager/modules/machine.nix | 2 +-
home-manager/modules/packages.nix | 4 +-
home-manager/programs/ssh.nix | 42 ++++++++++--------
nixos/builders.nix | 12 +++--
9 files changed, 91 insertions(+), 70 deletions(-)
diff --git a/configs/thilo-laptop/hardware-configuration.nix b/configs/thilo-laptop/hardware-configuration.nix
index d9441df..8bbf900 100644
--- a/configs/thilo-laptop/hardware-configuration.nix
+++ b/configs/thilo-laptop/hardware-configuration.nix
@@ -27,7 +27,8 @@
fsType = "ext4";
};
- boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device = "/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
+ boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device =
+ "/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/877C-C918";
diff --git a/configs/thilo-pc/hardware-configuration.nix b/configs/thilo-pc/hardware-configuration.nix
index 30c4bb2..f1ec164 100644
--- a/configs/thilo-pc/hardware-configuration.nix
+++ b/configs/thilo-pc/hardware-configuration.nix
@@ -9,27 +9,35 @@
}:
{
- imports =
- [ (modulesPath + "/installer/scan/not-detected.nix")
- ];
+ imports = [
+ (modulesPath + "/installer/scan/not-detected.nix")
+ ];
- boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+ boot.initrd.availableKernelModules = [
+ "nvme"
+ "xhci_pci"
+ "ahci"
+ "usbhid"
+ "usb_storage"
+ "sd_mod"
+ ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
- fileSystems."/" =
- { device = "/dev/disk/by-uuid/7b55546f-7bd5-4b46-b5b1-1c81fdd8509c";
- fsType = "ext4";
- };
-
- fileSystems."/boot" =
- {
- device = "/dev/disk/by-uuid/5A04-0844";
- fsType = "vfat";
- options = [ "fmask=0077" "dmask=0077" ];
- };
+ fileSystems."/" = {
+ device = "/dev/disk/by-uuid/7b55546f-7bd5-4b46-b5b1-1c81fdd8509c";
+ fsType = "ext4";
+ };
+ fileSystems."/boot" = {
+ device = "/dev/disk/by-uuid/5A04-0844";
+ fsType = "vfat";
+ options = [
+ "fmask=0077"
+ "dmask=0077"
+ ];
+ };
fileSystems = {
"/data" = {
@@ -39,9 +47,9 @@
};
};
- swapDevices =
- [ { device = "/dev/disk/by-uuid/da98aab4-f3a5-439b-aab5-b78624c219d3"; }
- ];
+ swapDevices = [
+ { device = "/dev/disk/by-uuid/da98aab4-f3a5-439b-aab5-b78624c219d3"; }
+ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/configs/thilo-pc/home.nix b/configs/thilo-pc/home.nix
index 9381004..30f9a86 100644
--- a/configs/thilo-pc/home.nix
+++ b/configs/thilo-pc/home.nix
@@ -1,8 +1,9 @@
-{ inputs
-, pkgs
-, config
-, lib
-, ...
+{
+ inputs,
+ pkgs,
+ config,
+ lib,
+ ...
}:
{
diff --git a/configs/thilo-pc/nixos.nix b/configs/thilo-pc/nixos.nix
index b835734..0f84ce3 100644
--- a/configs/thilo-pc/nixos.nix
+++ b/configs/thilo-pc/nixos.nix
@@ -54,21 +54,23 @@
programs.kdeconnect.enable = true;
programs.nix-ld = {
enable = true;
- libraries = (pkgs.steam-run.args.multiPkgs pkgs) ++ (with pkgs; [
- nss
- sane-backends
- nspr
- zlib
- libglvnd
- qt5.qtbase
- qt5.qtsvg
- qt5.qtdeclarative
- qt5.qtwayland
- pkcs11helper
- stdenv.cc.cc
- freetype
+ libraries =
+ (pkgs.steam-run.args.multiPkgs pkgs)
+ ++ (with pkgs; [
+ nss
+ sane-backends
+ nspr
+ zlib
+ libglvnd
+ qt5.qtbase
+ qt5.qtsvg
+ qt5.qtdeclarative
+ qt5.qtwayland
+ pkcs11helper
+ stdenv.cc.cc
+ freetype
- stdenv.cc.cc
+ stdenv.cc.cc
openssl
xorg.libXcomposite
xorg.libXtst
@@ -150,7 +152,7 @@
libdrm
mesa
libxkbcommon
- ]);
+ ]);
};
hardware.opengl = {
diff --git a/flake.nix b/flake.nix
index 199a5df..0785c94 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,11 +46,12 @@
};
outputs =
- { nixpkgs
- , home-manager
- , nixgl
- , w17
- , ...
+ {
+ nixpkgs,
+ home-manager,
+ nixgl,
+ w17,
+ ...
}@inputs:
let
system = "x86_64-linux";
diff --git a/home-manager/modules/machine.nix b/home-manager/modules/machine.nix
index 22f9e03..0fa886a 100644
--- a/home-manager/modules/machine.nix
+++ b/home-manager/modules/machine.nix
@@ -85,7 +85,7 @@ with lib;
nixGL = {
packages = inputs.nixgl.packages;
defaultWrapper = "mesa";
- installScripts = ["mesa"];
+ installScripts = [ "mesa" ];
vulkan.enable = true;
};
diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index fb1bc0c..8ee3c58 100644
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -59,8 +59,8 @@ in
(callPackage ./../pkgs/toggl-time-grouper/package.nix { inherit python3Packages; })
(callPackage ./../pkgs/extract.nix { inherit pkgs; })
(pkgs.writeShellScriptBin "kitty-term-fix" ''
- infocmp -a xterm-kitty | ssh $1 tic -x -o \~/.terminfo /dev/stdin
- '')
+ infocmp -a xterm-kitty | ssh $1 tic -x -o \~/.terminfo /dev/stdin
+ '')
nixpkgs-fmt
ddev
act
diff --git a/home-manager/programs/ssh.nix b/home-manager/programs/ssh.nix
index dd123cb..de6eb14 100644
--- a/home-manager/programs/ssh.nix
+++ b/home-manager/programs/ssh.nix
@@ -22,7 +22,9 @@ let
user = "git";
identitiesOnly = true;
};
- "mail" = { hostname = "mail.officerent.de"; };
+ "mail" = {
+ hostname = "mail.officerent.de";
+ };
"*.tu-darmstadt.de" = {
identityFile = "~/.ssh/id_tu-darmstadt-de";
};
@@ -61,25 +63,21 @@ let
};
};
catchAlls = builtins.listToAttrs (
- builtins.map
- (host: {
- name = "*.${host}";
- value = {
- identityFile = "~/.ssh/id_thilo-billerbeck-com";
- user = "root";
- };
- })
- ownDomains
+ builtins.map (host: {
+ name = "*.${host}";
+ value = {
+ identityFile = "~/.ssh/id_thilo-billerbeck-com";
+ user = "root";
+ };
+ }) ownDomains
);
hostnameAliasses = builtins.listToAttrs (
- builtins.map
- (host: {
- name = "${host}";
- value = {
- hostname = "${host}.thilo-billerbeck.com";
- };
- })
- thiloBillerbeckHosts
+ builtins.map (host: {
+ name = "${host}";
+ value = {
+ hostname = "${host}.thilo-billerbeck.com";
+ };
+ }) thiloBillerbeckHosts
);
buildersCCCDA = builtins.listToAttrs (
builtins.map
@@ -89,7 +87,13 @@ let
user = "avocadoom";
identityFile = "~/.ssh/id_darmstadt-ccc-de";
};
- }) [ "1" "2" "3" "4" ]
+ })
+ [
+ "1"
+ "2"
+ "3"
+ "4"
+ ]
);
in
{
diff --git a/nixos/builders.nix b/nixos/builders.nix
index 0183f23..d450048 100644
--- a/nixos/builders.nix
+++ b/nixos/builders.nix
@@ -1,9 +1,13 @@
{
programs.ssh.knownHosts = {
- "build1.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/oyJPRwW3bJoWKtXSrVOiqMaKq+9yd03+N2PuCbMKv";
- "build2.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOZ7/eZLTfUD7Ejjio+8ivNFb8iyK1CD5Pq8uCDojT+z";
- "build3.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2D/SwJf46XCoim06lOyO42JqJiTeM8UMkT4bYluJJr";
- "build4.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDu9ZsbUYaCzzZv4vn22KrKi/R9pCfOEe4aYWyLd96C1";
+ "build1.darmstadt.ccc.de".publicKey =
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/oyJPRwW3bJoWKtXSrVOiqMaKq+9yd03+N2PuCbMKv";
+ "build2.darmstadt.ccc.de".publicKey =
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOZ7/eZLTfUD7Ejjio+8ivNFb8iyK1CD5Pq8uCDojT+z";
+ "build3.darmstadt.ccc.de".publicKey =
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2D/SwJf46XCoim06lOyO42JqJiTeM8UMkT4bYluJJr";
+ "build4.darmstadt.ccc.de".publicKey =
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDu9ZsbUYaCzzZv4vn22KrKi/R9pCfOEe4aYWyLd96C1";
};
nix = {
From ee8bb08f2645f39d20f50f34c7ede2c4d1351f3b Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sat, 18 Jan 2025 01:30:39 +0100
Subject: [PATCH 09/16] rename deprecated options
---
configs/thilo-pc/nixos.nix | 3 ++-
nixos/common.nix | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/configs/thilo-pc/nixos.nix b/configs/thilo-pc/nixos.nix
index 0f84ce3..6bcf8d7 100644
--- a/configs/thilo-pc/nixos.nix
+++ b/configs/thilo-pc/nixos.nix
@@ -155,12 +155,13 @@
]);
};
- hardware.opengl = {
+ hardware.graphics = {
extraPackages = with pkgs; [
vaapiVdpau
libvdpau-va-gl
];
};
+
hardware.bluetooth.enable = true;
programs.steam.gamescopeSession = {
diff --git a/nixos/common.nix b/nixos/common.nix
index 99d9498..0662383 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -122,9 +122,9 @@
};
hardware = {
- pulseaudio.enable = false;
- opengl = {
- driSupport32Bit = true;
+ graphics = {
+ enable = true;
+ enable32Bit = true;
};
};
From 558a7ba74bd66aa0562163a9e0f5487b2d90ccc2 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sat, 18 Jan 2025 02:20:59 +0100
Subject: [PATCH 10/16] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'home-manager':
'github:nix-community/home-manager/0dfec9deb275854a56c97c356c40ef72e3a2e632?narHash=sha256-dgPgoPUSg8cGAMqbhQRkww665sZtgzpWXxWjlyqhv94%3D' (2025-01-14)
→ 'github:nix-community/home-manager/a0046af169ce7b1da503974e1b22c48ef4d71887?narHash=sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI%3D' (2025-01-17)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/eb62e6aa39ea67e0b8018ba8ea077efe65807dc8?narHash=sha256-uQ%2BNQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140%3D' (2025-01-14)
→ 'github:NixOS/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c?narHash=sha256-Tbk1MZbtV2s5aG%2BiM99U8FqwxU/YNArMcWAv6clcsBc%3D' (2025-01-16)
---
flake.lock | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/flake.lock b/flake.lock
index efa0089..5c0105d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
]
},
"locked": {
- "lastModified": 1736883540,
- "narHash": "sha256-dgPgoPUSg8cGAMqbhQRkww665sZtgzpWXxWjlyqhv94=",
+ "lastModified": 1737120639,
+ "narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "0dfec9deb275854a56c97c356c40ef72e3a2e632",
+ "rev": "a0046af169ce7b1da503974e1b22c48ef4d71887",
"type": "github"
},
"original": {
@@ -266,11 +266,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1736883708,
- "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
+ "lastModified": 1737062831,
+ "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
+ "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
"type": "github"
},
"original": {
From 49da0fb681c410e30974c34edcd313a752da7c94 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sat, 18 Jan 2025 15:30:35 +0100
Subject: [PATCH 11/16] ssh adjustment
---
home-manager/programs/ssh.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/home-manager/programs/ssh.nix b/home-manager/programs/ssh.nix
index de6eb14..da00b94 100644
--- a/home-manager/programs/ssh.nix
+++ b/home-manager/programs/ssh.nix
@@ -74,8 +74,10 @@ let
hostnameAliasses = builtins.listToAttrs (
builtins.map (host: {
name = "${host}";
- value = {
+ value = lib.hm.dag.entryBefore ["*.thilo-billerbeck.com"] {
hostname = "${host}.thilo-billerbeck.com";
+ identityFile = "~/.ssh/id_thilo-billerbeck-com";
+ user = "root";
};
}) thiloBillerbeckHosts
);
From 834debfd449c64a0d5d289e852e55205b0f272b6 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sat, 18 Jan 2025 20:27:33 +0100
Subject: [PATCH 12/16] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'home-manager':
'github:nix-community/home-manager/a0046af169ce7b1da503974e1b22c48ef4d71887?narHash=sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI%3D' (2025-01-17)
→ 'github:nix-community/home-manager/97d7946b5e107dd03cc82f21165251d4e0159655?narHash=sha256-igllW0yG%2BUbetvhT11jnt9RppSHXYgMykYhZJeqfHs0%3D' (2025-01-18)
---
flake.lock | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flake.lock b/flake.lock
index 5c0105d..22a2003 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
]
},
"locked": {
- "lastModified": 1737120639,
- "narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=",
+ "lastModified": 1737221749,
+ "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "a0046af169ce7b1da503974e1b22c48ef4d71887",
+ "rev": "97d7946b5e107dd03cc82f21165251d4e0159655",
"type": "github"
},
"original": {
From 138cfbff1cca8953a4f44be8cf17548101d1f497 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sun, 19 Jan 2025 17:17:00 +0100
Subject: [PATCH 13/16] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'home-manager':
'github:nix-community/home-manager/97d7946b5e107dd03cc82f21165251d4e0159655?narHash=sha256-igllW0yG%2BUbetvhT11jnt9RppSHXYgMykYhZJeqfHs0%3D' (2025-01-18)
→ 'github:nix-community/home-manager/f8ef4541bb8a54a8b52f19b52912119e689529b3?narHash=sha256-0NBrY2A7buujKmeCbieopOMSbLxTu8TFcTLqAbTnQDw%3D' (2025-01-19)
---
flake.lock | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flake.lock b/flake.lock
index 22a2003..784fc6d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
]
},
"locked": {
- "lastModified": 1737221749,
- "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=",
+ "lastModified": 1737299337,
+ "narHash": "sha256-0NBrY2A7buujKmeCbieopOMSbLxTu8TFcTLqAbTnQDw=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "97d7946b5e107dd03cc82f21165251d4e0159655",
+ "rev": "f8ef4541bb8a54a8b52f19b52912119e689529b3",
"type": "github"
},
"original": {
From 358e7c751cb4f0f9d988f4258af64a3f53802230 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Wed, 22 Jan 2025 21:29:55 +0100
Subject: [PATCH 14/16] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'home-manager':
'github:nix-community/home-manager/f8ef4541bb8a54a8b52f19b52912119e689529b3?narHash=sha256-0NBrY2A7buujKmeCbieopOMSbLxTu8TFcTLqAbTnQDw%3D' (2025-01-19)
→ 'github:nix-community/home-manager/cefb1889b96ddd1dac3dd4734e894f4cadab7802?narHash=sha256-qa/D3NC1JoApnUuLrq1gseBmIxeg6icm/ojPgggMDVQ%3D' (2025-01-22)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c?narHash=sha256-Tbk1MZbtV2s5aG%2BiM99U8FqwxU/YNArMcWAv6clcsBc%3D' (2025-01-16)
→ 'github:NixOS/nixpkgs/9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab?narHash=sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk%3D' (2025-01-21)
---
flake.lock | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/flake.lock b/flake.lock
index 784fc6d..19f375b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
]
},
"locked": {
- "lastModified": 1737299337,
- "narHash": "sha256-0NBrY2A7buujKmeCbieopOMSbLxTu8TFcTLqAbTnQDw=",
+ "lastModified": 1737575492,
+ "narHash": "sha256-qa/D3NC1JoApnUuLrq1gseBmIxeg6icm/ojPgggMDVQ=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "f8ef4541bb8a54a8b52f19b52912119e689529b3",
+ "rev": "cefb1889b96ddd1dac3dd4734e894f4cadab7802",
"type": "github"
},
"original": {
@@ -266,11 +266,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1737062831,
- "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
+ "lastModified": 1737469691,
+ "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
+ "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
"type": "github"
},
"original": {
From 3c84e06ef1d6c5aca9afc08a0cea1682a847ee0b Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sat, 25 Jan 2025 20:46:30 +0100
Subject: [PATCH 15/16] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'home-manager':
'github:nix-community/home-manager/7b9ece1bf3c8780cde9b975b28c2d9ccd7e9cdb9?narHash=sha256-v9WQ3c4ctwPMfdBZMZxpdM9xXev4uChce4BxOpvsu0E%3D' (2025-01-23)
→ 'github:nix-community/home-manager/daf04c5950b676f47a794300657f1d3d14c1a120?narHash=sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio%3D' (2025-01-24)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab?narHash=sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk%3D' (2025-01-21)
→ 'github:NixOS/nixpkgs/0aa475546ed21629c4f5bbf90e38c846a99ec9e9?narHash=sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ%2BNH28%3D' (2025-01-23)
---
flake.lock | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/flake.lock b/flake.lock
index 19f375b..76507e0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
]
},
"locked": {
- "lastModified": 1737575492,
- "narHash": "sha256-qa/D3NC1JoApnUuLrq1gseBmIxeg6icm/ojPgggMDVQ=",
+ "lastModified": 1737762889,
+ "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "cefb1889b96ddd1dac3dd4734e894f4cadab7802",
+ "rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
"type": "github"
},
"original": {
@@ -266,11 +266,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1737469691,
- "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
+ "lastModified": 1737632463,
+ "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
+ "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
"type": "github"
},
"original": {
From c23877a1efd5afabbd57c1461dce1df2b9116189 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sun, 26 Jan 2025 03:24:16 +0100
Subject: [PATCH 16/16] small adjustments for desktop
---
home-manager/modules/machine.nix | 1 +
home-manager/modules/packages.nix | 6 ++++--
home-manager/programs/zed.nix | 7 +++++++
3 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 home-manager/programs/zed.nix
diff --git a/home-manager/modules/machine.nix b/home-manager/modules/machine.nix
index 0fa886a..e1d0bc8 100644
--- a/home-manager/modules/machine.nix
+++ b/home-manager/modules/machine.nix
@@ -31,6 +31,7 @@ with lib;
./../programs/hstr.nix
./../programs/thefuck.nix
./../programs/ssh.nix
+ ./../programs/zed.nix
./../../nix.nix
./packages.nix
];
diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index 8ee3c58..9789ae3 100644
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -122,6 +122,7 @@ in
++ (
if (config.machine.isGraphical && !config.machine.isGeneric) then
[
+ jetbrains.pycharm-professional
# jetbrains.webstorm
# jetbrains.phpstorm
# jetbrains.rust-rover
@@ -148,7 +149,7 @@ in
quickgui
trilium-desktop
anki
- # inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager
+ muse-sounds-manager
jetbrains-toolbox
mumble
prusa-slicer
@@ -160,11 +161,12 @@ in
syncthingtray
reaper
yabridge
- inputs.suyu.packages.x86_64-linux.suyu
+ torzu
inputs.nix-alien.packages.x86_64-linux.nix-alien
kdePackages.kdenlive
audacity
signal-desktop
+ telegram-desktop
]
else
[ ]
diff --git a/home-manager/programs/zed.nix b/home-manager/programs/zed.nix
new file mode 100644
index 0000000..a4c12f8
--- /dev/null
+++ b/home-manager/programs/zed.nix
@@ -0,0 +1,7 @@
+{ pkgs, config, ... }:
+
+{
+ programs.zed-editor = {
+ enable = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
+ };
+}