Compare commits
No commits in common. "f7a10421a581ea03fc84ba3bf61a145f7c94d87f" and "9cefcd2509b73fc1ae8925a08a939ccdde939010" have entirely different histories.
f7a10421a5
...
9cefcd2509
|
@ -12,9 +12,16 @@ new_window pixel
|
|||
hide_edge_borders both
|
||||
|
||||
exec setxkbmap de
|
||||
exec xinput --map-to-output "ipts 045E:001F Pen Pen (0)" eDP1
|
||||
exec xinput --map-to-output "ipts 045E:001F Pen Eraser (0)" eDP1
|
||||
exec xinput --map-to-output "ipts 045E:001F Touchscreen" eDP1
|
||||
|
||||
bindsym $mod+Shift+s exec xinput --map-to-output "ipts 045E:001F Pen Pen (0)" eDP1; exec xinput --map-to-output "ipts 045E:001F Pen Eraser (0)" eDP1; exec xinput --map-to-output "ipts 045E:001F Touchscreen" eDP1
|
||||
bindsym $mod+Shift+a exec xinput --enable "ipts 045E:001F Touchscreen"
|
||||
bindsym $mod+Shift+d exec xinput --disable "ipts 045E:001F Touchscreen"
|
||||
|
||||
#exec compton -f
|
||||
exec feh --bg-scale $(xdg-user-dir PICTURES)/wallpaper.jpg
|
||||
exec feh --bg-scale Pictures/wallpaper.jpg
|
||||
#exec pulseaudio -D
|
||||
#exec fcitx
|
||||
#exec env=LC_CTYPE=zh_CN.UTF-8 emacs --daemon
|
||||
|
|
|
@ -18,7 +18,6 @@ order += "backlight"
|
|||
order += "volume_status"
|
||||
order += "cpu_temperature 0"
|
||||
order += "load"
|
||||
order += "battery 0"
|
||||
order += "group tz"
|
||||
|
||||
group network {
|
||||
|
@ -66,17 +65,6 @@ group tz {
|
|||
}
|
||||
}
|
||||
|
||||
battery 0 {
|
||||
format = "%status %percentage %remaining %emptytime"
|
||||
format_down = "No battery"
|
||||
status_chr = "⚡ CHR"
|
||||
status_bat = "🔋 BAT"
|
||||
status_unk = "? UNK"
|
||||
status_full = "☻ FULL"
|
||||
path = "/sys/class/power_supply/BAT%d/uevent"
|
||||
low_threshold = 10
|
||||
}
|
||||
|
||||
volume_status {
|
||||
button_up = 4
|
||||
button_down = 5
|
||||
|
|
|
@ -1,42 +1,7 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
with lib;
|
||||
{ config, ... }:
|
||||
|
||||
{
|
||||
networking = {
|
||||
hostName = config.machine.hostName;
|
||||
useNetworkd = config.machine.useNetworkd;
|
||||
useDHCP = !config.machine.useNetworkd;
|
||||
dhcpcd.enable = !config.machine.useNetworkd;
|
||||
};
|
||||
# Based on
|
||||
# https://github.com/NixOS/nixpkgs/issues/10001#issuecomment-905532069
|
||||
systemd.network = mkIf config.machine.useNetworkd {
|
||||
enable = true;
|
||||
networks = let
|
||||
networkConfig = {
|
||||
DHCP = "yes";
|
||||
DNSSEC = "yes";
|
||||
DNSOverTLS = "yes";
|
||||
DNS = [ "1.1.1.1" "1.0.0.1" ];
|
||||
};
|
||||
in {
|
||||
"40-wired" = {
|
||||
enable = true;
|
||||
name = "en*";
|
||||
dhcpV4Config.RouteMetric = 2048;
|
||||
inherit networkConfig;
|
||||
};
|
||||
"40-wireless" = {
|
||||
enable = true;
|
||||
name = "wl*";
|
||||
dhcpV4Config.RouteMetric = 1024;
|
||||
inherit networkConfig;
|
||||
};
|
||||
};
|
||||
};
|
||||
# Wait for any interface to become available, not for all
|
||||
systemd.services."systemd-networkd-wait-online".serviceConfig.ExecStart = [
|
||||
"" "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online --any"
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, config, lib, ... }:
|
||||
{ config, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.machine;
|
||||
|
@ -8,11 +8,8 @@ in {
|
|||
buildCores = 1;
|
||||
autoOptimiseStore = true;
|
||||
useSandbox = true;
|
||||
package = pkgs.nix_2_4;
|
||||
allowedUsers = [ "root" ] ++ (map (n: n.name) cfg.administrators);
|
||||
extraOptions = ''
|
||||
build-timeout = 86400 # 24 hours
|
||||
experimental-features = nix-command flakes
|
||||
'';
|
||||
binaryCachePublicKeys = [ (lib.fileContents "${cfg.secretPath}/hydra_cache.pub") ];
|
||||
trustedBinaryCaches = [
|
||||
|
|
|
@ -59,13 +59,6 @@ in {
|
|||
The Machines HostName
|
||||
'';
|
||||
};
|
||||
useNetworkd = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Disables dhcpcd and enables networkd.
|
||||
'';
|
||||
};
|
||||
binaryCaches = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
nix-update-source
|
||||
nix-zsh-completions
|
||||
nixbang
|
||||
nixops
|
||||
nmap
|
||||
nox
|
||||
ntfs3g
|
||||
|
|
|
@ -7,11 +7,10 @@
|
|||
{
|
||||
enable = true;
|
||||
configFile = ../../config/etc/i3/config;
|
||||
extraPackages = with pkgs; [
|
||||
extraPackages = with pkgs; [
|
||||
dmenu
|
||||
file
|
||||
i3lock
|
||||
i3status
|
||||
xdg-user-dirs
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,28 +0,0 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
mkIf (elem "nspawn" config.machine.services) {
|
||||
systemd = let
|
||||
fn = import ../fn.nix { inherit lib; };
|
||||
in {
|
||||
nspawn = recursiveUpdate (listToAttrs (
|
||||
(map (
|
||||
name: {
|
||||
name = name;
|
||||
value = { networkConfig.VirtualEthernet = "no"; };
|
||||
}
|
||||
)
|
||||
(fn.lst { p = /var/lib/machines; t = "directory"; b = false; })
|
||||
))) {
|
||||
"64Arch" = {
|
||||
filesConfig = {
|
||||
"BindReadOnly" = ["/tmp/.X11-unix"];
|
||||
"Bind" = ["/dev/snd" "/dev/dri"];
|
||||
# TODO: Add this to service overrides
|
||||
# "DeviceAllow" = [ "/dev/dri/renderD128" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Reference in a new issue