diff --git a/flake.lock b/flake.lock index 1e37a0de..ee70a8a8 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1748365336, - "narHash": "sha256-pg0w4uOZI32dLASD6UbBezeQg5PwOa0GLv7rTwn3VxY=", + "lastModified": 1755503773, + "narHash": "sha256-2iAIrSC4ubTCEM5BeC+R7dywkj9CAV0K6vHbqxCcCtA=", "owner": "anyrun-org", "repo": "anyrun", - "rev": "25367153f225a59c5ce5746583e39a71ff052f09", + "rev": "bed987ed5dec0b29865b973ad4fce04c5da2ea21", "type": "github" }, "original": { @@ -123,11 +123,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1755261355, - "narHash": "sha256-RQVhOuwfLSB64CMv8GMfBFZ2PXmIVleZeZskItqgD5o=", + "lastModified": 1755444192, + "narHash": "sha256-9eVUtk3ces32aJpHnsrO49UJNvMKNMxlV7NeNSAADLo=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "766a57635e5afd201c5d918087e5f9c9f63bfed1", + "rev": "958ba486ee73019e3820b9ebd97a38660f736f40", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1755240331, - "narHash": "sha256-wEtw76+R/TOHEIjYOnxADC91G6s422HGruAngbjzsDw=", + "lastModified": 1755499663, + "narHash": "sha256-OxHGov+A4qR4kpO3e1I3LFR78IAKvDFnWoWsDWvFhKU=", "owner": "nix-community", "repo": "fenix", - "rev": "3f076d4502001c64877099093318b2dbd8b062a1", + "rev": "d1ff4457857ad551e8d6c7c79324b44fac518b8b", "type": "github" }, "original": { @@ -444,11 +444,11 @@ }, "hardware": { "locked": { - "lastModified": 1754564048, - "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", + "lastModified": 1755330281, + "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", + "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", "type": "github" }, "original": { @@ -463,11 +463,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1755269578, - "narHash": "sha256-KiVR83GhEdKrBQm5JqAOSLbWsH8q4sN+acoLZziZCCM=", + "lastModified": 1755523503, + "narHash": "sha256-BWjVjMSb+cVUf5o5R83+WMoeNfrHN8w+UKMhqic5/Ys=", "owner": "helix-editor", "repo": "helix", - "rev": "a4a2b50a50971bc43952f5f75d19a56689793a6a", + "rev": "9f34f8b5ff63af86f0fb9eac2c9b092cd479e1c3", "type": "github" }, "original": { @@ -483,11 +483,11 @@ ] }, "locked": { - "lastModified": 1755229570, - "narHash": "sha256-soZegto0xXzG2zYlu/zjknDHv0Z7tRS5EQs+Z/VRTBg=", + "lastModified": 1755491080, + "narHash": "sha256-ib1Xi13NEalrFqQAHceRsb+6aIPANFuQq80SS/bY10M=", "owner": "nix-community", "repo": "home-manager", - "rev": "11626a4383b458f8dc5ea3237eaa04e8ab1912f3", + "rev": "f8af2cbe386f9b96dd9efa57ab15a09377f38f4d", "type": "github" }, "original": { @@ -525,11 +525,11 @@ ] }, "locked": { - "lastModified": 1755121891, - "narHash": "sha256-UtYkukiGnPRJ5rpd4W/wFVrLMh8fqtNkqHTPgHEtrqU=", + "lastModified": 1755313937, + "narHash": "sha256-pQb7bNcolxYGRiylUCrTddiF+qW2wsUiM9+eRIDUrVU=", "owner": "nix-community", "repo": "home-manager", - "rev": "279ca5addcdcfa31ac852b3ecb39fc372684f426", + "rev": "2a749f4790a14f7168be67cdf6e548ef1c944e10", "type": "github" }, "original": { @@ -676,11 +676,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1755277479, - "narHash": "sha256-LrXtv1RIEds93j+OiSEvYFVX4fcGk2vrEzva19oxvco=", + "lastModified": 1755531739, + "narHash": "sha256-TGFQdnGC1U2qg2Efjyk+94+aKxAkW5O+2IuKIsoQqzI=", "owner": "hyprwm", "repo": "hyprland", - "rev": "edc473e8b0c14e768445422080af9978d132bff6", + "rev": "1a0ed00f74f7cfcc3b7c4fd7e3bf0073c4973267", "type": "github" }, "original": { @@ -1143,11 +1143,11 @@ ] }, "locked": { - "lastModified": 1755223400, - "narHash": "sha256-iUAvYWdu91xO2xBmxXmAMymKvxxs1orbbUDhaubyp24=", + "lastModified": 1755396822, + "narHash": "sha256-gID7ynpJuflQ/+ibrhYUWybiGPduNvvMJSk27oqfK24=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "97bf2750a74b02dbfc1131d99862c9ddd842a48d", + "rev": "f2bf778502254d8852402a83ae346fd803095ccc", "type": "github" }, "original": { @@ -1379,11 +1379,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1755252692, - "narHash": "sha256-98Ad2F5w1xW94KymQiBohNBYpFqMa0K28v9S1SzyTY8=", + "lastModified": 1755463179, + "narHash": "sha256-5Ggb1Mhf7ZlRgGi2puCa2PvWs6KbMnWBlW6KW7Vf79Y=", "owner": "notashelf", "repo": "nvf", - "rev": "b6490efbe0b28b3bca727ecd4846fc8006352822", + "rev": "03833118267ad32226b014b360692bdce9d6e082", "type": "github" }, "original": { @@ -1493,11 +1493,11 @@ ] }, "locked": { - "lastModified": 1755139244, - "narHash": "sha256-SN1BFA00m+siVAQiGLtTwjv9LV9TH5n8tQcSziV6Nv4=", + "lastModified": 1755311859, + "narHash": "sha256-NspGtm0ZpihxlFD628pvh5ZEhL/Q6/Z9XBpe3n6ZtEw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "aeae248beb2a419e39d483dd9b7fec924aba8d4d", + "rev": "07619500e5937cc4669f24fec355d18a8fec0165", "type": "github" }, "original": { diff --git a/hosts/bunk/modules.nix b/hosts/bunk/modules.nix index e77811be..d1adde49 100644 --- a/hosts/bunk/modules.nix +++ b/hosts/bunk/modules.nix @@ -27,17 +27,6 @@ }; network = { enable = true; - extraHosts = '' - 192.168.88.14 sobotka - 192.168.88.14 cnst.dev - 192.168.88.14 lidarr.cnst.dev - 192.168.88.14 radarr.cnst.dev - 192.168.88.14 sonarr.cnst.dev - 192.168.88.14 prowlarr.cnst.dev - 192.168.88.14 qbt.cnst.dev - 192.168.88.14 jellyseerr.cnst.dev - 192.168.88.14 jellyfin.cnst.dev - ''; interfaces = { "wlp6s0" = { allowedTCPPorts = [22 80 443]; @@ -81,6 +70,7 @@ }; hyprland = { enable = true; + withUWSM = true; }; inkscape = { enable = false; diff --git a/hosts/kima/modules.nix b/hosts/kima/modules.nix index f110c7ac..f83cd0eb 100644 --- a/hosts/kima/modules.nix +++ b/hosts/kima/modules.nix @@ -71,6 +71,7 @@ }; hyprland = { enable = true; + withUWSM = true; }; inkscape = { enable = false; diff --git a/hosts/sobotka/modules.nix b/hosts/sobotka/modules.nix index 3995be5d..9dcf9692 100644 --- a/hosts/sobotka/modules.nix +++ b/hosts/sobotka/modules.nix @@ -28,20 +28,6 @@ }; network = { enable = true; - # extraHosts = '' - # 192.168.88.14 sobotka - # 192.168.88.14 cnst.dev - # 192.168.88.14 lidarr.cnst.dev - # 192.168.88.14 radarr.cnst.dev - # 192.168.88.14 sonarr.cnst.dev - # 192.168.88.14 prowlarr.cnst.dev - # 192.168.88.14 bazarr.cnst.dev - # 192.168.88.14 qbt.cnst.dev - # 192.168.88.14 jellyseerr.cnst.dev - # 192.168.88.14 jellyfin.cnst.dev - # 192.168.88.14 uptime.cnst.dev - # 192.168.88.14 pihole.cnst.dev - # ''; interfaces = { "enp6s0" = { allowedTCPPorts = [22 80 443 8090]; diff --git a/hosts/toothpc/modules.nix b/hosts/toothpc/modules.nix index b7ab84b0..031e284d 100644 --- a/hosts/toothpc/modules.nix +++ b/hosts/toothpc/modules.nix @@ -73,6 +73,7 @@ }; hyprland = { enable = true; + withUWSM = true; }; inkscape = { enable = false; diff --git a/modules/default.nix b/modules/default.nix index 46565e19..21737120 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -47,7 +47,6 @@ ./home/services/hyprpaper ./home/services/mako ./home/services/nix-index - ./home/services/protonmail-bridge ./home/services/syncthing ./home/services/udiskie ./home/services/xdg diff --git a/modules/home/services/protonmail-bridge/default.nix b/modules/home/services/protonmail-bridge/default.nix deleted file mode 100644 index be8d8f65..00000000 --- a/modules/home/services/protonmail-bridge/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - inherit (lib) mkIf mkEnableOption optionalString; - cfg = config.home.services.protonmail-bridge; -in { - options = { - home.services.protonmail-bridge.enable = mkEnableOption "Enables protonmail-bridge"; - }; - config = mkIf cfg.enable { - home.packages = [pkgs.protonmail-bridge]; - systemd.user.services.protonmail-bridge = { - Unit = { - Description = "Protonmail Bridge"; - After = ["network.target"]; - }; - - Service = { - Restart = "always"; - ExecStart = "${pkgs.protonmail-bridge}/bin/protonmail-bridge --no-window --noninteractive"; - }; - - Install = { - WantedBy = ["default.target"]; - }; - }; - }; -} diff --git a/modules/nixos/programs/hyprland/default.nix b/modules/nixos/programs/hyprland/default.nix index afdd3590..9b6a55aa 100644 --- a/modules/nixos/programs/hyprland/default.nix +++ b/modules/nixos/programs/hyprland/default.nix @@ -5,7 +5,7 @@ pkgs, ... }: let - inherit (lib) mkIf mkEnableOption mkDefault; + inherit (lib) mkIf mkEnableOption mkOption mkDefault; cfg = config.nixos.programs.hyprland; in { imports = [ @@ -18,7 +18,14 @@ in { ]; options = { - nixos.programs.hyprland.enable = mkEnableOption "Enable Hyprland"; + nixos.programs.hyprland = { + enable = mkEnableOption "Enable Hyprland"; + withUWSM = mkOption { + type = lib.types.bool; + default = false; + description = "Use UWSM to handle hyprland session"; + }; + }; }; config = mkIf cfg.enable { @@ -30,11 +37,24 @@ in { startup.enable = mkDefault true; }; - programs.hyprland = { - enable = true; - package = pkgs.hyprland; - withUWSM = true; + programs = { + hyprland = { + enable = true; + package = pkgs.hyprland; + withUWSM = cfg.withUWSM; + }; + uwsm = mkIf cfg.withUWSM { + enable = true; + waylandCompositors = { + hyprland = { + prettyName = "Hyprland"; + comment = "Hyprland compositor managed by UWSM"; + binPath = "/run/current-system/sw/bin/Hyprland"; + }; + }; + }; }; + environment.variables.NIXOS_OZONE_WL = "1"; }; } diff --git a/users/cnst/modules/kimamod.nix b/users/cnst/modules/kimamod.nix index 979dc16f..fbbc64a4 100644 --- a/users/cnst/modules/kimamod.nix +++ b/users/cnst/modules/kimamod.nix @@ -140,9 +140,6 @@ nix-index = { enable = true; }; - protonmail-bridge = { - enable = false; - }; syncthing = { enable = true; };