flameshot: let DE manage flameshot

flake.lock

@@ -651,6 +651,7 @@
         "repo-clone": "repo-clone",
         "sops-nix": "sops-nix",
         "umu": "umu_2",
+        "zdwl": "zdwl",
         "zdwm": "zdwm"
       }
     },
@@ -729,13 +730,13 @@
         "revCount": 867,
         "submodules": true,
         "type": "git",
-        "url": "https://github.com/Open-Wine-Components/umu-launcher/"
+        "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
       },
       "original": {
         "dir": "packaging/nix",
         "submodules": true,
         "type": "git",
-        "url": "https://github.com/Open-Wine-Components/umu-launcher/"
+        "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
       }
     },
     "xwayland-satellite-stable": {
@@ -771,6 +772,23 @@
         "type": "github"
       }
     },
+    "zdwl": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1734081909,
+        "narHash": "sha256-1gzw818Kqkn5JORht910b3kK3F2BZstzxdRFTaEAB5M=",
+        "ref": "0.7",
+        "rev": "49888cdcbbace159bc020e3f4be228e63e0c7bad",
+        "revCount": 1250,
+        "type": "git",
+        "url": "https://git.zynh.me/Zynh0722/dwl"
+      },
+      "original": {
+        "ref": "0.7",
+        "type": "git",
+        "url": "https://git.zynh.me/Zynh0722/dwl"
+      }
+    },
     "zdwm": {
       "flake": false,
       "locked": {

flake.nix

@@ -16,6 +16,7 @@
 
     repo-clone.url = "git+https://git.zynh.me/Zynh0722/repo-clone";
     zdwm = { url = "git+https://git.zynh.me/Zynh0722/dwm?ref=preanybar-systray"; flake = false; };
+    zdwl = { url = "git+https://git.zynh.me/Zynh0722/dwl?ref=0.7"; flake = false; };
     fish_theme = { url = "git+https://git.zynh.me/Zynh0722/omf-theme"; flake = false; };
     backgrounds = { url = "git+https://git.zynh.me/Zynh0722/backgrounds"; inputs.nixpkgs.follows = "nixpkgs"; };
     umu = { url = "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging\/nix&submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; };

home/modules/flameshot.nix

@@ -22,7 +22,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [ flameshot ];
+    # home.packages = with pkgs; [ flameshot ];
 
     xdg.configFile."flameshot/flameshot.ini".text = lib.generators.toINI { } cfg.config;
   };

hosts/snowhawk/configuration.nix

@@ -53,6 +53,7 @@
     syncthing.enable = true;
     user.enable = true;
     wake-on-lan.enable = true;
+    star-citizen.enable = true;
   };
 
   # Enable automatic login for the user.
@@ -80,11 +81,6 @@
     killall
 
     linux-manual
-
-    (inputs.nix-gaming.packages.${pkgs.system}.star-citizen.override {
-      useUmu = true;
-      location = "/data/star-citizen";
-    })
   ];
 
   fonts.packages = with pkgs; [
@@ -96,6 +92,14 @@
 
   hardware.keyboard.uhk.enable = true;
 
+  swapDevices = [{
+    device = "/swap";
+    size = 16 * 1024;
+  }];
+
+  # Also recommended, either as an alternative or in addition
+  zramSwap.enable = true;
+
   virtualisation = {
     libvirtd.enable = true;
   };

hosts/snowhawk/home.nix

@@ -88,6 +88,8 @@
     gparted
     arandr
 
+    bear
+
     spotify
     vesktop
     (writeShellScriptBin "discord" ''
@@ -95,6 +97,7 @@
     '')
 
     steam-run
+    brave
 
     nix-output-monitor
     (writeShellScriptBin "rebuild" ''

modules/dwl.nix

@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }:
+{ lib, config, pkgs, inputs, ... }:
 
 let
   cfg = config.snowhawk.dwl;
@@ -9,7 +9,9 @@ in
 
     package = lib.mkOption {
       type = with lib.types; package;
-      default = pkgs.dwl;
+      default = pkgs.dwl.overrideAttrs (old: {
+        src = inputs.zdwl;
+      });
       apply = p: p.overrideAttrs {
         postInstall = ''
           mkdir -p $out/share/wayland-sessions
@@ -27,6 +29,11 @@ in
       enable = true;
       sessionPackages = [ cfg.package ];
       defaultSession = "dwl";
+      # TODO: greetd?
+      sddm = {
+        enable = lib.mkDefault true;
+        wayland.enable = lib.mkDefault true;
+      };
     };
 
     security = {
@@ -53,6 +60,8 @@ in
     services.xserver.desktopManager.runXdgAutostartIfNone = lib.mkDefault true;
 
     environment.systemPackages = with pkgs; [
+      (flameshot.override { enableWlrSupport = true; })
+
       wl-clipboard
       wmenu
       foot

modules/dwm.nix

@@ -83,6 +83,7 @@ in
     environment.systemPackages = with pkgs; [
       dmenu
       xclip
+      flameshot
     ];
 
     home-manager.sharedModules = [

modules/star-citizen.nix

@@ -0,0 +1,24 @@
+{ lib, config, inputs, pkgs, ... }:
+
+let
+  cfg = config.snowhawk.star-citizen;
+in
+{
+  options.snowhawk.star-citizen = {
+    enable = lib.mkEnableOption "star-citizen";
+  };
+
+  config = lib.mkIf cfg.enable {
+    boot.kernel.sysctl = {
+      "vm.max_map_count" = 16777216;
+      "ds.file-max" = 524288;
+    };
+
+    environment.systemPackages = [
+      (inputs.nix-gaming.packages.${pkgs.system}.star-citizen.override {
+        useUmu = true;
+        location = "/data/star-citizen";
+      })
+    ];
+  };
+}