diff --git a/background.jpg b/background.jpg new file mode 100644 index 0000000..44e993a Binary files /dev/null and b/background.jpg differ diff --git a/configuration.nix b/configuration.nix index 16255bd..79e5d5d 100755 --- a/configuration.nix +++ b/configuration.nix @@ -2,10 +2,15 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ pkgs, inputs, system, ... }: +{ pkgs, inputs, system, lib, ... }: { imports = [ ./hardware-configuration.nix + inputs.sddm-sugar-candy-nix.nixosModules.default + ]; + + nixpkgs.overlays = [ + inputs.sddm-sugar-candy-nix.overlays.default ]; fileSystems."/mnt/arch" = { @@ -92,20 +97,6 @@ # You can disable this if you're only using the Wayland session. services.xserver.enable = false; - # KDE + SDDM Configuration - services.desktopManager.plasma6.enable = true; - services.displayManager.sddm = { - enable = true; - wayland.enable = true; - - sugarCandyNix = { - enable = true; - settings = { - HeaderText = ":3"; - }; - }; - }; - # Configure keymap in X11 services.xserver.xkb = { layout = "us"; @@ -213,4 +204,33 @@ # Enable bluetooth hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; + + # KDE + SDDM Configuration + services.desktopManager.plasma6 = { + enable = true; + enableQt5Integration = true; + }; + services.displayManager.sddm = { + enable = true; + wayland.enable = true; + enableHidpi = true; + package = lib.mkForce pkgs.libsForQt5.sddm; + extraPackages = lib.mkForce [ + pkgs.libsForQt5.qtbase + pkgs.libsForQt5.qt5.qtgraphicaleffects + ]; + + sugarCandyNix = { + enable = true; + settings = { + Background = "${pkgs.kdePackages.plasma-workspace-wallpapers}/share/wallpapers/Patak/contents/images_dark/3840x2160.png"; + ScreenWidth = 3072; + ScreenHeight = 1920; + FormPosition = "left"; + HaveFormBackground = true; + PartialBlur = true; + FontSize = "12"; + }; + }; + }; } diff --git a/flake.lock b/flake.lock index 016fa03..af4dc97 100755 --- a/flake.lock +++ b/flake.lock @@ -298,12 +298,12 @@ "owner": "Zhaith-Izaliel", "repo": "sddm-sugar-candy-nix", "rev": "35d6fdb4eed20d682e992ae3c6095427e89c2b74", - "type": "gitlab" + "type": "github" }, "original": { "owner": "Zhaith-Izaliel", "repo": "sddm-sugar-candy-nix", - "type": "gitlab" + "type": "github" } }, "systems": { diff --git a/flake.nix b/flake.nix index 565e842..724e72e 100755 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ }; # SDDM Sugar Candy sddm-sugar-candy-nix = { - url = "gitlab:Zhaith-Izaliel/sddm-sugar-candy-nix"; + url = "github:Zhaith-Izaliel/sddm-sugar-candy-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; # Home Manager + Plasma @@ -49,14 +49,6 @@ system = "x86_64-linux"; modules = [ - sddm-sugar-candy-nix.nixosModules.default - { - nixpkgs = { - overlays = [ - sddm-sugar-candy-nix.overlays.default - ]; - }; - } # Import legacy configuration ./configuration.nix diff --git a/home-manager/modules/vcs/jj.nix b/home-manager/modules/vcs/jj.nix index bcc1c27..681c3ab 100644 --- a/home-manager/modules/vcs/jj.nix +++ b/home-manager/modules/vcs/jj.nix @@ -24,6 +24,10 @@ format = "git"; }; }; + + revset-aliases = { + "immutable_heads()" = "builtin_immutable_heads() | main@forgejo"; + }; }; }; } \ No newline at end of file