diff --git a/config/home.nix b/config/home.nix index fe43bf9..1f75dab 100644 --- a/config/home.nix +++ b/config/home.nix @@ -52,17 +52,20 @@ in { dunst easytag firefox + flac flameshot flatpak font-awesome gimp git gnome.gnome-keyring + grip grub2 hack-font htop hugo i3 + i3-swallow i3lock-fancy keepassxc keepmenu @@ -82,6 +85,7 @@ in { os-prober pavucontrol picom + playerctl plexamp pm2 polybar @@ -93,6 +97,8 @@ in { rofi-emoji slack steam + sublime-music + sxiv tldr unzip vim diff --git a/config/packages/i3/config b/config/packages/i3/config index 248bf31..8ab1209 100644 --- a/config/packages/i3/config +++ b/config/packages/i3/config @@ -50,6 +50,12 @@ bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle +# Use playerctl to control playback +bindsym XF86AudioPlay exec playerctl play-pause +bindsym XF86AudioPause exec playerctl play-pause +bindsym XF86AudioNext exec playerctl next +bindsym XF86AudioPrev exec playerctl previous + # Use Mouse+$mod to drag floating windows to their wanted position floating_modifier $mod diff --git a/docs/Cleanup.md b/docs/Cleanup.md new file mode 100644 index 0000000..4d11743 --- /dev/null +++ b/docs/Cleanup.md @@ -0,0 +1,14 @@ +# Cleanup + +This document refers to information about cleaning the system, such as deleting +old generations, unused nix shells, etc. + +## Delete Old Generations + +Run the following commands to clean the system up and delete old generations: + +```bash +nix-collect-garbage --delete-old +sudo nox-collect-garbage -d +sudo /run/current-system/bin/switch-to-configuration boot +``` diff --git a/docs/Grub.md b/docs/Grub.md new file mode 100644 index 0000000..5a7b4b7 --- /dev/null +++ b/docs/Grub.md @@ -0,0 +1,12 @@ +# Grub + +This document is for information regarding Grub. + +## Reinstall Grub + +If the grub install breaks and you ever need to reinstall grub, the following +command is how you do it: + +```bash +sudo NIXOS_INSTALL_BOOTLOADER=1 /nix/var/nix/profiles/system/bin/switch-to-configuration boot +``` diff --git a/flake.lock b/flake.lock index 5998097..992c919 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1726818100, + "narHash": "sha256-z2V74f5vXqkN5Q+goFlhbFXY/dNaBAyeLpr2bxu4Eic=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "1bbc1a5a1f4de7401c92db85b2119ed21bb4139d", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1726688310, + "narHash": "sha256-Xc9lEtentPCEtxc/F1e6jIZsd4MPDYv4Kugl9WtXlz0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "dbebdd67a6006bb145d98c8debf9140ac7e651d0", "type": "github" }, "original": { diff --git a/system/shared.nix b/system/shared.nix index 8e66f36..6bd3de5 100644 --- a/system/shared.nix +++ b/system/shared.nix @@ -55,6 +55,7 @@ gnome.gnome-keyring.enable = true; rsyncd.enable = true; openssh.enable = true; + printing.enable = true; pipewire = { enable = true; @@ -116,6 +117,8 @@ yt-mp3 = "yt-dlp -xi --audio-format mp3"; yt-mp3-meta = "yt-dlp -xi --audio-format mp3 --parse-metadata \"playlist_index:%(track_number)s\" --add-metadata"; yt-mp3-meta-cookies = "yt-dlp -xi --audio-format mp3 --parse-metadata \"playlist_index:%(track_number)s\" --add-metadata --cookies-from-browser firefox"; + + s = "swallow"; }; }; diff --git a/system/vylpes-virt/hardware-configuration.nix b/system/vylpes-virt/hardware-configuration.nix index e5df6df..24469a6 100644 --- a/system/vylpes-virt/hardware-configuration.nix +++ b/system/vylpes-virt/hardware-configuration.nix @@ -4,35 +4,28 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = [ ]; + imports = + [ (modulesPath + "/profiles/qemu-guest.nix") + ]; - boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/2df2d138-ab85-430b-961f-40509de6e998"; + { device = "/dev/disk/by-uuid/9f9649cd-58a1-49cb-85c4-279ad926a312"; fsType = "ext4"; }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/A41B-7CC9"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/27a3e9d3-43d1-4bd7-81bd-1169db2637ee"; } - ]; + 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.enp0s3.useDHCP = lib.mkDefault true; + # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - virtualisation.virtualbox.guest.enable = true; }