Merge remote-tracking branch 'origin/nixos' into nixos

This commit is contained in:
Moritz Böhme 2023-05-07 12:06:25 +02:00
commit c9e2642e96
Signed by: moritz
GPG key ID: 970C6E89EB0547A9
3 changed files with 14 additions and 36 deletions

View file

@ -109,11 +109,12 @@
self.overlay
];
# overlays = utils.lib.exportOverlays {
# inherit (self) pkgs inputs;
# };
overlays.default = self.overlay;
overlays = utils.lib.exportOverlays
{
inherit (self) pkgs inputs;
} // {
default = self.overlay;
};
/*
@ -145,7 +146,6 @@
hosts.nixos-laptop.modules = [
./hosts/nixos-laptop
self.nixosModules.desktop
self.nixosModules.gaming
self.nixosModules.personal
];

View file

@ -2,31 +2,9 @@
{
environment.systemPackages = with pkgs; [
# nix
nixpkgs-review
# ripping
abcde
handbrake
picard
# other
anki
calibre
jellyfin-media-player
keepassxc
stable.libreoffice # HACK to fix build error
pavucontrol
stable.signal-desktop
tlaplusToolbox
vlc
thunderbird
plantuml
jetbrains.pycharm-professional
synology-drive-client
texlive.combined.scheme-full
];
}

View file

@ -5,6 +5,14 @@ require("which-key").register({
b = { "<cmd>Telescope buffers<cr>", "List buffers" },
d = { "<cmd>bd<cr>", "Delete buffer" },
},
}, { prefix = "<leader>" })
require("which-key").register({
["["] = {
b = { "<cmd>bprevious<cr>", "Previous buffer" },
},
["]"] = {
b = { "<cmd>bnext<cr>", "Next buffer" },
},
})
-- window
@ -17,14 +25,6 @@ require("which-key").register({
d = { "<C-w>c", "Delete window" },
},
}, { prefix = "<leader>" })
require("which-key").register({
["["] = {
b = { "<cmd>bprevious<cr>", "Previous buffer" },
},
["]"] = {
b = { "<cmd>bnext<cr>", "Next buffer" },
},
})
-- tab
require("which-key").register({