thor: Switch to i3
This commit is contained in:
parent
8ed718fe09
commit
2983121a35
SSH key fingerprint:
SHA256:9LmFDe1C6jSrEyqxxvX8NtJBmcbB105XoqyUZF092bg
2 changed files with 76 additions and 52 deletions
|
|
@ -1,5 +1,5 @@
|
|||
{ nixpkgs, nixos-hardware, ... }:
|
||||
{ pkgs, ... }:
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
imports = [
|
||||
"${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
|
||||
|
|
@ -15,19 +15,15 @@
|
|||
users.erwin = {
|
||||
enable = true;
|
||||
};
|
||||
base = {
|
||||
plymouth.enable = true;
|
||||
};
|
||||
desktop = {
|
||||
enable = true;
|
||||
wayland = true;
|
||||
};
|
||||
fonts.enable = true;
|
||||
gnome.enable = true;
|
||||
greetd = {
|
||||
fonts = {
|
||||
enable = true;
|
||||
sway = true;
|
||||
iosevka-aile = false;
|
||||
};
|
||||
gnome.enable = true;
|
||||
lightdm.enable = true;
|
||||
networking.enable = true;
|
||||
nix-common = {
|
||||
enable = true;
|
||||
|
|
@ -36,21 +32,27 @@
|
|||
systemd.enable = true;
|
||||
};
|
||||
|
||||
# nixpkgs.crossSystem.system = "aarch64-linux";
|
||||
|
||||
hardware = {
|
||||
# deviceTree.filter = "bcm2711-rpi-4-b.dtb";
|
||||
enableAllFirmware = true;
|
||||
raspberry-pi."4".fkms-3d = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
cma = 512;
|
||||
};
|
||||
};
|
||||
|
||||
boot = {
|
||||
bootspec.enable = true;
|
||||
kernelPackages = pkgs.linuxPackages_rpi4;
|
||||
growPartition = true;
|
||||
};
|
||||
|
||||
zramSwap.enable = true;
|
||||
sdImage.compressImage = false;
|
||||
|
||||
time.timeZone = "Europe/Amsterdam";
|
||||
|
||||
networking = {
|
||||
hostName = "thor";
|
||||
useDHCP = true;
|
||||
|
|
@ -71,12 +73,65 @@
|
|||
services.openssh.enable = true;
|
||||
services.tailscale.enable = true;
|
||||
|
||||
services.kanata = {
|
||||
enable = true;
|
||||
|
||||
keyboards = {
|
||||
code = {
|
||||
devices = [
|
||||
"/dev/input/by-id/usb-04d9_USB_Keyboard-event-kbd"
|
||||
];
|
||||
|
||||
config = ''
|
||||
(defsrc
|
||||
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 prtsc scrlck pp
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = bspc ins home pgup
|
||||
tab q w e r t y u i o p [ ] \ del end pgdn
|
||||
caps a s d f g h j k l ; ' ret
|
||||
lsft z x c v b n m , . / rsft up
|
||||
lctl lmet lalt spc ralt rmet rctl lft down rght)
|
||||
|
||||
(deflayer colemak
|
||||
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 prtsc @qwe pp
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = bspc ins home pgup
|
||||
tab q w f p g j l u y ; [ ] \ del end pgdn
|
||||
@cap a r s t d h n e i o ' ret
|
||||
lsft z x c v b k m , . / rsft up
|
||||
lctl lmet lalt spc ralt rmet rctl lft down rght)
|
||||
|
||||
(deflayer qwerty
|
||||
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 prtsc @col pp
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = bspc ins home pgup
|
||||
tab q w e r t y u i o p [ ] \ del end pgdn
|
||||
@cap a s d f g h j k l ; ' ret
|
||||
lsft z x c v b n m , . / rsft up
|
||||
lctl lmet lalt spc ralt rmet rctl lft down rght)
|
||||
|
||||
(defalias
|
||||
cap (tap-hold 100 100 bspc lctl)
|
||||
col (layer-switch colemak)
|
||||
qwe (layer-switch qwerty)
|
||||
)
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
windowManager.i3 = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [ i3lock-color ];
|
||||
};
|
||||
};
|
||||
|
||||
security = {
|
||||
polkit.enable = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
libraspberrypi
|
||||
raspberrypi-eeprom
|
||||
];
|
||||
|
||||
system.stateVersion = "23.05";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, config, lib, inputs, self-overlay, ... }:
|
||||
{ pkgs, config, lib, inputs, ... }:
|
||||
with lib; let
|
||||
cfg = config.eboskma.users.erwin;
|
||||
in
|
||||
|
|
@ -12,41 +12,20 @@ in
|
|||
home.username = "erwin";
|
||||
home.homeDirectory = "/home/erwin";
|
||||
home.sessionVariables = {
|
||||
EDITOR = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacsclient -c";
|
||||
EDITOR = "${pkgs.neovim}/bin/neovim";
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
home.stateVersion = "23.05";
|
||||
|
||||
eboskma = {
|
||||
programs = {
|
||||
alacritty.enable = true;
|
||||
atuin.enable = true;
|
||||
bat.enable = true;
|
||||
emacs = {
|
||||
enable = true;
|
||||
# package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: [ epkgs.emacsql epkgs.emacsql-sqlite ]));
|
||||
package = pkgs.emacsUnstablePgtk.override {
|
||||
treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
|
||||
};
|
||||
|
||||
daemon = true;
|
||||
};
|
||||
electron = {
|
||||
enable = true;
|
||||
wayland = true;
|
||||
};
|
||||
firefox = {
|
||||
enable = true;
|
||||
work = config.eboskma.base.work;
|
||||
};
|
||||
fish.enable = true;
|
||||
foot = {
|
||||
enable = true;
|
||||
server = false;
|
||||
};
|
||||
git = {
|
||||
enable = true;
|
||||
package = pkgs.git;
|
||||
name = "Erwin Boskma";
|
||||
email = "erwin@datarift.nl";
|
||||
# signingKey = "EE7ADEFE1D943C7B";
|
||||
|
|
@ -54,18 +33,18 @@ in
|
|||
signingKeyFormat = "ssh";
|
||||
};
|
||||
gpg.enable = true;
|
||||
i3.enable = true;
|
||||
neovim.enable = true;
|
||||
nushell.enable = true;
|
||||
polybar = {
|
||||
enable = true;
|
||||
};
|
||||
rofi = {
|
||||
enable = true;
|
||||
package = pkgs.rofi-wayland;
|
||||
terminal = config.home-manager.users.erwin.wayland.windowManager.sway.config.terminal;
|
||||
terminal = config.home-manager.users.erwin.xsession.windowManager.i3.config.terminal;
|
||||
};
|
||||
ssh.enable = true;
|
||||
starship.enable = true;
|
||||
sway.enable = true;
|
||||
swaynotificationcenter.enable = true;
|
||||
waybar.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -73,6 +52,7 @@ in
|
|||
[
|
||||
atool
|
||||
bottom
|
||||
falkon
|
||||
fd
|
||||
gnome.nautilus
|
||||
imagemagick
|
||||
|
|
@ -159,20 +139,9 @@ in
|
|||
};
|
||||
|
||||
imports = [
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
self-overlay
|
||||
inputs.ha-now-playing.overlays.${pkgs.system}
|
||||
inputs.pamedia.overlays.${pkgs.system}
|
||||
inputs.emacs-overlay.overlay
|
||||
];
|
||||
}
|
||||
../../modules/options
|
||||
] ++ (map (mod: (../../home-manager/modules + "/${mod}")) (builtins.attrNames (builtins.readDir ../../home-manager/modules)));
|
||||
};
|
||||
|
||||
programs.bandwhich.enable = true;
|
||||
|
||||
services.ddccontrol.enable = true;
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue