Squashed commit of the following:

commit e0e6824 Author: acrease <[email protected]> Date: Tue Aug 13 22:14:38 2024 +0100 Automatic commit on exp branch commit 8ca97c2 Author: acrease <[email protected]> Date: Tue Aug 13 22:04:24 2024 +0100 Automatic commit on exp branch commit b42f5f7 Author: acrease <[email protected]> Date: Tue Aug 13 19:31:01 2024 +0100 Automatic commit on exp branch commit e59e365 Author: acrease <[email protected]> Date: Tue Aug 13 19:30:43 2024 +0100 Automatic commit on exp branch
Apollo-XIV · Aug 13, 2024 · 318735d · 318735d
1 parent 513daa9
commit 318735d
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 11 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -7,7 +7,14 @@ on:
 permissions: write-all
 
 jobs:
-  infra:
-    name: Deploy Terraform
-    uses: ./.github/workflows/infra.yaml
-    secrets: inherit
+  # infra:
+  #   name: Deploy Terraform
+  #   uses: ./.github/workflows/infra.yaml
+  #   secrets: inherit
+  main:
+    name: main
+    runs-on: ubuntu-latest
+    steps:
+      - name: hello world
+        runs: echo "hello"
+
diff --git a/flake.nix b/flake.nix
@@ -22,7 +22,10 @@
           inputs.home-manager.nixosModules.default
           nur.nixosModules.nur
           ({pkgs, ...}: {
-            nixpkgs.overlays = [nur.overlay];
+            nixpkgs.overlays = [
+              nur.overlay
+              (import ./overlays/programs.nix)
+            ];
             imports = [
               ./hosts/default/configuration.nix
             ];

diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
@@ -142,11 +142,19 @@
   #   };
   # };
 
-  services.displayManager.sddm = {
-    enable = true;
-    wayland.enable = true;
-    theme = "breeze-dark";
+  services.displayManager = {
+    autoLogin = {
+      enable = true;
+      user = "acrease";
+    };
+    sddm = {
+      enable = true;
+      wayland.enable = true;
+      theme = "clairvoyance";
+      autoNumlock = true;
+    };
   };
+
   services.xserver.enable = true;
 
   qt = {
@@ -271,6 +279,8 @@
     xdg-desktop-portal-hyprland
     xdg-desktop-portal-gtk
     onlyoffice-bin
+    nil
+    yaml-language-server
   ];
 
 

diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix
@@ -14,7 +14,7 @@
         "Unknown-1, disable"
       ];
 
-      exec-once = "hyprpaper & waybar & firefox & spotify";
+      exec-once = "hyprlock & hyprpaper & waybar & firefox & spotify";
 
       input = {
         kb_layout = "gb";

diff --git a/modules/home-manager/hyprlock.nix b/modules/home-manager/hyprlock.nix
@@ -6,7 +6,7 @@
     settings = {
       general = {
         disable_loading_bar = false;
-        grace = 300;
+        grace = 0;
         hide_cursor = true;
         no_fade_in = false;
       };

diff --git a/overlays/programs.nix b/overlays/programs.nix
@@ -0,0 +1,6 @@
+final: prev: {
+  clairvoyance = prev.callPackage ./../packages/clairvoyance.nix {
+    autoFocusPassword = true;
+    backgroundURL = "https://wallpapercave.com/wp/wp1860715.jpg";
+  };
+}
diff --git a/packages/clairvoyance.nix b/packages/clairvoyance.nix
@@ -0,0 +1,40 @@
+{
+  stdenv, fetchFromGitHub,
+  autoFocusPassword ? false,
+  backgroundURL ? null,
+  enableHDPI ? false,
+  fileType ? "jpg"
+}:
+
+let bootToStr = b: if b then "true" else "false";
+  autoFocusPassword' = boolToStr autoFocusPassword;
+  enableHDPI' = boolToStr enableHDPI;
+  background = "Assets/Background."+ fileType;
+  themeConfig = builtins.toFile "theme.conf" ''
+    [General]
+    background=${background}
+    autoFocusPassword=${autoFocusPassword'}
+    enableHDPI=${enableHDPI'}
+  '';
+in stdenv.mkDerivation rec {
+  name = "sddm-clairvoyance";
+  src = fetchFromGithub {
+    owner = "eayus";
+    repo = "sddm-theme-clairvoyance";
+    rev = "fb0210303f67325162a5f132b6a3f709dcd8e181"; 
+    sha256 = "17hwh0ixnn5d9dbl1gaygbhb1zv4aamqkqf70pcgq1h9124mjshj";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/sddm/themes/clairvoyance
+    cp -r * $out/share/sddm/themes/clairvoyance
+    cp ${themeConfig} $out/share/sddm/themes/clairvoyance/theme.conf
+    ${if backgroundURL == null then "" else "cp ${builtins.fetchurl backgroundURL} $out/share/sddm/themes/clairvoyance/${background}"}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "eayus' sddm theme";
+    homepage = https://github.com/eayus/sddm-theme-clairvoyance;
+    platforms = platforms.linux;
+  };
+}