fix vterm keybinding
This commit is contained in:
parent
a41593f712
commit
5bfdc0710c
|
@ -1,5 +1,4 @@
|
||||||
{
|
{
|
||||||
username = "andreas";
|
username = "andreas";
|
||||||
system = "x86_64-linux";
|
|
||||||
version = "22.05";
|
version = "22.05";
|
||||||
}
|
}
|
||||||
|
|
48
flake.nix
48
flake.nix
|
@ -37,65 +37,44 @@
|
||||||
custom = import ./custom;
|
custom = import ./custom;
|
||||||
mkComputer = import "${inputs.self}/lib/mk_computer.nix";
|
mkComputer = import "${inputs.self}/lib/mk_computer.nix";
|
||||||
mkRaspi = import "${inputs.self}/lib/mk_raspi.nix";
|
mkRaspi = import "${inputs.self}/lib/mk_raspi.nix";
|
||||||
|
|
||||||
system = custom.system;
|
|
||||||
username = custom.username;
|
|
||||||
|
|
||||||
overlay-unstable = final: prev: {
|
|
||||||
unstable = import nixpkgs-unstable {
|
|
||||||
system = custom.system;
|
|
||||||
config.allowUnfree = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
pkgs = import nixpkgs {
|
|
||||||
inherit system;
|
|
||||||
config = {
|
|
||||||
allowUnfree = true;
|
|
||||||
};
|
|
||||||
overlays = [
|
|
||||||
overlay-unstable
|
|
||||||
inputs.nix-alien.overlay
|
|
||||||
];
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
gwyn = mkComputer {
|
gwyn = mkComputer {
|
||||||
hostname = "gwyn";
|
hostname = "gwyn";
|
||||||
home-module = "desktop";
|
home-module = "desktop";
|
||||||
inherit custom pkgs inputs;
|
inherit custom inputs;
|
||||||
};
|
};
|
||||||
nixos-vm = mkComputer {
|
nixos-vm = mkComputer {
|
||||||
hostname = "desktop-vm";
|
hostname = "desktop-vm";
|
||||||
home-module = "desktop";
|
home-module = "desktop";
|
||||||
inherit custom pkgs inputs;
|
inherit custom inputs;
|
||||||
};
|
};
|
||||||
staubfinger = mkComputer {
|
staubfinger = mkComputer {
|
||||||
hostname = "staubfinger";
|
hostname = "staubfinger";
|
||||||
home-module = "desktop";
|
home-module = "desktop";
|
||||||
inherit custom pkgs inputs;
|
inherit custom inputs;
|
||||||
};
|
};
|
||||||
# Servers
|
# Servers
|
||||||
git = mkComputer {
|
git = mkComputer {
|
||||||
hostname = "git";
|
hostname = "git";
|
||||||
inherit custom pkgs inputs;
|
inherit custom inputs;
|
||||||
};
|
};
|
||||||
mail = mkComputer {
|
mail = mkComputer {
|
||||||
hostname = "mail";
|
hostname = "mail";
|
||||||
inherit custom pkgs inputs;
|
inherit custom inputs;
|
||||||
};
|
};
|
||||||
nextcloud = mkComputer {
|
nextcloud = mkComputer {
|
||||||
hostname = "nextcloud";
|
hostname = "nextcloud";
|
||||||
inherit custom pkgs inputs;
|
inherit custom inputs;
|
||||||
};
|
};
|
||||||
pihole = mkComputer {
|
pihole = mkComputer {
|
||||||
hostname = "pihole";
|
hostname = "pihole";
|
||||||
inherit custom pkgs inputs;
|
inherit custom inputs;
|
||||||
};
|
};
|
||||||
plex = mkComputer {
|
plex = mkComputer {
|
||||||
hostname = "plex";
|
hostname = "plex";
|
||||||
inherit custom pkgs inputs;
|
inherit custom inputs;
|
||||||
};
|
};
|
||||||
proxy = mkRaspi {
|
proxy = mkRaspi {
|
||||||
hostname = "proxy";
|
hostname = "proxy";
|
||||||
|
@ -103,25 +82,26 @@
|
||||||
};
|
};
|
||||||
raspi-test = mkRaspi {
|
raspi-test = mkRaspi {
|
||||||
hostname = "raspi-test";
|
hostname = "raspi-test";
|
||||||
inherit custom pkgs inputs;
|
inherit custom inputs;
|
||||||
};
|
};
|
||||||
restic-server = mkComputer {
|
restic-server = mkComputer {
|
||||||
hostname = "restic-server";
|
hostname = "restic-server";
|
||||||
inherit custom pkgs inputs;
|
inherit custom inputs;
|
||||||
};
|
};
|
||||||
test-server = mkComputer {
|
test-server = mkComputer {
|
||||||
hostname = "test-server";
|
hostname = "test-server";
|
||||||
inherit custom pkgs inputs;
|
inherit custom inputs;
|
||||||
};
|
};
|
||||||
ttrss = mkComputer {
|
ttrss = mkComputer {
|
||||||
hostname = "ttrss";
|
hostname = "ttrss";
|
||||||
inherit custom pkgs inputs;
|
inherit custom inputs;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
homeConfigurations = {
|
homeConfigurations = {
|
||||||
"${custom.username}@co-ws-con4" = home-manager.lib.homeManagerConfiguration {
|
"${custom.username}@co-ws-con4" = home-manager.lib.homeManagerConfiguration {
|
||||||
configuration = import "${inputs.self}/home-manager/work-wsl.nix";
|
configuration = import "${inputs.self}/home-manager/work-wsl.nix";
|
||||||
inherit system username;
|
system = "x86_64";
|
||||||
|
username = custom.username;
|
||||||
homeDirectory = "/home/${custom.username}";
|
homeDirectory = "/home/${custom.username}";
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
inherit custom inputs;
|
inherit custom inputs;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
:config
|
:config
|
||||||
(setq vterm-kill-buffer-on-exit t
|
(setq vterm-kill-buffer-on-exit t
|
||||||
vterm-disable-bold t)
|
vterm-disable-bold t)
|
||||||
(global-set-key (kbd "M RET") 'vterm)
|
(global-set-key (kbd "M-RET") 'vterm)
|
||||||
(evil-set-initial-state 'vterm-mode 'emacs))
|
(evil-set-initial-state 'vterm-mode 'emacs))
|
||||||
|
|
||||||
(use-package multi-vterm
|
(use-package multi-vterm
|
||||||
|
|
|
@ -1,4 +1,25 @@
|
||||||
{ custom, hostname, inputs, pkgs, system ? "x86_64-linux", home-module ? "headless" }: inputs.nixpkgs.lib.nixosSystem {
|
{ custom, hostname, inputs, system ? "x86_64-linux", home-module ? "headless" }:
|
||||||
|
let
|
||||||
|
overlay-unstable = final: prev: {
|
||||||
|
unstable = import inputs.nixpkgs-unstable {
|
||||||
|
system = system;
|
||||||
|
config.allowUnfree = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
pkgs = import inputs.nixpkgs {
|
||||||
|
inherit system;
|
||||||
|
config = {
|
||||||
|
allowUnfree = true;
|
||||||
|
};
|
||||||
|
overlays = [
|
||||||
|
overlay-unstable
|
||||||
|
inputs.nix-alien.overlay
|
||||||
|
];
|
||||||
|
};
|
||||||
|
in
|
||||||
|
inputs.nixpkgs.lib.nixosSystem
|
||||||
|
{
|
||||||
inherit system pkgs;
|
inherit system pkgs;
|
||||||
specialArgs = { inherit custom inputs; };
|
specialArgs = { inherit custom inputs; };
|
||||||
modules = (
|
modules = (
|
||||||
|
|
Loading…
Reference in New Issue