diff --git a/flake.lock b/flake.lock index 73482b8..75df541 100644 --- a/flake.lock +++ b/flake.lock @@ -153,11 +153,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1771047055, - "narHash": "sha256-A5QktV1imIj1STwdt0MiZ5erGPnmFBjk2JC6gcgFFjQ=", + "lastModified": 1768984347, + "narHash": "sha256-VvC4rgAAaFnYLCdcUoz7dTE3kuBNuHIc+GlXOrPCxpg=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "9019a168873afc983631eeb830053ebdb799be40", + "rev": "57818a6da90fbef39ff80d62fab2cd319496c3b9", "type": "github" }, "original": { @@ -172,11 +172,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1771124256, - "narHash": "sha256-rfSiNMep0fUsenlx72ooQOxYEbUK4puai5+34gui2uI=", + "lastModified": 1770602774, + "narHash": "sha256-eRcZ279Oaf8ViHtvdWVTpcD9x7bvJ3ipQ1Xq9bd+qlk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9f7213cb27707bd7f2ef6445eccdd9160c9c778e", + "rev": "a3d87c21d1464f1069d8125cafe6adb84d200185", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1771057865, - "narHash": "sha256-Suny75DfQS3Mqd8ihiDZNsRs4CfRC3GiQDMmaFPj2qM=", + "lastModified": 1770539655, + "narHash": "sha256-Uik4la853QtCQJFfAuTroT88Al/LToTS0QGQe353Crc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "56690eb79372e49054b0c2b87780fe3f86be7616", + "rev": "e78fc8deedcaab439fedc8cac7229d8ff0f68027", "type": "github" }, "original": { @@ -492,11 +492,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1771001199, - "narHash": "sha256-q/ZyGZIfALlPW3AxZMjfsT01daTU232JGNVkQ/eiFsE=", + "lastModified": 1770596905, + "narHash": "sha256-ramJSHL39uTmfpY2O3zFd0IUiVPDNR1edCq0nIHEcAs=", "owner": "helix-editor", "repo": "helix", - "rev": "d12a48a51e2409e876a18baf3cae1e838a9dddc3", + "rev": "066dded21b7c520bfa114780907265eda801004b", "type": "github" }, "original": { @@ -513,11 +513,11 @@ ] }, "locked": { - "lastModified": 1771102945, - "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=", + "lastModified": 1770586272, + "narHash": "sha256-Ucci8mu8QfxwzyfER2DQDbvW9t1BnTUJhBmY7ybralo=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399", + "rev": "b1f916ba052341edc1f80d4b2399f1092a4873ca", "type": "github" }, "original": { @@ -610,11 +610,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1771113898, - "narHash": "sha256-0t6wai1op7OUc4mAhM4BYIbfQMvYmMhW2jXP2VQ0/KA=", + "lastModified": 1770595508, + "narHash": "sha256-d81J55C/ctzfofd10e4k8Bldm1eXKuVaQAewbZPjHN4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "5e829d6d57633d5d56a0f351564331fca40d507b", + "rev": "58b19445f29efe3b94db874fc64407099de0f0f7", "type": "github" }, "original": { @@ -626,11 +626,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1771089488, - "narHash": "sha256-xHSWR7wo4GiZVWAoBlD4f2szoftfoxOCqlOu1UBL9Wc=", + "lastModified": 1770587030, + "narHash": "sha256-2CaAx32akEOjUwkKnkvMWsHLhMvoIZ/SsV4ByiEIxfg=", "owner": "neovim", "repo": "neovim", - "rev": "8ab511bba524bcd5b5913d1b1205b5e4fe3f7210", + "rev": "19379d1255554041eb6d67423cfa83ca23e5be42", "type": "github" }, "original": { @@ -651,11 +651,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1771099995, - "narHash": "sha256-d9jSUIJa5MX+Y7+OMB6FgeHxS2YHT88IUl7HA5hK8FU=", + "lastModified": 1770597374, + "narHash": "sha256-eroNnfweC+C1qzwEFtPFCk7L9wSUIKabYAXQVK4Dtlg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3f765c47870861fafe4c6ed2e631c052aa1e1660", + "rev": "10aa0ca9d1b2ce08c4351a34bbb2fb5a64340a8a", "type": "github" }, "original": { @@ -684,11 +684,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1771048216, - "narHash": "sha256-g7HP0MMezWKT3R+3uQzUe3BJ68YMRZjmhNMzKTR3Sus=", + "lastModified": 1770394936, + "narHash": "sha256-Pa0fkyLYUR+pZh7phPENDUo4mJIweaAm0uV83iUUlX8=", "owner": "YaLTeR", "repo": "niri", - "rev": "8e3e93b6240dc9dbc702f0b44f20177c2ce737cf", + "rev": "549148d27779d024255a84535b42b947f1c2a113", "type": "github" }, "original": { @@ -707,11 +707,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1771059089, - "narHash": "sha256-0UCTQpyhLj8jPB2rUotrtGJ1dOnhC7rQ8cWCqifZVck=", + "lastModified": 1770540718, + "narHash": "sha256-GJrR3PSPJpmEP/X14aLFBlADKuA5pXmPTymgVPLiJJg=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "ee8c6178e5cc11a10bfcd9f0d4317bc95ec6a4e1", + "rev": "2d515fc37d205ff5b0cc8cb44c9d091e3c060842", "type": "github" }, "original": { @@ -726,11 +726,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1771123156, - "narHash": "sha256-Px1IFFTw3zdP8RNram2g41EvUTjIZRDLCgZyXgpBty0=", + "lastModified": 1770605007, + "narHash": "sha256-QeDZL8lMz3U318x3q7gb5gyrg2uWnr1Mjlyw5IngEG8=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "0c4bf3ac4eaf5b693e5d7ae75f3caba8fcf15d8f", + "rev": "4ea62f3a1990c0ad09ff46a177e1cdba6428a43d", "type": "github" }, "original": { @@ -750,11 +750,11 @@ ] }, "locked": { - "lastModified": 1770960282, - "narHash": "sha256-RlQqict6qNlyK9INY8+uLO64wl7aTOY8+dGyWCOd96s=", + "lastModified": 1770525359, + "narHash": "sha256-l8JfOrAPUsJ3Gr+JR56RxpzV9gwL9U7xIFfJt8c1a/Y=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "81df32933ce8c7f71ec5842866695034730a3c3a", + "rev": "df0761ff98ba2f49034ba9edc0f96ee499e602c9", "type": "github" }, "original": { @@ -765,11 +765,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1770882871, - "narHash": "sha256-nw5g+xl3veea+maxJ2/81tMEA/rPq9aF1H5XF35X+OE=", + "lastModified": 1769302137, + "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "af04cb78aa85b2a4d1c15fc7270347e0d0eda97b", + "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", "type": "github" }, "original": { @@ -781,11 +781,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -844,11 +844,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1771043024, - "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=", + "lastModified": 1770464364, + "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44", + "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", "type": "github" }, "original": { @@ -892,11 +892,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1770843696, - "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", + "lastModified": 1770537093, + "narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", + "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", "type": "github" }, "original": { @@ -907,38 +907,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1770843696, - "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1770380644, "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", @@ -954,13 +922,45 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1770169770, + "narHash": "sha256-awR8qIwJxJJiOmcEGgP2KUqYmHG4v/z8XpL9z8FnT1A=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "aa290c9891fa4ebe88f8889e59633d20cc06a5f2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_8": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -993,11 +993,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1771023756, - "narHash": "sha256-sTj1hrPT7D4oGHaQQzwDeqyZBwnxYc+T7yceyQc4sy4=", + "lastModified": 1770388595, + "narHash": "sha256-0NvpmDqFcJAtRFJE3RDZWnN7PDJBZutoDtN+Cl8a3DY=", "owner": "nix-community", "repo": "nixvim", - "rev": "4c63aa76be59b49ae89892ae803005afd4a400cd", + "rev": "51abc532525e486176f9a7b24b17908c60017b54", "type": "github" }, "original": { @@ -1013,11 +1013,11 @@ ] }, "locked": { - "lastModified": 1771121714, - "narHash": "sha256-wsExKYHTFoMJvDAxLa/1LMusQxoz+WP1rgesNGkNJck=", + "lastModified": 1770612565, + "narHash": "sha256-fptkFYS0dap7MEo/UpC+LIUa8KYO1BbqviV4xIKs+Rg=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "7c6596917c6243375e29c587ba7a4463674a853c", + "rev": "c2b3419b7f19b67a73d0f22bbd31c8e5d430e050", "type": "github" }, "original": { @@ -1032,11 +1032,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1771123039, - "narHash": "sha256-yVM4gGX23LBG3bGA4qXJmFK0uPPbQyeSHjX86vn4KBk=", + "lastModified": 1770609856, + "narHash": "sha256-ddzfyTBEX9v+s6xuQqUcX7Gl/QiH3GquK2o+UA5BOBY=", "owner": "nix-community", "repo": "NUR", - "rev": "5010258a3048dc147079a7291eb24f0c1b90d892", + "rev": "fbb61a1c12ecb25073bcc3dc0583213ccbec7a22", "type": "github" }, "original": { @@ -1189,11 +1189,11 @@ ] }, "locked": { - "lastModified": 1770683991, - "narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=", + "lastModified": 1770526836, + "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033", + "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d", "type": "github" }, "original": { @@ -1205,11 +1205,11 @@ "spacemacs": { "flake": false, "locked": { - "lastModified": 1770670534, - "narHash": "sha256-QzsrjOnCvHSIEqQaH+xcgz4R8HFqMMjC3oe9aiuNRI8=", + "lastModified": 1770245509, + "narHash": "sha256-ox5DYVDxS5oag6HckdyiKlWeW6pxZlEbCu6SQapQ040=", "owner": "syl20bnr", "repo": "spacemacs", - "rev": "690889139ab12b3b08b5efabbb93d52c86065fcf", + "rev": "de56b66b5f38db05f9da30dde9698a8d5eb2beb7", "type": "github" }, "original": { @@ -1241,11 +1241,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1770914701, - "narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=", + "lastModified": 1770587906, + "narHash": "sha256-N9ZTG3ia7l4iQO+9JlOj+sX4yu6gl7a3aozrlhSIJwQ=", "owner": "nix-community", "repo": "stylix", - "rev": "db03fed72e5ca02be34e1d24789345a943329738", + "rev": "72e6483a88d51471a6c55e1d43e7ed2bc47a76a4", "type": "github" }, "original": { @@ -1486,11 +1486,11 @@ ] }, "locked": { - "lastModified": 1771126860, - "narHash": "sha256-CYqJVjo71DYasbNYHbJVgV91cP2f8bm79aBm9HT3TYk=", + "lastModified": 1770568363, + "narHash": "sha256-RJ/C24wN7LyuMmBgvIutA/PqXXceZtJtUCuZSaTjF/4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "e9c332fcddbe43187cb0855a5012ee96a69653f4", + "rev": "2ada8a826ea88512387a5a17ee96f16369bcdd80", "type": "github" }, "original": { diff --git a/home/david/modules/programs/niri/config.nix b/home/david/modules/programs/niri/config.nix index e5890f0..b8dde94 100644 --- a/home/david/modules/programs/niri/config.nix +++ b/home/david/modules/programs/niri/config.nix @@ -34,7 +34,7 @@ # wpctl = getExe' pkgs.wireplumber "wpctl"; # waypaper = getExe pkgs.waypaper; default-terminal = getExe config.programs.ghostty.package; - default-browser = getExe' config.programs.zen-browser.package "zen-twilight"; + default-browser = getExe' config.programs.zen-browser.package "zen"; # wl-paste = getExe' pkgs.wl-clipboard "wl-paste"; # cliphist = getExe' pkgs.cliphist "cliphist"; # cliphist-fuzzel-img = getExe' pkgs.cliphist "cliphist-fuzzel-img"; diff --git a/home/david/modules/programs/noctalia/settings.json b/home/david/modules/programs/noctalia/settings.json index 78fe8f2..d0db0e0 100644 --- a/home/david/modules/programs/noctalia/settings.json +++ b/home/david/modules/programs/noctalia/settings.json @@ -1,5 +1,5 @@ { - "settingsVersion": 53, + "settingsVersion": 49, "bar": { "barType": "simple", "position": "right", @@ -42,7 +42,7 @@ "showSwapUsage": true, "textColor": "none", "useMonospaceFont": true, - "usePadding": false + "usePrimaryColor": false }, { "compactMode": false, @@ -88,11 +88,6 @@ ], "right": [ { - "defaultSettings": { - "compactMode": false, - "defaultDuration": 0, - "iconColor": "none" - }, "id": "plugin:timer" }, { @@ -132,7 +127,8 @@ "formatVertical": "HH mm - MM dd", "id": "Clock", "tooltipFormat": "HH:mm:ss ddd, MMM dd yyyy", - "useCustomFont": false + "useCustomFont": false, + "usePrimaryColor": true } ] }, @@ -168,18 +164,7 @@ "allowPasswordWithFprintd": false, "clockStyle": "digital", "clockFormat": "hh\\nmm", - "lockScreenMonitors": [], - "lockScreenBlur": 0.7000000000000001, - "lockScreenTint": 0, - "keybinds": { - "keyUp": ["Ctrl+N"], - "keyDown": ["Ctrl+P"], - "keyLeft": ["Ctrl+H"], - "keyRight": ["Ctrl+L"], - "keyEnter": ["Return"], - "keyEscape": ["Esc"], - "keyRemove": ["Del"] - } + "lockScreenMonitors": [] }, "ui": { "fontDefault": "Source Han Serif SC", @@ -234,7 +219,7 @@ "viewMode": "recursive", "setWallpaperOnAllMonitors": true, "fillMode": "crop", - "fillColor": "#313244", + "fillColor": "#000000", "useSolidColor": false, "solidColor": "#1a1a2e", "automationEnabled": true, @@ -242,12 +227,9 @@ "randomIntervalSec": 900, "transitionDuration": 1500, "transitionType": "random", - "skipStartupTransition": true, "transitionEdgeSmoothness": 0.05, "panelPosition": "center", "hideWallpaperFilenames": false, - "overviewBlur": 0.4, - "overviewTint": 0.6, "useWallhaven": false, "wallhavenQuery": "", "wallhavenSorting": "relevance", @@ -259,8 +241,7 @@ "wallhavenResolutionMode": "atleast", "wallhavenResolutionWidth": "", "wallhavenResolutionHeight": "", - "sortOrder": "name", - "favorites": [] + "sortOrder": "name" }, "appLauncher": { "enableClipboardHistory": true, @@ -282,11 +263,9 @@ "showIconBackground": true, "enableSettingsSearch": true, "enableWindowsSearch": true, - "enableSessionSearch": true, "ignoreMouseInput": false, "screenshotAnnotationTool": "", - "overviewLayer": false, - "density": "default" + "overviewLayer": false }, "controlCenter": { "position": "close_to_bar_button", @@ -353,7 +332,13 @@ "diskAvailCriticalThreshold": 10, "batteryWarningThreshold": 20, "batteryCriticalThreshold": 5, + "cpuPollingInterval": 1000, + "gpuPollingInterval": 3000, "enableDgpuMonitoring": true, + "memPollingInterval": 1000, + "diskPollingInterval": 3000, + "networkPollingInterval": 1000, + "loadAvgPollingInterval": 3000, "useCustomColors": false, "warningColor": "", "criticalColor": "", @@ -377,77 +362,67 @@ }, "network": { "wifiEnabled": false, - "airplaneModeEnabled": false, "bluetoothRssiPollingEnabled": true, "bluetoothRssiPollIntervalMs": 10000, "wifiDetailsViewMode": "grid", "bluetoothDetailsViewMode": "grid", - "bluetoothHideUnnamedDevices": false, - "disableDiscoverability": false + "bluetoothHideUnnamedDevices": false }, "sessionMenu": { "enableCountdown": true, "countdownDuration": 5000, "position": "center", "showHeader": true, - "showKeybinds": true, "largeButtonsStyle": true, "largeButtonsLayout": "grid", + "showNumberLabels": true, "powerOptions": [ { "action": "lock", "command": "", "countdownEnabled": true, "enabled": true, - "keybind": "1" + "keybind": "" }, { "action": "suspend", "command": "", "countdownEnabled": true, "enabled": true, - "keybind": "2" + "keybind": "" }, { "action": "hibernate", "command": "", "countdownEnabled": true, "enabled": true, - "keybind": "3" + "keybind": "" }, { "action": "reboot", "command": "", "countdownEnabled": true, "enabled": true, - "keybind": "4" + "keybind": "" }, { "action": "logout", "command": "", "countdownEnabled": true, "enabled": true, - "keybind": "5" + "keybind": "" }, { "action": "shutdown", "command": "", "countdownEnabled": true, "enabled": true, - "keybind": "6" - }, - { - "action": "rebootToUefi", - "command": "", - "countdownEnabled": true, - "enabled": true, "keybind": "" } ] }, "notifications": { "enabled": true, - "density": "default", "monitors": [], "location": "bottom_right", "overlayLayer": true, @@ -500,10 +475,10 @@ "colorSchemes": { "useWallpaperColors": false, "predefinedScheme": "Catppuccin", - "darkMode": true, - "schedulingMode": "manual", + "darkMode": false, + "schedulingMode": "location", "manualSunrise": "06:30", - "manualSunset": "17:30", + "manualSunset": "18:30", "generationMethod": "tonal-spot", "monitorForColors": "" }, diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 208e7b9..83df08d 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -33,10 +33,6 @@ enable = true; unixName = "david"; }; - virtualbox = { - enable = true; - unixName = "david"; - }; }; programs = { bash.enable = true; diff --git a/nixos/modules/gui/default.nix b/nixos/modules/gui/default.nix index 270b3d1..d9934f4 100644 --- a/nixos/modules/gui/default.nix +++ b/nixos/modules/gui/default.nix @@ -54,10 +54,9 @@ in { source-han-sans libertinus noto-fonts-color-emoji - noto-fonts-cjk-sans-static - noto-fonts-cjk-serif-static + noto-fonts-cjk-sans + noto-fonts-cjk-serif noto-fonts - nerd-fonts.symbols-only ]; fontconfig = { localConf = diff --git a/nixos/modules/virtualisation/virtualbox.nix b/nixos/modules/virtualisation/virtualbox.nix deleted file mode 100644 index 25b6b54..0000000 --- a/nixos/modules/virtualisation/virtualbox.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - config, - lib, - ... -}: let - cfg = config.youthlic.virtualisation.virtualbox; -in { - options = { - youthlic.virtualisation.virtualbox = { - enable = lib.mkEnableOption "virtualbox"; - unixName = lib.mkOption { - type = lib.types.str; - }; - }; - }; - config = lib.mkIf cfg.enable { - users.groups."vboxusers".members = [cfg.unixName]; - virtualisation.virtualbox = { - host = { - enableKvm = true; - enableExtensionPack = true; - enable = true; - addNetworkInterface = false; - enableHardening = true; - }; - guest = { - vboxsf = true; - use3rdPartyModules = true; - seamless = true; - enable = true; - dragAndDrop = true; - clipboard = true; - }; - }; - }; -} diff --git a/nvfetcher.toml b/nvfetcher.toml index 5ca5c3a..24edda9 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -1,3 +1,13 @@ +[noto-serif-cjk] +fetch.github = "notofonts/noto-cjk" +git.sparseCheckout = ["Serif/OTC"] +src.github = "notofonts/noto-cjk" + +[noto-sans-cjk] +fetch.github = "notofonts/noto-cjk" +git.sparseCheckout = ["Sans/OTC"] +src.github = "notofonts/noto-cjk" + [spotx] fetch.github = "SpotX-Official/SpotX-Bash" src.git = "https://github.com/SpotX-Official/SpotX-Bash.git" diff --git a/pkgs/fonts/noto-sans-cjk.nix b/pkgs/fonts/noto-sans-cjk.nix new file mode 100644 index 0000000..50d3d42 --- /dev/null +++ b/pkgs/fonts/noto-sans-cjk.nix @@ -0,0 +1,19 @@ +{ + nixosTests, + srcs, + stdenvNoCC, +}: let + source = srcs.noto-sans-cjk; +in + stdenvNoCC.mkDerivation (_finalAttrs: { + pname = "noto-sans-cjk"; + version = source.version; + + src = source.src; + + installPhase = '' + install -m444 -Dt $out/share/fonts/opentype/noto-sans-cjk Sans/OTC/*.ttc + ''; + + passthru.tests.noto-fonts = nixosTests.noto-fonts; + }) diff --git a/pkgs/fonts/noto-serif-cjk.nix b/pkgs/fonts/noto-serif-cjk.nix new file mode 100644 index 0000000..80b8f74 --- /dev/null +++ b/pkgs/fonts/noto-serif-cjk.nix @@ -0,0 +1,19 @@ +{ + nixosTests, + srcs, + stdenvNoCC, +}: let + source = srcs.noto-serif-cjk; +in + stdenvNoCC.mkDerivation (_finalAttrs: { + pname = "noto-serif-cjk"; + version = source.version; + + src = source.src; + + installPhase = '' + install -m444 -Dt $out/share/fonts/opentype/noto-serif-cjk Serif/OTC/*.ttc + ''; + + passthru.tests.noto-fonts = nixosTests.noto-fonts; + })