diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index 24db2a5..2a6b0ec 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -147,7 +147,7 @@ bind = $mainMod SHIFT, R, exec, hyprctl reload bind = $mainMod, E, exec, kitty bind = $mainMod, C, killactive, bind = $mainMod, M, exec, nwgbar -bind = $mainMod, G, exec, /home/tulg/.config/looking-glass-client -F -f /dev/kvmfr0 -m 58 +bind = $mainMod, G, exec, looking-glass-client -F -f /dev/kvmfr0 -m 58 bind = $mainMod SHIFT, O, togglefloating, bind = $mainMod, D, exec, wofi --show drun --allow-images -W 300 -H 500 -l 4 bind = $mainMod SHIFT, D, exec, nwg-drawer -mb 10 -mr 10 -ml 10 -mt 10 @@ -248,7 +248,7 @@ bind = ,233,exec,brightnessctl -c backlight set +5% # Old functions only commented out to make it easier for the user to change if necessary. # Snip a selection and pipe to swappy -bind = ,Print, exec, grim -g "$(slurp)" - | swappy -f - +bind =$mainMod,S, exec, grim -g "$(slurp)" - | swappy -f - # Screenshot a window and pipe to swappy bind = CTRL, Print, exec, .config/hypr/scripts/screenshot_window.sh # Screenshot the current display and pipe to swappy diff --git a/hosts/virgil/disko.nix b/hosts/virgil/disko.nix index 8125cd3..88fd9a6 100644 --- a/hosts/virgil/disko.nix +++ b/hosts/virgil/disko.nix @@ -3,7 +3,7 @@ disk = { nixos = { type = "disk"; - device = "/dev/vda"; + device = "/dev/sda"; content = { type = "gpt"; partitions = { diff --git a/hosts/virgil/hardware-configuration.nix b/hosts/virgil/hardware-configuration.nix index 7613335..558d80b 100644 --- a/hosts/virgil/hardware-configuration.nix +++ b/hosts/virgil/hardware-configuration.nix @@ -1,41 +1,20 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + { - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-amd"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-partlabel/disk-nixos-root"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-partlabel/disk-nixos-ESP"; - fsType = "vfat"; - options = ["fmask=0022" "dmask=0022"]; - }; - - swapDevices = []; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; + swapDevices = [ ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix index c6cdac4..87f283b 100644 --- a/modules/home-manager/home.nix +++ b/modules/home-manager/home.nix @@ -31,6 +31,8 @@ in { xfce.thunar alejandra arc-theme + swappy + pkgs.looking-glass-client tmux fastfetch btop