Compare commits

..

No commits in common. "99e04cd66563c2ea5188556f38ded6b4fc12e7fb" and "dbafe66098dfb10672d135c1131f7422c09f8156" have entirely different histories.

2 changed files with 26 additions and 36 deletions

View file

@ -11,10 +11,11 @@
]; ];
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; #boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; #boot.loader.efi.canTouchEfiVariables = true;
#boot.loader.grub.device = "/dev/vda"; boot.loader.grub.enable = true;
#boot.loader.grub.useOSProber = true; boot.loader.grub.device = "/dev/vda";
boot.loader.grub.useOSProber = true;
networking.hostName = "nixos-dad"; # Define your hostname. networking.hostName = "nixos-dad"; # Define your hostname.
networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@ -84,8 +85,8 @@
libinput libinput
pciutils pciutils
pulseaudio pulseaudio
(pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { }) pwvucontrol
]; ];
programs.firefox = { programs.firefox = {
enable = true; enable = true;
@ -109,26 +110,28 @@
user = "kemp"; user = "kemp";
program = "${pkgs.writeScriptBin "start-cage-app" '' program = "${pkgs.writeScriptBin "start-cage-app" ''
#!/usr/bin/env bash #!/usr/bin/env bash
exec ${ (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { })}/bin/firefox exec pwvucontrol
exec firefox
''}/bin/start-cage-app"; ''}/bin/start-cage-app";
}; };
services.getty.loginProgram = "${pkgs.coreutils}/bin/true"; services.getty.loginProgram = "${pkgs.coreutils}/bin/true";
services.actkbd.enable = true; services.actkbd.enable = true;
services.actkbd.bindings = [ services.actkbd.bindings = [
# Mute # Mute
{ keys = [ 113 ]; events = [ "key" ]; { keys = [ 113 ]; events = [ "key" ];
command = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; command = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
} }
# Volume down # Volume down
{ keys = [ 114 ]; events = [ "key" "rep" ]; { keys = [ 114 ]; events = [ "key" "rep" ];
command = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"; command = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
} }
# Volume up # Volume up
{ keys = [ 115 ]; events = [ "key" "rep" ]; { keys = [ 115 ]; events = [ "key" "rep" ];
command = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"; command = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
} }
]; ];
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; # if not already enabled enable = true; # if not already enabled

View file

@ -150,20 +150,8 @@
jdk jdk
gradle gradle
dconf
(pkgs.python3.withPackages (python-pkgs: with python-pkgs; [ gsettings-desktop-schemas
requests
odfpy
websocket-client
selenium
webdriver-manager
pytest
pytest-html
python-dotenv
pillow
config
]))
chromedriver
# GUI programs # GUI programs
@ -180,7 +168,6 @@
texstudio texstudio
(pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { }) (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { })
google-chrome google-chrome
chromium
tor-browser tor-browser
zathura zathura
vlc vlc