stylix

flake.lock

@@ -18,19 +18,166 @@
         "type": "github"
       }
     },
-    "base16-schemes": {
+    "base16": {
+      "inputs": {
+        "fromYaml": "fromYaml"
+      },
+      "locked": {
+        "lastModified": 1708890466,
+        "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "rev": "665b3c6748534eb766c777298721cece9453fdae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "type": "github"
+      }
+    },
+    "base16-fish": {
       "flake": false,
       "locked": {
-        "lastModified": 1696158499,
+        "lastModified": 1622559957,
-        "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=",
+        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "type": "github"
+      }
+    },
+    "base16-foot": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696725948,
+        "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
         "owner": "tinted-theming",
-        "repo": "base16-schemes",
+        "repo": "base16-foot",
-        "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a",
+        "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
         "type": "github"
       },
       "original": {
         "owner": "tinted-theming",
-        "repo": "base16-schemes",
+        "repo": "base16-foot",
+        "type": "github"
+      }
+    },
+    "base16-helix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696727917,
+        "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=",
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "type": "github"
+      }
+    },
+    "base16-kitty": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1665001328,
+        "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
+        "owner": "kdrag0n",
+        "repo": "base16-kitty",
+        "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kdrag0n",
+        "repo": "base16-kitty",
+        "type": "github"
+      }
+    },
+    "base16-tmux": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696725902,
+        "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
+        "owner": "tinted-theming",
+        "repo": "base16-tmux",
+        "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-tmux",
+        "type": "github"
+      }
+    },
+    "base16-vim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1716150083,
+        "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "fromYaml": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1689549921,
+        "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "type": "github"
+      }
+    },
+    "gnome-shell": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1713702291,
+        "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
+        "owner": "GNOME",
+        "repo": "gnome-shell",
+        "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
+        "type": "github"
+      },
+      "original": {
+        "owner": "GNOME",
+        "ref": "46.1",
+        "repo": "gnome-shell",
         "type": "github"
       }
     },
@@ -54,22 +201,24 @@
         "type": "github"
       }
     },
-    "nix-colors": {
+    "home-manager_2": {
       "inputs": {
-        "base16-schemes": "base16-schemes",
+        "nixpkgs": [
-        "nixpkgs-lib": "nixpkgs-lib"
+          "stylix",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1707825078,
+        "lastModified": 1715930644,
-        "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=",
+        "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
-        "owner": "misterio77",
+        "owner": "nix-community",
-        "repo": "nix-colors",
+        "repo": "home-manager",
-        "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1",
+        "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
         "type": "github"
       },
       "original": {
-        "owner": "misterio77",
+        "owner": "nix-community",
-        "repo": "nix-colors",
+        "repo": "home-manager",
         "type": "github"
       }
     },
@@ -89,21 +238,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1697935651,
-        "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1720179167,
@@ -119,12 +253,56 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1714912032,
+        "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "ags": "ags",
         "home-manager": "home-manager",
-        "nix-colors": "nix-colors",
+        "nixpkgs": "nixpkgs_2",
-        "nixpkgs": "nixpkgs_2"
+        "stylix": "stylix"
+      }
+    },
+    "stylix": {
+      "inputs": {
+        "base16": "base16",
+        "base16-fish": "base16-fish",
+        "base16-foot": "base16-foot",
+        "base16-helix": "base16-helix",
+        "base16-kitty": "base16-kitty",
+        "base16-tmux": "base16-tmux",
+        "base16-vim": "base16-vim",
+        "flake-compat": "flake-compat",
+        "gnome-shell": "gnome-shell",
+        "home-manager": "home-manager_2",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1719525570,
+        "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=",
+        "owner": "danth",
+        "repo": "stylix",
+        "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116",
+        "type": "github"
+      },
+      "original": {
+        "owner": "danth",
+        "repo": "stylix",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -3,8 +3,8 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs";
-    nix-colors.url = "github:misterio77/nix-colors";
     ags.url = "github:Aylur/ags";
+    stylix.url = "github:danth/stylix";
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -18,6 +18,7 @@
       specialArgs = {inherit inputs;};
       modules = [
       ./hosts/desktop
+      inputs.stylix.nixosModules.stylix
       ];
     };
    nixosConfigurations.laptop = nixpkgs.lib.nixosSystem {

home/alacritty/default.nix

@@ -4,46 +4,6 @@
   programs.alacritty = {
     enable = true;
     settings = {
-      # Font settings
-      font = {
-        size = 14;
-      };
-
-      # Color scheme
-      colors = {
-        primary = {
-          background = "0x282828";
-          foreground = "0xebdbb2";
-        };
-        normal = {
-          black = "0x665c54";
-          blue = "0x458588";
-          cyan = "0x689d6a";
-          green = "0x98971a";
-          magenta = "0xb16286";
-          red = "0xcc241d";
-          white = "0xa89984";
-          yellow = "0xd79921";
-        };
-        bright = {
-          black = "0x7c6f64";
-          blue = "0x83a598";
-          cyan = "0x8ec07c";
-          green = "0xb8bb26";
-          magenta = "0xd3869b";
-          red = "0xfb4934";
-          white = "0xbdae93";
-          yellow = "0xfabd2f";
-        };
-      };
-
-      # Cursor settings
-      cursor = {
-        style = "Block";
-        vi_mode_style = "Block";
-      };
-
-      # Window padding
       window = {
         padding = {
           x = 5;

home/default.nix

@@ -9,11 +9,9 @@
    ./gtk
    ./git
    ./ags
-   inputs.nix-colors.homeManagerModules.default
    inputs.ags.homeManagerModules.default
   ];
 
- 
   home.username = "joy";
     home.homeDirectory = "/home/joy";
     home.stateVersion = "23.11"; 
@@ -22,7 +20,4 @@
     EDITOR = "nvim";
   };
 
-
-  colorScheme = inputs.nix-colors.colorSchemes.gruvbox-dark-medium;
-
 } 

home/gtk/default.nix

@@ -4,115 +4,12 @@
   ...
 }: let
   gruvboxPlus = import ./gruvbox-plus.nix {inherit pkgs;};
-in let
-  cssContent = with config.colorScheme.palette; ''
-    @define-color accent_color #${base0D};
-    @define-color accent_bg_color mix(#${base0D}, #${base00},0.3);
-    @define-color accent_fg_color #${base00};
-    @define-color destructive_color #${base0C};
-    @define-color destructive_bg_color mix(#${base0C}, #${base00},0.3);
-    @define-color destructive_fg_color #${base00};
-    @define-color success_color #${base0B};
-    @define-color success_bg_color mix(#${base0B}, black,0.6);
-    @define-color success_fg_color #${base00};
-    @define-color warning_color #${base0A};
-    @define-color warning_bg_color mix(#${base0A}, black,0.6);
-    @define-color warning_fg_color rgba(0, 0, 0, 0.8);
-    @define-color error_color #${base08};
-    @define-color error_bg_color mix(#${base0C}, #${base00},0.3);
-    @define-color error_fg_color #${base02};
-    @define-color window_bg_color #${base00};
-    @define-color window_fg_color #${base04};
-    @define-color view_bg_color #${base00};
-    @define-color view_fg_color #${base04};
-    @define-color headerbar_bg_color mix(#${base00},black,0.2);
-    @define-color headerbar_fg_color #${base04};
-    @define-color headerbar_border_color #${base00};
-    @define-color headerbar_backdrop_color @window_bg_color;
-    @define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
-    @define-color card_bg_color rgba(255, 255, 255, 0.08);
-    @define-color card_fg_color #${base04};
-    @define-color card_shade_color rgba(0, 0, 0, 0.36);
-    @define-color dialog_bg_color #${base00};
-    @define-color dialog_fg_color #${base04};
-    @define-color popover_bg_color #${base00};
-    @define-color popover_fg_color #${base04};
-    @define-color shade_color rgba(0,0,0,0.36);
-    @define-color scrollbar_outline_color rgba(0,0,0,0.5);
-    @define-color blue_1 #${base0D};
-    @define-color blue_2 #${base0D};
-    @define-color blue_3 #${base0D};
-    @define-color blue_4 #${base0D};
-    @define-color blue_5 #${base0D};
-    @define-color green_1 #${base0B};
-    @define-color green_2 #${base0B};
-    @define-color green_3 #${base0B};
-    @define-color green_4 #${base0B};
-    @define-color green_5 #${base0B};
-    @define-color yellow_1 #${base0A};
-    @define-color yellow_2 #${base0A};
-    @define-color yellow_3 #${base0A};
-    @define-color yellow_4 #${base0A};
-    @define-color yellow_5 #${base0A};
-    @define-color orange_1 #${base09};
-    @define-color orange_2 #${base09};
-    @define-color orange_3 #${base09};
-    @define-color orange_4 #${base09};
-    @define-color orange_5 #${base09};
-    @define-color red_1 #${base08};
-    @define-color red_2 #${base08};
-    @define-color red_3 #${base08};
-    @define-color red_4 #${base08};
-    @define-color red_5 #${base08};
-    @define-color purple_1 #${base0E};
-    @define-color purple_2 #${base0E};
-    @define-color purple_3 #${base0E};
-    @define-color purple_4 #${base0E};
-    @define-color purple_5 #${base0E};
-    @define-color brown_1 #${base0F};
-    @define-color brown_2 #${base0F};
-    @define-color brown_3 #${base0F};
-    @define-color brown_4 #${base0F};
-    @define-color brown_5 #${base0F};
-    @define-color light_1 #${base00};
-    @define-color light_2 #f6f5f4;
-    @define-color light_3 #deddda;
-    @define-color light_4 #c0bfbc;
-    @define-color light_5 #9a9996;
-    @define-color dark_1 mix(#${base00},white,0.5);
-    @define-color dark_2 mix(#${base00},white,0.2);
-    @define-color dark_3 #${base00};
-    @define-color dark_4 mix(#${base00},black,0.2);
-    @define-color dark_5 mix(#${base00},black,0.4);
-  '';
 in {
   home.file = {
     ".local/share/icons/GruvboxPlus".source = "${gruvboxPlus}";
   };
 
-  home.pointerCursor.name = "Bibata-Modern-Ice";
-  home.pointerCursor.package = pkgs.bibata-cursors;
-    
   gtk.enable = true;
-
-  gtk.theme.package = pkgs.adw-gtk3;
-  gtk.theme.name = "adw-gtk3";
-
-  gtk.cursorTheme.package = pkgs.bibata-cursors;
-  gtk.cursorTheme.name = "Bibata-Modern-Ice";
-  gtk.cursorTheme.size = 24;
-
   gtk.iconTheme.package = gruvboxPlus;
   gtk.iconTheme.name = "GruvboxPlus";
-
+}
-  xdg.configFile."gtk-4.0/gtk.css" = {
-    text = cssContent;
-  };
-
-  xdg.configFile."gtk-3.0/gtk.css" = {
-    text = cssContent;
-  };
-  qt.enable = true;
-  qt.platformTheme.name= "gtk3";
-  qt.style.name = "Gruvbox";
-  }

home/hyprland/default.nix

@@ -61,8 +61,6 @@
         "$mod, Q, killactive"
         "$mod, W, togglefloating"
         "$mod, R, togglesplit"
-        "$mod, K, exec, amixer -q sset Master 5%+"
-        "$mod, J, exec, amixer -q sset Master 5%-"
         "$mod+shift, S, exec, systemctl suspend"
         "$mod+shift, M, exit, hyprland"
 
@@ -75,22 +73,22 @@
       
         # Move focus 
         "$mod, Return, fullscreen"
-        "$mod, left, movefocus, l"
+        "$mod, H, movefocus, l"
-        "$mod, right, movefocus, r"
+        "$mod, L, movefocus, r"
-        "$mod, up, movefocus, u"
+        "$mod, K, movefocus, u"
-        "$mod, down, movefocus, d"
+        "$mod, J, movefocus, d"
 
         # Window resizing                     X  Y
-        "CTRL+SHIFT, left,  resizeactive, -60 0"
+        "CTRL+SHIFT, H,  resizeactive, -60 0"
-        "CTRL+SHIFT, right, resizeactive,  60 0"
+        "CTRL+SHIFT, L, resizeactive,  60 0"
-        "CTRL+SHIFT, up,    resizeactive,  0 -60"
+        "CTRL+SHIFT, K,    resizeactive,  0 -60"
-        "CTRL+SHIFT, down,  resizeactive,  0  60"
+        "CTRL+SHIFT, J,  resizeactive,  0  60"
 
         # Moving windows
-        "$mod SHIFT, left,  swapwindow, l"
+        "$mod SHIFT, H, swapwindow, l"
-        "$mod SHIFT, right, swapwindow, r"
+        "$mod SHIFT, L, swapwindow, r"
-        "$mod SHIFT, up,    swapwindow, u"
+        "$mod SHIFT, K, swapwindow, u"
-        "$mod SHIFT, down,  swapwindow, d"
+        "$mod SHIFT, J, swapwindow, d"
       
         # Switch workspaces
         "$mod, 1, workspace, 1"
@@ -126,8 +124,8 @@
         gaps_in = 0;  
         gaps_out = 0;
         border_size = 3;
-        "col.active_border" = "0xFFEBDBB2";
+       #"col.active_border" = "0xFFEBDBB2";
-        "col.inactive_border" = "0xFF363537";
+       #"col.inactive_border" = "0xFF363537";
         allow_tearing = false;
         layout = "dwindle";
       };

home/rofi/default.nix

@@ -4,14 +4,13 @@
     programs.rofi = {
       enable = true;
       package = pkgs.rofi-wayland;
-      theme = "~/nix/home/rofi/gruvbox-material.rasi";
+      theme = lib.mkForce "~/nix/home/rofi/gruvbox-material.rasi";
       extraConfig = {
         modi = "drun";
         icon-theme = "Oranchelo";
         show-icons = true;
         terminal = "alacritty";
         drun-display-format = "{icon} {name}";
-        location = 1;
         disable-history = false;
         hide-scrollbar = true;
         display-drun = "   Apps ";

home/stylix/default.nix

@@ -0,0 +1,24 @@
+{ pkgs, ... }:
+
+{
+  stylix.base16Scheme = {
+    base00 = "282828";
+    base01 = "3c3836";
+    base02 = "504945";
+    base03 = "665c54";
+    base04 = "bdae93";
+    base05 = "d5c4a1";
+    base06 = "ebdbb2";
+    base07 = "fbf1c7";
+    base08 = "fb4934";
+    base09 = "fe8019";
+    base0A = "fabd2f";
+    base0B = "b8bb26";
+    base0C = "8ec07c";
+    base0D = "83a598";
+    base0E = "d3869b";
+    base0F = "d65d0e";
+  };
+
+  stylix.image = ../hyprland/wallpaper.png;
+}

modules/default.nix

@@ -6,5 +6,6 @@
     ./packages
     ./misc
     ./gdm
+    ./stylix
   ];
 }

modules/packages/default.nix

@@ -6,6 +6,7 @@
   #Games
   prismlauncher
   mangohud
+  lutris
   #hackerman
   fastfetch
   freshfetch
@@ -37,6 +38,7 @@
   cinnamon.nemo
   firefox
   bottles
+  boxbuddy
   gnome.gnome-clocks
   gnome-calculator
   gnome-disk-utility
@@ -54,7 +56,6 @@
   scrcpy
   appimage-run
   yt-dlp
-  boxbuddy
   distrobox
   vim
   ];  

modules/stylix/default.nix

@@ -0,0 +1,32 @@
+{ pkgs, ... }:
+
+{
+  stylix = {
+  enable = true;
+  base16Scheme = {
+    base00 = "282828";
+    base01 = "3c3836";
+    base02 = "504945";
+    base03 = "665c54";
+    base04 = "bdae93";
+    base05 = "d5c4a1";
+    base06 = "ebdbb2";
+    base07 = "fbf1c7";
+    base08 = "cc241d";
+    base09 = "fe8019";
+    base0A = "d78821";
+    base0B = "98971a";
+    base0C = "689d6a";
+    base0D = "458588";
+    base0E = "b16286";
+    base0F = "d65d0e";
+  };
+  image = ./wallpaper.png; 
+  fonts.sizes.terminal = 14;
+  targets.chromium.enable = false;
+  cursor.name = "Bibata-Modern-Ice";
+  cursor.package = pkgs.bibata-cursors;
+  cursor.size = 24;
+  fonts.sizes.desktop = 12;
+  };
+}