Merge branch 'master' of github.com:/kropatz/nix-config

home-manager/hyprland/hyprland-settings.nix

@@ -318,11 +318,11 @@ in
         ] ++ lib.lists.optionals (osConfig.networking.hostName == "kop-pc") [
           "[workspace 9 silent] discord"
           "[workspace 9 silent] discordcanary"
-          "[workspace 10 silent] floorp"
+          "[workspace 10 silent] firefox"
+          "xrandr --monitor ${monitor1} --primary"
         ] ++ [
           "sleep 3 && ${pkgs.waybar}/bin/waybar &"
           "${restartPortals}"
-          "xrandr --monitor ${monitor1} --primary"
         ];
       };
       extraConfig =

modules/collections/laptop.nix

@@ -40,14 +40,18 @@
       #games.enable = true;
       ime.enable = true;
       shared.enable = true;
-      stylix.enable = true;
+      stylix = {
+        enable = true;
+        base16Scheme = import ../../modules/themes/tsukasa.nix;
+        image = ../../tsukasa.jpg;
+      };
     };
   };
 
   nixpkgs.config.permittedInsecurePackages = [ "electron-27.3.11" "electron-28.3.3" ];
-  programs.firejail.wrappedBinaries = with pkgs;
-    let inherit (config.custom.misc.firejail) mk;
-    in lib.mkMerge [
-      (mk "Discord" { pkg = discord; })
-    ];
+  #programs.firejail.wrappedBinaries = with pkgs;
+  #  let inherit (config.custom.misc.firejail) mk;
+  #  in lib.mkMerge [
+  #    (mk "Discord" { pkg = discord; })
+  #  ];
 }

overlays.nix

@@ -21,6 +21,7 @@ in
     discord = prev.discord.override { withVencord = true; };
     tetrio-desktop = prev.tetrio-desktop.override { withTetrioPlus = true; };
     lact = prev.rdna4-lact;
+
     hyprland =
       inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.hyprland;
     xdg-desktop-portal-hyprland =

systems/laptop/configuration.nix

@@ -29,11 +29,11 @@
     };
   };
 
-  services.blueman.enable = true;
+  #services.blueman.enable = true;
 
-  hardware.bluetooth.enable = true; # enables support for Bluetooth
-  hardware.bluetooth.powerOnBoot =
-    true; # powers up the default Bluetooth controller on boot
+  #hardware.bluetooth.enable = true; # enables support for Bluetooth
+  #hardware.bluetooth.powerOnBoot =
+  #  true; # powers up the default Bluetooth controller on boot
 
   age.identityPaths =
     [ "/home/kopatz/.ssh/id_ed25519" "/etc/ssh/ssh_host_ed25519_key" ];