diff --git a/dad/configuration.nix b/dad/configuration.nix index 267f58f..70b2ddb 100644 --- a/dad/configuration.nix +++ b/dad/configuration.nix @@ -11,11 +11,10 @@ ]; # Bootloader. - #boot.loader.systemd-boot.enable = true; - #boot.loader.efi.canTouchEfiVariables = true; - boot.loader.grub.enable = true; - boot.loader.grub.device = "/dev/vda"; - boot.loader.grub.useOSProber = true; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + #boot.loader.grub.device = "/dev/vda"; + #boot.loader.grub.useOSProber = true; networking.hostName = "nixos-dad"; # Define your hostname. networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -85,8 +84,8 @@ libinput pciutils pulseaudio - pwvucontrol - ]; + (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { }) + ]; programs.firefox = { enable = true; @@ -110,28 +109,26 @@ user = "kemp"; program = "${pkgs.writeScriptBin "start-cage-app" '' #!/usr/bin/env bash - exec pwvucontrol - exec firefox + exec ${ (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { })}/bin/firefox ''}/bin/start-cage-app"; }; services.getty.loginProgram = "${pkgs.coreutils}/bin/true"; services.actkbd.enable = true; - services.actkbd.bindings = [ - # Mute - { keys = [ 113 ]; events = [ "key" ]; - command = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; - } - # Volume down - { keys = [ 114 ]; events = [ "key" "rep" ]; - command = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"; - } - # Volume up - { keys = [ 115 ]; events = [ "key" "rep" ]; - command = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"; - } - ]; - + services.actkbd.bindings = [ + # Mute + { keys = [ 113 ]; events = [ "key" ]; + command = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; + } + # Volume down + { keys = [ 114 ]; events = [ "key" "rep" ]; + command = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"; + } + # Volume up + { keys = [ 115 ]; events = [ "key" "rep" ]; + command = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"; + } + ]; security.rtkit.enable = true; services.pipewire = { enable = true; # if not already enabled diff --git a/kemptop/configuration.nix b/kemptop/configuration.nix index 922c732..b1c31cc 100644 --- a/kemptop/configuration.nix +++ b/kemptop/configuration.nix @@ -150,8 +150,20 @@ jdk gradle - dconf - gsettings-desktop-schemas + + (pkgs.python3.withPackages (python-pkgs: with python-pkgs; [ + requests + odfpy + websocket-client + selenium + webdriver-manager + pytest + pytest-html + python-dotenv + pillow + config + ])) + chromedriver # GUI programs @@ -168,6 +180,7 @@ texstudio (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { }) google-chrome + chromium tor-browser zathura vlc