Make things work

flake.lock

@@ -1,5 +1,168 @@
 {
   "nodes": {
+    "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": 1622559957,
+        "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-foot",
+        "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "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"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -20,6 +183,27 @@
         "type": "github"
       }
     },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1715930644,
+        "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1719690277,
@@ -36,10 +220,55 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "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": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "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_2"
+      },
+      "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

@@ -8,6 +8,8 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    stylix.url = "github:danth/stylix";
   };
 
   outputs = { self, nixpkgs, ... }@inputs:
@@ -21,6 +23,7 @@
         modules = [
           inputs.home-manager.nixosModules.default
           ./hosts/default/configuration.nix
+          inputs.stylix.nixosModules.stylix
         ];
       };
     };

hosts/default/configuration.nix

@@ -14,6 +14,9 @@
       ../../modules/nixos/gnome.nix
       # Home-manager
       inputs.home-manager.nixosModules.default
+      # Stylix colors
+      ../../modules/nixos/stylix/ghibli.nix
+      #../../modules/nixos/stylix/kuromi.nix
     ];
 
   # Bootloader.
@@ -101,29 +104,8 @@
       "shoi" = import ./home.nix;
     };
   };
-  
+
-  /*
+  home-manager.backupFileExtension = "backup";
-  stylix.enable = true;
-    stylix.image = ../../modules/home-manager/stylix/ghibli/ghibli-3.png;
-    stylix.base16Scheme = {
-        base00 = "#F0EBE1"; 
-        base01 = "#E1D6C6"; 
-        base02 = "#D0C2B2"; 
-        base03 = "#8C8075"; 
-        base04 = "#65594E";
-        base05 = "#4A413B"; 
-        base06 = "#322B25";
-        base07 = "#1C1813"; 
-        base08 = "#BF591E"; 
-        base09 = "#A38625"; 
-        base0A = "#86A325"; 
-        base0B = "#25A36C"; 
-        base0C = "#257EA3"; 
-        base0D = "#4659BF"; 
-        base0E = "#8646BF"; 
-        base0F = "#BF4686"; 
-    };
-    */
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;

hosts/default/home.nix

@@ -4,8 +4,8 @@
   imports =
   [
     ../../modules/home-manager/git.nix
-    ../../modules/home-manager/zsh.nix
+    # ../../modules/home-manager/zsh.nix
-    ../../modules/home-manager/themes/ghibli/theme.nix
+    ../../modules/home-manager/themes/ghibli-gtk.nix
   ];
 
   # Allow Unfree
@@ -33,6 +33,7 @@
     ferdium
     git
     gh
+    alacritty
 
     # School
     libreoffice-fresh

modules/home-manager/themes/ghibli-gtk.nix

@@ -0,0 +1,11 @@
+{ pkgs, lib, ... }:
+
+{
+    gtk.enable = true;
+
+    gtk.theme.package = lib.mkForce pkgs.adw-gtk3;
+    gtk.theme.name = "adw-gtk3";
+
+    gtk.iconTheme.package = pkgs.papirus-icon-theme;
+    gtk.iconTheme.name = "Papirus-Dark";
+}

modules/home-manager/themes/ghibli/theme.nix

@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-
-{
-    gtk.enable = true;
-    
-    # Cursors
-    gtk.cursorTheme.package = pkgs.bibata-cursors;
-    gtk.cursorTheme.name = "Bibata-Modern-Ice";
-
-    gtk.theme.package = pkgs.arc-theme;
-    gtk.theme.name = "Arc-Lighter";
-
-    gtk.iconTheme.package = pkgs.papirus-icon-theme;
-    gtk.iconTheme.name = "Papirus-Dark";
-}

modules/nixos/gnome.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-    packages = with pkgs.gnomeExtensions; [
+    environment.systemPackages = with pkgs.gnomeExtensions; [
         arcmenu
         caffeine
         blur-my-shell
@@ -13,7 +13,6 @@
         cheese
         eog
         epiphany
-        gedit
         simple-scan
         totem
         yelp

modules/nixos/stylix/ghibli.nix

@@ -2,23 +2,25 @@
 
 {
     stylix.enable = true;
-    stylix.image = ../../modules/home-manager/stylix/ghibli/ghibli-3.png;
+    stylix.image = ./wallpapers/ghibli-7.png;
-    stylix.base16Scheme = {
+
-        base00 = "#F0EBE1"; 
+    stylix.cursor.package = pkgs.bibata-cursors;
-        base01 = "#E1D6C6"; 
+    stylix.cursor.name = "Bibata-Modern-Ice";
-        base02 = "#D0C2B2"; 
+
-        base03 = "#8C8075"; 
+    stylix.fonts = {
-        base04 = "#65594E";
+        monospace = {
-        base05 = "#4A413B"; 
+            package = pkgs.nerdfonts.override { fonts = ["JetBrainsMono"]; };
-        base06 = "#322B25";
+            name = "JetBrainsMono Nerd Font";
-        base07 = "#1C1813"; 
+        };
-        base08 = "#BF591E"; 
+        sansSerif = {
-        base09 = "#A38625"; 
+            package = pkgs.dejavu_fonts;
-        base0A = "#86A325"; 
+            name = "DejaVu Serif";
-        base0B = "#25A36C"; 
+        };
-        base0C = "#257EA3"; 
+        serif = {
-        base0D = "#4659BF"; 
+            package = pkgs.dejavu_fonts;
-        base0E = "#8646BF"; 
+            name = "Dejavu Serif";
-        base0F = "#BF4686"; 
+        };
     };
+
+    stylix.polarity = "dark";
 }

modules/nixos/stylix/kuromi.nix

@@ -0,0 +1,26 @@
+{ pkgs, ... }:
+
+{
+    stylix.enable = true;
+    stylix.image = ./wallpapers/kuromi.jpg;
+
+    stylix.cursor.package = pkgs.bibata-cursors;
+    stylix.cursor.name = "Bibata-Modern-Ice";
+
+    stylix.fonts = {
+        monospace = {
+            package = pkgs.nerdfonts.override { fonts = ["JetBrainsMono"]; };
+            name = "JetBrainsMono Nerd Font";
+        };
+        sansSerif = {
+            package = pkgs.dejavu_fonts;
+            name = "DejaVu Serif";
+        };
+        serif = {
+            package = pkgs.dejavu_fonts;
+            name = "Dejavu Serif";
+        };
+    };
+
+    stylix.polarity = "dark";
+}