From 7f5860d2e69fb6ac72f96fe957718d609aa42556 Mon Sep 17 00:00:00 2001 From: dichgrem Date: Tue, 22 Jul 2025 16:28:04 +0800 Subject: [PATCH] fix:floorp_config --- dotfiles/.config/fcitx5/config | 3 +- dotfiles/.config/nvim/.neoconf.json | 15 -- dotfiles/.config/nvim/LICENSE | 201 ------------------ dotfiles/.config/nvim/README.md | 18 -- dotfiles/.config/nvim/init.lua | 9 - dotfiles/.config/nvim/lazy-lock.json | 46 ---- dotfiles/.config/nvim/lazyvim.json | 15 -- dotfiles/.config/nvim/lua/config/autocmds.lua | 8 - dotfiles/.config/nvim/lua/config/keymaps.lua | 31 --- dotfiles/.config/nvim/lua/config/lazy.lua | 53 ----- dotfiles/.config/nvim/lua/config/options.lua | 3 - .../.config/nvim/lua/plugins/dashboard.lua | 18 -- dotfiles/.config/nvim/lua/plugins/example.lua | 197 ----------------- dotfiles/.config/nvim/lua/plugins/lazygit.lua | 16 -- .../.config/nvim/lua/plugins/markdown.lua | 9 - dotfiles/.config/nvim/lua/plugins/osc52.lua | 18 -- dotfiles/.config/nvim/stylua.toml | 3 - flake.nix | 2 +- home/gui/browser/floorp.nix | 56 +---- hosts/dos/default.nix | 32 +++ hosts/dos/env.nix | 66 ++++++ hosts/dos/hardware.nix | 40 ++++ 22 files changed, 145 insertions(+), 714 deletions(-) delete mode 100644 dotfiles/.config/nvim/.neoconf.json delete mode 100644 dotfiles/.config/nvim/LICENSE delete mode 100644 dotfiles/.config/nvim/README.md delete mode 100644 dotfiles/.config/nvim/init.lua delete mode 100644 dotfiles/.config/nvim/lazy-lock.json delete mode 100644 dotfiles/.config/nvim/lazyvim.json delete mode 100644 dotfiles/.config/nvim/lua/config/autocmds.lua delete mode 100644 dotfiles/.config/nvim/lua/config/keymaps.lua delete mode 100644 dotfiles/.config/nvim/lua/config/lazy.lua delete mode 100644 dotfiles/.config/nvim/lua/config/options.lua delete mode 100644 dotfiles/.config/nvim/lua/plugins/dashboard.lua delete mode 100644 dotfiles/.config/nvim/lua/plugins/example.lua delete mode 100644 dotfiles/.config/nvim/lua/plugins/lazygit.lua delete mode 100644 dotfiles/.config/nvim/lua/plugins/markdown.lua delete mode 100644 dotfiles/.config/nvim/lua/plugins/osc52.lua delete mode 100644 dotfiles/.config/nvim/stylua.toml create mode 100644 hosts/dos/default.nix create mode 100644 hosts/dos/env.nix create mode 100644 hosts/dos/hardware.nix diff --git a/dotfiles/.config/fcitx5/config b/dotfiles/.config/fcitx5/config index 0443fe2..f4b972b 100644 --- a/dotfiles/.config/fcitx5/config +++ b/dotfiles/.config/fcitx5/config @@ -21,7 +21,7 @@ DeactivateKeys= TogglePreedit= [Hotkey/TriggerKeys] -0=Super+space +0=Alt+Shift [Hotkey/PrevPage] 0=Up @@ -70,4 +70,3 @@ AllowInputMethodForPassword=False ShowPreeditForPassword=False # Interval of saving user data in minutes AutoSavePeriod=30 - diff --git a/dotfiles/.config/nvim/.neoconf.json b/dotfiles/.config/nvim/.neoconf.json deleted file mode 100644 index 7c48087..0000000 --- a/dotfiles/.config/nvim/.neoconf.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "neodev": { - "library": { - "enabled": true, - "plugins": true - } - }, - "neoconf": { - "plugins": { - "lua_ls": { - "enabled": true - } - } - } -} diff --git a/dotfiles/.config/nvim/LICENSE b/dotfiles/.config/nvim/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/dotfiles/.config/nvim/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/dotfiles/.config/nvim/README.md b/dotfiles/.config/nvim/README.md deleted file mode 100644 index 1375d9d..0000000 --- a/dotfiles/.config/nvim/README.md +++ /dev/null @@ -1,18 +0,0 @@ -# ๐Ÿ’ค LazyVim - -A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). -Refer to the [documentation](https://lazyvim.github.io/installation) to get started. - -## Plugins - -- Markdown support: using Markdown-priview.nvim ## Fix Markdown Code-box display -- Clipboard support: using nvim-osc52 -- Git UI support: using lazygit.nvim -- Dashboard support: using snacks.nvim - -## Keymaps - -- Add Ctrl+W to quit buffer; -- Add Ctrl+Tab to switch buffer; -- Add Ctrl+Shift+5 to start a new terminal; -- Add Ctrl+/h/j/k/l to switch between terminals; diff --git a/dotfiles/.config/nvim/init.lua b/dotfiles/.config/nvim/init.lua deleted file mode 100644 index bb0d29c..0000000 --- a/dotfiles/.config/nvim/init.lua +++ /dev/null @@ -1,9 +0,0 @@ --- bootstrap lazy.nvim, LazyVim and your plugins -require("config.lazy") - -vim.api.nvim_create_autocmd("FileType", { - pattern = "markdown", - callback = function() - vim.opt_local.conceallevel = 0 - end, -}) diff --git a/dotfiles/.config/nvim/lazy-lock.json b/dotfiles/.config/nvim/lazy-lock.json deleted file mode 100644 index 3445ef1..0000000 --- a/dotfiles/.config/nvim/lazy-lock.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" }, - "SchemaStore.nvim": { "branch": "main", "commit": "a9ba109549de51e3b4594d39a1c07f14b9d0cfa5" }, - "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" }, - "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "catppuccin": { "branch": "main", "commit": "56a9dfd1e05868cf3189369aad87242941396563" }, - "clangd_extensions.nvim": { "branch": "main", "commit": "db28f29be928d18cbfb86fbfb9f83f584f658feb" }, - "cmake-tools.nvim": { "branch": "master", "commit": "591ae37fc5494677e929118f0a182d2b61fe1af1" }, - "conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" }, - "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, - "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" }, - "grug-far.nvim": { "branch": "main", "commit": "f24022147ca4a0fe1d424a520a9437accbeba193" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "lazygit.nvim": { "branch": "main", "commit": "b9eae3badab982e71abab96d3ee1d258f0c07961" }, - "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" }, - "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mini.ai": { "branch": "main", "commit": "7f1fe86277f0e977642cf8fe15f004229f61e61a" }, - "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, - "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, - "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, - "nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" }, - "nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" }, - "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" }, - "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, - "nvim-lint": { "branch": "master", "commit": "b47cbb249351873e3a571751c3fb66ed6369852f" }, - "nvim-lspconfig": { "branch": "master", "commit": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9" }, - "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-osc52": { "branch": "main", "commit": "04cfaba1865ae5c53b6f887c3ca7304973824fb2" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "0f051e9813a36481f48ca1f833897210dbcfffde" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, - "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, - "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, - "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, - "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } -} diff --git a/dotfiles/.config/nvim/lazyvim.json b/dotfiles/.config/nvim/lazyvim.json deleted file mode 100644 index 54fa8d2..0000000 --- a/dotfiles/.config/nvim/lazyvim.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extras": [ - "lazyvim.plugins.extras.dap.core", - "lazyvim.plugins.extras.lang.clangd", - "lazyvim.plugins.extras.lang.cmake", - "lazyvim.plugins.extras.lang.docker", - "lazyvim.plugins.extras.lang.go", - "lazyvim.plugins.extras.lang.yaml" - ], - "install_version": 8, - "news": { - "NEWS.md": "10960" - }, - "version": 8 -} \ No newline at end of file diff --git a/dotfiles/.config/nvim/lua/config/autocmds.lua b/dotfiles/.config/nvim/lua/config/autocmds.lua deleted file mode 100644 index 4221e75..0000000 --- a/dotfiles/.config/nvim/lua/config/autocmds.lua +++ /dev/null @@ -1,8 +0,0 @@ --- Autocmds are automatically loaded on the VeryLazy event --- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua --- --- Add any additional autocmds here --- with `vim.api.nvim_create_autocmd` --- --- Or remove existing autocmds by their group name (which is prefixed with `lazyvim_` for the defaults) --- e.g. vim.api.nvim_del_augroup_by_name("lazyvim_wrap_spell") diff --git a/dotfiles/.config/nvim/lua/config/keymaps.lua b/dotfiles/.config/nvim/lua/config/keymaps.lua deleted file mode 100644 index aa48b03..0000000 --- a/dotfiles/.config/nvim/lua/config/keymaps.lua +++ /dev/null @@ -1,31 +0,0 @@ --- Keymaps are automatically loaded on the VeryLazy event --- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua --- Add any additional keymaps here - -local map = vim.keymap.set -local opts = { noremap = true, silent = true } - --- === VSCode-like buffer/tab navigation === -map("n", "", "bnext", { desc = "Next buffer (like VSCode)" }) -map("n", "", "bprevious", { desc = "Previous buffer (like VSCode)" }) - --- === Close buffer like Ctrl + W in VSCode === -vim.keymap.set("n", "", "BufferLinePickClose", { desc = "Close buffer (BufferLine)" }) - -vim.keymap.set("n", "", function() - if vim.bo.buftype == "terminal" then - vim.cmd("vsplit | terminal") - else - vim.cmd("botright split | terminal") - end -end, { desc = "Split terminal" }) - --- ๅœจ็ปˆ็ซฏๆจกๅผไธ‹็š„ๅฟซๆท้”ฎ -vim.keymap.set("t", "", "h", { desc = "Go to left window" }) -vim.keymap.set("t", "", "j", { desc = "Go to lower window" }) -vim.keymap.set("t", "", "k", { desc = "Go to upper window" }) -vim.keymap.set("t", "", "l", { desc = "Go to right window" }) - -vim.keymap.set("n", "xo", function() - vim.fn.jobstart({ "xdg-open", vim.fn.expand("%:p") }, { detach = true }) -end, { desc = "ไฝฟ็”จ็ณป็ปŸ้ป˜่ฎคๅบ”็”จ็จ‹ๅบๆ‰“ๅผ€ๅฝ“ๅ‰ๆ–‡ไปถ" }) diff --git a/dotfiles/.config/nvim/lua/config/lazy.lua b/dotfiles/.config/nvim/lua/config/lazy.lua deleted file mode 100644 index d73bfa1..0000000 --- a/dotfiles/.config/nvim/lua/config/lazy.lua +++ /dev/null @@ -1,53 +0,0 @@ -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = "https://github.com/folke/lazy.nvim.git" - local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, - { "\nPress any key to exit..." }, - }, true, {}) - vim.fn.getchar() - os.exit(1) - end -end -vim.opt.rtp:prepend(lazypath) - -require("lazy").setup({ - spec = { - -- add LazyVim and import its plugins - { "LazyVim/LazyVim", import = "lazyvim.plugins" }, - -- import/override with your plugins - { import = "plugins" }, - }, - defaults = { - -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. - -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. - lazy = false, - -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, - -- have outdated releases, which may break your Neovim install. - version = false, -- always use the latest git commit - -- version = "*", -- try installing the latest stable version for plugins that support semver - }, - install = { colorscheme = { "tokyonight", "habamax" } }, - checker = { - enabled = true, -- check for plugin updates periodically - notify = false, -- notify on update - }, -- automatically check for plugin updates - performance = { - rtp = { - -- disable some rtp plugins - disabled_plugins = { - "gzip", - -- "matchit", - -- "matchparen", - -- "netrwPlugin", - "tarPlugin", - "tohtml", - "tutor", - "zipPlugin", - }, - }, - }, -}) diff --git a/dotfiles/.config/nvim/lua/config/options.lua b/dotfiles/.config/nvim/lua/config/options.lua deleted file mode 100644 index 3ea1454..0000000 --- a/dotfiles/.config/nvim/lua/config/options.lua +++ /dev/null @@ -1,3 +0,0 @@ --- Options are automatically loaded before lazy.nvim startup --- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua --- Add any additional options here diff --git a/dotfiles/.config/nvim/lua/plugins/dashboard.lua b/dotfiles/.config/nvim/lua/plugins/dashboard.lua deleted file mode 100644 index 02a47d1..0000000 --- a/dotfiles/.config/nvim/lua/plugins/dashboard.lua +++ /dev/null @@ -1,18 +0,0 @@ --- ~/.config/nvim/lua/plugins/dashboard.lua -return { - "folke/snacks.nvim", - opts = { - dashboard = { - preset = { - header = [[ -โ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ–ˆโ•— -โ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•”โ•โ•โ•โ•โ•โ–ˆโ–ˆโ•”โ•โ•โ•โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ–ˆโ–ˆโ•‘ -โ–ˆโ–ˆโ•”โ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•”โ–ˆโ–ˆโ–ˆโ–ˆโ•”โ–ˆโ–ˆโ•‘ -โ–ˆโ–ˆโ•‘โ•šโ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•”โ•โ•โ• โ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ•‘โ•šโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•”โ•โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘โ•šโ–ˆโ–ˆโ•”โ•โ–ˆโ–ˆโ•‘ -โ–ˆโ–ˆโ•‘ โ•šโ–ˆโ–ˆโ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•—โ•šโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•”โ• โ•šโ–ˆโ–ˆโ–ˆโ–ˆโ•”โ• โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘ โ•šโ•โ• โ–ˆโ–ˆโ•‘ -โ•šโ•โ• โ•šโ•โ•โ•โ•โ•šโ•โ•โ•โ•โ•โ•โ• โ•šโ•โ•โ•โ•โ•โ• โ•šโ•โ•โ•โ• โ•šโ•โ•โ•šโ•โ• โ•šโ•โ• - ]], - }, - }, - }, -} diff --git a/dotfiles/.config/nvim/lua/plugins/example.lua b/dotfiles/.config/nvim/lua/plugins/example.lua deleted file mode 100644 index 17f53d6..0000000 --- a/dotfiles/.config/nvim/lua/plugins/example.lua +++ /dev/null @@ -1,197 +0,0 @@ --- since this is just an example spec, don't actually load anything here and return an empty spec --- stylua: ignore -if true then return {} end - --- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim --- --- In your plugin files, you can: --- * add extra plugins --- * disable/enabled LazyVim plugins --- * override the configuration of LazyVim plugins -return { - -- add gruvbox - { "ellisonleao/gruvbox.nvim" }, - - -- Configure LazyVim to load gruvbox - { - "LazyVim/LazyVim", - opts = { - colorscheme = "gruvbox", - }, - }, - - -- change trouble config - { - "folke/trouble.nvim", - -- opts will be merged with the parent spec - opts = { use_diagnostic_signs = true }, - }, - - -- disable trouble - { "folke/trouble.nvim", enabled = false }, - - -- override nvim-cmp and add cmp-emoji - { - "hrsh7th/nvim-cmp", - dependencies = { "hrsh7th/cmp-emoji" }, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - table.insert(opts.sources, { name = "emoji" }) - end, - }, - - -- change some telescope options and a keymap to browse plugin files - { - "nvim-telescope/telescope.nvim", - keys = { - -- add a keymap to browse plugin files - -- stylua: ignore - { - "fp", - function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end, - desc = "Find Plugin File", - }, - }, - -- change some options - opts = { - defaults = { - layout_strategy = "horizontal", - layout_config = { prompt_position = "top" }, - sorting_strategy = "ascending", - winblend = 0, - }, - }, - }, - - -- add pyright to lspconfig - { - "neovim/nvim-lspconfig", - ---@class PluginLspOpts - opts = { - ---@type lspconfig.options - servers = { - -- pyright will be automatically installed with mason and loaded with lspconfig - pyright = {}, - }, - }, - }, - - -- add tsserver and setup with typescript.nvim instead of lspconfig - { - "neovim/nvim-lspconfig", - dependencies = { - "jose-elias-alvarez/typescript.nvim", - init = function() - require("lazyvim.util").lsp.on_attach(function(_, buffer) - -- stylua: ignore - vim.keymap.set( "n", "co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) - vim.keymap.set("n", "cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) - end) - end, - }, - ---@class PluginLspOpts - opts = { - ---@type lspconfig.options - servers = { - -- tsserver will be automatically installed with mason and loaded with lspconfig - tsserver = {}, - }, - -- you can do any additional lsp server setup here - -- return true if you don't want this server to be setup with lspconfig - ---@type table - setup = { - -- example to setup with typescript.nvim - tsserver = function(_, opts) - require("typescript").setup({ server = opts }) - return true - end, - -- Specify * to use this function as a fallback for any server - -- ["*"] = function(server, opts) end, - }, - }, - }, - - -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, - -- treesitter, mason and typescript.nvim. So instead of the above, you can use: - { import = "lazyvim.plugins.extras.lang.typescript" }, - - -- add more treesitter parsers - { - "nvim-treesitter/nvim-treesitter", - opts = { - ensure_installed = { - "bash", - "html", - "javascript", - "json", - "lua", - "markdown", - "markdown_inline", - "python", - "query", - "regex", - "tsx", - "typescript", - "vim", - "yaml", - }, - }, - }, - - -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above - -- would overwrite `ensure_installed` with the new value. - -- If you'd rather extend the default config, use the code below instead: - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - -- add tsx and treesitter - vim.list_extend(opts.ensure_installed, { - "tsx", - "typescript", - }) - end, - }, - - -- the opts function can also be used to change the default opts: - { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = function(_, opts) - table.insert(opts.sections.lualine_x, { - function() - return "๐Ÿ˜„" - end, - }) - end, - }, - - -- or you can return new options to override all the defaults - { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = function() - return { - --[[add your custom lualine config here]] - } - end, - }, - - -- use mini.starter instead of alpha - { import = "lazyvim.plugins.extras.ui.mini-starter" }, - - -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc - { import = "lazyvim.plugins.extras.lang.json" }, - - -- add any tools you want to have installed below - { - "williamboman/mason.nvim", - opts = { - ensure_installed = { - "stylua", - "shellcheck", - "shfmt", - "flake8", - }, - }, - }, -} diff --git a/dotfiles/.config/nvim/lua/plugins/lazygit.lua b/dotfiles/.config/nvim/lua/plugins/lazygit.lua deleted file mode 100644 index f260504..0000000 --- a/dotfiles/.config/nvim/lua/plugins/lazygit.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - "kdheepak/lazygit.nvim", - cmd = { - "LazyGit", - "LazyGitConfig", - "LazyGitCurrentFile", - "LazyGitFilter", - "LazyGitFilterCurrentFile", - }, - keys = { - { "gg", "LazyGit", desc = "Open LazyGit" }, - }, - dependencies = { - "nvim-lua/plenary.nvim", - }, -} diff --git a/dotfiles/.config/nvim/lua/plugins/markdown.lua b/dotfiles/.config/nvim/lua/plugins/markdown.lua deleted file mode 100644 index 1b0209f..0000000 --- a/dotfiles/.config/nvim/lua/plugins/markdown.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - { - "iamcco/markdown-preview.nvim", - cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, - ft = { "markdown" }, - build = ':call mkdp#util#install()' - } -} - diff --git a/dotfiles/.config/nvim/lua/plugins/osc52.lua b/dotfiles/.config/nvim/lua/plugins/osc52.lua deleted file mode 100644 index 7a20603..0000000 --- a/dotfiles/.config/nvim/lua/plugins/osc52.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - "ojroques/nvim-osc52", - config = function() - require("osc52").setup { - max_length = 0, -- ไธ้™ๅˆถ้•ฟๅบฆ - silent = false, - trim = false, - } - - local function copy() - if vim.v.event.operator == "y" and vim.v.event.regname == "" then - require("osc52").copy_register("") - end - end - - vim.api.nvim_create_autocmd("TextYankPost", { callback = copy }) - end, -} diff --git a/dotfiles/.config/nvim/stylua.toml b/dotfiles/.config/nvim/stylua.toml deleted file mode 100644 index 5d6c50d..0000000 --- a/dotfiles/.config/nvim/stylua.toml +++ /dev/null @@ -1,3 +0,0 @@ -indent_type = "Spaces" -indent_width = 2 -column_width = 120 \ No newline at end of file diff --git a/flake.nix b/flake.nix index a87fe91..287d3c3 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ stylix.url = "github:danth/stylix"; }; outputs = inputs: let - hostname = "woonix"; + hostname = "dos"; username = "dich"; in { nixosConfigurations = { diff --git a/home/gui/browser/floorp.nix b/home/gui/browser/floorp.nix index 6a1b126..56e1d30 100644 --- a/home/gui/browser/floorp.nix +++ b/home/gui/browser/floorp.nix @@ -1,52 +1,6 @@ -_: { - programs = { - floorp = { - enable = true; - languagePacks = ["en-US"]; - policies = { - DisableAccounts = true; - DisableAppUpdate = true; - DisableFirefoxAccounts = true; - DisableFirefoxScreenshots = true; - DisableFirefoxStudies = true; - DisablePocket = true; - DisableTelemetry = true; - DisplayBookmarksToolbar = "newtab"; - DisplayMenuBar = "default-off"; - DontCheckDefaultBrowser = true; - EnableTrackingProtection = { - Cryptomining = true; - Fingerprinting = true; - Locked = true; - Value = true; - }; - OverrideFirstRunPage = ""; - OverridePostUpdatePage = ""; - Preferences = { - "browser.contentblocking.category" = { - Value = "strict"; - Status = "locked"; - }; - "browser.formfill.enable" = false; - "browser.newtabpage.activity-stream.feeds.section.topstories" = false; - "browser.newtabpage.activity-stream.feeds.snippets" = false; - "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false; - "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false; - "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; - "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false; - "browser.newtabpage.activity-stream.showSponsored" = false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; - "browser.newtabpage.activity-stream.system.showSponsored" = false; - "browser.search.suggest.enabled" = false; - "browser.search.suggest.enabled.private" = false; - "browser.topsites.contile.enabled" = false; - "browser.urlbar.showSearchSuggestionsFirst" = false; - "browser.urlbar.suggest.searches" = false; - "extensions.pocket.enabled" = false; - "extensions.screenshots.disabled" = true; - }; - SearchBar = "unified"; - }; - }; - }; +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + floorp + ]; } diff --git a/hosts/dos/default.nix b/hosts/dos/default.nix new file mode 100644 index 0000000..3f69c62 --- /dev/null +++ b/hosts/dos/default.nix @@ -0,0 +1,32 @@ +{ + lib, + pkgs, + username, + ... +}: { + imports = + [ + ./hardware.nix + ] + ++ lib.filesystem.listFilesRecursive ../../modules; + + # Define users + # If use nixos-anywhere to install, hashedPassword should be declared before installation + users = { + # users.root = { + # hashedPassword = "xxxxxx"; could be generated by mkpasswd + # }; + users."${username}" = { + extraGroups = [ + "libvirtd" + "networkmanager" + "wheel" + ]; + # hashedPassword = ""; + homeMode = "755"; + ignoreShellProgramCheck = true; + isNormalUser = true; + shell = pkgs.nushell; + }; + }; +} diff --git a/hosts/dos/env.nix b/hosts/dos/env.nix new file mode 100644 index 0000000..b856aa8 --- /dev/null +++ b/hosts/dos/env.nix @@ -0,0 +1,66 @@ +{ + # Specific Use Cases + ## Hardware related + Bluetooth = true; + ### See https://github.com/blueman-project/blueman + + GPU-AMD = true; + ### See https://nixos.wiki/wiki/AMD_GPU + + GPU-Nvidia = false; + ### See https://nixos.wiki/wiki/Nvidia + + GPU-Intel = false; + ### See https://nixos.wiki/wiki/Intel_Graphics + + HotSpot-Use-Case = false; + ### See https://nixos.wiki/wiki/Internet_Connection_Sharing + + ZFS-Networking-HostID = ""; + ### See https://search.nixos.org/options?channel=unstable&show=networking.hostId&from=0&size=30&sort=relevance&query=networking.hostId + ### Could be generated by `head -c4 /dev/urandom | od -A none -t x4` + + ZFS-Use-Case = false; + ### See https://openzfs.github.io/openzfs-docs/Getting%20Started/NixOS/index.html + + ## Software related + QEMU-VM-Use-Case = false; + ### See https://github.com/qemu/qemu ; https://github.com/virt-manager/virt-manager + + Transparent-Proxy = false; + ### See https://github.com/daeuniverse/daed + + # Options + ## System related + BootLoader = "systemd-boot"; + ### Possible options: grub ; grub-mirror ; systemd-boot # See https://nixos.wiki/wiki/Bootloader https://search.nixos.org/options?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=mirroredBoots + + KernelPackages = "linuxPackages_cachyos"; + ### See https://search.nixos.org/options?show=boot.kernelPackages https://www.nyx.chaotic.cx/#using-sched-ext-schedulers + + KeyboardLayout = "us"; + ### See https://en.wikipedia.org/wiki/Keyboard_layout + + Locale = "en_US.UTF-8"; + ### See https://docs.moodle.org/405/en/Table_of_locales + + StateVersion = "25.05"; + ### See https://mynixos.com/nixpkgs/option/system.stateVersion + + TimeZone = "Asia/Singapore"; + ### See https://en.wikipedia.org/wiki/List_of_tz_database_time_zones + + ## Wayland related + MonitorSettings = "monitor = , preferred, auto, auto"; + ### MonitorSettings For Hyprland See https://wiki.hyprland.org/Configuring/Monitors/ + + OutputSettings = "output * scale 1"; + ### OutputSettings For sway See https://github.com/swaywm/sway/wiki#display-configuration + + ScaleLevel = "1"; + ### For Hyprland see https://wiki.hyprland.org/Configuring/XWayland/#hidpi-xwayland + ### For sway see https://github.com/swaywm/sway/wiki#hidpi + + WM = "Hyprland"; + ### Possible options: Hyprland ; niri ; sway +} diff --git a/hosts/dos/hardware.nix b/hosts/dos/hardware.nix new file mode 100644 index 0000000..30c242d --- /dev/null +++ b/hosts/dos/hardware.nix @@ -0,0 +1,40 @@ +# Do not modify this file! It was generated by โ€˜nixos-generate-configโ€™ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/67e9d418-8f31-4af7-9178-ae9641099844"; + fsType = "xfs"; + }; + + boot.initrd.luks.devices."luks-6647cbcd-ed3a-4205-9a2c-78e337e2f3bf".device = "/dev/disk/by-uuid/6647cbcd-ed3a-4205-9a2c-78e337e2f3bf"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/CE66-E001"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}