winston/dotfiles
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

refactor: per-machine settings

Browse source
This commit is contained in:
winston 2023-05-18 15:19:31 +02:00
parent b7f052bfaa
commit d2d58dbe13
Signed by: winston
GPG key ID: 3786770EDBC2B481
5 changed files with 45 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
flake.nix
View file

@ -52,10 +52,7 @@
};
sway-unwrapped = swayfx.packages.${prev.system}.default;
};
commonHMConfig = {
username,
machine,
}: ({
commonHMConfig = {username}: ({
config,
pkgs,
...
@ -76,7 +73,6 @@
if pkgs.stdenv.isDarwin
then "/Users/${username}/.config/nixpkgs"
else "/home/${username}/.config/nixpkgs";
inherit machine;
};
};
};
@ -92,7 +88,6 @@
./machines/futomaki
(commonHMConfig {
username = "winston";
machine.personal = true;
})
];
};
@ -104,7 +99,6 @@
./machines/bento
(commonHMConfig {
username = "w";
machine.personal = false;
})
];
};
@ -118,7 +112,6 @@
./machines/sashimi
(commonHMConfig {
username = "winston";
machine.personal = true;
})
];
};
@ -150,7 +143,6 @@
if pkgs.stdenv.isDarwin
then "/Users/${username}/.config/nixpkgs"
else "/home/${username}/.config/nixpkgs";
machine.personal = false;
};
};
}

7
machines/common/linux/default.nix
View file

@ -1,14 +1,11 @@
{pkgs, ...}: {
{
imports = [
./boot.nix
./input.nix
./network.nix
./sound.nix
./xsession.nix
];
# needed for gnome3 pinentry
services.dbus.packages = [pkgs.gcr];
xdg.portal.enable = true;
xdg.portal.wlr.enable = true;
console.colors = [
"1e1e2e"

27
machines/common/linux/input.nix Normal file
View file

@ -0,0 +1,27 @@
{
hardware.keyboard.qmk.enable = true;
services.kanata = {
enable = true;
keyboards.keychron-k6 = {
devices = ["/dev/input/by-id/usb-Keychron_Keychron_K6-event-kbd"];
config = ''
(defsrc
esc 1 2 3 4 5 6 7 8 9 0 - = bspc
tab q w e r t y u i o p [ ] \
caps a s d f g h j k l ; ' ret
lsft z x c v b n m , . / rsft
lctl lmet lalt spc ralt rmet rctl)
(deflayer qwerty
@sesc 1 2 3 4 5 6 7 8 9 0 - = bspc
tab q w e r t y u i o p [ ] \
caps a s d f g h j k l ; ' ret
lsft z x c v b n m , . / rsft
lctl lmet lalt spc ralt rmet rctl)
(defalias
sesc (fork esc grv (lsft rsft))
)
'';
};
};
}

39
machines/common/linux/xsession.nix
View file

@ -22,6 +22,15 @@
};
};
programs.sway = {
enable = true;
extraPackages = with pkgs; [
foot
swaylock-effects
swayidle
];
};
services = {
# mounting
gvfs.enable = true;
@ -58,31 +67,6 @@
gnome.gnome-keyring.enable = true;
kanata = {
enable = true;
keyboards.keychron-k6 = {
devices = ["/dev/input/by-id/usb-Keychron_Keychron_K6-event-kbd"];
config = ''
(defsrc
esc 1 2 3 4 5 6 7 8 9 0 - = bspc
tab q w e r t y u i o p [ ] \
caps a s d f g h j k l ; ' ret
lsft z x c v b n m , . / rsft
lctl lmet lalt spc ralt rmet rctl)
(deflayer qwerty
@sesc 1 2 3 4 5 6 7 8 9 0 - = bspc
tab q w e r t y u i o p [ ] \
caps a s d f g h j k l ; ' ret
lsft z x c v b n m , . / rsft
lctl lmet lalt spc ralt rmet rctl)
(defalias
sesc (fork esc grv (lsft rsft))
)
'';
};
};
xserver = {
enable = true;
desktopManager.xterm.enable = false;
@ -96,6 +80,11 @@
};
};
# needed for gnome3 pinentry
services.dbus.packages = [pkgs.gcr];
xdg.portal.enable = true;
xdg.portal.wlr.enable = true;
security.polkit.enable = true;
systemd = {
packages = [pkgs.polkit_gnome];

1
machines/futomaki/default.nix
View file

@ -44,6 +44,7 @@ in {
environment.systemPackages = with pkgs; [
(discord.override {withOpenASAR = true;})
gnome.gnome-boxes
heroic
lutris
nur.repos.nekowinston.discover-overlay