diff --git a/flake.lock b/flake.lock index a7b649a..3e49bb6 100644 --- a/flake.lock +++ b/flake.lock @@ -3,15 +3,14 @@ "apple-silicon-support": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "treefmt-nix": "treefmt-nix" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756110286, - "narHash": "sha256-NE0HwcQCQTgM+HuYqmiemPf/5e+3fjwowceAyJj+ikU=", + "lastModified": 1758525110, + "narHash": "sha256-iEF0aG6df4NjPV88uqwAph/WujIabENZabS7C9Ljf0A=", "owner": "nix-community", "repo": "nixos-apple-silicon", - "rev": "b99bf9bf7445416fe55da09034fc4a6cd733805c", + "rev": "9eb8ad09af823be7088dcfa908071e71cc19359a", "type": "github" }, "original": { @@ -198,11 +197,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1758033778, - "narHash": "sha256-oQH2wLOWLFHXT3NE+gcsFOX+Pq40bKjlOH1xw0wcmT8=", + "lastModified": 1758642505, + "narHash": "sha256-056XfEHlYdBKU2RtN4R+9m2nzL588TCZ8AsIviWONRg=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "b3efa297b9c6a9e55a44f3b6905d55f80738704f", + "rev": "0fe60fa161631289a051fef36dfaab28465ddc7b", "type": "github" }, "original": { @@ -324,11 +323,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1758392533, - "narHash": "sha256-H5lHwJeUMgVmUQ8XXgwor/pYdJZahDtrMFhXlyCEiYs=", + "lastModified": 1758755737, + "narHash": "sha256-H8SohcQLpbPglxBy9d9vsHiaYTdCNed7KJLEp9TcH+U=", "owner": "KyleKrein", "repo": "DesktopShell", - "rev": "d4816bd174901cb5582151dac6ead636cf96090d", + "rev": "ec75ef468b0ad0904305585f522148eb472c6b34", "type": "github" }, "original": { @@ -1149,11 +1148,11 @@ ] }, "locked": { - "lastModified": 1757920978, - "narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=", + "lastModified": 1758464306, + "narHash": "sha256-i56XRXqjwJRdVYmpzVUQ0ktqBBHqNzQHQMQvFRF/acQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8", + "rev": "939e91e1cff1f99736c5b02529658218ed819a2a", "type": "github" }, "original": { @@ -1169,11 +1168,11 @@ ] }, "locked": { - "lastModified": 1758313341, - "narHash": "sha256-SsI6INUzWwPcRKRaxvi50RttnD9rcC4EjV+67TOEfrQ=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6f656618ebc71ca82d93d306a8aecb2c5f6f2ab2", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -1283,11 +1282,11 @@ }, "master": { "locked": { - "lastModified": 1758399045, - "narHash": "sha256-AlzOLxRITCu3ReEhZwW3QfdTdS71KoXATINbx41ApUk=", + "lastModified": 1758786844, + "narHash": "sha256-NAyDW/+V70PkKFBE1/hyZyUZtiO17uBEoQIEsjCwBPI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aec2312d626dabe9cb76922bbbdc8c81dafd3600", + "rev": "e8d0f9505755dd4713a8df168933395423a5f651", "type": "github" }, "original": { @@ -1373,11 +1372,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1758375815, - "narHash": "sha256-IAr+n58c+nfxGXmX4NRjfVfV8i5baHnB8LCWlB7XYHo=", + "lastModified": 1758697829, + "narHash": "sha256-1pO4A16ssvjHNyHilpvxo15mBkAifCSOiLs3hBlrYdU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a6b5a4263b1d6b5d1e07babd59bc66e91f492190", + "rev": "9dbeb8f613d2da107bff8375c2db7182a2bb79bb", "type": "github" }, "original": { @@ -1406,11 +1405,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1758370089, - "narHash": "sha256-0C7695SLx4hU9m3VW4fCrZdvyIY+3kFQTWELHA4hxRQ=", + "lastModified": 1758691861, + "narHash": "sha256-CYgoGrY/Fx+hjzp8graTxJw1M7mn1f2jBkK26M04T0s=", "owner": "YaLTeR", "repo": "niri", - "rev": "a1dccedbb72da372d2a8a84022f37ccaa4d4a6e6", + "rev": "e837e39623457dc5ad29c34a5ce4d4616e5fbf1e", "type": "github" }, "original": { @@ -1467,11 +1466,11 @@ ] }, "locked": { - "lastModified": 1758387173, - "narHash": "sha256-E5Ru709RoQEFl+Q0MHRXTIvbY0l6LSR1UHqwTulSeog=", + "lastModified": 1758447883, + "narHash": "sha256-yGA6MV0E4JSEXqLTb4ZZkmdJZcoQ8HUzihRRX12Bvpg=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "7be9c1b136ef7083e60eb060be0a66dcb254e3ca", + "rev": "25381509d5c91bbf3c30e23abc6d8476d2143cd1", "type": "github" }, "original": { @@ -1544,11 +1543,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1757814419, - "narHash": "sha256-wmlDAkOrwX9cvhXQa7wekGr/5G6SfE2D5KlvuvSEEXc=", + "lastModified": 1758678659, + "narHash": "sha256-Ff5IFCEABf3CStKvf8MqJe7jwrHk2J8swdYTrwOj9dk=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "17db183a6a2ba1217bbfc123b47d4b5ee70b256a", + "rev": "6418c314274a8ce27078402ab1fbac7c06da7a36", "type": "github" }, "original": { @@ -1661,11 +1660,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757943327, - "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", + "lastModified": 1758663926, + "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", + "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", "type": "github" }, "original": { @@ -1681,11 +1680,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1758123407, - "narHash": "sha256-4qwMlR0Q4Zr2rjUFauYIldfjzffYt3G5tZ1uPFPPYGU=", + "lastModified": 1758785683, + "narHash": "sha256-mRn51IeEBXeNh5a6xNLylk4PKBX0s/QQxgkEbYoPq/w=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "ba2b3b6c0bc42442559a3b090f032bc8d501f5e3", + "rev": "1bfb978f2f6261b6086e04af17f9418e1fe36d70", "type": "github" }, "original": { @@ -1788,11 +1787,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1758216857, - "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=", + "lastModified": 1758589230, + "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743", + "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", "type": "github" }, "original": { @@ -1804,11 +1803,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1757746433, - "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", + "lastModified": 1758262103, + "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", + "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", "type": "github" }, "original": { @@ -1820,11 +1819,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "github" }, "original": { @@ -1836,11 +1835,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1758216857, - "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=", + "lastModified": 1758589230, + "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743", + "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", "type": "github" }, "original": { @@ -1852,11 +1851,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1757746433, - "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", + "lastModified": 1758262103, + "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", + "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", "type": "github" }, "original": { @@ -1884,11 +1883,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758029758, - "narHash": "sha256-fKqsvznISxVSBo6aaiGGXMRiBG4IIuV3sSySxx80pcQ=", + "lastModified": 1758633633, + "narHash": "sha256-20FVSEcXWV0P1A/1EDMUH7UVFvktg/ltBNqHJmoQTO8=", "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "4eb5897225c3d7e78a0b9d1542197ee7c8d270a5", + "rev": "36740bcdb7ea5625132575da3c627032b812c236", "type": "github" }, "original": { @@ -2074,7 +2073,7 @@ "stylix", "nixpkgs" ], - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix" }, "locked": { "lastModified": 1751320053, @@ -4378,11 +4377,11 @@ ] }, "locked": { - "lastModified": 1757930296, - "narHash": "sha256-Z9u5VszKs8rfEvg2AsFucWEjl7wMtAln9l1b78cfBh4=", + "lastModified": 1758422215, + "narHash": "sha256-JvF5SXhp1wBHbfEVAWgJCDVSO8iknfDqXfqMch5YWg0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "09442765a05c2ca617c20ed68d9613da92a2d96b", + "rev": "6f3988eb5885f1e2efa874a480d91de09a7f9f0b", "type": "github" }, "original": { @@ -4547,11 +4546,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1758007585, - "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", + "lastModified": 1758425756, + "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", + "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", "type": "github" }, "original": { @@ -4579,11 +4578,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1757957798, - "narHash": "sha256-FT4O5imFJ+FUIGhYj/aFwEEgyvLhuyJ2my8f6mCLtTY=", + "lastModified": 1758752640, + "narHash": "sha256-UYkixkkd3VgoO7NeSlKcaE3Glt1r1FHmBlziwYijgMQ=", "owner": "danth", "repo": "stylix", - "rev": "e6fc25cd12e8f461e402cf34649cc73ad93c7bdd", + "rev": "fdfa65624eed1e28960c24a27ba27fffc92e9a32", "type": "github" }, "original": { @@ -4810,27 +4809,6 @@ } }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "apple-silicon-support", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754847726, - "narHash": "sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl+V/PsmIiJREG4rE=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "7d81f6fb2e19bf84f1c65135d1060d829fae2408", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { "inputs": { "nixpkgs": [ "stylix", @@ -4854,11 +4832,11 @@ }, "unstable": { "locked": { - "lastModified": 1758277210, - "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -4924,11 +4902,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1757179758, - "narHash": "sha256-TIvyWzRt1miQj6Cf5Wy8Qz43XIZX7c4vTVwRLAT5S4Y=", + "lastModified": 1758577423, + "narHash": "sha256-sB2GAOjhjoWnjU6A/uHNJiY6O3UeztV5pJAN2g1FkXU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "970728d0d9d1eada342bb8860af214b601139e58", + "rev": "03368548ba745e17a85bd631613a59cb2d8469a4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a37bbf2..6768651 100644 --- a/flake.nix +++ b/flake.nix @@ -101,7 +101,7 @@ url = "github:AvengeMedia/dgop"; inputs.nixpkgs.follows = "nixpkgs"; }; - desktopShell.url = "github:KyleKrein/DesktopShell"; + desktopShell.url = "github:KyleKrein/DesktopShell";#?ref=d4816bd174901cb5582151dac6ead636cf96090d"; rose-pine-hyprcursor = { url = "github:ndom91/rose-pine-hyprcursor"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/homes/x86_64-linux/kylekrein/niri/settings.json b/homes/x86_64-linux/kylekrein/niri/settings.json index eff7ae4..8233be6 100644 --- a/homes/x86_64-linux/kylekrein/niri/settings.json +++ b/homes/x86_64-linux/kylekrein/niri/settings.json @@ -32,7 +32,66 @@ "controlCenterShowNetworkIcon": true, "controlCenterShowBluetoothIcon": true, "controlCenterShowAudioIcon": true, - "showWorkspaceIndex": true, + "controlCenterWidgets": [ + { + "id": "volumeSlider", + "enabled": true, + "width": 50 + }, + { + "id": "brightnessSlider", + "enabled": true, + "width": 50 + }, + { + "id": "wifi", + "enabled": true, + "width": 50 + }, + { + "id": "bluetooth", + "enabled": true, + "width": 50 + }, + { + "id": "audioOutput", + "enabled": true, + "width": 50 + }, + { + "id": "audioInput", + "enabled": true, + "width": 50 + }, + { + "id": "nightMode", + "enabled": true, + "width": 25 + }, + { + "id": "idleInhibitor", + "enabled": true, + "width": 25 + }, + { + "id": "doNotDisturb", + "enabled": true, + "width": 25 + }, + { + "id": "battery", + "enabled": true, + "width": 25 + }, + { + "id": "diskUsage", + "enabled": true, + "width": 100, + "instanceId": "mfz4b7s6aer4zpglo9g", + "mountPath": "/" + } + ], + "showWorkspaceIndex": false, "showWorkspacePadding": false, "showWorkspaceApps": true, "maxWorkspaceIcons": 30, @@ -77,10 +136,6 @@ "id": "clipboard", "enabled": true }, - { - "id": "idleInhibitor", - "enabled": true - }, { "id": "notificationButton", "enabled": true @@ -110,7 +165,6 @@ "osLogoColorOverride": "", "osLogoBrightness": 0.5, "osLogoContrast": 1, - "wallpaperDynamicTheming": true, "fontFamily": "Inter Variable", "monoFontFamily": "Fira Code", "fontWeight": 400, @@ -118,10 +172,14 @@ "notepadUseMonospace": true, "notepadFontFamily": "", "notepadFontSize": 14, + "notepadShowLineNumbers": false, + "notepadTransparencyOverride": -1, + "notepadLastCustomTransparency": 0.95, "gtkThemingEnabled": true, "qtThemingEnabled": true, "showDock": false, "dockAutoHide": false, + "dockGroupByApp": false, "cornerRadius": 12, "notificationOverlayEnabled": false, "topBarAutoHide": false, @@ -135,6 +193,7 @@ "topBarGothCornersEnabled": false, "lockScreenShowPowerActions": true, "hideBrightnessSlider": false, + "widgetBackgroundColor": "sth", "notificationTimeoutLow": 5000, "notificationTimeoutNormal": 5000, "notificationTimeoutCritical": 0, @@ -146,4 +205,4 @@ "all" ] } -} \ No newline at end of file +} diff --git a/systems/x86_64-linux/kylekrein-framework12/default.nix b/systems/x86_64-linux/kylekrein-framework12/default.nix index 251e037..969f333 100644 --- a/systems/x86_64-linux/kylekrein-framework12/default.nix +++ b/systems/x86_64-linux/kylekrein-framework12/default.nix @@ -50,6 +50,7 @@ in custom.services.ai = { enable = true; models = ["qwq" "llama3.1" "qwen2.5-coder:7b" "gpt-oss:20b"]; + ui = disabled; }; custom.users.kylekrein = { enable = true;