diff --git a/.profile b/.profile index c3b9c62..5cb376a 100644 --- a/.profile +++ b/.profile @@ -1,2 +1,3 @@ export GTK_THEME=Adwaita:dark export MOZ_USE_XINPUT2=1 +export XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share diff --git a/home-manager/home.nix b/home-manager/home.nix index bbb9e28..f0e599f 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -171,20 +171,23 @@ in { pkgs.i3lock pkgs.flameshot - # Note + # Note & Documents pkgs.obsidian pkgs.xournalpp + pkgs.sioyek # Multimedia pkgs.kdePackages.gwenview pkgs.vlc pkgs.playerctl pkgs.ffmpeg + pkgs.spotify + unstable.spotify-player # Streaming pkgs.obs-studio - # IM + # Communication pkgs.telegram-desktop pkgs.discord @@ -205,7 +208,7 @@ in { pkgs.adwaita-qt pkgs.adwaita-qt6 pkgs.firefox-devedition - pkgs.sioyek + pkgs.wiki-tui # My version of BerkeleyMono NF is incomplete. Should add some fallback fonts. (pkgs.nerdfonts.override { fonts = [ @@ -315,6 +318,7 @@ in { set -g default-command "${pkgs.zsh}/bin/zsh" setw -g mode-keys vi set-option -g status-position top + set -sg escape-time 0 set -g @plugin 'tmux-plugins/tpm' # This plugin seems to break terminfo when default shell of a terminal emulator is set to zsh. # set -g @plugin 'tmux-plugins/tmux-sensible' diff --git a/nixos/configuration.nix b/nixos/configuration.nix index ddc8118..348d506 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -163,7 +163,11 @@ in { # Define a user account. Don't forget to set a password with ‘passwd’. users.users.user = { isNormalUser = true; - extraGroups = [ "wheel" "wireshark" ]; # Enable ‘sudo’ for the user. + extraGroups = [ + "wheel" + "wireshark" + "vboxusers" + ]; # Enable ‘sudo’ for the user. packages = with pkgs; [ home-manager contour @@ -223,6 +227,25 @@ in { htb = { config = '' config /home/user/Downloads/starting_point_bzw.ovpn ''; }; }; + virtualisation.virtualbox = { + host = { + enable = true; + enableExtensionPack = true; + }; + guest = { + enable = true; + draganddrop = true; + clipboard = true; + }; + }; + + services.flatpak.enable = true; + xdg.portal = { + enable = true; + extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + config.common.default = "gtk"; + }; + # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; diff --git a/nvim/lua/config.lua b/nvim/lua/config.lua index 879cab5..e8170e8 100644 --- a/nvim/lua/config.lua +++ b/nvim/lua/config.lua @@ -1,5 +1,6 @@ vim.cmd("set encoding=utf-8") vim.cmd("set exrc") +vim.cmd("filetype off") vim.cmd("set pumblend=40") vim.cmd("set winblend=40") vim.cmd("set expandtab") @@ -22,14 +23,16 @@ vim.cmd("set signcolumn=yes") vim.cmd("set noequalalways") vim.cmd("set cmdheight=0") vim.cmd("set scrolloff=10") -vim.cmd("set foldmethod=expr") -vim.cmd("set foldexpr=nvim_treesitter#foldexpr()") -vim.cmd("set foldlevelstart=99") +-- vim.cmd("set foldmethod=expr") +-- vim.cmd("set foldexpr=nvim_treesitter#foldexpr()") +-- vim.cmd("set foldlevelstart=99") vim.cmd("set list") vim.cmd("set listchars=trail:█") vim.cmd("set guicursor=n-v-c:block,i:ver25,a:blinkon0") +vim.cmd("set guifont=BerkeleyMono\\ Nerd\\ Font") vim.cmd("set noshowmode") vim.diagnostic.config({ + virtual_text = false, update_in_insert = true, float = { border = "none", @@ -370,11 +373,11 @@ local plugins = { -- { "nvim-telescope/telescope-fzy-native.nvim" }, -- }, -- }, - { - "chrisgrieser/nvim-origami", -- Fold keymap - event = "BufReadPost", -- later or on keypress would prevent saving folds - opts = true, -- needed even when using default config - }, + -- { + -- "chrisgrieser/nvim-origami", -- Fold keymap + -- event = "BufReadPost", -- later or on keypress would prevent saving folds + -- opts = true, -- needed even when using default config + -- }, { -- dir = '/home/user/Documents/ultimate-autopair.nvim', 'altermo/ultimate-autopair.nvim', @@ -468,6 +471,8 @@ local plugins = { dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.nvim' }, -- if you use the mini.nvim suite }, { 'echasnovski/mini.trailspace', version = '*' }, + { url = 'https://git.sr.ht/~whynothugo/lsp_lines.nvim' }, + { 'glacambre/firenvim', build = ":call firenvim#install(0)" }, } require("lazy").setup(plugins, {}) @@ -1153,3 +1158,5 @@ require("telescope").setup { -- vim.diagnostic.config({ virtual_text = false }) require('mini.trailspace').setup {} + +require('lsp_lines').setup {}