diff --git a/nixos/boxes/yoga/default.nix b/nixos/boxes/yoga/default.nix index 0bb69f8b..22da4f29 100644 --- a/nixos/boxes/yoga/default.nix +++ b/nixos/boxes/yoga/default.nix @@ -72,5 +72,4 @@ systemd.services."getty@tty1".enable = false; systemd.services."autovt@tty1".enable = false; - system = { stateVersion = "22.11"; }; } diff --git a/nixos/i3/i3.nix b/nixos/i3/i3.nix index 065625c8..b302b936 100644 --- a/nixos/i3/i3.nix +++ b/nixos/i3/i3.nix @@ -1,11 +1,7 @@ -{ - config, - pkgs, - ... -}: let - mod = "Mod4"; +{ config, pkgs, ... }: +let mod = "Mod4"; in { - home.packages = with pkgs; [font-awesome intel-gpu-tools]; + home.packages = with pkgs; [ font-awesome intel-gpu-tools ]; xsession.windowManager.i3 = { enable = true; @@ -27,7 +23,8 @@ in { notification = false; } { - command = "exec xdg-mime default org.gnome.Evince.desktop application/pdf"; + command = + "exec xdg-mime default org.gnome.Evince.desktop application/pdf"; always = false; notification = false; } @@ -45,20 +42,19 @@ in { }; workspaceLayout = "tabbed"; - bars = [ - { - statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-top.toml"; - position = "top"; - colors.background = "#001e26"; - colors.statusline = "#708183"; - fonts = { - names = ["Berkeley Mono" "Font Awesome 6 Free"]; - size = 10.0; - }; + bars = [{ + statusCommand = + "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-top.toml"; + position = "top"; + colors.background = "#001e26"; + colors.statusline = "#708183"; + fonts = { + names = [ "Berkeley Mono" "Font Awesome 6 Free" ]; + size = 10.0; + }; - trayOutput = "primary"; - } - ]; + trayOutput = "primary"; + }]; modifier = mod; keybindings = { @@ -69,17 +65,25 @@ in { "${mod}+Shift+l" = "exec physlock -d"; "${mod}+Return" = "exec i3-sensible-terminal"; - "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5%"; - "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5%"; - "XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle"; - "XF86AudioMicMute" = "exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle"; + "XF86AudioRaiseVolume" = + "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%"; + "XF86AudioLowerVolume" = + "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%"; + "XF86AudioMute" = + "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle"; + "XF86AudioMicMute" = + "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle"; - "XF86MonBrightnessUp" = "exec light -s sysfs/backlight/intel_backlight -A 5"; - "XF86MonBrightnessDown" = "exec light -s sysfs/backlight/intel_backlight -U 5"; + "XF86MonBrightnessUp" = + "exec light -s sysfs/backlight/intel_backlight -A 5"; + "XF86MonBrightnessDown" = + "exec light -s sysfs/backlight/intel_backlight -U 5"; - "Print" = "exec ${pkgs.gnome3.gnome-screenshot}/bin/gnome-screenshot -i"; + "Print" = + "exec ${pkgs.gnome3.gnome-screenshot}/bin/gnome-screenshot -i"; - "${mod}+r" = "exec ${pkgs.rofi}/bin/rofi -show combi -combi-modi window#run#ssh -modi combi"; + "${mod}+r" = + "exec ${pkgs.rofi}/bin/rofi -show combi -combi-modi window#run#ssh -modi combi"; "${mod}+c" = "exec ${pkgs.clipmenu}/bin/clipmenu"; "${mod}+q" = "kill"; "${mod}+f" = "fullscreen toggle";