From 60fed676caf6131137156bab89d5c25231f98bc2 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Tue, 25 Feb 2025 14:29:17 +0100
Subject: [PATCH 01/19] 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/ed030a787938cae01d693ebaad52bbb672a4a69d?narHash=sha256-R61wtNknWWejnl%2BK0l4sxu/wnLNFbNe44tNM2zbj5yE%3D' (2025-02-23)
→ 'github:nix-community/home-manager/c12dcc9b61429b2ad437a7d4974399ad8f910319?narHash=sha256-BCeFtoJ/%2BLrZc03viRJWHfzAqqG8gPu/ikZeurv05xs%3D' (2025-02-24)
• Updated input 'jovian-nixos':
'github:Jovian-Experiments/Jovian-NixOS/11ba89d13831cb399194310304fffb025081c674?narHash=sha256-l%2BzB5a39MJp4Olc4YxP7GChFXmNZIhoXaiSS6QRXa9o%3D' (2025-02-23)
→ 'github:Jovian-Experiments/Jovian-NixOS/b217d3a65d7454192fd90d498012fcce3d08f410?narHash=sha256-LWy/wUm%2B1212PIi3LaStYKZ3cTVzTANrH7ejHmeHyHM%3D' (2025-02-25)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/73cf49b8ad837ade2de76f87eb53fc85ed5d4680?narHash=sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64%3D' (2025-02-18)
→ 'github:NixOS/nixpkgs/0196c0175e9191c474c26ab5548db27ef5d34b05?narHash=sha256-WGaHVAjcrv%2BCun7zPlI41SerRtfknGQap281%2BAakSAw%3D' (2025-02-24)
---
flake.lock | 87 +++++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 73 insertions(+), 14 deletions(-)
diff --git a/flake.lock b/flake.lock
index da701d3..9ab987c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -75,11 +75,11 @@
]
},
"locked": {
- "lastModified": 1740283128,
- "narHash": "sha256-R61wtNknWWejnl+K0l4sxu/wnLNFbNe44tNM2zbj5yE=",
+ "lastModified": 1740432748,
+ "narHash": "sha256-BCeFtoJ/+LrZc03viRJWHfzAqqG8gPu/ikZeurv05xs=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "ed030a787938cae01d693ebaad52bbb672a4a69d",
+ "rev": "c12dcc9b61429b2ad437a7d4974399ad8f910319",
"type": "github"
},
"original": {
@@ -88,6 +88,26 @@
"type": "github"
}
},
+ "jovian-nixos": {
+ "inputs": {
+ "nix-github-actions": "nix-github-actions",
+ "nixpkgs": "nixpkgs"
+ },
+ "locked": {
+ "lastModified": 1740471659,
+ "narHash": "sha256-LWy/wUm+1212PIi3LaStYKZ3cTVzTANrH7ejHmeHyHM=",
+ "owner": "Jovian-Experiments",
+ "repo": "Jovian-NixOS",
+ "rev": "b217d3a65d7454192fd90d498012fcce3d08f410",
+ "type": "github"
+ },
+ "original": {
+ "owner": "Jovian-Experiments",
+ "ref": "development",
+ "repo": "Jovian-NixOS",
+ "type": "github"
+ }
+ },
"mmdoc": {
"inputs": {
"nixpkgs": [
@@ -134,7 +154,7 @@
"inputs": {
"flake-compat": "flake-compat",
"nix-index-database": "nix-index-database",
- "nixpkgs": "nixpkgs"
+ "nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1740094523,
@@ -150,6 +170,28 @@
"type": "github"
}
},
+ "nix-github-actions": {
+ "inputs": {
+ "nixpkgs": [
+ "jovian-nixos",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1729697500,
+ "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
+ "owner": "zhaofengli",
+ "repo": "nix-github-actions",
+ "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
+ "type": "github"
+ },
+ "original": {
+ "owner": "zhaofengli",
+ "ref": "matrix-name",
+ "repo": "nix-github-actions",
+ "type": "github"
+ }
+ },
"nix-index-database": {
"inputs": {
"nixpkgs": [
@@ -194,11 +236,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1739446958,
- "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
+ "lastModified": 1739214665,
+ "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
+ "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
"type": "github"
},
"original": {
@@ -211,7 +253,7 @@
"nixpkgs-update": {
"inputs": {
"mmdoc": "mmdoc",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_4",
"runtimeDeps": "runtimeDeps",
"treefmt-nix": "treefmt-nix"
},
@@ -231,11 +273,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1739866667,
- "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
+ "lastModified": 1739446958,
+ "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
+ "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
"type": "github"
},
"original": {
@@ -246,6 +288,22 @@
}
},
"nixpkgs_3": {
+ "locked": {
+ "lastModified": 1740367490,
+ "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_4": {
"locked": {
"lastModified": 1672428209,
"narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=",
@@ -259,7 +317,7 @@
"type": "indirect"
}
},
- "nixpkgs_4": {
+ "nixpkgs_5": {
"locked": {
"lastModified": 1726142289,
"narHash": "sha256-Jks8O42La+nm5AMTSq/PvM5O+fUAhIy0Ce1QYqLkyZ4=",
@@ -279,10 +337,11 @@
"inputs": {
"dagger": "dagger",
"home-manager": "home-manager",
+ "jovian-nixos": "jovian-nixos",
"muse-sounds-manager": "muse-sounds-manager",
"nix-alien": "nix-alien",
"nixgl": "nixgl",
- "nixpkgs": "nixpkgs_2",
+ "nixpkgs": "nixpkgs_3",
"nixpkgs-update": "nixpkgs-update",
"suyu": "suyu"
}
@@ -306,7 +365,7 @@
"suyu": {
"inputs": {
"flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_4"
+ "nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1726259531,
From bc17dada7d92bbe82abcaa19679f7ff6f67b4eed Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Thu, 27 Feb 2025 14:23:40 +0100
Subject: [PATCH 02/19] 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/53c587d263f94aaf6a281745923c76bbec62bcf3?narHash=sha256-Dwt/3KknOQ4bgFG5YjqDT7oWRy27rPpDjAi2P0ok1zw%3D' (2025-02-26)
→ 'github:nix-community/home-manager/b8869e4ead721bbd4f0d6b927e8395705d4f16e6?narHash=sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU%3D' (2025-02-27)
• Updated input 'jovian-nixos':
'github:Jovian-Experiments/Jovian-NixOS/14a125ea5c440c57310dc1bb3acf7641078d783a?narHash=sha256-ujQ/f3mcYECH1o0vzakMLAQRCMeF/SXd8w4uBFHxYO8%3D' (2025-02-26)
→ 'github:Jovian-Experiments/Jovian-NixOS/227d9adc3331820a349b3344a5fcc710a5f196c1?narHash=sha256-%2BTGCqVdf8OHKSsJZTT4KNPS5JPZB/DfDHbT3dFq7yH4%3D' (2025-02-27)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/0196c0175e9191c474c26ab5548db27ef5d34b05?narHash=sha256-WGaHVAjcrv%2BCun7zPlI41SerRtfknGQap281%2BAakSAw%3D' (2025-02-24)
→ 'github:NixOS/nixpkgs/5135c59491985879812717f4c9fea69604e7f26f?narHash=sha256-Vr3Qi346M%2B8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic%3D' (2025-02-26)
---
flake.lock | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/flake.lock b/flake.lock
index 9ab987c..f445d04 100644
--- a/flake.lock
+++ b/flake.lock
@@ -75,11 +75,11 @@
]
},
"locked": {
- "lastModified": 1740432748,
- "narHash": "sha256-BCeFtoJ/+LrZc03viRJWHfzAqqG8gPu/ikZeurv05xs=",
+ "lastModified": 1740624780,
+ "narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "c12dcc9b61429b2ad437a7d4974399ad8f910319",
+ "rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6",
"type": "github"
},
"original": {
@@ -94,11 +94,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1740471659,
- "narHash": "sha256-LWy/wUm+1212PIi3LaStYKZ3cTVzTANrH7ejHmeHyHM=",
+ "lastModified": 1740637966,
+ "narHash": "sha256-+TGCqVdf8OHKSsJZTT4KNPS5JPZB/DfDHbT3dFq7yH4=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
- "rev": "b217d3a65d7454192fd90d498012fcce3d08f410",
+ "rev": "227d9adc3331820a349b3344a5fcc710a5f196c1",
"type": "github"
},
"original": {
@@ -289,11 +289,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1740367490,
- "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
+ "lastModified": 1740560979,
+ "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+ "rev": "5135c59491985879812717f4c9fea69604e7f26f",
"type": "github"
},
"original": {
From ee41a1c5c378ad42f9c2cb9183c42e348f9f8573 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Thu, 13 Mar 2025 21:55:16 +0100
Subject: [PATCH 03/19] 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/588d2e8a81dc965705d56e83f0392f76f93985e4?narHash=sha256-TNSSDjVF4%2BI%2BLlcA3tWc5kgoDtGCLusrNdhdkciSUig%3D' (2025-02-27)
→ 'github:dagger/nix/a16cf50595de02fd3cfa644794e0983d8761d177?narHash=sha256-NyezPcnXjuZSsIkZZr4rRuThs7u1sYhPU%2BPwgJjmFgU%3D' (2025-03-12)
• Updated input 'distrobox4nix':
'github:aguirre-matteo/distrobox4nix/fc6578785ece239f64c4ab5f50a7c1f06e3880ad?narHash=sha256-eJuZoG%2BvBTt6t0bjTvZRcQW2eAgD5tCIW/CkPnkbA0k%3D' (2025-03-09)
→ 'github:aguirre-matteo/distrobox4nix/ec25a464c675837cb71ed7b875a8049d23ea0506?narHash=sha256-YH/s8KahaQiJ6gJmRJQ0SvcMK/ZiJDPJM6uwfSJlvww%3D' (2025-03-13)
• Updated input 'home-manager':
'github:nix-community/home-manager/7fb8678716c158642ac42f9ff7a18c0800fea551?narHash=sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU%3D' (2025-03-10)
→ 'github:nix-community/home-manager/0b0baed7b2bf6a5e365d4cba042b580a2bc32e34?narHash=sha256-Mu2YXrGr/8Cid6W44AXci/YYnASoXjGrMV9Sjs66oyc%3D' (2025-03-13)
• Updated input 'jovian-nixos':
'github:Jovian-Experiments/Jovian-NixOS/c769e6fa7ea00689254eb3f8385baec7e2f771cc?narHash=sha256-v%2BbQZbis5c1uSXWCGsbMUb5oL8i8%2B6YbdVZYaJr4qI0%3D' (2025-03-10)
→ 'github:Jovian-Experiments/Jovian-NixOS/662d117ac0ffc81f3e91b5f0fb800c3effd904a1?narHash=sha256-gtIrDkG/iap32MYyaSAlWaixshiqMyFB9eKyhcF66eM%3D' (2025-03-13)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/e3e32b642a31e6714ec1b712de8c91a3352ce7e1?narHash=sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk%3D' (2025-03-09)
→ 'github:NixOS/nixpkgs/6607cf789e541e7873d40d3a8f7815ea92204f32?narHash=sha256-cPfs8qMccim2RBgtKGF%2Bx9IBCduRvd/N5F4nYpU0TVE%3D' (2025-03-13)
---
flake.lock | 132 ++++++++++++-----------------------------------------
1 file changed, 29 insertions(+), 103 deletions(-)
diff --git a/flake.lock b/flake.lock
index f445d04..d63c150 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1740026216,
- "narHash": "sha256-wRW107bfN9jOrFHZdT7JUNw/RDn2BNxInqLLDKsgodk=",
+ "lastModified": 1741791233,
+ "narHash": "sha256-NyezPcnXjuZSsIkZZr4rRuThs7u1sYhPU+PwgJjmFgU=",
"owner": "dagger",
"repo": "nix",
- "rev": "578e8c28bba72e4269cfe15de4a7097c1b3ebcff",
+ "rev": "a16cf50595de02fd3cfa644794e0983d8761d177",
"type": "github"
},
"original": {
@@ -20,6 +20,21 @@
"type": "github"
}
},
+ "distrobox4nix": {
+ "locked": {
+ "lastModified": 1741895647,
+ "narHash": "sha256-YH/s8KahaQiJ6gJmRJQ0SvcMK/ZiJDPJM6uwfSJlvww=",
+ "owner": "aguirre-matteo",
+ "repo": "distrobox4nix",
+ "rev": "ec25a464c675837cb71ed7b875a8049d23ea0506",
+ "type": "github"
+ },
+ "original": {
+ "owner": "aguirre-matteo",
+ "repo": "distrobox4nix",
+ "type": "github"
+ }
+ },
"flake-compat": {
"locked": {
"lastModified": 1733328505,
@@ -50,24 +65,6 @@
"type": "github"
}
},
- "flake-utils_2": {
- "inputs": {
- "systems": "systems_2"
- },
- "locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -75,11 +72,11 @@
]
},
"locked": {
- "lastModified": 1740624780,
- "narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=",
+ "lastModified": 1741894454,
+ "narHash": "sha256-Mu2YXrGr/8Cid6W44AXci/YYnASoXjGrMV9Sjs66oyc=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6",
+ "rev": "0b0baed7b2bf6a5e365d4cba042b580a2bc32e34",
"type": "github"
},
"original": {
@@ -94,11 +91,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1740637966,
- "narHash": "sha256-+TGCqVdf8OHKSsJZTT4KNPS5JPZB/DfDHbT3dFq7yH4=",
+ "lastModified": 1741874414,
+ "narHash": "sha256-gtIrDkG/iap32MYyaSAlWaixshiqMyFB9eKyhcF66eM=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
- "rev": "227d9adc3331820a349b3344a5fcc710a5f196c1",
+ "rev": "662d117ac0ffc81f3e91b5f0fb800c3effd904a1",
"type": "github"
},
"original": {
@@ -130,26 +127,6 @@
"type": "github"
}
},
- "muse-sounds-manager": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1711493694,
- "narHash": "sha256-u6hPaeOUsV/d/kBNo1vlG6X0/gHvTkHfCECH9pjFnV8=",
- "owner": "thilobillerbeck",
- "repo": "muse-sounds-manager-nix",
- "rev": "06b0da28c54331d5af73efd2ebf264ce914e5936",
- "type": "github"
- },
- "original": {
- "owner": "thilobillerbeck",
- "repo": "muse-sounds-manager-nix",
- "type": "github"
- }
- },
"nix-alien": {
"inputs": {
"flake-compat": "flake-compat",
@@ -289,11 +266,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1740560979,
- "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
+ "lastModified": 1741851582,
+ "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5135c59491985879812717f4c9fea69604e7f26f",
+ "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
"type": "github"
},
"original": {
@@ -317,33 +294,16 @@
"type": "indirect"
}
},
- "nixpkgs_5": {
- "locked": {
- "lastModified": 1726142289,
- "narHash": "sha256-Jks8O42La+nm5AMTSq/PvM5O+fUAhIy0Ce1QYqLkyZ4=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "280db3decab4cbeb22a4599bd472229ab74d25e1",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"root": {
"inputs": {
"dagger": "dagger",
+ "distrobox4nix": "distrobox4nix",
"home-manager": "home-manager",
"jovian-nixos": "jovian-nixos",
- "muse-sounds-manager": "muse-sounds-manager",
"nix-alien": "nix-alien",
"nixgl": "nixgl",
"nixpkgs": "nixpkgs_3",
- "nixpkgs-update": "nixpkgs-update",
- "suyu": "suyu"
+ "nixpkgs-update": "nixpkgs-update"
}
},
"runtimeDeps": {
@@ -362,25 +322,6 @@
"type": "github"
}
},
- "suyu": {
- "inputs": {
- "flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_5"
- },
- "locked": {
- "lastModified": 1726259531,
- "narHash": "sha256-84sIM3Gd7e6PhjsBT2EiiAInJlKQsb4HpgUPTYr6eg0=",
- "owner": "Noodlez1232",
- "repo": "suyu-flake",
- "rev": "e3ea28163248edaf5fe2a65f92e9ef3593bdc20a",
- "type": "github"
- },
- "original": {
- "owner": "Noodlez1232",
- "repo": "suyu-flake",
- "type": "github"
- }
- },
"systems": {
"locked": {
"lastModified": 1681028828,
@@ -396,21 +337,6 @@
"type": "github"
}
},
- "systems_2": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
"treefmt-nix": {
"inputs": {
"nixpkgs": [
From 8df50c157543cfea0ebd3ef625f9619074390ddb Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Fri, 14 Mar 2025 13:51:21 +0100
Subject: [PATCH 04/19] 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/0b0baed7b2bf6a5e365d4cba042b580a2bc32e34?narHash=sha256-Mu2YXrGr/8Cid6W44AXci/YYnASoXjGrMV9Sjs66oyc%3D' (2025-03-13)
→ 'github:nix-community/home-manager/4e12151c9e014e2449e0beca2c0e9534b96a26b4?narHash=sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY%3D' (2025-03-14)
• Updated input 'jovian-nixos':
'github:Jovian-Experiments/Jovian-NixOS/662d117ac0ffc81f3e91b5f0fb800c3effd904a1?narHash=sha256-gtIrDkG/iap32MYyaSAlWaixshiqMyFB9eKyhcF66eM%3D' (2025-03-13)
→ 'github:Jovian-Experiments/Jovian-NixOS/534188d0b0cbddf3f9df3f20cfbc424efb46b36c?narHash=sha256-EzHZB9Im6weG2kkprL5w%2BuDaB%2BgEDy3zDTdX9WNAPw0%3D' (2025-03-14)
---
flake.lock | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/flake.lock b/flake.lock
index d63c150..cca6b7a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -72,11 +72,11 @@
]
},
"locked": {
- "lastModified": 1741894454,
- "narHash": "sha256-Mu2YXrGr/8Cid6W44AXci/YYnASoXjGrMV9Sjs66oyc=",
+ "lastModified": 1741955947,
+ "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "0b0baed7b2bf6a5e365d4cba042b580a2bc32e34",
+ "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4",
"type": "github"
},
"original": {
@@ -91,11 +91,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1741874414,
- "narHash": "sha256-gtIrDkG/iap32MYyaSAlWaixshiqMyFB9eKyhcF66eM=",
+ "lastModified": 1741936035,
+ "narHash": "sha256-EzHZB9Im6weG2kkprL5w+uDaB+gEDy3zDTdX9WNAPw0=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
- "rev": "662d117ac0ffc81f3e91b5f0fb800c3effd904a1",
+ "rev": "534188d0b0cbddf3f9df3f20cfbc424efb46b36c",
"type": "github"
},
"original": {
From 42f2685c5ecd0bf075c71b76cd76534b48db4889 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sat, 15 Mar 2025 17:52:17 +0100
Subject: [PATCH 05/19] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'jovian-nixos':
'github:Jovian-Experiments/Jovian-NixOS/534188d0b0cbddf3f9df3f20cfbc424efb46b36c?narHash=sha256-EzHZB9Im6weG2kkprL5w%2BuDaB%2BgEDy3zDTdX9WNAPw0%3D' (2025-03-14)
→ 'github:Jovian-Experiments/Jovian-NixOS/ecaf8b6aa7d28cb7b87da334310fbe1ba31f8d64?narHash=sha256-Nxrkvh353BeG6/D8yPq50VCaYnCMKviS7krw4DfzLVU%3D' (2025-03-15)
• Updated input 'nix-alien':
'github:thiagokokada/nix-alien/ab175cdbbad2a93afc86125eb0835694b005b2fb?narHash=sha256-vGxTGexcKN8BVunczdqps1dbu0khOFp0%2B%2BGvip9QZJ8%3D' (2025-02-20)
→ 'github:thiagokokada/nix-alien/876d83ac35fc52145674282f87898824182edc48?narHash=sha256-mzZdujmFWC%2BwHRvm0tKUlXL0LLz3YI3EDUCnFCtzgxY%3D' (2025-03-15)
• Updated input 'nix-alien/nix-index-database':
'github:nix-community/nix-index-database/895d81b6228bbd50a6ef22f5a58a504ca99763ea?narHash=sha256-/Ak%2BQuinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I%3D' (2025-02-09)
→ 'github:nix-community/nix-index-database/66537fb185462ba9b07f4e6f2d54894a1b2d04ab?narHash=sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE%3D' (2025-03-10)
• Updated input 'nix-alien/nixpkgs':
'github:NixOS/nixpkgs/2ff53fe64443980e139eaa286017f53f88336dd0?narHash=sha256-%2B/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc%3D' (2025-02-13)
→ 'github:NixOS/nixpkgs/6607cf789e541e7873d40d3a8f7815ea92204f32?narHash=sha256-cPfs8qMccim2RBgtKGF%2Bx9IBCduRvd/N5F4nYpU0TVE%3D' (2025-03-13)
---
flake.lock | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/flake.lock b/flake.lock
index cca6b7a..453ddf9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -91,11 +91,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1741936035,
- "narHash": "sha256-EzHZB9Im6weG2kkprL5w+uDaB+gEDy3zDTdX9WNAPw0=",
+ "lastModified": 1742021951,
+ "narHash": "sha256-Nxrkvh353BeG6/D8yPq50VCaYnCMKviS7krw4DfzLVU=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
- "rev": "534188d0b0cbddf3f9df3f20cfbc424efb46b36c",
+ "rev": "ecaf8b6aa7d28cb7b87da334310fbe1ba31f8d64",
"type": "github"
},
"original": {
@@ -134,11 +134,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1740094523,
- "narHash": "sha256-vGxTGexcKN8BVunczdqps1dbu0khOFp0++Gvip9QZJ8=",
+ "lastModified": 1742038403,
+ "narHash": "sha256-mzZdujmFWC+wHRvm0tKUlXL0LLz3YI3EDUCnFCtzgxY=",
"owner": "thiagokokada",
"repo": "nix-alien",
- "rev": "ab175cdbbad2a93afc86125eb0835694b005b2fb",
+ "rev": "876d83ac35fc52145674282f87898824182edc48",
"type": "github"
},
"original": {
@@ -177,11 +177,11 @@
]
},
"locked": {
- "lastModified": 1739071773,
- "narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=",
+ "lastModified": 1741619381,
+ "narHash": "sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea",
+ "rev": "66537fb185462ba9b07f4e6f2d54894a1b2d04ab",
"type": "github"
},
"original": {
@@ -250,11 +250,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1739446958,
- "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
+ "lastModified": 1741851582,
+ "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
+ "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
"type": "github"
},
"original": {
From d4262b32e643377c1427facce52538a172ef0782 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sun, 16 Mar 2025 14:27:10 +0100
Subject: [PATCH 06/19] 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/6607cf789e541e7873d40d3a8f7815ea92204f32?narHash=sha256-cPfs8qMccim2RBgtKGF%2Bx9IBCduRvd/N5F4nYpU0TVE%3D' (2025-03-13)
→ 'github:NixOS/nixpkgs/c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5?narHash=sha256-C7jVfohcGzdZRF6DO%2BybyG/sqpo1h6bZi9T56sxLy%2Bk%3D' (2025-03-15)
---
flake.lock | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flake.lock b/flake.lock
index 453ddf9..1cfd016 100644
--- a/flake.lock
+++ b/flake.lock
@@ -266,11 +266,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1741851582,
- "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
+ "lastModified": 1742069588,
+ "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
+ "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
"type": "github"
},
"original": {
From b8a4571150ded9e9e30b8bbfc74a6d29df5c8435 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Mon, 17 Mar 2025 22:53:26 +0100
Subject: [PATCH 07/19] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'distrobox4nix':
'github:aguirre-matteo/distrobox4nix/ec25a464c675837cb71ed7b875a8049d23ea0506?narHash=sha256-YH/s8KahaQiJ6gJmRJQ0SvcMK/ZiJDPJM6uwfSJlvww%3D' (2025-03-13)
→ 'github:aguirre-matteo/distrobox4nix/50ebee1435727183a958a8e0833121246e0fa637?narHash=sha256-vir5H5eO%2B6sMXGEiJLYaxBGAyR7d7pNfjyLrBHn0bjU%3D' (2025-03-17)
• Updated input 'home-manager':
'github:nix-community/home-manager/4e12151c9e014e2449e0beca2c0e9534b96a26b4?narHash=sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY%3D' (2025-03-14)
→ 'github:nix-community/home-manager/c657142e24a43ea1035889f0b0a7c24598e0e18a?narHash=sha256-1e4oFbtdOOb6NqauHevWWjEUXZnfZ6RUAJJjn9i4YBc%3D' (2025-03-17)
---
flake.lock | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/flake.lock b/flake.lock
index 1cfd016..f59b239 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,11 +22,11 @@
},
"distrobox4nix": {
"locked": {
- "lastModified": 1741895647,
- "narHash": "sha256-YH/s8KahaQiJ6gJmRJQ0SvcMK/ZiJDPJM6uwfSJlvww=",
+ "lastModified": 1742219975,
+ "narHash": "sha256-vir5H5eO+6sMXGEiJLYaxBGAyR7d7pNfjyLrBHn0bjU=",
"owner": "aguirre-matteo",
"repo": "distrobox4nix",
- "rev": "ec25a464c675837cb71ed7b875a8049d23ea0506",
+ "rev": "50ebee1435727183a958a8e0833121246e0fa637",
"type": "github"
},
"original": {
@@ -72,11 +72,11 @@
]
},
"locked": {
- "lastModified": 1741955947,
- "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=",
+ "lastModified": 1742246081,
+ "narHash": "sha256-1e4oFbtdOOb6NqauHevWWjEUXZnfZ6RUAJJjn9i4YBc=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4",
+ "rev": "c657142e24a43ea1035889f0b0a7c24598e0e18a",
"type": "github"
},
"original": {
From 7afb9f7d6a2d3c7755a92eeb997ab83111d9fa05 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Tue, 18 Mar 2025 13:59:30 +0100
Subject: [PATCH 08/19] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'jovian-nixos':
'github:Jovian-Experiments/Jovian-NixOS/ecaf8b6aa7d28cb7b87da334310fbe1ba31f8d64?narHash=sha256-Nxrkvh353BeG6/D8yPq50VCaYnCMKviS7krw4DfzLVU%3D' (2025-03-15)
→ 'github:Jovian-Experiments/Jovian-NixOS/fd69a59cfab06fe8ac0695377e10573e91b6a3ff?narHash=sha256-ZShdL237Hz%2BSog0mzfsCui%2Bkyj%2BXd2ka91Dilxlz9j4%3D' (2025-03-18)
---
flake.lock | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flake.lock b/flake.lock
index f59b239..9f2a91e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -91,11 +91,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1742021951,
- "narHash": "sha256-Nxrkvh353BeG6/D8yPq50VCaYnCMKviS7krw4DfzLVU=",
+ "lastModified": 1742278596,
+ "narHash": "sha256-ZShdL237Hz+Sog0mzfsCui+kyj+Xd2ka91Dilxlz9j4=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
- "rev": "ecaf8b6aa7d28cb7b87da334310fbe1ba31f8d64",
+ "rev": "fd69a59cfab06fe8ac0695377e10573e91b6a3ff",
"type": "github"
},
"original": {
From 36c5da7e589f794bef4b508e17cfcd107293afa7 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Tue, 18 Mar 2025 19:52:41 +0100
Subject: [PATCH 09/19] several improvements to nixos config
---
configs/thilo-pc/home.nix | 24 +++++++++++++++++++++++
configs/thilo-pc/nixos.nix | 39 +++++++++-----------------------------
flake.nix | 7 ++-----
nixos/common.nix | 1 +
4 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/configs/thilo-pc/home.nix b/configs/thilo-pc/home.nix
index 2eaea42..e1c0a12 100644
--- a/configs/thilo-pc/home.nix
+++ b/configs/thilo-pc/home.nix
@@ -13,6 +13,11 @@
extraSpecialArgs = {
inherit inputs;
};
+
+ sharedModules = [
+ inputs.distrobox4nix.homeManagerModule
+ ];
+
users.thilo = {
imports = [ ./../../home-manager/modules/machine.nix ];
@@ -42,6 +47,25 @@
home.packages = with pkgs; [
lix
];
+
+ programs.distrobox = {
+ enable = true;
+ containers = {
+ arch = {
+ image = "arch-toolbox";
+ additional_packages = "python python-pip nodejs";
+ volume = "/etc/static/profiles/per-user:/etc/profiles/per-user:ro";
+ replace = true;
+ };
+ fedora = {
+ image = "quay.io/fedora/fedora-toolbox:41";
+ additional_packages = "python python-pip code";
+ home = "/home/thilo/.distrobox/fedora";
+ pre_init_hooks = ''rpm --import https://packages.microsoft.com/keys/microsoft.asc && echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\nautorefresh=1\ntype=rpm-md\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" | sudo tee /etc/yum.repos.d/vscode.repo > /dev/null'';
+ replace = true;
+ };
+ };
+ };
};
};
}
diff --git a/configs/thilo-pc/nixos.nix b/configs/thilo-pc/nixos.nix
index 0bc6a6a..eb76819 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, options, ... }:
+{ pkgs, inputs, ... }:
{
imports = [
@@ -9,6 +9,7 @@
./hardware-configuration.nix
./../../nixos/common.nix
./../../nixos/builders.nix
+ inputs.jovian-nixos.nixosModules.jovian
];
# Bootloader.
@@ -43,14 +44,7 @@
layout = "us";
variant = "";
};
- # AI
- # ollama = {
- # enable = true;
- # acceleration = "rocm";
- # };
- # open-webui = {
- # enable = true;
- # };
+ envfs.enable = true;
};
programs.kdeconnect.enable = true;
@@ -167,32 +161,17 @@
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
- programs.steam.gamescopeSession = {
- enable = false;
- env = {
- WLR_RENDERER = "vulkan";
- DXVK_HDR = "1";
- STEAM_GAMESCOPE_VRR_SUPPORTED = "1";
- SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS = "0";
- ENABLE_GAMESCOPE_WSI = "1";
- WINE_FULLSCREEN_FSR = "1";
+ jovian = {
+ steam = {
+ enable = true;
+ user = "thilo";
};
- args = [
- "-f"
- "-F fsr"
- "--rt"
- "--adaptive-sync"
- "-w 1920"
- "-h 1080"
- "-r 120"
- "--hdr-enabled"
- "--hdr-itm-enable"
- "-O DP-3"
- ];
};
programs.gamescope.enable = true;
+ networking.firewall.enable = false;
+
system.stateVersion = "24.11";
environment.systemPackages = with pkgs; [
diff --git a/flake.nix b/flake.nix
index 5a13390..88b5367 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,12 +18,9 @@
url = "github:guibou/nixGL";
inputs.nixpkgs.follows = "nixpkgs";
};
- muse-sounds-manager = {
- url = "github:thilobillerbeck/muse-sounds-manager-nix";
- inputs.nixpkgs.follows = "nixpkgs";
- };
- suyu.url = "github:Noodlez1232/suyu-flake";
nix-alien.url = "github:thiagokokada/nix-alien";
+ jovian-nixos.url = "github:Jovian-Experiments/Jovian-NixOS/development";
+ distrobox4nix.url = "github:aguirre-matteo/distrobox4nix";
};
nixConfig = {
diff --git a/nixos/common.nix b/nixos/common.nix
index 0055cac..acac05d 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -111,6 +111,7 @@ in
};
tailscale = {
enable = true;
+ useRoutingFeatures = "both";
};
flatpak.enable = true;
avahi = {
From 6f15ff68affbb844574aeb3ebf232d1a4dd3afda Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Thu, 20 Mar 2025 16:56:22 +0100
Subject: [PATCH 10/19] 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/c657142e24a43ea1035889f0b0a7c24598e0e18a?narHash=sha256-1e4oFbtdOOb6NqauHevWWjEUXZnfZ6RUAJJjn9i4YBc%3D' (2025-03-17)
→ 'github:nix-community/home-manager/94605dcadefeaff6b35c8931c9f38e4f4dc7ad0a?narHash=sha256-Q0KXcHQmum8L6IzGhhkVhjFMKY6BvYa/rhmLP26Ws8o%3D' (2025-03-20)
• Updated input 'jovian-nixos':
'github:Jovian-Experiments/Jovian-NixOS/fd69a59cfab06fe8ac0695377e10573e91b6a3ff?narHash=sha256-ZShdL237Hz%2BSog0mzfsCui%2Bkyj%2BXd2ka91Dilxlz9j4%3D' (2025-03-18)
→ 'github:Jovian-Experiments/Jovian-NixOS/a95606cae5c9e1f5b84debe7865ef171d4deb287?narHash=sha256-gpjtkoeq5Ye9J8GoR%2BrWg3NL4bbEtcLvvF4nN6MtxdU%3D' (2025-03-20)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5?narHash=sha256-C7jVfohcGzdZRF6DO%2BybyG/sqpo1h6bZi9T56sxLy%2Bk%3D' (2025-03-15)
→ 'github:NixOS/nixpkgs/b6eaf97c6960d97350c584de1b6dcff03c9daf42?narHash=sha256-Txwa5uO%2BqpQXrNG4eumPSD%2BhHzzYi/CdaM80M9XRLCo%3D' (2025-03-18)
---
flake.lock | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/flake.lock b/flake.lock
index 9f2a91e..3580a7b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -72,11 +72,11 @@
]
},
"locked": {
- "lastModified": 1742246081,
- "narHash": "sha256-1e4oFbtdOOb6NqauHevWWjEUXZnfZ6RUAJJjn9i4YBc=",
+ "lastModified": 1742447757,
+ "narHash": "sha256-Q0KXcHQmum8L6IzGhhkVhjFMKY6BvYa/rhmLP26Ws8o=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "c657142e24a43ea1035889f0b0a7c24598e0e18a",
+ "rev": "94605dcadefeaff6b35c8931c9f38e4f4dc7ad0a",
"type": "github"
},
"original": {
@@ -91,11 +91,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1742278596,
- "narHash": "sha256-ZShdL237Hz+Sog0mzfsCui+kyj+Xd2ka91Dilxlz9j4=",
+ "lastModified": 1742465245,
+ "narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
- "rev": "fd69a59cfab06fe8ac0695377e10573e91b6a3ff",
+ "rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287",
"type": "github"
},
"original": {
@@ -266,11 +266,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1742069588,
- "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
+ "lastModified": 1742288794,
+ "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
+ "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
"type": "github"
},
"original": {
From b4a544f2410da891173d777a0d3cc5843e8a61d7 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sat, 22 Mar 2025 14:05:02 +0100
Subject: [PATCH 11/19] 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/a16cf50595de02fd3cfa644794e0983d8761d177?narHash=sha256-NyezPcnXjuZSsIkZZr4rRuThs7u1sYhPU%2BPwgJjmFgU%3D' (2025-03-12)
→ 'github:dagger/nix/126e5c49a7195dbaf3b4f96110e6c640faf09d7e?narHash=sha256-eFYjzvS8cCNfi/970yVJriSOQASZfOFgDhoqGEY/bsE%3D' (2025-03-20)
• Updated input 'distrobox4nix':
'github:aguirre-matteo/distrobox4nix/50ebee1435727183a958a8e0833121246e0fa637?narHash=sha256-vir5H5eO%2B6sMXGEiJLYaxBGAyR7d7pNfjyLrBHn0bjU%3D' (2025-03-17)
→ 'github:aguirre-matteo/distrobox4nix/c53dcd3b85a5e6416972214733cc03aa286af347?narHash=sha256-XS6qjrxdt75Qeq06agwQU91Ba9%2BkenuDrLkSIbFom%2BA%3D' (2025-03-21)
• Updated input 'home-manager':
'github:nix-community/home-manager/94605dcadefeaff6b35c8931c9f38e4f4dc7ad0a?narHash=sha256-Q0KXcHQmum8L6IzGhhkVhjFMKY6BvYa/rhmLP26Ws8o%3D' (2025-03-20)
→ 'github:nix-community/home-manager/296ddc64627f4a6a4eb447852d7346b9dd16197d?narHash=sha256-Fi5g8H5FXMSRqy%2BmU6gPG0v%2BC9pzjYbkkiePtz8%2BPpA%3D' (2025-03-21)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/b6eaf97c6960d97350c584de1b6dcff03c9daf42?narHash=sha256-Txwa5uO%2BqpQXrNG4eumPSD%2BhHzzYi/CdaM80M9XRLCo%3D' (2025-03-18)
→ 'github:NixOS/nixpkgs/a84ebe20c6bc2ecbcfb000a50776219f48d134cc?narHash=sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ%3D' (2025-03-19)
---
flake.lock | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/flake.lock b/flake.lock
index 3580a7b..8033665 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1741791233,
- "narHash": "sha256-NyezPcnXjuZSsIkZZr4rRuThs7u1sYhPU+PwgJjmFgU=",
+ "lastModified": 1742503124,
+ "narHash": "sha256-eFYjzvS8cCNfi/970yVJriSOQASZfOFgDhoqGEY/bsE=",
"owner": "dagger",
"repo": "nix",
- "rev": "a16cf50595de02fd3cfa644794e0983d8761d177",
+ "rev": "126e5c49a7195dbaf3b4f96110e6c640faf09d7e",
"type": "github"
},
"original": {
@@ -22,11 +22,11 @@
},
"distrobox4nix": {
"locked": {
- "lastModified": 1742219975,
- "narHash": "sha256-vir5H5eO+6sMXGEiJLYaxBGAyR7d7pNfjyLrBHn0bjU=",
+ "lastModified": 1742570020,
+ "narHash": "sha256-XS6qjrxdt75Qeq06agwQU91Ba9+kenuDrLkSIbFom+A=",
"owner": "aguirre-matteo",
"repo": "distrobox4nix",
- "rev": "50ebee1435727183a958a8e0833121246e0fa637",
+ "rev": "c53dcd3b85a5e6416972214733cc03aa286af347",
"type": "github"
},
"original": {
@@ -72,11 +72,11 @@
]
},
"locked": {
- "lastModified": 1742447757,
- "narHash": "sha256-Q0KXcHQmum8L6IzGhhkVhjFMKY6BvYa/rhmLP26Ws8o=",
+ "lastModified": 1742588233,
+ "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "94605dcadefeaff6b35c8931c9f38e4f4dc7ad0a",
+ "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d",
"type": "github"
},
"original": {
@@ -266,11 +266,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1742288794,
- "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
+ "lastModified": 1742422364,
+ "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
+ "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
"type": "github"
},
"original": {
From 1b1e1c22154455dc9712c62fe52ab3148ec0c788 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Mon, 24 Mar 2025 15:20:41 +0100
Subject: [PATCH 12/19] 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/296ddc64627f4a6a4eb447852d7346b9dd16197d?narHash=sha256-Fi5g8H5FXMSRqy%2BmU6gPG0v%2BC9pzjYbkkiePtz8%2BPpA%3D' (2025-03-21)
→ 'github:nix-community/home-manager/908e055e157a0b35466faf4125d7e7410ff56160?narHash=sha256-wgnQZMrLLQJlZ%2BhtTXzoQtoz9EzL15Z2crH3%2BOnRmMk%3D' (2025-03-24)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/a84ebe20c6bc2ecbcfb000a50776219f48d134cc?narHash=sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ%3D' (2025-03-19)
→ 'github:NixOS/nixpkgs/1e5b653dff12029333a6546c11e108ede13052eb?narHash=sha256-G5n%2BFOXLXcRx%2B3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w%3D' (2025-03-22)
---
flake.lock | 28 ++++++----------------------
1 file changed, 6 insertions(+), 22 deletions(-)
diff --git a/flake.lock b/flake.lock
index 8033665..21a2b4e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,21 +20,6 @@
"type": "github"
}
},
- "distrobox4nix": {
- "locked": {
- "lastModified": 1742570020,
- "narHash": "sha256-XS6qjrxdt75Qeq06agwQU91Ba9+kenuDrLkSIbFom+A=",
- "owner": "aguirre-matteo",
- "repo": "distrobox4nix",
- "rev": "c53dcd3b85a5e6416972214733cc03aa286af347",
- "type": "github"
- },
- "original": {
- "owner": "aguirre-matteo",
- "repo": "distrobox4nix",
- "type": "github"
- }
- },
"flake-compat": {
"locked": {
"lastModified": 1733328505,
@@ -72,11 +57,11 @@
]
},
"locked": {
- "lastModified": 1742588233,
- "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=",
+ "lastModified": 1742825959,
+ "narHash": "sha256-wgnQZMrLLQJlZ+htTXzoQtoz9EzL15Z2crH3+OnRmMk=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d",
+ "rev": "908e055e157a0b35466faf4125d7e7410ff56160",
"type": "github"
},
"original": {
@@ -266,11 +251,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1742422364,
- "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
+ "lastModified": 1742669843,
+ "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
+ "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
"type": "github"
},
"original": {
@@ -297,7 +282,6 @@
"root": {
"inputs": {
"dagger": "dagger",
- "distrobox4nix": "distrobox4nix",
"home-manager": "home-manager",
"jovian-nixos": "jovian-nixos",
"nix-alien": "nix-alien",
From 62bfab8427681d5a6c39ce7e3aeb647fc84b1373 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Tue, 25 Mar 2025 14:56:49 +0100
Subject: [PATCH 13/19] 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/126e5c49a7195dbaf3b4f96110e6c640faf09d7e?narHash=sha256-eFYjzvS8cCNfi/970yVJriSOQASZfOFgDhoqGEY/bsE%3D' (2025-03-20)
→ 'github:dagger/nix/76507e2d0e6c302cfc652c7acd68c6c700f7125f?narHash=sha256-Gv7hgW37lyZd2XabuOYQEn8WT7TH9yTqK2%2BuaAudYyE%3D' (2025-03-24)
• Updated input 'home-manager':
'github:nix-community/home-manager/908e055e157a0b35466faf4125d7e7410ff56160?narHash=sha256-wgnQZMrLLQJlZ%2BhtTXzoQtoz9EzL15Z2crH3%2BOnRmMk%3D' (2025-03-24)
→ 'github:nix-community/home-manager/869f2ec2add75ce2a70a6dbbf585b8399abec625?narHash=sha256-F3xBdOs5m0SE6Gq3jz%2BJxDOPvsLs22vbGfD05uF6xEc%3D' (2025-03-25)
• Updated input 'nixpkgs-update':
'github:ryantm/nixpkgs-update/ca25a2a7aaa94faeb209bf488c201b34dddcda27?narHash=sha256-0vSf4gjSg/MGTdI%2Bb3ZOjdvVZR53MZWRyRUvREc16jo%3D' (2025-02-06)
→ 'github:ryantm/nixpkgs-update/30ca7d55d05bfc99bfb04521ba09c26ccbec8625?narHash=sha256-eKl1y0COzmaD5tPw8MgmEBSsH46t4jmPbneulCLgG3M%3D' (2025-03-24)
---
flake.lock | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/flake.lock b/flake.lock
index 21a2b4e..98a0b4e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1742503124,
- "narHash": "sha256-eFYjzvS8cCNfi/970yVJriSOQASZfOFgDhoqGEY/bsE=",
+ "lastModified": 1742857412,
+ "narHash": "sha256-Gv7hgW37lyZd2XabuOYQEn8WT7TH9yTqK2+uaAudYyE=",
"owner": "dagger",
"repo": "nix",
- "rev": "126e5c49a7195dbaf3b4f96110e6c640faf09d7e",
+ "rev": "76507e2d0e6c302cfc652c7acd68c6c700f7125f",
"type": "github"
},
"original": {
@@ -57,11 +57,11 @@
]
},
"locked": {
- "lastModified": 1742825959,
- "narHash": "sha256-wgnQZMrLLQJlZ+htTXzoQtoz9EzL15Z2crH3+OnRmMk=",
+ "lastModified": 1742871411,
+ "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "908e055e157a0b35466faf4125d7e7410ff56160",
+ "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625",
"type": "github"
},
"original": {
@@ -220,11 +220,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1738838691,
- "narHash": "sha256-0vSf4gjSg/MGTdI+b3ZOjdvVZR53MZWRyRUvREc16jo=",
+ "lastModified": 1742857708,
+ "narHash": "sha256-eKl1y0COzmaD5tPw8MgmEBSsH46t4jmPbneulCLgG3M=",
"owner": "ryantm",
"repo": "nixpkgs-update",
- "rev": "ca25a2a7aaa94faeb209bf488c201b34dddcda27",
+ "rev": "30ca7d55d05bfc99bfb04521ba09c26ccbec8625",
"type": "github"
},
"original": {
From 76b06e0530414bb7e698afe41e01c0a045119c2b Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Tue, 25 Mar 2025 15:54:16 +0100
Subject: [PATCH 14/19] several small adjustments
---
configs/thilo-pc/home.nix | 7 ++-----
configs/thilo-pc/nixos.nix | 22 +++++++++++++++++-----
flake.nix | 1 -
home-manager/modules/packages.nix | 6 ------
home-manager/programs/syncthing.nix | 2 +-
5 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/configs/thilo-pc/home.nix b/configs/thilo-pc/home.nix
index e1c0a12..f9dd94f 100644
--- a/configs/thilo-pc/home.nix
+++ b/configs/thilo-pc/home.nix
@@ -13,10 +13,7 @@
extraSpecialArgs = {
inherit inputs;
};
-
- sharedModules = [
- inputs.distrobox4nix.homeManagerModule
- ];
+ backupFileExtension = ".bak";
users.thilo = {
imports = [ ./../../home-manager/modules/machine.nix ];
@@ -49,7 +46,7 @@
];
programs.distrobox = {
- enable = true;
+ enable = lib.mkForce true;
containers = {
arch = {
image = "arch-toolbox";
diff --git a/configs/thilo-pc/nixos.nix b/configs/thilo-pc/nixos.nix
index eb76819..532e028 100644
--- a/configs/thilo-pc/nixos.nix
+++ b/configs/thilo-pc/nixos.nix
@@ -1,7 +1,12 @@
# 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, inputs, ... }:
+{
+ pkgs,
+ inputs,
+ lib,
+ ...
+}:
{
imports = [
@@ -161,10 +166,16 @@
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
- jovian = {
- steam = {
- enable = true;
- user = "thilo";
+ specialisation = {
+ game-console.configuration = {
+ services.displayManager.sddm.enable = lib.mkForce false;
+ jovian = {
+ steam = {
+ autoStart = true;
+ enable = true;
+ user = "thilo";
+ };
+ };
};
};
@@ -176,6 +187,7 @@
environment.systemPackages = with pkgs; [
kdePackages.skanpage
+ qt5.qtwayland
];
services.resolved = {
diff --git a/flake.nix b/flake.nix
index 88b5367..efe3419 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,7 +20,6 @@
};
nix-alien.url = "github:thiagokokada/nix-alien";
jovian-nixos.url = "github:Jovian-Experiments/Jovian-NixOS/development";
- distrobox4nix.url = "github:aguirre-matteo/distrobox4nix";
};
nixConfig = {
diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index 9117039..7169253 100644
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -66,9 +66,7 @@ in
ddev
act
mkcert
- # pulumi
kubectl
- pulumiPackages.pulumi-language-nodejs
ncdu
devenv
inputs.nixpkgs-update.packages.x86_64-linux.nixpkgs-update
@@ -78,7 +76,6 @@ in
nixd
unrar
# inputs.w17.packages.x86_64-linux.default
- aichat
nix-output-monitor
nodePackages.pnpm
npm-check-updates
@@ -94,8 +91,6 @@ in
php
(lib.hiPrio phpPackages.composer)
-
- nixfmt-rfc-style
]
++ (
if (!config.machine.isGeneric) then
@@ -155,7 +150,6 @@ in
inkscape
musescore
obsidian
- syncthingtray
reaper
yabridge
torzu
diff --git a/home-manager/programs/syncthing.nix b/home-manager/programs/syncthing.nix
index 2ab81c9..1bdb3d1 100644
--- a/home-manager/programs/syncthing.nix
+++ b/home-manager/programs/syncthing.nix
@@ -1,5 +1,5 @@
{
services.syncthing = {
- enable = true;
+ enable = false;
};
}
From ae57b200d337867de1a7fc0f175fac64c8e0d45a Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Wed, 26 Mar 2025 15:52:38 +0100
Subject: [PATCH 15/19] 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/869f2ec2add75ce2a70a6dbbf585b8399abec625?narHash=sha256-F3xBdOs5m0SE6Gq3jz%2BJxDOPvsLs22vbGfD05uF6xEc%3D' (2025-03-25)
→ 'github:nix-community/home-manager/693840c01b9bef9e54100239cef937e53d4661bf?narHash=sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA%3D' (2025-03-26)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/1e5b653dff12029333a6546c11e108ede13052eb?narHash=sha256-G5n%2BFOXLXcRx%2B3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w%3D' (2025-03-22)
→ 'github:NixOS/nixpkgs/698214a32beb4f4c8e3942372c694f40848b360d?narHash=sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw%3D' (2025-03-25)
---
flake.lock | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/flake.lock b/flake.lock
index 98a0b4e..755267b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -57,11 +57,11 @@
]
},
"locked": {
- "lastModified": 1742871411,
- "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=",
+ "lastModified": 1742996658,
+ "narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625",
+ "rev": "693840c01b9bef9e54100239cef937e53d4661bf",
"type": "github"
},
"original": {
@@ -251,11 +251,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1742669843,
- "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
+ "lastModified": 1742889210,
+ "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
+ "rev": "698214a32beb4f4c8e3942372c694f40848b360d",
"type": "github"
},
"original": {
From 3f417272768f212c73179a82e73f8b21b96f43d5 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Thu, 27 Mar 2025 22:10:13 +0100
Subject: [PATCH 16/19] 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/693840c01b9bef9e54100239cef937e53d4661bf?narHash=sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA%3D' (2025-03-26)
→ 'github:nix-community/home-manager/b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52?narHash=sha256-5tUbaMBKYbfTe/4aXACxmiXG22TgwPBNcfZ8Kg3rt%2Bg%3D' (2025-03-27)
---
flake.lock | 27 +++------------------------
1 file changed, 3 insertions(+), 24 deletions(-)
diff --git a/flake.lock b/flake.lock
index 755267b..a81ea79 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,25 +1,5 @@
{
"nodes": {
- "dagger": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1742857412,
- "narHash": "sha256-Gv7hgW37lyZd2XabuOYQEn8WT7TH9yTqK2+uaAudYyE=",
- "owner": "dagger",
- "repo": "nix",
- "rev": "76507e2d0e6c302cfc652c7acd68c6c700f7125f",
- "type": "github"
- },
- "original": {
- "owner": "dagger",
- "repo": "nix",
- "type": "github"
- }
- },
"flake-compat": {
"locked": {
"lastModified": 1733328505,
@@ -57,11 +37,11 @@
]
},
"locked": {
- "lastModified": 1742996658,
- "narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=",
+ "lastModified": 1743097780,
+ "narHash": "sha256-5tUbaMBKYbfTe/4aXACxmiXG22TgwPBNcfZ8Kg3rt+g=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "693840c01b9bef9e54100239cef937e53d4661bf",
+ "rev": "b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52",
"type": "github"
},
"original": {
@@ -281,7 +261,6 @@
},
"root": {
"inputs": {
- "dagger": "dagger",
"home-manager": "home-manager",
"jovian-nixos": "jovian-nixos",
"nix-alien": "nix-alien",
From 87f8c661a9d9b3a3cb3df72f77759d6857b27860 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Fri, 28 Mar 2025 15:47:54 +0100
Subject: [PATCH 17/19] 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/b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52?narHash=sha256-5tUbaMBKYbfTe/4aXACxmiXG22TgwPBNcfZ8Kg3rt%2Bg%3D' (2025-03-27)
→ 'github:nix-community/home-manager/1efd2503172016a6742c87b47b43ca2c8145607d?narHash=sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54%3D' (2025-03-28)
• Updated input 'jovian-nixos':
'github:Jovian-Experiments/Jovian-NixOS/a95606cae5c9e1f5b84debe7865ef171d4deb287?narHash=sha256-gpjtkoeq5Ye9J8GoR%2BrWg3NL4bbEtcLvvF4nN6MtxdU%3D' (2025-03-20)
→ 'github:Jovian-Experiments/Jovian-NixOS/1c17514c8558886af0afc34b6c348c1f2ee9fd24?narHash=sha256-QlEk4Xm5KG0jW5Kus9teY3bhxdf0GUTexxTUCaJM5ms%3D' (2025-03-28)
---
flake.lock | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/flake.lock b/flake.lock
index a81ea79..bf45b7c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,11 +37,11 @@
]
},
"locked": {
- "lastModified": 1743097780,
- "narHash": "sha256-5tUbaMBKYbfTe/4aXACxmiXG22TgwPBNcfZ8Kg3rt+g=",
+ "lastModified": 1743136572,
+ "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52",
+ "rev": "1efd2503172016a6742c87b47b43ca2c8145607d",
"type": "github"
},
"original": {
@@ -56,11 +56,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1742465245,
- "narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=",
+ "lastModified": 1743144043,
+ "narHash": "sha256-QlEk4Xm5KG0jW5Kus9teY3bhxdf0GUTexxTUCaJM5ms=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
- "rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287",
+ "rev": "1c17514c8558886af0afc34b6c348c1f2ee9fd24",
"type": "github"
},
"original": {
From bf3882147740ec2c6177567c2489f8884e1f0e5d Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Mon, 31 Mar 2025 14:18:15 +0200
Subject: [PATCH 18/19] 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/5e5402ecbcb27af32284d4a62553c019a3a49ea6?narHash=sha256-gWd4urRoLRe8GLVC/3rYRae1h%2BxfQzt09xOfb0PaHSk%3D' (2025-03-27)
→ 'github:NixOS/nixpkgs/52faf482a3889b7619003c0daec593a1912fddc1?narHash=sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om%2BD4UnDhlDW9BE%3D' (2025-03-30)
---
flake.lock | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/flake.lock b/flake.lock
index bf45b7c..a330569 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,11 +37,11 @@
]
},
"locked": {
- "lastModified": 1743136572,
- "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=",
+ "lastModified": 1743360001,
+ "narHash": "sha256-HtpS/ZdgWXw0y+aFdORcX5RuBGTyz3WskThspNR70SM=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "1efd2503172016a6742c87b47b43ca2c8145607d",
+ "rev": "b6fd653ef8fbeccfd4958650757e91767a65506d",
"type": "github"
},
"original": {
@@ -231,11 +231,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1742889210,
- "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
+ "lastModified": 1743315132,
+ "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "698214a32beb4f4c8e3942372c694f40848b360d",
+ "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
"type": "github"
},
"original": {
From b4e9a29654a21a55b90029f1e021e49856726db7 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Tue, 1 Apr 2025 20:01:20 +0200
Subject: [PATCH 19/19] several improvements to desktop
---
configs/thilo-pc/hardware-configuration.nix | 13 ++++++++-----
configs/thilo-pc/home.nix | 4 ++--
configs/thilo-pc/nixos.nix | 2 ++
flake.nix | 4 +---
home-manager/modules/machine.nix | 1 +
home-manager/modules/packages.nix | 14 ++------------
home-manager/programs/firefox.nix | 2 +-
home-manager/programs/topgrade.nix | 1 +
home-manager/programs/vscode.nix | 5 +++++
9 files changed, 23 insertions(+), 23 deletions(-)
create mode 100644 home-manager/programs/vscode.nix
diff --git a/configs/thilo-pc/hardware-configuration.nix b/configs/thilo-pc/hardware-configuration.nix
index 499a169..23ce156 100644
--- a/configs/thilo-pc/hardware-configuration.nix
+++ b/configs/thilo-pc/hardware-configuration.nix
@@ -15,21 +15,24 @@
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
- boot.kernelModules = [ "kvm-amd" ];
+ boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
- { device = "/dev/disk/by-uuid/caa83e18-f2f2-46f9-8c27-0842c3051dc1";
- fsType = "btrfs";
- options = [ "subvol=@" ];
+ { device = "/dev/disk/by-uuid/ecc9110a-4510-4a67-9227-021e146b59ca";
+ fsType = "ext4";
};
fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/DADB-44A9";
+ { device = "/dev/disk/by-uuid/230E-6756";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
+ swapDevices =
+ [ { device = "/dev/disk/by-uuid/9ad760a9-34e4-4858-96e6-98c7a8e497a4"; }
+ ];
+
fileSystems = {
"/data" = {
device = "/dev/disk/by-uuid/a13a2cfa-12af-463d-ae5c-d46c881fcdd6";
diff --git a/configs/thilo-pc/home.nix b/configs/thilo-pc/home.nix
index f9dd94f..0a881f9 100644
--- a/configs/thilo-pc/home.nix
+++ b/configs/thilo-pc/home.nix
@@ -46,10 +46,10 @@
];
programs.distrobox = {
- enable = lib.mkForce true;
+ enable = true;
containers = {
arch = {
- image = "arch-toolbox";
+ image = "quay.io/toolbx/arch-toolbox";
additional_packages = "python python-pip nodejs";
volume = "/etc/static/profiles/per-user:/etc/profiles/per-user:ro";
replace = true;
diff --git a/configs/thilo-pc/nixos.nix b/configs/thilo-pc/nixos.nix
index 532e028..f139162 100644
--- a/configs/thilo-pc/nixos.nix
+++ b/configs/thilo-pc/nixos.nix
@@ -23,6 +23,7 @@
grub = {
efiSupport = true;
device = "nodev";
+ useOSProber = true;
};
efi.canTouchEfiVariables = true;
};
@@ -174,6 +175,7 @@
autoStart = true;
enable = true;
user = "thilo";
+ desktopSession = "plasma";
};
};
};
diff --git a/flake.nix b/flake.nix
index efe3419..331b035 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,8 +12,6 @@
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
- dagger.url = "github:dagger/nix";
- dagger.inputs.nixpkgs.follows = "nixpkgs";
nixgl = {
url = "github:guibou/nixGL";
inputs.nixpkgs.follows = "nixpkgs";
@@ -57,7 +55,7 @@
};
in
{
- nixosConfigurations.thilo-pc = nixpkgs.lib.nixosSystem {
+ nixosConfigurations."thilo-pc" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
diff --git a/home-manager/modules/machine.nix b/home-manager/modules/machine.nix
index e1d0bc8..0065423 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/vscode.nix
./../programs/zed.nix
./../../nix.nix
./packages.nix
diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index 7169253..e15ea25 100644
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -14,14 +14,6 @@ let
in
{
config = {
- nixpkgs.overlays = [
- (_: prev: {
- quickemu = prev.quickemu.overrideAttrs (old: {
- patches = (old.patches or [ ]) ++ [ ./../patches/quickemu.patch ];
- });
- })
- ];
-
home.packages =
with pkgs;
[
@@ -70,12 +62,11 @@ in
ncdu
devenv
inputs.nixpkgs-update.packages.x86_64-linux.nixpkgs-update
- inputs.dagger.packages.x86_64-linux.dagger
+ nixpkgs-review
unzip
nil
nixd
unrar
- # inputs.w17.packages.x86_64-linux.default
nix-output-monitor
nodePackages.pnpm
npm-check-updates
@@ -136,10 +127,8 @@ in
bottles
protontricks
heroic
- (vscode.override { commandLineArgs = electronFlags; })
quickemu
quickgui
- trilium-desktop
anki
muse-sounds-manager
jetbrains-toolbox
@@ -160,6 +149,7 @@ in
telegram-desktop
thunderbird
gearlever
+ kdePackages.merkuro
]
else
[ ]
diff --git a/home-manager/programs/firefox.nix b/home-manager/programs/firefox.nix
index 06ffc31..e1f7c1a 100644
--- a/home-manager/programs/firefox.nix
+++ b/home-manager/programs/firefox.nix
@@ -1,7 +1,7 @@
{ config, ... }:
{
- programs.firefox = {
+ programs.floorp = {
enable = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
};
}
diff --git a/home-manager/programs/topgrade.nix b/home-manager/programs/topgrade.nix
index 26d70ed..7b22e66 100644
--- a/home-manager/programs/topgrade.nix
+++ b/home-manager/programs/topgrade.nix
@@ -25,6 +25,7 @@ in
"nix"
"uv"
];
+ nix_arguments = "--builders \"\"";
};
git.repos = [ configPath ];
firmware = {
diff --git a/home-manager/programs/vscode.nix b/home-manager/programs/vscode.nix
new file mode 100644
index 0000000..39292b7
--- /dev/null
+++ b/home-manager/programs/vscode.nix
@@ -0,0 +1,5 @@
+{
+ programs.vscode = {
+ enable = true;
+ };
+}