From 65e136fd9518c5ef5ced13c6ec0963fe2fc56204 Mon Sep 17 00:00:00 2001 From: Till Date: Sat, 9 Dec 2023 13:22:32 +0100 Subject: [PATCH] diesdas --- flake.lock | 18 +++++++++--------- home/default.nix | 5 +++++ home/firefox.nix | 44 +++++++++++++++++++++++++++++++++++++++++++ home/fish.nix | 1 + home/nvim/config.vim | 3 --- home/nvim/default.nix | 2 +- home/nvim/lsp.vim | 1 + system/default.nix | 2 +- 8 files changed, 62 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 6b9b1a0..81d47c2 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1701433070, - "narHash": "sha256-Gf9JStfENaUQ7YWFz3V7x/srIwr4nlnVteqaAxtwpgM=", + "lastModified": 1702110948, + "narHash": "sha256-GzK0k5kFgZLbeaOPPoFS4C2BP8vZ0fAH36UtbFRnrWs=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a8545f5e737a6338814a4676dc8e18c7f43fc57", + "rev": "efa36e896951bec8d96e38ea40a22c010bd1bd8f", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701389149, - "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=", + "lastModified": 1701952659, + "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c", + "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nur": { "locked": { - "lastModified": 1701595091, - "narHash": "sha256-vqncvyr9sXKjKo8i6TePntG9HaeihB7Lp0QxXVIdwNA=", + "lastModified": 1702118209, + "narHash": "sha256-k1m1DtnqBMGr3J0vyS6CyBQwJni820lLXdfhJDmcrdQ=", "owner": "nix-community", "repo": "nur", - "rev": "b1868c9209bd28d9c76251649cfc4f0d72d87601", + "rev": "89ddb7a494640ae6209d2c5937db3776928e6ff8", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 5744c2f..e193af2 100644 --- a/home/default.nix +++ b/home/default.nix @@ -171,6 +171,11 @@ "; }; + programs.bottom = { + enable = true; + settings.flags.color = "default-light"; + }; + programs.obs-studio.enable = true; } diff --git a/home/firefox.nix b/home/firefox.nix index 96178cb..36b97fb 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -44,6 +44,50 @@ linkhints keepassxc-browser ]; + search = { + force = true; + default = "Google"; + engines = { + "Nix Packages" = { + urls = [{ + template = "https://search.nixos.org/packages"; + params = [ + { name = "type"; value = "packages"; } + { name = "query"; value = "{searchTerms}"; } + ]; + }]; + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ "@np" ]; + }; + "NixOS Wiki" = { + urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }]; + iconUpdateURL = "https://nixos.wiki/favicon.png"; + updateInterval = 24 * 60 * 60 * 1000; + definedAliases = [ "@nw" ]; + }; + "Home manager options" = { + urls = [{ template = "https://mipmip.github.io/home-manager-option-search/?query={searchTerms}"; }]; + iconUpdateURL = "https://mipmip.github.io/home-manager-option-search/images/favicon.png"; + updateInterval = 24 * 60 * 60 * 1000; + definedAliases = [ "@hm" ]; + }; + "Google maps" = { + urls = [{ template = "http://maps.google.com/?q={searchTerms}"; }]; + iconUpdateURL = "https://www.google.com/images/branding/product/ico/maps15_bnuw3a_32dp.ico"; + updateInterval = 24 * 60 * 60 * 1000; + definedAliases = [ "@gm" ]; + }; + "Google scholar" = { + urls = [{ template = "https://scholar.google.com/scholar?q={searchTerms}"; }]; + iconUpdateURL = "https://scholar.google.com/favicon.ico"; + updateInterval = 24 * 60 * 60 * 1000; + definedAliases = [ "@gs" ]; + }; + "Wikipedia (en)".metaData.alias = "@wiki"; + "Bing".metaData.hidden = true; + "Amazon.de".metaData.hidden = true; + }; + }; extraConfig = '' user_pref("app.shield.optoutstudies.enabled", false); user_pref("browser.aboutConfig.showWarning", false); diff --git a/home/fish.nix b/home/fish.nix index acbee84..e268c76 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -5,6 +5,7 @@ enable = true; interactiveShellInit = "fish_add_path ${config.xdg.dataHome}/npm/packages/bin"; shellAliases = { + htop = "btm -b"; linkbox = "ln -s (pwd) ~/box/"; rloft = "tmux source-file ~/.config/tmux/rloft.conf"; liftbox = "rsync -vaL --delete ~/box/ tstraube@login.server.uni-frankfurt.de:box/"; diff --git a/home/nvim/config.vim b/home/nvim/config.vim index 6f1484d..d737b47 100644 --- a/home/nvim/config.vim +++ b/home/nvim/config.vim @@ -26,9 +26,6 @@ set updatetime=300 let g:netrw_liststyle = 3 let g:netrw_fastbrowse = 0 -nnoremap ve :edit $MYVIMRC -nnoremap vs :source $MYVIMRC - nnoremap Y y$ nnoremap gF :edit diff --git a/home/nvim/default.nix b/home/nvim/default.nix index ebe9371..7f5e842 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -46,7 +46,7 @@ nnoremap R :Read ~/ nnoremap a :Ag nnoremap b :Buffers - nnoremap . :Files ~/omniflake/ + nnoremap . :Files ~/.config/omniflake/ command! -nargs=? -complete=dir Read call fzf#run( \fzf#wrap({'sink': 'read', 'dir': }) \) diff --git a/home/nvim/lsp.vim b/home/nvim/lsp.vim index e6cdc93..5aabbd2 100644 --- a/home/nvim/lsp.vim +++ b/home/nvim/lsp.vim @@ -58,6 +58,7 @@ lua <e', vim.diagnostic.open_float, {}) end local nvim_lsp = require('lspconfig') diff --git a/system/default.nix b/system/default.nix index 907a865..4c01bdb 100644 --- a/system/default.nix +++ b/system/default.nix @@ -71,7 +71,7 @@ firefox foot git - bottom + htop killall neovim pciutils