Remove unused lines

features-nixos/global/default.nix

@@ -13,6 +13,7 @@
       ./nix.nix
       ./sops.nix
       ./root.nix
+      ./stylix.nix
     ]
     ++ [
       inputs.home-manager.nixosModules.home-manager

features-nixos/global/nix.nix

@@ -1,7 +1,6 @@
 {outputs, ...}: {
   # Apply overlays
   nixpkgs = {
-    # TODO: apply this to hm and nixos without duplicate code
     overlays = builtins.attrValues outputs.overlays;
     config = {
       nvidia.acceptLicense = true;

features-nixos/global/stylix.nix

@@ -0,0 +1,32 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [inputs.stylix.nixosModules.stylix];
+
+  stylix.enable = true;
+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+
+  stylix.fonts = {
+    serif = {
+      package = pkgs.dejavu_fonts;
+      name = "DejaVu Serif";
+    };
+
+    sansSerif = {
+      package = pkgs.dejavu_fonts;
+      name = "DejaVu Sans";
+    };
+
+    monospace = {
+      package = pkgs.dejavu_fonts;
+      name = "DejaVu Sans Mono";
+    };
+
+    emoji = {
+      package = pkgs.noto-fonts-color-emoji;
+      name = "Noto Color Emoji";
+    };
+  };
+}

features-nixos/optional/greetd.nix

@@ -7,28 +7,10 @@
 
   programs.regreet = {
     enable = true;
-    # iconTheme = julianCfg.gtk.iconTheme;
-    # theme = julianCfg.gtk.theme;
-    # # font = julianCfg.fontProfiles.regular; # TODO: do
-    # cursorTheme = {
-    #   inherit (julianCfg.gtk.cursorTheme) name package;
-    # };
     cageArgs = [
       "-s"
       "-m"
       "last"
     ]; # multimonitor use last monitor
-    # settings.background = {
-    #   path = julianCfg.wallpaper;
-    #   fit = "Cover";
-    # }; # TODO: fix
-
-    # TODO: setting keyboard language does not work
-    # settings = {
-    #   env = {
-    #     XKB_DEFAULT_LAYOUT = "de";
-    #     # XKB_DEFAULT_VARIANT = "altgr-intl";
-    #   };
-    # };
   };
 }

flake.lock

@@ -642,11 +642,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780281641,
-        "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=",
+        "lastModified": 1779766384,
+        "narHash": "sha256-P7Ohnlq8b8b2fU+Sgkrej7LBTM60LBTkHleLuYzmLmU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01",
+        "rev": "57800b7ab648725ccd33551d01484ee14952ad3f",
         "type": "github"
       },
       "original": {
@@ -739,15 +739,16 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1780418031,
-        "narHash": "sha256-/lkloe/Vlpq8GmKiHzxA3woYUubWX1mV/RDtv8TE4d0=",
+        "lastModified": 1780418496,
+        "narHash": "sha256-m34WEd1dxo17CQUz702xJrMsnTewsaYyeKKi5Y86HJw=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "b670c2bdf09861b3215f30fc8a70f2fe26dc5f16",
+        "rev": "45b51150627b28b1d4a4ab4e5d645af8cb7c2ef6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-26.05",
         "repo": "stylix",
         "type": "github"
       }

flake.nix

@@ -10,7 +10,7 @@
     deploy-rs.url = "github:serokell/deploy-rs";
 
     stylix = {
-      url = "github:nix-community/stylix";
+      url = "github:nix-community/stylix/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

homes/julian/features/ghostty/default.nix

@@ -7,7 +7,7 @@
     enable = true;
     enableFishIntegration = true;
     settings = {
-      theme = "catppuccin-mocha";
+      # theme = "catppuccin-mocha";
       font-size = 12;
     };
   };

homes/julian/features/hyprland/default.nix

@@ -114,7 +114,7 @@
     #   }
     # );
 
-    configType = "lua";
+    configType = "hyprlang";
 
     systemd = {
       enable = true;
@@ -182,12 +182,11 @@
 
     # Disable animations for selection, fixes screenshots
     extraConfig = ''
-      # layerrule {
-      #   name = no_anim_for_selection
-      #   no_anim = on
-      #   match:namespace = selection
-      # }
-      layerrule = noanim, selection
+      layerrule {
+        name = no_anim_for_selection
+        no_anim = on
+        match:namespace = selection
+      }
     '';
 
     settings = {
@@ -222,7 +221,7 @@
 
       # Dwindle layout
       dwindle = {
-        pseudotile = true; # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+        # pseudotile = true; # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
         preserve_split = true; # You probably want this
         smart_split = false;
         smart_resizing = false;
@@ -260,7 +259,7 @@
 
         force_default_wallpaper = 0;
 
-        vfr = true; # power saving
+        # vfr = true; # power saving
       };
 
       cursor = {
@@ -280,18 +279,18 @@
       };
 
       # Window rules
-      windowrulev2 = [
-        "suppressevent maximize, class:.*"
-        "workspace 1, class:firefox"
-        "workspace 8, class:Zotero"
-        "workspace 9, class:nheko"
-        "workspace 9, class:Element"
-        "workspace 9, class:discord"
-        "workspace 9, class:org.telegram.desktop"
-        "workspace 10, class:thunderbird"
-        "float, class:qalculate-gtk"
-        "tile, class:MATLAB, title:MATLAB"
-      ];
+      # windowrulev2 = [
+      #   "suppressevent maximize, class:.*"
+      #   "workspace 1, class:firefox"
+      #   "workspace 8, class:Zotero"
+      #   "workspace 9, class:nheko"
+      #   "workspace 9, class:Element"
+      #   "workspace 9, class:discord"
+      #   "workspace 9, class:org.telegram.desktop"
+      #   "workspace 10, class:thunderbird"
+      #   "float, class:qalculate-gtk"
+      #   "tile, class:MATLAB, title:MATLAB"
+      # ];
 
       # Workspace rules
       workspace =
@@ -327,7 +326,7 @@
           "$mod, F, fullscreen,"
           "$mod, X, killactive,"
 
-          "$mod, -, togglesplit," # dwindle
+          # "$mod, -, togglesplit," # dwindle
 
           # opening applications
           "$mod, D, exec, wofi --show drun,run"

homes/julian/features/hyprland/waybar/default.nix

@@ -1,29 +1,31 @@
 {config, ...}: let
   palette = config.lib.stylix.colors;
 in {
+  stylix.targets.waybar.enable = false;
+
   programs.waybar = {
     enable = true;
     # systemd.enable = true;
     settings.mainBar = builtins.fromJSON (builtins.readFile ./config.json);
   };
 
-  # xdg.configFile."waybar/style.css".source = ./style.css;
-  # xdg.configFile."waybar/theme.css".text = ''
-  #   /*
-  #   bg - background
-  #   fg - foreground
-  #   */
+  xdg.configFile."waybar/style.css".source = ./style.css;
+  xdg.configFile."waybar/theme.css".text = ''
+    /*
+    bg - background
+    fg - foreground
+    */
 
-  #   /* Main Colors */
-  #   @define-color background        #${palette.base00};
-  #   @define-color foreground        #${palette.base05};
+    /* Main Colors */
+    @define-color background        #${palette.base00};
+    @define-color foreground        #${palette.base05};
 
-  #   /* Workspace Button Colors */
-  #   @define-color hover-bg          #${palette.base01};
-  #   @define-color hover-fg          #${palette.base05};
-  #   @define-color active-bg         #${palette.base02};
-  #   @define-color active-fg         #${palette.base0A};
-  #   @define-color urgent-bg         #${palette.base08};
-  #   @define-color urgent-fg         #${palette.base00};
-  # '';
+    /* Workspace Button Colors */
+    @define-color hover-bg          #${palette.base01};
+    @define-color hover-fg          #${palette.base05};
+    @define-color active-bg         #${palette.base02};
+    @define-color active-fg         #${palette.base0A};
+    @define-color urgent-bg         #${palette.base08};
+    @define-color urgent-fg         #${palette.base00};
+  '';
 }

homes/julian/features/suites/desktop/default.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  imports = [./stylix.nix];
+  # imports = [./stylix.nix];
 
   services.blueman-applet.enable = true;
   services.nextcloud-client.enable = true;
@@ -9,6 +9,8 @@
   services.syncthing.tray.enable = true;
   services.syncthing.tray.command = "syncthingtray --wait"; # Wait for tray to become available
 
+  gtk.gtk4.theme = null; # Fix evaluation warning since using old home manager version
+
   programs.chromium = {
     enable = true;
     extensions = [

homes/julian/features/suites/desktop/stylix.nix

@@ -1,10 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  imports = [inputs.stylix.homeModules.stylix];
-
-  stylix.enable = true;
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
-}

homes/julian/global/default.nix

@@ -57,14 +57,4 @@
 
     sessionPath = ["$HOME/.local/bin"];
   };
-
-  # TODO: colorscheme
-  # colorscheme.mode = lib.mkOverride 1499 "dark";
-  # specialisation = {
-  #   dark.configuration.colorscheme.mode = lib.mkOverride 1498 "dark";
-  #   light.configuration.colorscheme.mode = lib.mkOverride 1498 "light";
-  # };
-  # home.file = {
-  #   ".colorscheme.json".text = builtins.toJSON config.colorscheme;
-  # };
 }