Update configuration for new system
This commit removed all old hardware information and updates it to
currently generated config as well as turning off chromium and enabling
stgit.
Change-Id: Icd79ca7102198b98fa69e777aed73be1628f2cd9
Reviewed-on: https://git.clicks.codes/c/Chimera/NixFiles/+/408
Reviewed-by: Skyler Grey <minion@clicks.codes>
Tested-by: Samuel Shuert <coded@clicks.codes>
diff --git a/homes/x86_64-linux/coded@shorthair/default.nix b/homes/x86_64-linux/coded@shorthair/default.nix
index 8cc029a..85b2f01 100644
--- a/homes/x86_64-linux/coded@shorthair/default.nix
+++ b/homes/x86_64-linux/coded@shorthair/default.nix
@@ -25,7 +25,7 @@
starship.enable = true;
- rebuildFlakePath = "/home/coded/Documents/programming/nix/Personal";
+ rebuildFlakePath = "/home/coded/programming/nix/personal";
defaultAliases.enable = true;
usefulPackages.enable = true;
@@ -43,6 +43,7 @@
git = {
delta.enable = true;
+ stgit.enable = true;
gitReview.enable = true;
auth.clicksUsername = "coded";
};
@@ -73,30 +74,30 @@
returnDislike.enable = true;
deArrow.enable = true;
};
- reactdevtools.enable = true;
+ reactDevTools.enable = true;
ublockOrigin.enable = true;
};
extraExtensions = [ config.nur.repos.rycee.firefox-addons.simple-tab-groups ];
};
- browser.chromium = {
- enable = true;
- extensions = {
- bitwarden.enable = true;
- youtube = {
- sponsorBlock.enable = true;
- returnDislike.enable = true;
- deArrow.enable = true;
- };
- reactdevtools.enable = true;
- ublockOrigin.enable = true;
- };
- extraExtensions = [
- { id = "gmkiokemhjjdjmpnnjmnpkpfoenpnpne"; } # Lofi Girl
- { id = "bmnlcjabgnpnenekpadlanbbkooimhnj"; } # PayPal Honey
- { id = "kekjfbackdeiabghhcdklcdoekaanoel"; } # MAL Sync
- ];
- };
+ #browser.chromium = {
+ # enable = true;
+ # extensions = {
+ # bitwarden.enable = true;
+ # youtube = {
+ # sponsorBlock.enable = true;
+ # returnDislike.enable = true;
+ # deArrow.enable = true;
+ # };
+ # reactDevTools.enable = true;
+ # ublockOrigin.enable = true;
+ # };
+ # extraExtensions = [
+ # { id = "gmkiokemhjjdjmpnnjmnpkpfoenpnpne"; } # Lofi Girl
+ # { id = "bmnlcjabgnpnenekpadlanbbkooimhnj"; } # PayPal Honey
+ # { id = "kekjfbackdeiabghhcdklcdoekaanoel"; } # MAL Sync
+ # ];
+ #};
editor.neovim.enable = true;
diff --git a/systems/x86_64-linux/shorthair/hardware/boot/default.nix b/systems/x86_64-linux/shorthair/hardware/boot/default.nix
index 6301e3b..0bdd46f 100644
--- a/systems/x86_64-linux/shorthair/hardware/boot/default.nix
+++ b/systems/x86_64-linux/shorthair/hardware/boot/default.nix
@@ -9,12 +9,14 @@
"sd_mod"
"sr_mod"
];
- boot.initrd.kernelModules = [ "amdgpu" ];
+ boot.initrd.kernelModules = [ "kvm-amd" "amdgpu" ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
+ boot.loader.systemd-boot.enable = true;
+ boot.loader.efi.canTouchEfiVariables = true;
+
boot.initrd = {
- luks.devices."luks-bf23eee1-7cb7-43b9-822f-a9f49ea0a768".device = "/dev/disk/by-uuid/bf23eee1-7cb7-43b9-822f-a9f49ea0a768";
- luks.devices."luks-c38bc921-8979-4a25-9520-f3354dee3557".device = "/dev/disk/by-uuid/c38bc921-8979-4a25-9520-f3354dee3557";
+ luks.devices."NIXROOT".device = "/dev/disk/by-uuid/744c83f8-f8d9-4604-8e44-ceb7bf7fdf87";
};
}
diff --git a/systems/x86_64-linux/shorthair/hardware/filesystems/default.nix b/systems/x86_64-linux/shorthair/hardware/filesystems/default.nix
index f9ce7e8..07145e9 100644
--- a/systems/x86_64-linux/shorthair/hardware/filesystems/default.nix
+++ b/systems/x86_64-linux/shorthair/hardware/filesystems/default.nix
@@ -1,14 +1,19 @@
{ ... }:
{
fileSystems."/" = {
- device = "/dev/disk/by-uuid/63caf2b5-90d4-49a7-99e9-98dcdd797859";
- fsType = "ext4";
+ device = "/dev/disk/by-uuid/49f641f9-27c1-451e-9dff-d270879ede42";
+ fsType = "btrfs";
};
fileSystems."/boot" = {
- device = "/dev/disk/by-uuid/5B78-4B2D";
+ device = "/dev/disk/by-uuid/F1F9-C8D5";
fsType = "vfat";
};
- swapDevices = [ { device = "/dev/disk/by-uuid/3a9212d4-6c39-4d5b-abf0-49294bd991c9"; } ];
+ #swapDevices = [
+ # {
+ # device = "/dev/disk/by-uuid/b0ffc786-a525-413d-97e8-24e57a39dd0b";
+ # }
+ #];
+
}