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

Update system configurations to 22.05

Browse source
This commit is contained in:
Fabian Hauser 2022-06-06 21:16:07 +02:00
parent 2d5aa915c3
commit f76ca115f7
8 changed files with 118 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
defaults/base/applications.nix
View file

@ -40,11 +40,10 @@
git git
git-lfs git-lfs
] ++ [ # Filesystem & Disk Utilities ] ++ [ # Filesystem & Disk Utilities
fuse_exfat exfat
samba
cifs-utils cifs-utils
keyutils # required for cifs kerberos auth keyutils # required for cifs kerberos auth
smbclient
exfat-utils
sshfs-fuse sshfs-fuse
hdparm hdparm
mtpfs mtpfs
@ -56,9 +55,7 @@
bind bind
curl curl
wget wget
ncat
tor tor
tor-arm
mosh mosh
whois whois
wol wol

2
defaults/base/default.nix
View file

@ -84,7 +84,7 @@ in {
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;
email = "sysadmin@qo.is"; defaults.email = "sysadmin@qo.is";
}; };
# Default Settings # Default Settings

1
defaults/desktop/desktop-environment.nix
View file

@ -11,7 +11,6 @@
xfce.thunar xfce.thunar
xfce.thunar-archive-plugin xfce.thunar-archive-plugin
xfce.xfce4-appfinder # xfce.thunar-volman # needed? xfce.xfce4-appfinder # xfce.thunar-volman # needed?
xfce.terminal
pinentry-gtk2 # Required by gnupg pinentry-gtk2 # Required by gnupg
]; ];

29
defaults/desktop/hardware.nix
View file

@ -12,35 +12,6 @@
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
pulse.enable = true; pulse.enable = true;
media-session.enable = true;
media-session.config.bluez-monitor.rules = [
{
# Matches all cards
matches = [{ "device.name" = "~bluez_card.*"; }];
actions = {
"update-props" = {
"bluez5.reconnect-profiles" = [
"a2dp_sink"
]; # Optional: "hfp_hf" "hsp_hs" for microphone support
# mSBC is not expected to work on all headset + adapter combinations.
"bluez5.msbc-support" = true;
# SBC-XQ is not expected to work on all headset + adapter combinations.
"bluez5.sbc-xq-support" = true;
};
};
}
{
matches = [
# Matches all sources
{
"node.name" = "~bluez_input.*";
}
# Matches all outputs
{ "node.name" = "~bluez_output.*"; }
];
actions = { "node.pause-on-idle" = false; };
}
];
}; };
security.rtkit.enable = true; security.rtkit.enable = true;

2
home/fhauser/applications/default.nix
View file

@ -62,7 +62,7 @@
# gutenprintBin # gutenprintBin
# hplipWithPlugin # hplipWithPlugin
simple-scan simple-scan
gnome.gnome-online-accounts pkgs.gnome-online-accounts
gnome.gnome-control-center gnome.gnome-control-center
] ++ [ # Communication ] ++ [ # Communication
#TODO: ekiga? #TODO: ekiga?

2
home/fhauser/applications/sway.nix
View file

@ -18,7 +18,7 @@ in rec {
sway-contrib.grimshot sway-contrib.grimshot
wl-clipboard wl-clipboard
libappindicator libappindicator
gnome.defaultIconTheme gnome.adwaita-icon-theme
gnome2.gnome-icon-theme gnome2.gnome-icon-theme
hicolor-icon-theme # TODO: Move these requirements? hicolor-icon-theme # TODO: Move these requirements?
]; ];

226
home/fhauser/applications/waybar.nix
View file

@ -24,138 +24,136 @@
"tray" "tray"
"clock" "clock"
]; ];
modules = { backlight.format = " {percent}%";
backlight.format = " {percent}%"; disk.format = " {percentage_used}%";
disk.format = " {percentage_used}%"; clock.format = "{:%Y-%2m-%2d %H:%M}";
clock.format = "{:%Y-%2m-%2d %H:%M}"; "sway/workspaces" = {
"sway/workspaces" = { disable-scroll-wraparound = true;
disable-scroll-wraparound = true; enable-bar-scroll = true;
enable-bar-scroll = true; numeric-first = true;
numeric-first = true; };
};
battery = { battery = {
interval = 10; interval = 10;
states = { states = {
warning = 15; warning = 15;
critical = 10; critical = 10;
};
format = " {capacity}% {time}"; # Icon: bolt
format-discharging = "{icon} {capacity}% {time}";
format-time = "{H}:{M}";
format-icons = [
"" # Icon: battery-full
"" # Icon: battery-three-quarters
"" # Icon: battery-half
"" # Icon: battery-quarter
"" # Icon: battery-empty
];
tooltip = "true";
}; };
format = " {capacity}% {time}"; # Icon: bolt
format-discharging = "{icon} {capacity}% {time}";
format-time = "{H}:{M}";
format-icons = [
"" # Icon: battery-full
"" # Icon: battery-three-quarters
"" # Icon: battery-half
"" # Icon: battery-quarter
"" # Icon: battery-empty
];
tooltip = "true";
};
cpu = { cpu = {
interval = "5"; interval = "5";
format = " {usage}% ({load})"; # Icon: microchip format = " {usage}% ({load})"; # Icon: microchip
states = { states = {
warning = "70"; warning = "70";
critical = "90"; critical = "90";
};
}; };
};
#"custom/keyboard-layout" = { #"custom/keyboard-layout" = {
# exec = pkgs.writeShellScript "keyboard-layout" "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4"; # exec = pkgs.writeShellScript "keyboard-layout" "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4";
# # Interval set only as a fallback, as the value is updated by signal # # Interval set only as a fallback, as the value is updated by signal
# interval = "30"; # interval = "30";
# format = " {}"; # Icon: keyboard # format = " {}"; # Icon: keyboard
# # Signal sent by Sway key binding (~/.config/sway/key-bindings) # # Signal sent by Sway key binding (~/.config/sway/key-bindings)
# signal = "1"; # SIGHUP # signal = "1"; # SIGHUP
# tooltip = "false"; # tooltip = "false";
#}; #};
memory = { memory = {
interval = "5"; interval = "5";
format = " {}%"; # Icon: microchip format = " {}%"; # Icon: microchip
states = { states = {
warning = "70"; warning = "70";
critical = "90"; critical = "90";
};
}; };
};
network = { network = {
interval = "5"; interval = "5";
format-wifi = " {essid} ({signalStrength}%)"; # Icon: wifi format-wifi = " {essid} ({signalStrength}%)"; # Icon: wifi
format-ethernet = "🔗 {ifname}: {ipaddr}/{cidr}"; # Icon: ethernet format-ethernet = "🔗 {ifname}: {ipaddr}/{cidr}"; # Icon: ethernet
format-disconnected = "🔗"; format-disconnected = "🔗";
tooltip-format = "{ifname}: {ipaddr}"; tooltip-format = "{ifname}: {ipaddr}";
}; };
"sway/mode" = { "sway/mode" = {
format = format =
''<span style="italic"> {}</span>''; # Icon: expand-arrows-alt ''<span style="italic"> {}</span>''; # Icon: expand-arrows-alt
tooltip = "false"; tooltip = "false";
}; };
"sway/window" = { "sway/window" = {
format = "{}"; format = "{}";
max-length = "120"; max-length = "120";
}; };
"sway/workspaces" = { "sway/workspaces" = {
all-outputs = false; all-outputs = false;
disable-scroll = true; disable-scroll = true;
format = "{icon}"; format = "{icon}";
format-icons = { format-icons = {
"10" = " 10"; "10" = " 10";
"11" = " 11"; "11" = " 11";
"12" = " 12"; "12" = " 12";
"13" = " 13"; "13" = " 13";
};
}; };
};
pulseaudio = { pulseaudio = {
scroll-step = 3; scroll-step = 3;
format = "{icon} {volume}%"; format = "{icon} {volume}%";
format-bluetooth = "{icon} {volume}%"; format-bluetooth = "{icon} {volume}%";
format-muted = "🔇"; format-muted = "🔇";
format-icons = { format-icons = {
headphones = ""; headphones = "";
handsfree = ""; handsfree = "";
headset = ""; headset = "";
phone = ""; phone = "";
portable = ""; portable = "";
car = ""; car = "";
default = [ "" "" "" ]; default = [ "" "" "" ];
};
on-click = "pavucontrol";
}; };
on-click = "pavucontrol";
};
temperature = { temperature = {
critical-threshold = 80; critical-threshold = 80;
interval = 5; interval = 5;
format = "{icon} {temperatureC}°C"; format = "{icon} {temperatureC}°C";
format-icons = [ format-icons = [
"" # Icon: temperature-empty "" # Icon: temperature-empty
"" # Icon: temperature-quarter "" # Icon: temperature-quarter
"" # Icon: temperature-half "" # Icon: temperature-half
"" # Icon: temperature-three-quarters "" # Icon: temperature-three-quarters
"" # Icon: temperature-full "" # Icon: temperature-full
]; ];
tooltip = "true"; tooltip = "true";
hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input"; hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input";
}; };
idle_inhibitor = { idle_inhibitor = {
format = "{icon}"; format = "{icon}";
format-icons = { format-icons = {
activated = ""; activated = "";
deactivated = ""; deactivated = "";
};
}; };
};
tray = { tray = {
icon-size = "21"; icon-size = "21";
spacing = "10"; spacing = "10";
};
}; };
}]; }];

2
host/ochsenchopf/networking.nix
View file

@ -4,7 +4,7 @@
networking = { networking = {
networkmanager = { networkmanager = {
enable = true; enable = true;
#enableFccUnlock = true; # TODO: Enable with nixos 22.05 enableFccUnlock = true;
}; };
useDHCP = false; useDHCP = false;
hostName = "ochsenchopf"; hostName = "ochsenchopf";