From dd7694ba473e85b0cb7060ba4bbcef9939523247 Mon Sep 17 00:00:00 2001
From: Lillian-Violet <git@lillianviolet.dev>
Date: Mon, 24 Mar 2025 23:52:26 +0100
Subject: [PATCH] disable stylix, re-enable plasma6, update flake lock, and set
font configs
---
flake.lock | 309 ++++++++----------
.../package-configs/plasma-desktop.nix | 2 +-
home-manager/shared/default.nix | 56 ++--
nixos/desktop/default.nix | 3 +-
nixos/shared/default.nix | 105 +++---
5 files changed, 221 insertions(+), 254 deletions(-)
diff --git a/flake.lock b/flake.lock
index 88a552f..c376c31 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,7 +70,6 @@
"bcachefs-tools": {
"inputs": {
"crane": "crane",
- "fenix": "fenix",
"flake-compat": "flake-compat",
"flake-parts": [
"flake-parts"
@@ -78,14 +77,15 @@
"nixpkgs": [
"nixpkgs"
],
+ "rust-overlay": "rust-overlay",
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1740234596,
- "narHash": "sha256-PVLS4fImqMAemwT1BP1Pw4RVy1BrLRFRh4ZRQ6YSKJo=",
+ "lastModified": 1742852783,
+ "narHash": "sha256-pgpFoMc1RGGSyOGJikcXzsQND7VQ1/ywTwFa537b/hQ=",
"owner": "koverstreet",
"repo": "bcachefs-tools",
- "rev": "86cbeaf1c2b76b1b1d9e440d2f021df66d868b2e",
+ "rev": "6657ce2de3cdb25b14fb0183b90366e3e577fb9a",
"type": "github"
},
"original": {
@@ -115,11 +115,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1739934729,
- "narHash": "sha256-PcrLk10meIJICzUJqtCMOJxoITzbH52fZg2XAB7SSsM=",
+ "lastModified": 1742599566,
+ "narHash": "sha256-xr6ntmiUPXSh9o9mJ7og9vxALMQs1EQhIhWUAO2D1M0=",
"owner": "catppuccin",
"repo": "nix",
- "rev": "b1ff2a638afa827f1473498190a2c1cae1cf41cf",
+ "rev": "5e303e8d7e251868fa79f83bbda69da90aa62402",
"type": "github"
},
"original": {
@@ -129,18 +129,12 @@
}
},
"crane": {
- "inputs": {
- "nixpkgs": [
- "bcachefs-tools",
- "nixpkgs"
- ]
- },
"locked": {
- "lastModified": 1721842668,
- "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=",
+ "lastModified": 1742394900,
+ "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=",
"owner": "ipetkov",
"repo": "crane",
- "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf",
+ "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd",
"type": "github"
},
"original": {
@@ -151,11 +145,11 @@
},
"crane_2": {
"locked": {
- "lastModified": 1731098351,
- "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
+ "lastModified": 1741148495,
+ "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=",
"owner": "ipetkov",
"repo": "crane",
- "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
+ "rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53",
"type": "github"
},
"original": {
@@ -186,11 +180,11 @@
]
},
"locked": {
- "lastModified": 1740485968,
- "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
+ "lastModified": 1741786315,
+ "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
"owner": "nix-community",
"repo": "disko",
- "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
+ "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
"type": "github"
},
"original": {
@@ -199,36 +193,14 @@
"type": "github"
}
},
- "fenix": {
- "inputs": {
- "nixpkgs": [
- "bcachefs-tools",
- "nixpkgs"
- ],
- "rust-analyzer-src": "rust-analyzer-src"
- },
- "locked": {
- "lastModified": 1722320953,
- "narHash": "sha256-DfGaJtgrzcwPQYLTvjL1KaVIjpvi85b2MpM6yEGvJzM=",
- "owner": "nix-community",
- "repo": "fenix",
- "rev": "483df76def3e5010d709aa3a0418ba2088503994",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "fenix",
- "type": "github"
- }
- },
"firefox-gnome-theme": {
"flake": false,
"locked": {
- "lastModified": 1739223196,
- "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=",
+ "lastModified": 1741628778,
+ "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
- "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21",
+ "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80",
"type": "github"
},
"original": {
@@ -240,11 +212,11 @@
"flake-compat": {
"flake": false,
"locked": {
- "lastModified": 1696426674,
- "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+ "lastModified": 1733328505,
+ "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
@@ -256,11 +228,11 @@
"flake-compat_2": {
"flake": false,
"locked": {
- "lastModified": 1696426674,
- "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+ "lastModified": 1733328505,
+ "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
@@ -307,11 +279,11 @@
]
},
"locked": {
- "lastModified": 1738453229,
- "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+ "lastModified": 1741352980,
+ "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+ "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github"
},
"original": {
@@ -328,11 +300,11 @@
]
},
"locked": {
- "lastModified": 1730504689,
- "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+ "lastModified": 1740872218,
+ "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+ "rev": "3876f6b87db82f33775b1ef5ea343986105db764",
"type": "github"
},
"original": {
@@ -449,11 +421,11 @@
]
},
"locked": {
- "lastModified": 1737465171,
- "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
+ "lastModified": 1741379162,
+ "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
+ "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
"type": "github"
},
"original": {
@@ -530,11 +502,11 @@
]
},
"locked": {
- "lastModified": 1740579671,
- "narHash": "sha256-Dwt/3KknOQ4bgFG5YjqDT7oWRy27rPpDjAi2P0ok1zw=",
+ "lastModified": 1742851132,
+ "narHash": "sha256-8vEcDefstheV1whup+5fSpZu4g9Jr7WpYzOBKAMSHn4=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "53c587d263f94aaf6a281745923c76bbec62bcf3",
+ "rev": "c4d5d72805d14ea43c140eeb70401bf84c0f11b4",
"type": "github"
},
"original": {
@@ -552,11 +524,11 @@
]
},
"locked": {
- "lastModified": 1740347597,
- "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=",
+ "lastModified": 1741635347,
+ "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449",
+ "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551",
"type": "github"
},
"original": {
@@ -571,11 +543,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1740553144,
- "narHash": "sha256-ujQ/f3mcYECH1o0vzakMLAQRCMeF/SXd8w4uBFHxYO8=",
+ "lastModified": 1742465245,
+ "narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
- "rev": "14a125ea5c440c57310dc1bb3acf7641078d783a",
+ "rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287",
"type": "github"
},
"original": {
@@ -591,14 +563,14 @@
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_3",
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
- "rust-overlay": "rust-overlay"
+ "rust-overlay": "rust-overlay_2"
},
"locked": {
- "lastModified": 1740440383,
- "narHash": "sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts=",
+ "lastModified": 1741442524,
+ "narHash": "sha256-tVcxLDLLho8dWcO81Xj/3/ANLdVs0bGyCPyKjp70JWk=",
"owner": "nix-community",
"repo": "lanzaboote",
- "rev": "6321bc060d757c137c1fbae2057c7e941483878f",
+ "rev": "d8099586d9a84308ffedac07880e7f07a0180ff4",
"type": "github"
},
"original": {
@@ -636,11 +608,11 @@
]
},
"locked": {
- "lastModified": 1740281615,
- "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=",
+ "lastModified": 1742701275,
+ "narHash": "sha256-AulwPVrS9859t+eJ61v24wH/nfBEIDSXYxlRo3fL/SA=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023",
+ "rev": "36dc43cb50d5d20f90a28d53abb33a32b0a2aae6",
"type": "github"
},
"original": {
@@ -672,11 +644,11 @@
]
},
"locked": {
- "lastModified": 1737057290,
- "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
+ "lastModified": 1742568034,
+ "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=",
"owner": "nix-community",
"repo": "nixos-generators",
- "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
+ "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11",
"type": "github"
},
"original": {
@@ -687,11 +659,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1740387674,
- "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=",
+ "lastModified": 1742806253,
+ "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "d58f642ddb23320965b27beb0beba7236e9117b5",
+ "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726",
"type": "github"
},
"original": {
@@ -703,11 +675,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1736012469,
- "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
+ "lastModified": 1742288794,
+ "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
+ "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
"type": "github"
},
"original": {
@@ -734,11 +706,11 @@
},
"nixpkgs-edge": {
"locked": {
- "lastModified": 1740582133,
- "narHash": "sha256-uP0ydEFGG/w30Ja6+nEHIhquGg8qjzpn1RYRph9SbeU=",
+ "lastModified": 1742855907,
+ "narHash": "sha256-7njF0f8vk19p0cCYP+9EgYWT2RPCTSD822Yi41THKcs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b2f2859ddc345465d64cd0300a246e1b3455ea5f",
+ "rev": "d395b30f4825e4bfbc31ed2fbd06162da496217e",
"type": "github"
},
"original": {
@@ -747,29 +719,13 @@
"type": "indirect"
}
},
- "nixpkgs-stable": {
- "locked": {
- "lastModified": 1730741070,
- "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-24.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1740367490,
- "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
+ "lastModified": 1742669843,
+ "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+ "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
"type": "github"
},
"original": {
@@ -797,11 +753,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1731919951,
- "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=",
+ "lastModified": 1741241576,
+ "narHash": "sha256-/mxmUVd+AE2bTmulNfM7yICocUvavlFQHcMYK67z3qI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe",
+ "rev": "ffe8d1b1030b5de6eba761102ee34b6e41d040ee",
"type": "github"
},
"original": {
@@ -813,11 +769,11 @@
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1740367490,
- "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
+ "lastModified": 1742669843,
+ "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+ "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
"type": "github"
},
"original": {
@@ -844,11 +800,11 @@
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1731763621,
- "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=",
+ "lastModified": 1742578646,
+ "narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d",
+ "rev": "94c4dbe77c0740ebba36c173672ca15a7926c993",
"type": "github"
},
"original": {
@@ -860,11 +816,11 @@
},
"nixpkgs_7": {
"locked": {
- "lastModified": 1740367490,
- "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
+ "lastModified": 1741513245,
+ "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+ "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
"type": "github"
},
"original": {
@@ -900,11 +856,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
- "lastModified": 1740408283,
- "narHash": "sha256-2xECnhgF3MU9YjmvOkrRp8wRFo2OjjewgCtlfckhL5s=",
+ "lastModified": 1741693509,
+ "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "496a4a11162bdffb9a7b258942de138873f019f7",
+ "rev": "5479646b2574837f1899da78bdf9a48b75a9fb27",
"type": "github"
},
"original": {
@@ -923,11 +879,11 @@
]
},
"locked": {
- "lastModified": 1740569341,
- "narHash": "sha256-WV8nY2IOfWdzBF5syVgCcgOchg/qQtpYh6LECYS9XkY=",
+ "lastModified": 1742765550,
+ "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=",
"owner": "pjones",
"repo": "plasma-manager",
- "rev": "5eeb0172fb74392053b66a8149e61b5e191b2845",
+ "rev": "b70be387276e632fe51232887f9e04e2b6ef8c16",
"type": "github"
},
"original": {
@@ -946,15 +902,14 @@
"nixpkgs": [
"lanzaboote",
"nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable"
+ ]
},
"locked": {
- "lastModified": 1731363552,
- "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
+ "lastModified": 1740915799,
+ "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+ "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732",
"type": "github"
},
"original": {
@@ -986,36 +941,19 @@
"zjstatus": "zjstatus"
}
},
- "rust-analyzer-src": {
- "flake": false,
- "locked": {
- "lastModified": 1722262053,
- "narHash": "sha256-KxjkPVn9rQqYam6DhiN/V2NcMXtYW25maxkJoiVMpmE=",
- "owner": "rust-lang",
- "repo": "rust-analyzer",
- "rev": "a021b85be57d34b1eed687fcafd5d5ec64b2d853",
- "type": "github"
- },
- "original": {
- "owner": "rust-lang",
- "ref": "nightly",
- "repo": "rust-analyzer",
- "type": "github"
- }
- },
"rust-overlay": {
"inputs": {
"nixpkgs": [
- "lanzaboote",
+ "bcachefs-tools",
"nixpkgs"
]
},
"locked": {
- "lastModified": 1731897198,
- "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
+ "lastModified": 1742524367,
+ "narHash": "sha256-KzTwk/5ETJavJZYV1DEWdCx05M4duFCxCpRbQSKWpng=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
+ "rev": "70bf752d176b2ce07417e346d85486acea9040ef",
"type": "github"
},
"original": {
@@ -1025,6 +963,27 @@
}
},
"rust-overlay_2": {
+ "inputs": {
+ "nixpkgs": [
+ "lanzaboote",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1741228283,
+ "narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=",
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403",
+ "type": "github"
+ },
+ "original": {
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "type": "github"
+ }
+ },
+ "rust-overlay_3": {
"inputs": {
"nixpkgs": [
"zjstatus",
@@ -1053,11 +1012,11 @@
"nixpkgs-24_11": "nixpkgs-24_11"
},
"locked": {
- "lastModified": 1740437053,
- "narHash": "sha256-exPTta4qI1ka9sk+jPcLogGffJ1OVXnAsTRqpeAXeNw=",
+ "lastModified": 1742413977,
+ "narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
- "rev": "c8ec4d5e432f5df4838eacd39c11828d23ce66ec",
+ "rev": "b4fbffe79c00f19be94b86b4144ff67541613659",
"type": "gitlab"
},
"original": {
@@ -1072,11 +1031,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
- "lastModified": 1739262228,
- "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
+ "lastModified": 1742700801,
+ "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
+ "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
"type": "github"
},
"original": {
@@ -1107,11 +1066,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
- "lastModified": 1740520441,
- "narHash": "sha256-CWK3L7i7YqubbcrdS/5D/+Vo+IuClrNR+5B+ByhBlEo=",
+ "lastModified": 1742855382,
+ "narHash": "sha256-C/aBeGktWiRg2EoSc0Aug8v+cZirSkyoVtMx1P0Dex0=",
"owner": "danth",
"repo": "stylix",
- "rev": "a98c363a58accad047a2580382d90433619a08e0",
+ "rev": "5321ab0c763caa786c9756a8e8e85d1c35a8e650",
"type": "github"
},
"original": {
@@ -1202,11 +1161,11 @@
"tinted-schemes": {
"flake": false,
"locked": {
- "lastModified": 1740351358,
- "narHash": "sha256-Hdk850xgAd3DL8KX0AbyU7tC834d3Lej1jOo3duWiOA=",
+ "lastModified": 1741468895,
+ "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=",
"owner": "tinted-theming",
"repo": "schemes",
- "rev": "a1bc2bd89e693e7e3f5764cfe8114e2ae150e184",
+ "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991",
"type": "github"
},
"original": {
@@ -1218,11 +1177,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
- "lastModified": 1740272597,
- "narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=",
+ "lastModified": 1740877430,
+ "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
- "rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0",
+ "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4",
"type": "github"
},
"original": {
@@ -1255,11 +1214,11 @@
]
},
"locked": {
- "lastModified": 1722330636,
- "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=",
+ "lastModified": 1742370146,
+ "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "768acdb06968e53aa1ee8de207fd955335c754b7",
+ "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808",
"type": "github"
},
"original": {
@@ -1295,14 +1254,14 @@
"crane": "crane_3",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_8",
- "rust-overlay": "rust-overlay_2"
+ "rust-overlay": "rust-overlay_3"
},
"locked": {
- "lastModified": 1740510704,
- "narHash": "sha256-AMGLqcSS9eNWM1K2lm7lZz5t6RFHgLSNTAGI1vYF2VY=",
+ "lastModified": 1741803511,
+ "narHash": "sha256-DcCGBWvAvt+OWI+EcPRO+/IXZHkFgPxZUmxf2VLl8no=",
"owner": "dj95",
"repo": "zjstatus",
- "rev": "331ae24595e0c1c612f343547559d1e058128646",
+ "rev": "df9c77718f7023de8406e593eda6b5b0bc09cddd",
"type": "github"
},
"original": {
diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix
index d1acf8c..9b1a44f 100644
--- a/home-manager/desktop/package-configs/plasma-desktop.nix
+++ b/home-manager/desktop/package-configs/plasma-desktop.nix
@@ -13,7 +13,7 @@
programs.plasma = {
enable = true;
desktop.mouseActions.verticalScroll = "switchVirtualDesktop";
- kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}";
+ # kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}";
fonts = {
fixedWidth = {
pointSize = 11;
diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix
index 74e8945..e769ee2 100644
--- a/home-manager/shared/default.nix
+++ b/home-manager/shared/default.nix
@@ -58,32 +58,32 @@
# qt.platformTheme.name = lib.mkForce "kvantum";
# qt.style.name = lib.mkForce "kvantum";
- stylix = {
- enable = true;
- autoEnable = true;
- base16Scheme = {
- scheme = "Catppuccin Macchiato";
- author = "https://github.com/catppuccin/catppuccin";
- base00 = "24273a";
- base01 = "1e2030";
- base02 = "363a4f";
- base03 = "494d64";
- base04 = "5b6078";
- base05 = "cad3f5";
- base06 = "f4dbd6";
- base07 = "b7bdf8";
- base08 = "ed8796";
- base09 = "f5a97f";
- base0A = "eed49f";
- base0B = "a6da95";
- base0C = "8bd5ca";
- base0D = "8aadf4";
- base0E = "c6a0f6";
- base0F = "f0c6c6";
- };
- image = ./background.jpg;
- cursor.package = pkgs.catppuccin-cursors;
- cursor.name = "catppuccin-macchiato-mauve-cursors";
- cursor.size = 16;
- };
+ # stylix = {
+ # enable = true;
+ # autoEnable = true;
+ # base16Scheme = {
+ # scheme = "Catppuccin Macchiato";
+ # author = "https://github.com/catppuccin/catppuccin";
+ # base00 = "24273a";
+ # base01 = "1e2030";
+ # base02 = "363a4f";
+ # base03 = "494d64";
+ # base04 = "5b6078";
+ # base05 = "cad3f5";
+ # base06 = "f4dbd6";
+ # base07 = "b7bdf8";
+ # base08 = "ed8796";
+ # base09 = "f5a97f";
+ # base0A = "eed49f";
+ # base0B = "a6da95";
+ # base0C = "8bd5ca";
+ # base0D = "8aadf4";
+ # base0E = "c6a0f6";
+ # base0F = "f0c6c6";
+ # };
+ # image = ./background.jpg;
+ # cursor.package = pkgs.catppuccin-cursors;
+ # cursor.name = "catppuccin-macchiato-mauve-cursors";
+ # cursor.size = 16;
+ # };
}
diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix
index b6ec6ab..50f1252 100644
--- a/nixos/desktop/default.nix
+++ b/nixos/desktop/default.nix
@@ -141,7 +141,8 @@
wayland.enable = true;
};
displayManager.defaultSession = "plasma";
- xserver.desktopManager.plasma5.enable = true;
+ desktopManager.plasma6.enable = true;
+ desktopManager.plasma6.notoPackage = pkgs.atkinson-hyperlegible;
# Enable flatpak support
flatpak.enable = true;
diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix
index de2531d..5a5e04c 100644
--- a/nixos/shared/default.nix
+++ b/nixos/shared/default.nix
@@ -87,64 +87,71 @@
enableBrowserSocket = true;
};
- stylix = {
- enable = true;
- # targets.qt.platform = "kde6";
- autoEnable = true;
- base16Scheme = {
- scheme = "Catppuccin Macchiato";
- author = "https://github.com/catppuccin/catppuccin";
- base00 = "24273a";
- base01 = "1e2030";
- base02 = "363a4f";
- base03 = "494d64";
- base04 = "5b6078";
- base05 = "cad3f5";
- base06 = "f4dbd6";
- base07 = "b7bdf8";
- base08 = "ed8796";
- base09 = "f5a97f";
- base0A = "eed49f";
- base0B = "a6da95";
- base0C = "8bd5ca";
- base0D = "8aadf4";
- base0E = "c6a0f6";
- base0F = "f0c6c6";
- };
- image = ./background.jpg;
- cursor.package = pkgs.catppuccin-cursors.macchiatoMauve;
- cursor.name = "catppuccin-macchiato-mauve-cursors";
- cursor.size = 16;
- homeManagerIntegration.followSystem = true;
- fonts = {
- serif = {
- package = pkgs.dejavu_fonts;
- name = "DejaVu Serif";
- };
+ # stylix = {
+ # enable = true;
+ # # targets.qt.platform = "kde6";
+ # autoEnable = true;
+ # base16Scheme = {
+ # scheme = "Catppuccin Macchiato";
+ # author = "https://github.com/catppuccin/catppuccin";
+ # base00 = "24273a";
+ # base01 = "1e2030";
+ # base02 = "363a4f";
+ # base03 = "494d64";
+ # base04 = "5b6078";
+ # base05 = "cad3f5";
+ # base06 = "f4dbd6";
+ # base07 = "b7bdf8";
+ # base08 = "ed8796";
+ # base09 = "f5a97f";
+ # base0A = "eed49f";
+ # base0B = "a6da95";
+ # base0C = "8bd5ca";
+ # base0D = "8aadf4";
+ # base0E = "c6a0f6";
+ # base0F = "f0c6c6";
+ # };
+ # image = ./background.jpg;
+ # cursor.package = pkgs.catppuccin-cursors.macchiatoMauve;
+ # cursor.name = "catppuccin-macchiato-mauve-cursors";
+ # cursor.size = 16;
+ # homeManagerIntegration.followSystem = true;
+ # fonts = {
+ # serif = {
+ # package = pkgs.dejavu_fonts;
+ # name = "DejaVu Serif";
+ # };
- monospace = {
- package = pkgs.dejavu_fonts;
- name = "DejaVu Sans Mono";
- };
+ # monospace = {
+ # package = pkgs.dejavu_fonts;
+ # name = "DejaVu Sans Mono";
+ # };
- sansSerif = {
- package = pkgs.dejavu_fonts;
- name = "DejaVu Sans";
- };
+ # sansSerif = {
+ # package = pkgs.dejavu_fonts;
+ # name = "DejaVu Sans";
+ # };
- emoji = {
- package = pkgs.noto-fonts-emoji-blob-bin;
- name = "Blobmoji";
- };
- };
- };
+ # emoji = {
+ # package = pkgs.noto-fonts-emoji-blob-bin;
+ # name = "Blobmoji";
+ # };
+ # };
+ # };
fonts.packages = [
- pkgs.dejavu_fonts
+ pkgs.atkinson-hyperlegible
+ pkgs.atkinson-monolegible
pkgs.noto-fonts
pkgs.nerd-fonts.fira-mono
];
+ fonts.fontconfig.defaultFonts = {
+ emoji = ["Blobmoji"];
+ monospace = ["Atkinson Monolegible"];
+ sansSerif = ["Atkinson Hyperlegible"];
+ };
+
networking =
if config.services.vpn-ip.enable
then {