diff --git a/flake.lock b/flake.lock index b52720f..da40706 100644 --- a/flake.lock +++ b/flake.lock @@ -870,7 +870,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-Cp+apszVyMt3AIJSc7YFfxO2KhPvVQ63s3f8Uzkrfs8=", + "narHash": "sha256-9Ajo8TveKRz2KN9eO9AgpMuPMl0g9pf/ehU6NKFxDiQ=", "path": "./pkgs/nixvim", "type": "path" }, diff --git a/modules/home/firefox/firefox.nix b/modules/home/firefox/firefox.nix index 4ee2838..206feee 100644 --- a/modules/home/firefox/firefox.nix +++ b/modules/home/firefox/firefox.nix @@ -30,16 +30,42 @@ name = "${username}"; bookmarks = [ { - name = "NixOS Options"; - url = "https://search.nixos.org/options"; - } - { - name = "Home Manager Options"; - url = "https://home-manager-options.extranix.com/"; - } - { - name = "Nixvim Docs"; - url = "https://nix-community.github.io/nixvim/"; + name = "Nix Sites"; + toolbar = true; + bookmarks = [ + { + name = "NixOS Wiki"; + url = "https://nixos.wiki/wiki/Main_Page"; + } + { + name = "Nixpkgs Reference Manual"; + url = "https://nixos.org/manual/nixpkgs/stable/"; + } + { + name = "NixOS Manual"; + url = "https://nixos.org/manual/nixos/stable/"; + } + { + name = "NixOS Options"; + url = "https://search.nixos.org/options"; + } + { + name = "Home Manager Options"; + url = "https://home-manager-options.extranix.com/"; + } + { + name = "Nixpkgs Package Search"; + url = "https://search.nixos.org/packages"; + } + { + name = "Noogle - Nixpkgs Function Docs"; + url = "https://noogle.dev"; + } + { + name = "Nixvim Docs"; + url = "https://nix-community.github.io/nixvim/"; + } + ]; } { name = "Rust Manual"; @@ -68,7 +94,6 @@ firenvim privacy-badger new-tab-override - tampermonkey ]; extraConfig = '' "browser.startup.homepage" = "${self}/glasshouse-desktop/home/firefox/homepage.html"; diff --git a/modules/home/scripts/commands/invoke.nix b/modules/home/scripts/commands/invoke.nix index 0c85334..a116b89 100644 --- a/modules/home/scripts/commands/invoke.nix +++ b/modules/home/scripts/commands/invoke.nix @@ -5,5 +5,5 @@ pkgs.writeShellScriptBin "invoke" '' #!/run/current-system/sw/bin/bash - nix run nixpkgs#$"@" + nix run nixpkgs#"$@" '' diff --git a/pkgs/nixvim/config/autocmd.nix b/pkgs/nixvim/config/autocmd.nix index fef9a03..39025dd 100644 --- a/pkgs/nixvim/config/autocmd.nix +++ b/pkgs/nixvim/config/autocmd.nix @@ -4,31 +4,31 @@ command = "FloatermNew --wintype=float --name=shadeterm --position=topright --autoclose=0 --silent --cwd= --titleposition=left zsh"; event = ["VimEnter"]; pattern = ["*"]; - desc = "Create a floating terminal, placed in the top right"; + desc = "Create a floating terminal, placed in the top right"; } { command = "silent! mkview"; event = ["BufWinLeave"]; pattern = ["*"]; - desc = "Save session window settings to be loaded next time the file is opened"; + desc = "Save session window settings to be loaded next time the file is opened"; } { command = "silent! !aplay ~/sound/sys/cd.wav > /dev/null 2>&1 &"; event = ["BufWinLeave"]; pattern = ["*"]; - desc = "Play a neat little sound effect when you close neovim"; + desc = "Play a neat little sound effect when you close neovim"; } { command = "silent! loadview"; event = ["BufWinEnter"]; pattern = ["*"]; - desc = "Load previous session window settings for the opened file (folds, cursor pos, etc)"; + desc = "Load previous session window settings for the opened file (folds, cursor pos, etc)"; + } + { + command = "setlocal textwidth = 135"; + event = ["BufWinEnter" "BufEnter"]; + pattern = ["*.md" "*.wiki" "*.txt"]; + desc = "Set automatic linebreaks in plain text file formats"; } - { - command = "setlocal textwidth = 135"; - event = ["BufWinEnter" "BufEnter"]; - pattern = ["*.md" "*.wiki" "*.txt"]; - desc = "Set automatic linebreaks in plain text file formats"; - } ]; }