fix: bunch of stupid stuff

nekowinston · Jan 15, 2024 · 6c46ddc · 6c46ddc
1 parent 39f5454
commit 6c46ddc
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 32 deletions.
diff --git a/home/apps/browsers.nix b/home/apps/browsers.nix
@@ -157,6 +157,7 @@ in {
 
     home.packages = lib.mkIf isLinux [
       pkgs.nur.repos.nekowinston.sizzy
+      pkgs.mullvad-browser
     ];
 
     xdg.mimeApps.defaultApplications = {

diff --git a/home/apps/gtk.nix b/home/apps/gtk.nix
@@ -18,13 +18,17 @@ in {
       iconTheme = {
         name = "Papirus-Dark";
         package = pkgs.catppuccin-papirus-folders.override {
-          flavor = "mocha";
           accent = "pink";
+          flavor = "frappe";
         };
       };
       theme = {
-        name = "Catppuccin-Compact-Pink";
-        package = pkgs.callPackage ../../pkgs/catppuccin-gtk.nix {};
+        name = "Catppuccin-Frappe-Compact-Pink-Dark";
+        package = pkgs.catppuccin-gtk.override {
+          accents = ["pink"];
+          variant = "frappe";
+          size = "compact";
+        };
       };
       gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
       gtk2.extraConfig = ''

diff --git a/machines/common/shared/nix.nix b/machines/common/shared/nix.nix
@@ -12,7 +12,7 @@ in {
   nixpkgs.config.allowUnfree = true;
   nix = {
     gc.automatic = true;
-    package = pkgs.nixVersions.nix_2_19;
+    package = pkgs.nixVersions.nix_2_17;
     settings =
       {
         auto-optimise-store = true;

diff --git a/machines/futomaki/hardware.nix b/machines/futomaki/hardware.nix
@@ -34,41 +34,18 @@
 
   hardware.bluetooth.enable = true;
 
-  boot.initrd.luks.devices = {
-    luksroot = {
-      device = "/dev/disk/by-uuid/170cdc3f-2b04-4123-93ea-5e03136f6548";
-      preLVM = true;
-      allowDiscards = true;
-    };
-  };
-
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/894ceea3-0596-4652-89fd-772fbb82474c";
-    fsType = "btrfs";
-    options = ["subvol=root" "compress=zstd"];
+    device = "/dev/disk/by-uuid/018963d2-463f-451d-a54c-dc6f29f24daa";
+    fsType = "ext4";
   };
 
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/894ceea3-0596-4652-89fd-772fbb82474c";
-    fsType = "btrfs";
-    options = ["subvol=home" "compress=zstd"];
-  };
-
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/894ceea3-0596-4652-89fd-772fbb82474c";
-    fsType = "btrfs";
-    options = ["subvol=nix" "compress=zstd" "noatime"];
-  };
+  boot.initrd.luks.devices."luks-b8839f86-af3a-4cb7-a906-108ece087aa0".device = "/dev/disk/by-uuid/b8839f86-af3a-4cb7-a906-108ece087aa0";
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/D3BE-5F94";
+    device = "/dev/disk/by-uuid/1D0D-B170";
     fsType = "vfat";
   };
 
-  swapDevices = [
-    {device = "/dev/disk/by-uuid/72a4ce61-6cb8-4996-9966-83de91a49b6c";}
-  ];
-
   # 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

diff --git a/pkgs/overlays.nix b/pkgs/overlays.nix
@@ -1,8 +1,8 @@
 {inputs}: [
-  inputs.swayfx.overlays.default
   inputs.nix-vscode-extensions.overlays.default
   inputs.catppuccin-vsc.overlays.default
   (final: prev: {
+    sway-unwrapped = inputs.swayfx.packages.${prev.system}.default;
     yabai = prev.yabai.overrideAttrs (old: rec {
       version = "6.0.6";
       src = prev.fetchzip {