Touchups
This commit is contained in:
parent
40b24908c3
commit
727947abc1
5 changed files with 11 additions and 19 deletions
|
@ -62,11 +62,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1697226376,
|
"lastModified": 1697655685,
|
||||||
"narHash": "sha256-cumLLb1QOUtWieUnLGqo+ylNt3+fU8Lcv5Zl+tYbRUE=",
|
"narHash": "sha256-79Kuv+QdgsVc+rkibuAgWHnh8IXrLBTOKg5nM0Qvux0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "898cb2064b6e98b8c5499f37e81adbdf2925f7c5",
|
"rev": "80c1aab725151632ddc2a20caeb914e76dd0673c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -35,7 +35,8 @@
|
||||||
inherit self inputs;
|
inherit self inputs;
|
||||||
|
|
||||||
channelsConfig = {
|
channelsConfig = {
|
||||||
allowUnfree = true;
|
allowUnfree.allowUnfreePredicate = pkg: builtins.elem (utils.lib.getName pkg) [
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
sharedOverlays = [
|
sharedOverlays = [
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
home-manager.enable = true;
|
home-manager.enable = true;
|
||||||
sops.enable = true;
|
sops.enable = true;
|
||||||
ssh.enable = true;
|
ssh.enable = true;
|
||||||
zellij.enable = true;
|
|
||||||
};
|
};
|
||||||
services = {
|
services = {
|
||||||
desktop.gnome.enable = true;
|
desktop.gnome.enable = true;
|
||||||
|
@ -66,6 +65,9 @@
|
||||||
lidSwitchExternalPower = "lock";
|
lidSwitchExternalPower = "lock";
|
||||||
lidSwitchDocked = "ignore";
|
lidSwitchDocked = "ignore";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Touchpad
|
||||||
|
xserver.libinput.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
system.stateVersion = "23.05";
|
system.stateVersion = "23.05";
|
||||||
|
@ -94,12 +96,4 @@
|
||||||
# no need to redefine it in your config for now)
|
# no need to redefine it in your config for now)
|
||||||
#media-session.enable = true;
|
#media-session.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable touchpad support (enabled default in most desktopManager).
|
|
||||||
services.xserver = {
|
|
||||||
libinput.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Allow unfree packages
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./apps
|
./apps
|
||||||
./shells
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Nix Flakes
|
# Nix Flakes
|
||||||
|
@ -27,9 +26,4 @@
|
||||||
# font = "Lat2-Terminus16";
|
# font = "Lat2-Terminus16";
|
||||||
useXkbConfig = true; # use xkbOptions in tty.
|
useXkbConfig = true; # use xkbOptions in tty.
|
||||||
};
|
};
|
||||||
|
|
||||||
services.xserver = {
|
|
||||||
layout = "us";
|
|
||||||
xkbVariant = "altgr-intl";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,9 @@ in {
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
layout = "us";
|
||||||
|
xkbVariant = "altgr-intl";
|
||||||
|
|
||||||
excludePackages = with pkgs; [
|
excludePackages = with pkgs; [
|
||||||
xterm
|
xterm
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in a new issue