diff --git a/home/fabric/default.nix b/home/fabric/default.nix index 9fd800c..17df5b7 100644 --- a/home/fabric/default.nix +++ b/home/fabric/default.nix @@ -123,6 +123,7 @@ gnupg dig zathura + librewolf ]; # Enable home-manager diff --git a/home/fabric/programs/neomutt.nix b/home/fabric/programs/neomutt.nix index f6959fd..6b08cbc 100644 --- a/home/fabric/programs/neomutt.nix +++ b/home/fabric/programs/neomutt.nix @@ -5,6 +5,6 @@ }; }; home.packages = with pkgs; [ - msmtp + urlscan ]; } diff --git a/home/fabric/programs/nixvim.nix b/home/fabric/programs/nixvim.nix index 9ead0ba..8b2bf93 100644 --- a/home/fabric/programs/nixvim.nix +++ b/home/fabric/programs/nixvim.nix @@ -225,16 +225,6 @@ indent-blankline.enable = true; harpoon = { enable = true; - # keymaps = { - # addFile = "ha"; - # toggleQuickMenu = ""; - # navFile = { - # "1" = "h;"; - # "2" = "h,"; - # "3" = "h."; - # "4" = "hp"; - # }; - # }; }; yazi.enable = true; gitsigns = { @@ -504,40 +494,70 @@ keymaps = [ { mode = "n"; - key = "ha"; + key = ""; action.__raw = "function() require'harpoon':list():add() end"; options.desc = "Harpoon add file"; } { mode = "n"; - key = ""; + key = ""; action.__raw = "function() require'harpoon'.ui:toggle_quick_menu(require'harpoon':list()) end"; options.desc = "Harpoon quick menu"; } { mode = "n"; - key = "h;"; + key = ""; action.__raw = "function() require'harpoon':list():select(1) end"; options.desc = "Harpoon file 1"; } { mode = "n"; - key = "h,"; + key = ""; action.__raw = "function() require'harpoon':list():select(2) end"; options.desc = "Harpoon file 2"; } { mode = "n"; - key = "h."; + key = ""; action.__raw = "function() require'harpoon':list():select(3) end"; options.desc = "Harpoon file 3"; } { mode = "n"; - key = "hp"; + key = ""; action.__raw = "function() require'harpoon':list():select(4) end"; options.desc = "Harpoon file 4"; } + { + mode = "n"; + key = ""; + action.__raw = "function() require'harpoon':list():select(5) end"; + options.desc = "Harpoon file 5"; + } + { + mode = "n"; + key = ""; + action.__raw = "function() require'harpoon':list():select(6) end"; + options.desc = "Harpoon file 6"; + } + { + mode = "n"; + key = ""; + action.__raw = "function() require'harpoon':list():select(7) end"; + options.desc = "Harpoon file 7"; + } + { + mode = "n"; + key = ""; + action.__raw = "function() require'harpoon':list():select(8) end"; + options.desc = "Harpoon file 8"; + } + { + mode = "n"; + key = ""; + action.__raw = "function() require'harpoon':list():select(9) end"; + options.desc = "Harpoon file 9"; + } { mode = "n"; key = ""; @@ -547,24 +567,24 @@ remap = true; }; } - { - mode = "n"; - key = ""; - action = "j"; - options = { - desc = "Go to Lower Window"; - remap = true; - }; - } - { - mode = "n"; - key = ""; - action = "k"; - options = { - desc = "Go to Upper Window"; - remap = true; - }; - } + # { + # mode = "n"; + # key = ""; + # action = "j"; + # options = { + # desc = "Go to Lower Window"; + # remap = true; + # }; + # } + # { + # mode = "n"; + # key = ""; + # action = "k"; + # options = { + # desc = "Go to Upper Window"; + # remap = true; + # }; + # } { mode = "n"; key = ""; diff --git a/home/fabric/programs/zsh.nix b/home/fabric/programs/zsh.nix index fce4208..17b0cce 100644 --- a/home/fabric/programs/zsh.nix +++ b/home/fabric/programs/zsh.nix @@ -26,6 +26,7 @@ export GPG_TTY=$(tty) export GPG_AGENT_INFO= export GPGPINENTRYMODE=loopback + export BROWSER=/home/fabric/.nix-profile/bin/qutebrowser GOPATH=$HOME/go PATH=$PATH:/usr/local/go/bin:$GOPATH/bin PATH="$HOME/.govm/shim:$PATH" diff --git a/hosts/common/optional/plasma.nix b/hosts/common/optional/plasma.nix index 8d892bb..c909091 100644 --- a/hosts/common/optional/plasma.nix +++ b/hosts/common/optional/plasma.nix @@ -8,18 +8,6 @@ }; environment.systemPackages = with pkgs; [ - kdePackages.discover # Optional: Install if you use Flatpak or fwupd firmware update sevice - kdePackages.kcalc # Calculator - kdePackages.kcharselect # Tool to select and copy special characters from all installed fonts - kdePackages.kcolorchooser # A small utility to select a color - kdePackages.kolourpaint # Easy-to-use paint program - kdePackages.ksystemlog # KDE SystemLog Application - kdePackages.sddm-kcm # Configuration module for SDDM - kdiff3 # Compares and merges 2 or 3 files or directories - kdePackages.isoimagewriter # Optional: Program to write hybrid ISO files onto USB disks - kdePackages.partitionmanager # Optional Manage the disk devices, partitions and file systems on your computer - hardinfo2 # System information and benchmarks for Linux systems - haruna # Open source video player built with Qt/QML and libmpv wayland-utils # Wayland utilities wl-clipboard # Command-line copy/paste utilities for Wayland ]; diff --git a/hosts/zion/default.nix b/hosts/zion/default.nix index 6f4c535..7bbc805 100644 --- a/hosts/zion/default.nix +++ b/hosts/zion/default.nix @@ -10,7 +10,7 @@ ./hardware-configuration.nix # Common configurations - # ../common/optional/plasma.nix + ../common/optional/plasma.nix ../common/global ../common/optional/nvidia.nix ../common/optional/docker.nix @@ -68,7 +68,7 @@ }; # Display manager configuration - services.displayManager.defaultSession = "dwl"; + services.displayManager.defaultSession = "plasma"; # Basic system packages environment.systemPackages = with pkgs; [ @@ -79,5 +79,6 @@ usbutils obs-studio ntfs3g + firefox ]; }