diff --git a/misc/browser/surfingkeys.js b/misc/browser/surfingkeys.js index 7116777..7e8fa33 100644 --- a/misc/browser/surfingkeys.js +++ b/misc/browser/surfingkeys.js @@ -225,12 +225,18 @@ api.map("g/", "gU"); // Goto Root Domain // TODO: Add SPC keymap as leader (maybe change `,` to `SPC`) api.unmap(""); // Leader Key +api.map("'","om"); // Use ' to search vim quickmarks + forwardFactory.pull(mapLists); // vForwardFactory.pull(vMapLists); api.map("gH", "g/"); api.map("J", "d"); api.map("K", "e"); + +map('>', '>>'); +map('<', '<<'); + // #endregion // #region Omnibar NOTE: Dosn't work @@ -303,6 +309,7 @@ const searchAliases = [ "https://www.shenyandayi.com/wantWordsResult?lang=zh&query=", ], ["yt", "YouTube", "https://www.youtube.com/results?search_query="], + ["o", "SearXNG", "https://searx.js0ny.net?q="] ]; api.unmap("on"); @@ -928,3 +935,254 @@ addVimMapKey( // #region Hints api.Hints.setCharacters("qwertasdfgzx"); // Left-hand keys // #endregion + +// #region Theming +// Reference: https://github.com/Foldex/surfingkeys-config +Hints.style('border: solid 2px #373B41; color:#52C196; background: initial; background-color: #1D1F21;'); +Hints.style("border: solid 2px #373B41 !important; padding: 1px !important; color: #C5C8C6 !important; background: #1D1F21 !important;", "text"); +Visual.style('marks', 'background-color: #52C19699;'); +Visual.style('cursor', 'background-color: #81A2BE;'); + +settings.theme = ` +/* Edit these variables for easy theme making */ +:root { + /* Font */ + --font: 'Maple Mono NF CN', 'Source Code Pro', Ubuntu, sans; + --font-size: 12; + --font-weight: bold; + + /* -------------- */ + /* --- THEMES --- */ + /* -------------- */ + + /* -------------------- */ + /* -- Tomorrow Night -- */ + /* -------------------- */ + --fg: #C5C8C6; + --bg: #282A2E; + --bg-dark: #1D1F21; + --border: #373b41; + --main-fg: #81A2BE; + --accent-fg: #52C196; + --info-fg: #AC7BBA; + --select: #585858; + /* ---------- Generic ---------- */ +.sk_theme { +background: var(--bg); +color: var(--fg); + background-color: var(--bg); + border-color: var(--border); + font-family: var(--font); + font-size: var(--font-size); + font-weight: var(--font-weight); +} + +input { + font-family: var(--font); + font-weight: var(--font-weight); +} + +.sk_theme tbody { + color: var(--fg); +} + +.sk_theme input { + color: var(--fg); +} + +/* Hints */ +#sk_hints .begin { + color: var(--accent-fg) !important; +} + +#sk_tabs .sk_tab { + background: var(--bg-dark); + border: 1px solid var(--border); +} + +#sk_tabs .sk_tab_title { + color: var(--fg); +} + +#sk_tabs .sk_tab_url { + color: var(--main-fg); +} + +#sk_tabs .sk_tab_hint { + background: var(--bg); + border: 1px solid var(--border); + color: var(--accent-fg); +} + +.sk_theme #sk_frame { + background: var(--bg); + opacity: 0.2; + color: var(--accent-fg); +} + +/* ---------- Omnibar ---------- */ +/* Uncomment this and use settings.omnibarPosition = 'bottom' for Pentadactyl/Tridactyl style bottom bar */ +/* .sk_theme#sk_omnibar { + width: 100%; + left: 0; +} */ + +.sk_theme .title { + color: var(--accent-fg); +} + +.sk_theme .url { + color: var(--main-fg); +} + +.sk_theme .annotation { + color: var(--accent-fg); +} + +.sk_theme .omnibar_highlight { + color: var(--accent-fg); +} + +.sk_theme .omnibar_timestamp { + color: var(--info-fg); +} + +.sk_theme .omnibar_visitcount { + color: var(--accent-fg); +} + +.sk_theme #sk_omnibarSearchResult ul li:nth-child(odd) { + background: var(--bg-dark); +} + +.sk_theme #sk_omnibarSearchResult ul li.focused { + background: var(--border); +} + +.sk_theme #sk_omnibarSearchArea { + border-top-color: var(--border); + border-bottom-color: var(--border); +} + +.sk_theme #sk_omnibarSearchArea input, +.sk_theme #sk_omnibarSearchArea span { + font-size: var(--font-size); +} + +.sk_theme .separator { + color: var(--accent-fg); +} + +/* ---------- Popup Notification Banner ---------- */ +#sk_banner { + font-family: var(--font); + font-size: var(--font-size); + font-weight: var(--font-weight); + background: var(--bg); + border-color: var(--border); + color: var(--fg); + opacity: 0.9; +} + +/* ---------- Popup Keys ---------- */ +#sk_keystroke { + background-color: var(--bg); +} + +.sk_theme kbd .candidates { + color: var(--info-fg); +} + +.sk_theme span.annotation { + color: var(--accent-fg); +} + +/* ---------- Popup Translation Bubble ---------- */ +#sk_bubble { + background-color: var(--bg) !important; + color: var(--fg) !important; + border-color: var(--border) !important; +} + +#sk_bubble * { + color: var(--fg) !important; +} + +#sk_bubble div.sk_arrow div:nth-of-type(1) { + border-top-color: var(--border) !important; + border-bottom-color: var(--border) !important; +} + +#sk_bubble div.sk_arrow div:nth-of-type(2) { + border-top-color: var(--bg) !important; + border-bottom-color: var(--bg) !important; +} + +/* ---------- Search ---------- */ +#sk_status, +#sk_find { + font-size: var(--font-size); + border-color: var(--border); +} + +.sk_theme kbd { + background: var(--bg-dark); + border-color: var(--border); + box-shadow: none; + color: var(--fg); +} + +.sk_theme .feature_name span { + color: var(--main-fg); +} + +/* ---------- ACE Editor ---------- */ +#sk_editor { + background: var(--bg-dark) !important; + height: 50% !important; + /* Remove this to restore the default editor size */ +} + +.ace_dialog-bottom { + border-top: 1px solid var(--bg) !important; +} + +.ace-chrome .ace_print-margin, +.ace_gutter, +.ace_gutter-cell, +.ace_dialog { + background: var(--bg) !important; +} + +.ace-chrome { + color: var(--fg) !important; +} + +.ace_gutter, +.ace_dialog { + color: var(--fg) !important; +} + +.ace_cursor { + color: var(--fg) !important; +} + +.normal-mode .ace_cursor { + background-color: var(--fg) !important; + border: var(--fg) !important; + opacity: 0.7 !important; +} + +.ace_marker-layer .ace_selection { + background: var(--select) !important; +} + +.ace_editor, +.ace_dialog span, +.ace_dialog input { + font-family: var(--font); + font-size: var(--font-size); + font-weight: var(--font-weight); +} +`; +//#endregion diff --git a/nixcfgs/flake.lock b/nixcfgs/flake.lock index 87e6972..7c6eb83 100644 --- a/nixcfgs/flake.lock +++ b/nixcfgs/flake.lock @@ -100,11 +100,11 @@ ] }, "locked": { - "lastModified": 1769226332, - "narHash": "sha256-JKD9M2+/J4e6nRtcY2XRfpLlOHaGXT4aUHyIG/20qlw=", + "lastModified": 1769740633, + "narHash": "sha256-W4gMgX8RsDeJioRPQHhUgXD/TxqAQxdZjkhjHRX70Pk=", "owner": "caelestia-dots", "repo": "cli", - "rev": "52a3a3c50ef55e3561057e8a74c85cf16f83039f", + "rev": "90fc2a981e587d38edc5a899011eca7979ecf124", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1769305032, - "narHash": "sha256-Of4+4pnT+EmAl/DM1GYkpceX6yXw+QLU30WTec0ZypQ=", + "lastModified": 1769911585, + "narHash": "sha256-fc/o0hiTc16e53he7ytDaNsCI71xhJ9hkYl+zHOxp6o=", "owner": "caelestia-dots", "repo": "shell", - "rev": "b33440684950acf0b3f089b789da370685d9396c", + "rev": "45b87645e20d9b472d0449415cd9f277dce21364", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1769164550, - "narHash": "sha256-AxLb3L4j148v4Cj6ju5E9wsVdcHULuoI8il7+H5t6cs=", + "lastModified": 1769946009, + "narHash": "sha256-cjPsPx3qlP7RW78lcGJoTP/B6yqY6BJJjwT7QUg8ByY=", "owner": "catppuccin", "repo": "nix", - "rev": "deb2a5a54cf9e05ddf60aeeb933f60ad2fac20e1", + "rev": "ff59ad5085b7d71705ea1f019c02b08dfe40d9c8", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1769093894, - "narHash": "sha256-Ka1uvhSq66yp0IlNFFpx7h+NlysbN52/yUbQKvI4AiA=", + "lastModified": 1769329000, + "narHash": "sha256-0vibWqmCsG1t4xL2euR6PScB3M4QZigB5JGl+BIH4NY=", "owner": "abenz1267", "repo": "elephant", - "rev": "b34dd272ab5dc60096157d7cc7ff781f359c48b1", + "rev": "1988112d1f54dd76e8a90f551945df763586bdad", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1769303011, - "narHash": "sha256-rz7sMVPAxofeBMxFgoGe1uaqNAkxMzWJO36QowMz+iE=", + "lastModified": 1769994580, + "narHash": "sha256-urmg1I7aNQ8xCsvzewLH2EamyivDc/XYqX1i8o2pcdI=", "owner": "petrkozorezov", "repo": "firefox-addons-nix", - "rev": "a473d91931f22836b0c91fcf02eb3eb6d2e5b21c", + "rev": "0cf05a1f9daabe782e051ccdae29bfa56eb8a991", "type": "github" }, "original": { @@ -278,6 +278,27 @@ } }, "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nixpak", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nur", @@ -298,7 +319,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -319,7 +340,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -389,6 +410,31 @@ "type": "gitlab" } }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": [ + "nixpak", + "flake-parts" + ], + "nixpkgs": [ + "nixpak", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765774562, + "narHash": "sha256-UQhfCggNGDc7eam+EittlYmeW89CZVT1KkFIHZWBH7k=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "edcbb19948b6caf1700434e369fde6ff9e6a3c93", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -396,11 +442,11 @@ ] }, "locked": { - "lastModified": 1769289524, - "narHash": "sha256-6Cwtvzrw79cOk1lCzN2aKSVrpgSOSQoYhyMmhXXZjTA=", + "lastModified": 1769978395, + "narHash": "sha256-gj1yP3spUb1vGtaF5qPhshd2j0cg4xf51pklDsIm19Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "2539eba97a6df237d75617c25cd2dbef92df3d5b", + "rev": "984708c34d3495a518e6ab6b8633469bbca2f77a", "type": "github" }, "original": { @@ -434,11 +480,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1769282225, - "narHash": "sha256-5rcscjSoahWOb/xTNCLlqh/PKfNwvAwcf2hQ7XLj5RI=", + "lastModified": 1769980417, + "narHash": "sha256-BOxPHApuXJE0wFKaDK811u5Ihvn4gnsXhCABo0O/u/Q=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "2efd11d9a6b5655c3b97beb666739eabcebd6171", + "rev": "ca6c544ca6a737bdb32676046bf98aca11f8f13d", "type": "github" }, "original": { @@ -467,11 +513,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1768678265, - "narHash": "sha256-Ub8eed4DsfIDWyg30xEe+8bSxL/z5Af/gCjmvJ0V/Hs=", + "lastModified": 1769577126, + "narHash": "sha256-v9vz9Rj4MGwPuhGELdvpRKl2HH+xvkgat6VwL0L86Fg=", "owner": "YaLTeR", "repo": "niri", - "rev": "d7184a04b904e07113f4623610775ae78d32394c", + "rev": "f30db163b5748e8cf95c05aba77d0d3736f40543", "type": "github" }, "original": { @@ -543,11 +589,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1769284737, - "narHash": "sha256-FN6sOLBVidcmlKN+hrVuBjK/DjLCuM3qTmsRwuTYDmk=", + "lastModified": 1769847318, + "narHash": "sha256-dtn4DcXRekEowv87x1LtDTpRvsCIwc473ViL3sRpZIc=", "owner": "kaylorben", "repo": "nixcord", - "rev": "672b0dfb216b52b6bc892d08f4f7dccd39676db8", + "rev": "c7d3828af413799cffb3d312cb5c427124e892d6", "type": "github" }, "original": { @@ -556,6 +602,28 @@ "type": "github" } }, + "nixpak": { + "inputs": { + "flake-parts": "flake-parts_3", + "hercules-ci-effects": "hercules-ci-effects", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769288622, + "narHash": "sha256-GaDPnzDQAx5WRi12XVttCHsVw0VkOMYNpniT7KHYNfk=", + "owner": "nixpak", + "repo": "nixpak", + "rev": "4276954ad4f877d79801fd8952af38a3370bcb65", + "type": "github" + }, + "original": { + "owner": "nixpak", + "repo": "nixpak", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1763806073, @@ -604,11 +672,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1769089682, - "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=", + "lastModified": 1769900590, + "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "078d69f03934859a181e81ba987c2bb033eebfc5", + "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646", "type": "github" }, "original": { @@ -652,11 +720,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -684,11 +752,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1769789167, + "narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "62c8382960464ceb98ea593cb8321a2cf8f9e3e5", "type": "github" }, "original": { @@ -716,11 +784,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1769268028, - "narHash": "sha256-mAdJpV0e5IGZjnE4f/8uf0E4hQR7ptRP00gnZKUOdMo=", + "lastModified": 1770015011, + "narHash": "sha256-7vUo0qWCl/rip+fzr6lcMlz9I0tN/8m7d5Bla/rS2kk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab9fbbcf4858bd6d40ba2bbec37ceb4ab6e1f562", + "rev": "f08e6b11a5ed43637a8ac444dd44118bc7d273b9", "type": "github" }, "original": { @@ -732,11 +800,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1770019141, + "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137", "type": "github" }, "original": { @@ -780,15 +848,15 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1769314173, - "narHash": "sha256-as0Z5YGOzKMdrq4UyTDBeOCCzvL8NUAdlovH/z6XxHA=", + "lastModified": 1770052405, + "narHash": "sha256-UDmX0avA8jhv2pe0bBaw5uCoGjyrwYMxU/Pxffd7yHw=", "owner": "nix-community", "repo": "NUR", - "rev": "523d33ab04f89289bfa9e253abfa98a945a26edf", + "rev": "4b8258c4c5a076483f30fa9e8465aa46c82d0262", "type": "github" }, "original": { @@ -832,11 +900,11 @@ ] }, "locked": { - "lastModified": 1767662275, - "narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=", + "lastModified": 1769956244, + "narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e", + "rev": "fe54ea85c6e4413fba03b84d50f2b431d2f7c831", "type": "github" }, "original": { @@ -853,11 +921,11 @@ ] }, "locked": { - "lastModified": 1768985439, - "narHash": "sha256-qkU4r+l+UPz4dutMMRZSin64HuVZkEv9iFpu9yMWVY0=", + "lastModified": 1769593411, + "narHash": "sha256-WW00FaBiUmQyxvSbefvgxIjwf/WmRrEGBbwMHvW/7uQ=", "ref": "refs/heads/master", - "rev": "191085a8821b35680bba16ce5411fc9dbe912237", - "revCount": 731, + "rev": "1e4d804e7f3fa7465811030e8da2bf10d544426a", + "revCount": 732, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -879,6 +947,7 @@ "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", "nixcord": "nixcord", + "nixpak": "nixpak", "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_2", "nur": "nur", @@ -897,11 +966,11 @@ ] }, "locked": { - "lastModified": 1769314333, - "narHash": "sha256-+Uvq9h2eGsbhacXpuS7irYO7fFlz514nrhPCSTkASlw=", + "lastModified": 1769921679, + "narHash": "sha256-twBMKGQvaztZQxFxbZnkg7y/50BW9yjtCBWwdjtOZew=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2eb9eed7ef48908e0f02985919f7eb9d33fa758f", + "rev": "1e89149dcfc229e7e2ae24a8030f124a31e4f24f", "type": "github" }, "original": { @@ -917,7 +986,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_5", "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_8", "nur": "nur_2", @@ -929,11 +998,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769202931, - "narHash": "sha256-4IZuCMjlWEtS6rVXozVXaJG6QADHVncXC29PLZr6ZB4=", + "lastModified": 1769978605, + "narHash": "sha256-Vjniae6HHJCb9xZLeUOP15aRQXSZuKeeaZFM+gRDCgo=", "owner": "nix-community", "repo": "stylix", - "rev": "749285c90e3e35ebe0952c86838f3089abbc7939", + "rev": "ce22070ec5ce6169a6841da31baea33ce930ed38", "type": "github" }, "original": { @@ -1123,16 +1192,16 @@ "xremap": { "flake": false, "locked": { - "lastModified": 1766606475, - "narHash": "sha256-FPZ4iQA/vVZGzbO8i8lTK8i9A3zs9BLqMvTMeAVv9rQ=", + "lastModified": 1769021727, + "narHash": "sha256-2wylBk3+Zu1pHa41dhKwvUtxOVyHSMRDfOD9fIp8x2I=", "owner": "k0kubun", "repo": "xremap", - "rev": "cdc744d873c19899ef21f329c4305b4b5e53d459", + "rev": "890e0a6ca92e90f3bcbd1e235abcf2192e233a46", "type": "github" }, "original": { "owner": "k0kubun", - "ref": "v0.14.8", + "ref": "v0.14.10", "repo": "xremap", "type": "github" } @@ -1140,16 +1209,16 @@ "xremap-flake": { "inputs": { "crane": "crane", - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "nixpkgs": "nixpkgs_10", "xremap": "xremap" }, "locked": { - "lastModified": 1767318478, - "narHash": "sha256-h3oE50RedA8DRGrFU+Hv2kirt4rmzdaC9oSD+MSg9Ms=", + "lastModified": 1769636170, + "narHash": "sha256-X000Dgg053Dv9NIzm1b9QYSAHYtW2jHMVALQezui7L0=", "owner": "xremap", "repo": "nix-flake", - "rev": "9a2224aa01a3c86e94b398c33329c8ff6496dc5d", + "rev": "00bc6dd4275d4b003a17ef7f5f271ba87f73d698", "type": "github" }, "original": { @@ -1178,11 +1247,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1769279212, - "narHash": "sha256-LAd6DYp6bbnQqtzMm62BE/0IMy67A4CgyYVi4xvyD6s=", + "lastModified": 1769713942, + "narHash": "sha256-0BtCSO2qzYK/akRDsERqRVLknCYD3FYErc+szreSHUo=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3af3e3ab78d0eb96fb9b5161693811e050b90991", + "rev": "37ec78ee26e158b71f42e113e0e7dd9d5eb6bdb0", "type": "github" }, "original": { @@ -1198,11 +1267,11 @@ ] }, "locked": { - "lastModified": 1769228180, - "narHash": "sha256-94KY0JNjdd3CcSyKlHPCPswlqmUrWT6+MfOHektsdB8=", + "lastModified": 1769747637, + "narHash": "sha256-fRdj480sqW/a+APO6CmelZsa07BRAdEQLUjBQJuyQbU=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "ef1663c14b7c3c2b84bcf140232534be5a2a0257", + "rev": "09e429679b7cc175e71e2d25800bab66493c1c80", "type": "github" }, "original": { diff --git a/nixcfgs/flake.nix b/nixcfgs/flake.nix index a4a669a..aa06f1c 100644 --- a/nixcfgs/flake.nix +++ b/nixcfgs/flake.nix @@ -59,6 +59,10 @@ }; stylix.url = "github:nix-community/stylix"; + nixpak = { + url = "github:nixpak/nixpak"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { @@ -82,6 +86,7 @@ nix-index-database, walker, stylix, + nixpak, ... } @ inputs: let overlays = [ diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix index 2fc32ad..2e33ae3 100644 --- a/nixcfgs/hosts/zephyrus/default.nix +++ b/nixcfgs/hosts/zephyrus/default.nix @@ -16,7 +16,7 @@ ../../modules/nixos/desktop/laptop.nix # hardware drivers - ../../modules/nixos/hardware/nvidia/nvidia-enable.nix + ../../modules/nixos/hardware/nvidia/nvidia-disable.nix # udev rules ../../modules/nixos/hardware/udev/basys3.nix diff --git a/nixcfgs/modules/nixos/desktop/host-machine.nix b/nixcfgs/modules/nixos/desktop/host-machine.nix index 05f06f5..af2d1bb 100644 --- a/nixcfgs/modules/nixos/desktop/host-machine.nix +++ b/nixcfgs/modules/nixos/desktop/host-machine.nix @@ -12,6 +12,7 @@ usbutils v4l-utils f2fs-tools + openvpn ]; programs.gpu-screen-recorder.enable = true; diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index 4707e3b..9ee72d7 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -113,7 +113,6 @@ in { dconf-editor fsearch # Everything-like search tool kdePackages.elisa - lollypop showmethekey # Use Wayland for Jetbrains diff --git a/nixcfgs/users/js0ny/packages/stylix.nix b/nixcfgs/users/js0ny/packages/stylix.nix index c2bc9cf..63e5910 100644 --- a/nixcfgs/users/js0ny/packages/stylix.nix +++ b/nixcfgs/users/js0ny/packages/stylix.nix @@ -71,7 +71,7 @@ in { }; }; - base16Scheme = "${pkgs.base16-schemes}/share/themes/deep-oceanic-next.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/material-palenight.yaml"; image = ./wallpaper.jpg; polarity = "dark"; }; diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix index a7c476f..be7230b 100644 --- a/nixcfgs/users/js0ny/zephyrus.nix +++ b/nixcfgs/users/js0ny/zephyrus.nix @@ -80,6 +80,7 @@ in { ./programs/feishin.nix ./programs/fsearch.nix ./programs/elisa.nix + ./programs/lollypop.nix # Desktop Linux ./programs/desktop/gnome @@ -153,5 +154,7 @@ in { }; }; + programs.distrobox.enable = true; + home.stateVersion = "25.05"; }