From ae87c5ad00163e8ebcb6544fbd393042d1c3955b Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sun, 1 Sep 2024 14:04:45 +0100 Subject: [PATCH 01/14] Enable printing --- system/shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/system/shared.nix b/system/shared.nix index 8e66f36..a36cf45 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; From d2beeed71be09ecb631130a38f36338d2c1e21d3 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Thu, 5 Sep 2024 17:16:22 +0100 Subject: [PATCH 02/14] Install i3-swallow --- config/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/home.nix b/config/home.nix index b6c597e..153c8ec 100644 --- a/config/home.nix +++ b/config/home.nix @@ -63,6 +63,7 @@ in { htop hugo i3 + i3-swallow i3lock-fancy keepassxc keepmenu From e5e92050eb88246e30ab7f18dfd600351767ac2c Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Thu, 5 Sep 2024 17:35:35 +0100 Subject: [PATCH 03/14] Alias swallow to s --- system/shared.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/shared.nix b/system/shared.nix index a36cf45..6bd3de5 100644 --- a/system/shared.nix +++ b/system/shared.nix @@ -117,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"; }; }; From 0cbe3869f1fe926783263f4bf9c5a6baee8bce3c Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sat, 7 Sep 2024 11:36:33 +0100 Subject: [PATCH 04/14] Nix flake update - 07/09/2024 --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 5998097..ff519fe 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1725703823, + "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1725407940, + "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", "type": "github" }, "original": { From 89ba56f3e98ce1335624f6fde206f3d4bae170af Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sun, 8 Sep 2024 11:36:54 +0100 Subject: [PATCH 05/14] Add documentation about grub and cleanup --- docs/Cleanup.md | 14 ++++++++++++++ docs/Grub.md | 12 ++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 docs/Cleanup.md create mode 100644 docs/Grub.md 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 +``` From 5b88b5124d29089d7866cd3fd62c622b3e5d4293 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Fri, 13 Sep 2024 20:51:55 +0100 Subject: [PATCH 06/14] Install sxiv --- config/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/home.nix b/config/home.nix index 153c8ec..e683137 100644 --- a/config/home.nix +++ b/config/home.nix @@ -94,6 +94,7 @@ in { rofi-emoji slack steam + sxiv tldr unzip vim From 4452765c0c7a481922532506eec68d62492c914c Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sun, 15 Sep 2024 10:41:56 +0100 Subject: [PATCH 07/14] Nix flake update - 15/09/24 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index ff519fe..3013543 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725407940, - "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", + "lastModified": 1726320982, + "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", + "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", "type": "github" }, "original": { From 04ad3208dbd2f3b829e4c1f48ec1eea43441fcde Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Tue, 17 Sep 2024 18:06:56 +0100 Subject: [PATCH 08/14] Install grip --- config/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/home.nix b/config/home.nix index e683137..d3e6c04 100644 --- a/config/home.nix +++ b/config/home.nix @@ -58,6 +58,7 @@ in { gimp git gnome.gnome-keyring + grip grub2 hack-font htop From e471d5a96dfe90842ae3b5ae0efae9a384bd411d Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Tue, 17 Sep 2024 18:10:18 +0100 Subject: [PATCH 09/14] Install flac --- config/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/home.nix b/config/home.nix index d3e6c04..1d688f1 100644 --- a/config/home.nix +++ b/config/home.nix @@ -52,6 +52,7 @@ in { dunst easytag firefox + flac flameshot flatpak font-awesome From ac358f07fa99f773077c958b795fdda19c6a9d0f Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sat, 21 Sep 2024 09:13:41 +0100 Subject: [PATCH 10/14] Nix flake update - 21/09/24 --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 3013543..992c919 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1725703823, - "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", + "lastModified": 1726818100, + "narHash": "sha256-z2V74f5vXqkN5Q+goFlhbFXY/dNaBAyeLpr2bxu4Eic=", "owner": "nix-community", "repo": "home-manager", - "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", + "rev": "1bbc1a5a1f4de7401c92db85b2119ed21bb4139d", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726320982, - "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", + "lastModified": 1726688310, + "narHash": "sha256-Xc9lEtentPCEtxc/F1e6jIZsd4MPDYv4Kugl9WtXlz0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", + "rev": "dbebdd67a6006bb145d98c8debf9140ac7e651d0", "type": "github" }, "original": { From eb7a93917c9e03aeb5166a6459aa9310631b7755 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sat, 21 Sep 2024 09:37:57 +0100 Subject: [PATCH 11/14] Install sublime-music --- config/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/home.nix b/config/home.nix index 1d688f1..a0ba204 100644 --- a/config/home.nix +++ b/config/home.nix @@ -96,6 +96,7 @@ in { rofi-emoji slack steam + sublime-music sxiv tldr unzip From fb27812693c098db5c67901157de7dcc1f72d003 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sat, 21 Sep 2024 09:45:15 +0100 Subject: [PATCH 12/14] Install playerctl --- config/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/home.nix b/config/home.nix index a0ba204..ca29a89 100644 --- a/config/home.nix +++ b/config/home.nix @@ -85,6 +85,7 @@ in { os-prober pavucontrol picom + playerctl plexamp pm2 polybar From d3feac2a7f78d7864719a8f8d7a80d1f188d58db Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sat, 21 Sep 2024 09:47:09 +0100 Subject: [PATCH 13/14] Setup i3 media controls --- config/packages/i3/config | 6 ++++++ 1 file changed, 6 insertions(+) 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 From 63d9437c0935eceecfe3a4c5ae89870094c91b6b Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sat, 21 Sep 2024 13:42:52 +0100 Subject: [PATCH 14/14] Update hardware configuration for virtual machine --- system/vylpes-virt/hardware-configuration.nix | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) 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; }