feat: update hyprland config

sioodmy · Aug 27, 2023 · df2352a · df2352a
1 parent cfde205
commit df2352a
Show file tree

Hide file tree

Showing 17 changed files with 711 additions and 422 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -8,16 +8,30 @@
     xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland";
     impermanence.url = "github:nix-community/impermanence";
 
+    nixpak = {
+      url = "github:nixpak/nixpak";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    hyprpicker = {
+      url = "github:hyprwm/hyprpicker";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     schizofox = {
-      url = "github:schizofox/schizofox";
-      # url = "path:/home/sioodmy/dev/schizofox";
+      # url = "github:schizofox/schizofox";
+      url = "path:/home/sioodmy/dev/schizofox";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpak.follows = "nixpak";
     };
 
     anyrun = {
       url = "github:Kirottu/anyrun";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nh = {
+      url = "github:viperML/nh";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     ragenix = {
       url = "github:yaxitech/ragenix";
       inputs.nixpkgs.follows = "nixpkgs";

diff --git a/modules/core/nix.nix b/modules/core/nix.nix
@@ -5,17 +5,25 @@
   inputs,
   ...
 }: {
+  imports = [inputs.nh.nixosModules.default];
   environment = {
     # set channels (backwards compatibility)
+    sessionVariables.FLAKE = "/home/sioodmy/dev/dotfiles";
     etc = {
       "nix/flake-channels/nixpkgs".source = inputs.nixpkgs;
       "nix/flake-channels/home-manager".source = inputs.home-manager;
     };
 
-    systemPackages = with pkgs; [git deadnix alejandra statix];
+    systemPackages = with pkgs; [git deadnix alejandra statix inputs.nh.packages.${pkgs.system}.default nix-output-monitor];
     defaultPackages = [];
   };
 
+  nh = {
+    enable = true;
+    clean.enable = true;
+    clean.extraArgs = "--keep-since 4d --keep 3";
+  };
+
   nixpkgs = {
     config = {
       allowUnfree = false;
@@ -33,6 +41,17 @@
           "nvidia-x11"
           "nvidia-settings"
         ];
+      overlays = [
+        (
+          _: prev: {
+            # temp fix until https://github.com/NixOS/nixpkgs/pull/249382 is merged
+            gtklock = prev.gtklock.overrideAttrs (self: super: {
+              nativeBuildInputs = super.nativeBuildInputs ++ [prev.wrapGAppsHook];
+              buildInputs = super.buildInputs ++ [prev.librsvg];
+            });
+          }
+        )
+      ];
     };
   };
 
@@ -97,6 +116,7 @@
         "https://hyprland.cachix.org"
         "https://nixpkgs-unfree.cachix.org"
         "https://anyrun.cachix.org"
+        "https://viperml.cachix.org"
       ];
 
       trusted-public-keys = [
@@ -107,6 +127,7 @@
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
         "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs="
         "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
+        "viperml.cachix.org-1:qZhKBMTfmcLL+OG6fj/hzsMEedgKvZVFRRAhq7j8Vh8="
       ];
     };
   };

diff --git a/modules/core/schizo.nix b/modules/core/schizo.nix
@@ -82,6 +82,7 @@
       packages = [pkgs.apparmor-profiles];
     };
     pam = {
+      services.gtklock.text = "auth include login";
       loginLimits = [
         {
           domain = "@wheel";
@@ -98,11 +99,6 @@
       ];
       services = {
         login.enableGnomeKeyring = true;
-        swaylock = {
-          text = ''
-            auth include login
-          '';
-        };
       };
     };
 
@@ -136,7 +132,7 @@
         }
       ];
     };
-    sudo.enable = false;
+    sudo.enable = true;
   };
 
   boot.kernel.sysctl = {

diff --git a/modules/home/default.nix b/modules/home/default.nix
@@ -11,7 +11,7 @@
   config.home.stateVersion = "22.05";
   config.home.extraOutputsToInstall = ["doc" "devdoc"];
   imports = [
-    inputs.hyprland.homeManagerModules.default
+    # inputs.hyprland.homeManagerModules.default
     inputs.nix-index-db.hmModules.nix-index
     inputs.anyrun.homeManagerModules.default
     inputs.spicetify-nix.homeManagerModule
@@ -32,7 +32,8 @@
     ./dunst
     ./bottom
     ./shell
-    ./swaylock
+    ./swayidle
+    ./gtklock
     ./tools
     ./hyprland
     ./media

diff --git a/modules/home/gtklock/default.nix b/modules/home/gtklock/default.nix
@@ -0,0 +1,33 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [gtklock];
+
+  xdg.configFile."gtklock/style.css".text = ''
+    window {
+      background: rgba(0, 0, 0, .5);
+      font-family: Lexend;
+    }
+
+    grid > label {
+      color: transparent;
+      margin: -20rem;
+    }
+
+    button {
+      all: unset;
+      color: transparent;
+      margin: -20rem;
+    }
+
+    #clock-label {
+      font-size: 6rem;
+      margin-bottom: 4rem;
+      text-shadow: 0px 2px 10px rgba(0, 0, 0, .1);
+    }
+
+    entry {
+      border-radius: 16px;
+      margin: 6rem;
+      box-shadow: 0 1px 3px rgba(0, 0, 0, .1);
+    }
+  '';
+}