diff --git a/home-manager/stylix.nix b/home-manager/stylix.nix index 612ea82..e8c91b4 100644 --- a/home-manager/stylix.nix +++ b/home-manager/stylix.nix @@ -1,3 +1,13 @@ { osConfig, pkgs, config, lib, ... }: let cfg = osConfig.custom.graphical.stylix; -in { config = lib.mkIf cfg.enable { stylix.enable = true; }; } +in { + config = lib.mkIf cfg.enable { + stylix = { + enable = true; + targets = { + hyprland.enable = false; + waybar.enable = false; + }; + }; + }; +} diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix index 8a1ea94..ae75486 100644 --- a/modules/graphical/default.nix +++ b/modules/graphical/default.nix @@ -4,6 +4,7 @@ imports = [ ./audio.nix ./code.nix + ./sddm.nix ./code-android.nix ./awesome.nix ./emulators.nix diff --git a/modules/graphical/i3.nix b/modules/graphical/i3.nix index 409fa65..c5c92dc 100644 --- a/modules/graphical/i3.nix +++ b/modules/graphical/i3.nix @@ -23,11 +23,10 @@ in { }; }; + custom.graphical.sddm.enable = true; services = { displayManager = { defaultSession = "none+i3"; - sddm.enable = true; - sddm.theme = "${pkgs.sddm-astronaut}"; }; xserver = { diff --git a/modules/graphical/sddm.nix b/modules/graphical/sddm.nix new file mode 100644 index 0000000..54904bc --- /dev/null +++ b/modules/graphical/sddm.nix @@ -0,0 +1,21 @@ +{ config, pkgs, lib, ... }: +let cfg = config.custom.graphical.sddm; +in { + + options = { + custom.graphical.sddm.enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable sddm"; + }; + }; + + config = lib.mkIf cfg.enable { + services = { + displayManager = { + sddm.enable = true; + sddm.theme = "${pkgs.sddm-astronaut}"; + }; + }; + }; +} diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix index 3d3e78f..111f6ee 100644 --- a/modules/services/syncthing.nix +++ b/modules/services/syncthing.nix @@ -42,11 +42,15 @@ in id = "5T6Y3WO-FOQYYFQ-5MLNDSZ-7APIDUG-6KM2ZZM-RTRXMWX-MCZKLMH-BYNDJAQ"; addresses = [ "tcp://192.168.2.22" ]; }; + phone = { + id = "XFQ7MV6-MKBYQXH-WGYVQUB-BYJJPFJ-HJTNZEP-PXWAMYY-DMADWSU-PQOTVAI"; + addresses = [ "tcp://192.168.0.15" "tcp://192.168.2.30" ]; + }; }; folders."${basePath}/default" = { id = "default"; - devices = [ "kop-pc" "server" "laptop" "mini-pc" ]; + devices = [ "kop-pc" "server" "laptop" "mini-pc" "phone" ]; ignorePerms = false; }; diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 20c1dbc..5002383 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -58,10 +58,12 @@ ime.enable = true; noise-supression.enable = true; obs.enable = true; + sddm.enable = true; #openrgb.enable = true; nightlight.enable = true; #plasma.enable = true; i3.enable = true; + #hyprland.enable = true; #gnome.enable = true; #cosmic.enable = true; shared.enable = true;