setup JWST properly and fixed river

This commit is contained in:
Aria Nolan 2023-10-30 15:20:14 -04:00
parent dd95df4297
commit 034796f526
5 changed files with 21 additions and 23 deletions

View file

@ -87,17 +87,10 @@
}; };
programs.river.enable = true; programs.river.enable = true;
# programs.river.extraPackages = with pkgs; [ programs.river.extraPackages = with pkgs; [
# swaylock swaylock
# swayidle swayidle
# dunst ];
# wlsunset
# nm-applet
# grim
# slurp
# waybar
# wbg
# ];
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [

View file

@ -8,16 +8,21 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/488c7ef3-5ea1-4a16-a5f9-e241901c24ce"; { device = "/dev/disk/by-uuid/d05d358d-19d4-4629-b0bd-594a754ad76d";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/6DD4-5A29";
fsType = "vfat";
};
fileSystems."/mnt/void" = fileSystems."/mnt/void" =
{ device = "/dev/disk/by-uuid/987518fa-8ea0-49a6-b1e5-1fed4e4ae50f"; { device = "/dev/disk/by-uuid/987518fa-8ea0-49a6-b1e5-1fed4e4ae50f";
fsType = "ext4"; fsType = "ext4";
@ -28,11 +33,6 @@
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot/efi" =
{ device = "/dev/disk/by-uuid/F54B-C04F";
fsType = "vfat";
};
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/802e89ce-52b8-41b9-85ea-b969ab08765f"; } [ { device = "/dev/disk/by-uuid/802e89ce-52b8-41b9-85ea-b969ab08765f"; }
]; ];

View file

@ -14,8 +14,8 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
wl-clipboard wl-clipboard
swaylock # swaylock
swayidle # swayidle
wbg wbg
dunst dunst
grim grim

View file

@ -1,11 +1,11 @@
#!/bin/bash #!/usr/bin/env bash
# See the river(1), riverctl(1), and rivertile(1) man pages for complete # See the river(1), riverctl(1), and rivertile(1) man pages for complete
# documentation. # documentation.
# Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc. # Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc.
# riverctl spawn "dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND _DISPLAY XDG_CURRENT_DESKTOP=river" riverctl spawn "dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND _DISPLAY XDG_CURRENT_DESKTOP=river"
riverctl map normal Super+Shift Return spawn 'kitty --single-instance' riverctl map normal Super+Shift Return spawn 'kitty --single-instance'
riverctl map normal Super D spawn 'rofi -show drun' riverctl map normal Super D spawn 'rofi -show drun'
@ -177,4 +177,4 @@ else
fi fi
# autostart apps # autostart apps
# "$HOME/.config/river/process" "$HOME/.config/river/process"

View file

@ -112,6 +112,11 @@
]; ];
tooltip = false; tooltip = false;
}; };
"clock#date" = {
interval = 20;
format = "{:%e %b %Y}";
tooltip = false;
};
"tray" = { "tray" = {
icon-size = 18; icon-size = 18;
spacing = 10; spacing = 10;