🎨 use stylix for gtk, ⬆️ flake lock update (#253)

* ⬆️ update flake

* ♻️ use nixpkgs anyrun

* use stylix for gtk

* update lock

* add vicinae.json

* update flake

* update flake lock

* update flake lock

* use nixpkgs-unstable

* use overlays

* update flake

* update flake

* remove git hyprland

* remove rust-overlay

* small updates

* remove nixpkgs-unstable

Author: danielgafni

flake.lock

@@ -3,15 +3,6 @@
 
   inputs = {
     nixos-hardware.url = "github:NixOS/nixos-hardware";
-    hyprland = {
-      type = "git";
-      url = "https://github.com/hyprwm/Hyprland";
-      submodules = true;
-    };
-    hyprland-plugins = {
-      url = "github:hyprwm/hyprland-plugins";
-      inputs.hyprland.follows = "hyprland";
-    };
 
     nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
     nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
@@ -56,9 +47,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nixpkgs-vsCodeExtensionsPythonPinned = {
-      url = "github:NixOs/nixpkgs?rev=2d068ae5c6516b2d04562de50a58c682540de9bf";
-    };
+    # nixpkgs-vsCodeExtensionsPythonPinned = {
+    #   url = "github:NixOs/nixpkgs?rev=2d068ae5c6516b2d04562de50a58c682540de9bf";
+    # };
 
     vicinae.url = "github:vicinaehq/vicinae";
   };
@@ -70,8 +61,6 @@
     pre-commit-hooks,
     home-manager,
     catppuccin,
-    hyprland,
-    hyprland-plugins,
     stylix,
     nixvim,
     sops-nix,
@@ -82,20 +71,21 @@
   } @ inputs: let
     system = "x86_64-linux";
 
+    overlays = [
+      inputs.nixpkgs-wayland.overlay
+    ];
+
     pkgs = import nixpkgs {
-      inherit system;
-      overlays = [
-        inputs.nixpkgs-wayland.overlay
-      ];
+      inherit system overlays;
       config = {
         allowUnfree = true;
         allowUnfreePredicate = _: true;
       };
     };
 
-    vsCodeExtensionsPythonPinnedPkgs = import inputs.nixpkgs-vsCodeExtensionsPythonPinned {
-      inherit system;
-    };
+    # vsCodeExtensionsPythonPinnedPkgs = import inputs.nixpkgs-vsCodeExtensionsPythonPinned {
+    #   inherit system;
+    # };
 
     # zedNixPkgs = import inputs.nixpkgs-zed {
     #   inherit system;
@@ -105,13 +95,21 @@
       dan = {
         isNormalUser = true;
         initialPassword = "pw123";
-        extraGroups = ["wheel" "docker" "video" "networkmanager"];
+        extraGroups = [
+          "wheel"
+          "docker"
+          "video"
+          "networkmanager"
+        ];
         packages = [pkgs.home-manager];
       };
       underdel = {
         isNormalUser = true;
         initialPassword = "pw123";
-        extraGroups = ["video" "networkmanager"];
+        extraGroups = [
+          "video"
+          "networkmanager"
+        ];
         packages = [pkgs.home-manager];
       };
     };
@@ -158,7 +156,10 @@
 
     host-users-map = {
       DanPC = ["dan"];
-      framnix = ["dan" "underdel"];
+      framnix = [
+        "dan"
+        "underdel"
+      ];
     };
 
     mkNixosConfiguration = {
@@ -180,7 +181,6 @@
         modules = [
           ./modules/NixOS/shared
           ./systems/x86_64-linux/${host}
-          # hyprland.nixosModules.default
           catppuccin.nixosModules.catppuccin
           stylix.nixosModules.stylix
           {programs.hyprland.xwayland.enable = true;}
@@ -198,7 +198,7 @@
         inherit pkgs;
         extraSpecialArgs = {
           # these args are passed to the other home-manager modules
-          inherit user inputs vsCodeExtensionsPythonPinnedPkgs; # zedNixpkgs
+          inherit user inputs; # zedNixpkgs
           host-settings = import ./modules/settings/${host};
           userConfig = user-configs.${user};
         };
@@ -207,9 +207,10 @@
           ./modules/home-manager/hosts/${host}
           ./modules/home-manager/shared
           catppuccin.homeModules.catppuccin
-          nixvim.homeManagerModules.nixvim
+          nixvim.homeModules.nixvim
           sops-nix.homeManagerModules.sops
           vicinae.homeManagerModules.default
+          stylix.homeModules.stylix
         ];
       };
   in {
@@ -234,7 +235,9 @@
     # NixOS configuration entrypoint
     # Available through 'nixos-rebuild --flake .#<hostname>' (hosts are taken from the 'hosts' list above)
     nixosConfigurations =
-      nixpkgs.lib.attrsets.mapAttrs (host: user-selection: mkNixosConfiguration {inherit host user-selection;})
+      nixpkgs.lib.attrsets.mapAttrs (
+        host: user-selection: mkNixosConfiguration {inherit host user-selection;}
+      )
       host-users-map;
 
     # Standalone home-manager configuration entrypoint
@@ -243,11 +246,13 @@
     homeConfigurations =
       pkgs.lib.concatMapAttrs (
         host: users:
-          pkgs.lib.listToAttrs (pkgs.lib.map (user: {
+          pkgs.lib.listToAttrs (
+            pkgs.lib.map (user: {
               name = "${user}@${host}";
               value = mkHomeConfiguration {inherit host user;};
             })
-            users)
+            users
+          )
       )
       host-users-map;
   };

flake.nix

@@ -14,3 +14,6 @@ set positional-arguments
 
 home host *args='':
   unbuffer home-manager --cores 12 --max-jobs 6 --flake .#{{user}}@{{host}} "${@:2}" |& grep -v '^$' | nom
+
+pr:
+    gh pr view --web

justfile

@@ -26,7 +26,6 @@
         "https://pre-commit-hooks.cachix.org"
         "https://danielgafni.cachix.org"
         "https://nix-community.cachix.org"
-        "https://anyrun.cachix.org"
         "https://chaotic-nyx.cachix.org/"
         "https://vicinae.cachix.org"
       ];
@@ -36,7 +35,6 @@
         "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc="
         "danielgafni.cachix.org-1:ZdXJoJEqeiGGOf/MtAiocqj7/vvFbA2MWFVwopJ2WQM="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
         "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8"
         "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
       ];
@@ -329,10 +327,6 @@
     hyprland = {
       enable = true;
       xwayland.enable = true;
-      # set the flake package
-      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-      # make sure to also set the portal package, so that they are in sync
-      portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
     };
     zsh.enable = true;
     nix-ld = {

modules/NixOS/shared/default.nix

@@ -0,0 +1,18 @@
+scheme: "Catppuccin Mocha"
+author: "https://github.com/catppuccin/catppuccin"
+base00: "1e1e2e" # base
+base01: "181825" # mantle
+base02: "313244" # surface0
+base03: "45475a" # surface1
+base04: "585b70" # surface2
+base05: "cdd6f4" # text
+base06: "f5e0dc" # rosewater
+base07: "b4befe" # lavender
+base08: "f38ba8" # red
+base09: "fab387" # peach
+base0A: "f9e2af" # yellow
+base0B: "a6e3a1" # green
+base0C: "94e2d5" # teal
+base0D: "89b4fa" # blue
+base0E: "cba6f7" # mauve
+base0F: "f2cdcd" # flamingo

modules/home-manager/shared/base16-catppuccin-mocha.yaml

@@ -17,6 +17,7 @@ in {
     ./shell
     ./environment.nix
     ./fonts.nix
+    ./stylix.nix
   ];
   home = {
     username = user;
@@ -45,10 +46,6 @@ in {
       enable = true;
       accent = cursorAccent; # affects HYPRCURSOR_THEME
     };
-    gtk = {
-      enable = true; # TODO: remove as it's deprecated
-      icon.enable = true;
-    };
   };
 
   # default browser for electron-based apps
@@ -97,8 +94,8 @@ in {
   gtk = {
     enable = true;
     font = {
-      name = "Cabin";
-      package = pkgs.cabin;
+      name = lib.mkForce "Cabin";
+      package = lib.mkForce pkgs.cabin;
     };
 
     gtk3.extraConfig = {

modules/home-manager/shared/default.nix

@@ -0,0 +1,11 @@
+# typically everything is styled with catppuccin-nix, but some programs are missing there (e.g. GTK) so we use Stylix for them instead
+{inputs, ...}: {
+  stylix = {
+    enable = true;
+    autoEnable = false; # targets have to be enabled individually
+    base16Scheme = ./base16-catppuccin-mocha.yaml;
+    targets.gtk = {
+      enable = true;
+    };
+  };
+}

modules/home-manager/shared/stylix.nix

@@ -6,7 +6,6 @@
   programs = {
     anyrun = {
       enable = true;
-      package = inputs.anyrun.packages.${pkgs.system}.anyrun;
       config = {
         # layer = "top";
         closeOnClick = true;
@@ -16,7 +15,7 @@
         # width = { fraction = 0.3; };
         plugins = [
           # An array of all the plugins you want, which either can be paths to the .so files, or their packages
-          inputs.anyrun.packages.${pkgs.system}.applications
+          "${pkgs.anyrun}/lib/libapplications.so"
           # file search
           # inputs.anyrun.packages.${pkgs.system}.kidex
           # inputs.anyrun.packages.${pkgs.system}.websearch

modules/home-manager/shared/wayland/anyrun/default.nix

@@ -72,8 +72,7 @@ in {
       };
 
       gestures = {
-        workspace_swipe = "yes";
-        workspace_swipe_fingers = 4;
+        workspace_swipe_touch = "yes";
       };
 
       general = {

modules/home-manager/shared/wayland/hyprland/default.nix

@@ -4,4 +4,7 @@ _: {
     autoStart = true; # default: true
     # package = # specify package to use here. Can be omitted.
   };
+
+  # create a configfile from ./vicinae.json
+  xdg.configFile."vicinae/config.json".source = ./vicinae.json;
 }