From 87f78bac52a496e36f0a60fb459cf9b22fd19cb7 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 27 Jun 2023 00:12:18 +0200 Subject: [PATCH 1/3] Archie: fix typo in archie's hardware-configuration.nix --- machines/Archie/hardware-configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/machines/Archie/hardware-configuration.nix b/machines/Archie/hardware-configuration.nix index 08c86b5..3412764 100644 --- a/machines/Archie/hardware-configuration.nix +++ b/machines/Archie/hardware-configuration.nix @@ -9,6 +9,7 @@ ]; # Enabke support for the Xbox One wireless dongle + # Enable support for the Xbox One wireless dongle hardware.xone.enable = true; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; From 6e6fa9c599b121fed77377a7ac422e2f725c50e0 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 27 Jun 2023 00:26:10 +0200 Subject: [PATCH 2/3] Archie: mount root subvolume of ssd --- machines/Archie/hardware-configuration.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/machines/Archie/hardware-configuration.nix b/machines/Archie/hardware-configuration.nix index 3412764..48133e7 100644 --- a/machines/Archie/hardware-configuration.nix +++ b/machines/Archie/hardware-configuration.nix @@ -40,6 +40,19 @@ fsType = "vfat"; }; + /* + Mount the root subvolume of the SSD + This is helpful for getting things from + my old Arch install, as well as for running btdu + */ + fileSystems = { + "/mnt/ssd" = { + device = config.fileSystems."/".device; + fsType = config.fileSystems."/".fsType; + options = [ "subvolid=5" "ro" ]; + }; + }; + swapDevices = [ ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; From 25ca3bb7cca4c79a28faa356b43581af98f2f73e Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 27 Jun 2023 00:40:33 +0200 Subject: [PATCH 3/3] Install KeePassXC using home-manager --- roles/desktop/default.nix | 1 + roles/desktop/keepassxc.nix | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 roles/desktop/keepassxc.nix diff --git a/roles/desktop/default.nix b/roles/desktop/default.nix index b13a242..ac8b5dc 100755 --- a/roles/desktop/default.nix +++ b/roles/desktop/default.nix @@ -4,5 +4,6 @@ imports = [ ./discord.nix ./firefox.nix + ./keepassxc.nix ]; } diff --git a/roles/desktop/keepassxc.nix b/roles/desktop/keepassxc.nix new file mode 100644 index 0000000..677c828 --- /dev/null +++ b/roles/desktop/keepassxc.nix @@ -0,0 +1,20 @@ +{ config, pkgs, ... }: + +{ + # I'm only using keepass on my user, so I'm installing it with home-manager + home-manager = { + /* + TODO: move home-manager settings into the common role + They are not keepass specific, so they really should + not be here. I'm too lazy to do it now tho :P + */ + backupFileExtension = "backup"; + useGlobalPkgs = true; + users.toast = { config, pkgs, ... }: { + home = { + stateVersion = "23.05"; + packages = [ pkgs.keepassxc ]; + }; + }; + }; +}