Merge remote-tracking branch 'origin/nixos' into nixos
This commit is contained in:
commit
c9e2642e96
3 changed files with 14 additions and 36 deletions
12
flake.nix
12
flake.nix
|
@ -109,11 +109,12 @@
|
||||||
self.overlay
|
self.overlay
|
||||||
];
|
];
|
||||||
|
|
||||||
# overlays = utils.lib.exportOverlays {
|
overlays = utils.lib.exportOverlays
|
||||||
# inherit (self) pkgs inputs;
|
{
|
||||||
# };
|
inherit (self) pkgs inputs;
|
||||||
|
} // {
|
||||||
overlays.default = self.overlay;
|
default = self.overlay;
|
||||||
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
╔══════════════════════════════════════════════════════════╗
|
╔══════════════════════════════════════════════════════════╗
|
||||||
|
@ -145,7 +146,6 @@
|
||||||
hosts.nixos-laptop.modules = [
|
hosts.nixos-laptop.modules = [
|
||||||
./hosts/nixos-laptop
|
./hosts/nixos-laptop
|
||||||
self.nixosModules.desktop
|
self.nixosModules.desktop
|
||||||
self.nixosModules.gaming
|
|
||||||
self.nixosModules.personal
|
self.nixosModules.personal
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -2,31 +2,9 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# nix
|
|
||||||
nixpkgs-review
|
|
||||||
|
|
||||||
# ripping
|
# ripping
|
||||||
abcde
|
abcde
|
||||||
handbrake
|
handbrake
|
||||||
picard
|
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
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,14 @@ require("which-key").register({
|
||||||
b = { "<cmd>Telescope buffers<cr>", "List buffers" },
|
b = { "<cmd>Telescope buffers<cr>", "List buffers" },
|
||||||
d = { "<cmd>bd<cr>", "Delete buffer" },
|
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
|
-- window
|
||||||
|
@ -17,14 +25,6 @@ require("which-key").register({
|
||||||
d = { "<C-w>c", "Delete window" },
|
d = { "<C-w>c", "Delete window" },
|
||||||
},
|
},
|
||||||
}, { prefix = "<leader>" })
|
}, { prefix = "<leader>" })
|
||||||
require("which-key").register({
|
|
||||||
["["] = {
|
|
||||||
b = { "<cmd>bprevious<cr>", "Previous buffer" },
|
|
||||||
},
|
|
||||||
["]"] = {
|
|
||||||
b = { "<cmd>bnext<cr>", "Next buffer" },
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- tab
|
-- tab
|
||||||
require("which-key").register({
|
require("which-key").register({
|
||||||
|
|
Loading…
Reference in a new issue