diff --git a/flake.lock b/flake.lock
index f2474ed..8c800ce 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,25 +1,5 @@
 {
   "nodes": {
-    "auto-cpufreq": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgsUnstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1758887019,
-        "narHash": "sha256-5QDHaIKbmremgFh8Pc9ess59K4HJ5APM8pNgnYzAMno=",
-        "owner": "AdnanHodzic",
-        "repo": "auto-cpufreq",
-        "rev": "52194f4db364347626985fed5372eba2b6109cf4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "AdnanHodzic",
-        "repo": "auto-cpufreq",
-        "type": "github"
-      }
-    },
     "catppuccin": {
       "inputs": {
         "nixpkgs": "nixpkgs"
@@ -774,7 +754,6 @@
         "alejandra": [
           "nixpkgsUnstable"
         ],
-        "auto-cpufreq": "auto-cpufreq",
         "catppuccin": "catppuccin",
         "home-manager": "home-manager",
         "lix": "lix",
diff --git a/flake.nix b/flake.nix
index 1aee8ed..224d4da 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,10 +64,6 @@
       url = "github:moonlight-mod/moonlight/develop"; # Add `/develop` to the flake URL to use nightly.
       inputs.nixpkgs.follows = "nixpkgsUnstable";
     };
-    auto-cpufreq = {
-      url = "github:AdnanHodzic/auto-cpufreq";
-      inputs.nixpkgs.follows = "nixpkgsUnstable";
-    };
   };
 
   outputs =
@@ -86,7 +82,6 @@
       musnix,
       lix-module,
       moonlight,
-      auto-cpufreq,
       ...
     }@inputs:
     let
@@ -154,27 +149,21 @@
           specialArgs = specialArgs;
           modules = [
             ./hosts/buldak/configuration.nix
-            # lix-module.nixosModules.default
-            auto-cpufreq.nixosModules.default
             catppuccin.nixosModules.catppuccin
             home-manager.nixosModules.home-manager
             {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.users.${username} = {
-                imports = [
-                  ./home-manager/home.nix
-                  catppuccin.homeModules.catppuccin
-                  moonlight.homeModules.default
-                ];
+               home-manager.useGlobalPkgs = true;
+               home-manager.useUserPackages = true;
+               home-manager.users.${username} = {
+                  imports = [./home-manager/home.nix catppuccin.homeModules.catppuccin moonlight.homeModules.default];
+                  
+                  home.packages = [
+                     inputs.miovim.packages.${system}.default
+                  ];
 
-                home.packages = [
-                  inputs.miovim.packages.${system}.default
-                ];
+               };
 
-              };
-
-              home-manager.extraSpecialArgs = { inherit inputs; };
+                  home-manager.extraSpecialArgs = { inherit inputs; };
             }
           ];
         };
@@ -280,8 +269,8 @@
       packages.fourget = pkgs.callPackage ./packages/4get.nix { };
 
       homeManager = home-manager.lib.homeManagerConfiguration {
-        pkgs = import nixpkgs { };
-        modules = [ ./home-manager/home.nix ];
+        pkgs = import nixpkgs {};
+        modules = [./home-manager/home.nix];
         extraSpecialArgs = specialArgs;
       };
     };
diff --git a/home-manager/dotfiles/matugen/templates/colors.css b/home-manager/dotfiles/matugen/templates/colors.css
deleted file mode 100644
index f246856..0000000
--- a/home-manager/dotfiles/matugen/templates/colors.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
-* Css Colors
-* Generated with Matugen
-*/
-<* for name, value in colors *>
-    @define-color {{name}} {{value.default.hex}};
-<* endfor *>
diff --git a/home-manager/dotfiles/niri/config.kdl b/home-manager/dotfiles/niri/config.kdl
index fa82ce4..166259b 100644
--- a/home-manager/dotfiles/niri/config.kdl
+++ b/home-manager/dotfiles/niri/config.kdl
@@ -579,18 +579,18 @@ environment {
 }
 
 // apps to launch at startup
+spawn-at-startup "qutebrowser"
 spawn-at-startup "discord"
-spawn-at-startup "footclient" "nvim" "~/Documents/Notes"
-spawn-at-startup "cider"
+spawn-at-startup "beeper"
+spawn-at-startup "cinny"
 
 clipboard {
   disable-primary
 }
 
-workspace "code "
-workspace "internet "
-workspace "chat 󱋊"
-workspace "music 󰽱"
+workspace "code"
+workspace "internet"
+workspace "chat"
 
 window-rule {
   match at-startup=true app-id=r#"^discord$"#
@@ -611,11 +611,6 @@ window-rule {
   open-on-workspace "internet"
 }
 
-window-rule {
-  match at-startup=true app-id=r#"Cider$"#
-  open-on-workspace "music"
-}
-
 window-rule {
   match app-id=r#"mpv$"#
   open-floating true
diff --git a/home-manager/dotfiles/niri/start-bg.sh b/home-manager/dotfiles/niri/start-bg.sh
index 6bfe74a..a2ab43a 100755
--- a/home-manager/dotfiles/niri/start-bg.sh
+++ b/home-manager/dotfiles/niri/start-bg.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-~/.config/niri/background.sh ~/.config/niri/wallpapers/ 
+./background.sh ~/.config/niri/wallpapers/ 
diff --git a/home-manager/dotfiles/waybar/config.jsonc b/home-manager/dotfiles/waybar/config.jsonc
index f1a063b..ba68370 100644
--- a/home-manager/dotfiles/waybar/config.jsonc
+++ b/home-manager/dotfiles/waybar/config.jsonc
@@ -9,8 +9,7 @@
     "network",
     "wireplumber",
     "clock",
-    "privacy",
-    "battery"
+    "privacy"
   ],
   "clock": {
     "format-alt": "{:%a, %d. %b  %H:%M}"
@@ -82,14 +81,5 @@
   },
   "tray": {
     "spacing": 10
-  },
-  "battery": {
-    "bat": "BAT0",
-    "states": {
-      "warning": 20,
-      "critical": 10
-    },
-    "format": "{capacity}% {icon}"
-    "format-icons": ["", "", "", "", ""],
   }
 }
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 909ec27..65912d2 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -112,31 +112,12 @@
     ".config/hyfetch.json".source = dotfiles/hyfetch/hyfetch.json;
     ".config/niri".source = dotfiles/niri;
     ".config/mako".source = dotfiles/mako;
-  };
 
-  programs.matugen = {
-    enable = true;
-    variant = "dark";
-
-    config = {
-      wallpaper = {
-        command = "swww";
-        arguments = [
-          "img"
-          "--transition-type"
-          "center"
-        ];
-        set = true;
-      };
-    };
-
-    templates = {
-      waybar = {
-        input_path = "./templates/colors.css";
-        output_path = "~/.config/waybar/colors.css";
-        post_hook = "pkill -SIGUSR2 waybar";
-      };
-    };
+    # # You can also set the file content immediately.
+    # ".gradle/gradle.properties".text = ''
+    #   org.gradle.console=verbose
+    #   org.gradle.daemon.idletimeout=3600000
+    # '';
   };
 
   programs.direnv = {
@@ -217,7 +198,7 @@
   };
 
   programs.git = {
-    userName = "misschloe777";
+    userName = "chloe";
     userEmail = "harryh@ik.me";
     enable = true;
     extraConfig = {
@@ -374,7 +355,6 @@
       search_mode = "fuzzy";
     };
   };
-
   # programs.moonlight = {
   #   enable = true;
   #   configs.stable = {
diff --git a/hosts/buldak/configuration.nix b/hosts/buldak/configuration.nix
index 3b89372..de2540a 100644
--- a/hosts/buldak/configuration.nix
+++ b/hosts/buldak/configuration.nix
@@ -11,6 +11,7 @@
 
 {
   imports = [
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
     ../../shared/client/tailscale.nix
     ../../shared/client/niri.nix
@@ -20,40 +21,18 @@
   ];
 
   # Bootloader.
-
-  boot = {
-    plymouth = {
-      enable = true;
-      theme = "blahaj";
-      themePackages = with pkgs; [
-        # By default we would install all themes
-        plymouth-blahaj-theme
-      ];
-    };
-
-    # Enable "Silent boot"
-    consoleLogLevel = 3;
-    initrd.verbose = false;
-    kernelParams = [
-      "quiet"
-      "splash"
-      "boot.shell_on_fail"
-      "udev.log_priority=3"
-      "rd.systemd.show_status=auto"
-    ];
-    # Hide the OS choice for bootloaders.
-    # It's still possible to open the bootloader list by pressing any key
-    # It will just not appear on screen unless a key is pressed
-    loader.timeout = 0;
-    loader.systemd-boot.enable = true;
-    loader.efi.canTouchEfiVariables = true;
-  };
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 
   boot.initrd.luks.devices."luks-d265e9b2-2ef5-445a-83f2-ec022e0eec7b".device =
     "/dev/disk/by-uuid/d265e9b2-2ef5-445a-83f2-ec022e0eec7b";
   networking.hostName = "buldak"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
   # Enable networking
   networking.networkmanager.enable = true;
 
@@ -110,30 +89,32 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    poweralertd
-    matugen
+    #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    #  wget
   ];
 
   nixpkgs.config.permittedInsecurePackages = [
     "libsoup-2.74.3"
   ];
 
-  nix.package = pkgs.lixPackageSets.stable.lix;
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
 
-  # laptop stuff
-  services.thermald.enable = true;
+  # List services that you want to enable:
 
-  programs.auto-cpufreq.enable = true;
-  programs.auto-cpufreq.settings = {
-    battery = {
-      governor = "powersave";
-      turbo = "auto";
-    };
-    charger = {
-      governor = "performance";
-      turbo = "auto";
-    };
-  };
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
diff --git a/hosts/buldak/features/software.nix b/hosts/buldak/features/software.nix
index 24b833c..dbe233f 100644
--- a/hosts/buldak/features/software.nix
+++ b/hosts/buldak/features/software.nix
@@ -8,7 +8,6 @@
     osu-lazer-bin
     signal-desktop
     cider-2
-    iamb
   ];
 
   virtualisation.containers.enable = true;
diff --git a/hosts/sisyphe/configuration.nix b/hosts/sisyphe/configuration.nix
index 9bc6395..34f999a 100644
--- a/hosts/sisyphe/configuration.nix
+++ b/hosts/sisyphe/configuration.nix
@@ -42,8 +42,6 @@ in
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA8sdToNavEQv7PTMJ97HIGM6UlChwGS3x9O8hFilzui harryh@ik.me"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHjz5MUSmc1ahtUJWuvzG7PHH432nx6a0Nj2zfxt3oTP geekcat@protonmail.com"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP9Yp7TbDhYJ27Sh+LcPXT569bMVwbFrkE4zksfU84l+ harry123@goober"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILIKvsv6BM1CxcJ7bmKrq9BZATxtALcOABWJpBfou3HN misschloe777@buldak
-"
     ];
   };
 
diff --git a/hosts/sisyphe/features/services/default.nix b/hosts/sisyphe/features/services/default.nix
index aa5c677..9837998 100644
--- a/hosts/sisyphe/features/services/default.nix
+++ b/hosts/sisyphe/features/services/default.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 {
   imports = [
-    # ./akkoma.nix
+    ./akkoma.nix
     # ./archivebox.nix
     ./homelab-dashboard.nix
     # ./nextcloud.nix