diff --git a/devices/desktop/default.nix b/devices/desktop/default.nix index c5ca13d..b35e846 100644 --- a/devices/desktop/default.nix +++ b/devices/desktop/default.nix @@ -17,8 +17,8 @@ efiSupport = true; device = "nodev"; useOSProber = true; - font = null; - splashImage = null; + # font = null; + # splashImage = null; }; }; diff --git a/flake.lock b/flake.lock index 6ce9b37..92cd6fc 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,152 @@ { "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-alacritty": { + "flake": false, + "locked": { + "lastModified": 1703982197, + "narHash": "sha256-TNxKbwdiUXGi4Z4chT72l3mt3GSvOcz6NZsUH8bQU/k=", + "owner": "aarowill", + "repo": "base16-alacritty", + "rev": "c95c200b3af739708455a03b5d185d3d2d263c6e", + "type": "github" + }, + "original": { + "owner": "aarowill", + "repo": "base16-alacritty", + "type": "github" + } + }, + "base16-alacritty-yaml": { + "flake": false, + "locked": { + "lastModified": 1674275109, + "narHash": "sha256-Adwx9yP70I6mJrjjODOgZJjt4OPPe8gJu7UuBboXO4M=", + "owner": "aarowill", + "repo": "base16-alacritty", + "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", + "type": "github" + }, + "original": { + "owner": "aarowill", + "repo": "base16-alacritty", + "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", + "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": 1663659192, + "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", + "owner": "chriskempson", + "repo": "base16-vim", + "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "type": "github" + }, + "original": { + "owner": "chriskempson", + "repo": "base16-vim", + "type": "github" + } + }, "cachix": { "inputs": { "devenv": [ @@ -112,6 +259,22 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, + "flake-compat_2": { + "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" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -206,6 +369,22 @@ "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" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -229,6 +408,23 @@ "type": "github" } }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1698794309, + "narHash": "sha256-/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "a7c169c6c29cf02a4c392fa0acbbc5f5072823e7", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "45.1", + "repo": "gnome-shell", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -249,6 +445,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706001011, + "narHash": "sha256-J7Bs9LHdZubgNHZ6+eE/7C18lZ1P6S5/zdJSdXFItI4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3df2a80f3f85f91ea06e5e91071fa74ba92e5084", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "niri": { "inputs": { "crate2nix": "crate2nix", @@ -401,6 +618,22 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1700856099, + "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1710794701, @@ -456,7 +689,38 @@ "niri": "niri", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", - "nur": "nur" + "nur": "nur", + "stylix": "stylix" + } + }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-alacritty": "base16-alacritty", + "base16-alacritty-yaml": "base16-alacritty-yaml", + "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_2", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1710774666, + "narHash": "sha256-ZkaYqxHcSBlSpehz7PTO8KP47YoLuUU4/4RfDm3VR1Y=", + "owner": "danth", + "repo": "stylix", + "rev": "2221c7d61b2e10b17df6c6795b4678fb59a0a92a", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" } }, "systems": { diff --git a/flake.nix b/flake.nix index cbc14ef..1b1eb1c 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,10 @@ url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + + stylix = { + url = "github:danth/stylix"; + }; }; outputs = inputs: import ./outputs.nix inputs; diff --git a/modules/system/default.nix b/modules/system/default.nix index 852efe9..5fec1cd 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -8,13 +8,14 @@ ./bluetooth.nix ./containers.nix ./distrobox.nix - ./fonts.nix ./games.nix ./gnome ./niri ./virt.nix ]; + stylix.image = ../../wallpaper/wallpaper.png; + services.xserver.displayManager.gdm.enable = true; environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/modules/system/fonts.nix b/modules/system/fonts.nix deleted file mode 100644 index 5331921..0000000 --- a/modules/system/fonts.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, ... }: { - # Configure fonts - fonts.packages = with pkgs; [ - alegreya - alegreya-sans - (nerdfonts.override { fonts = [ "FiraCode" ]; }) - ]; - - fonts.fontconfig = { - defaultFonts = { - serif = [ "Alegreya" ]; - sansSerif = [ "Alegreya Sans" ]; - monospace = [ "Fira Code Nerd Font" ]; - }; - }; -} diff --git a/modules/system/home/default.nix b/modules/system/home/default.nix index ca4f7a6..66fbbb7 100644 --- a/modules/system/home/default.nix +++ b/modules/system/home/default.nix @@ -3,7 +3,7 @@ ./art ./browser ./chat - ./cursor + # ./cursor ./discord ./direnv ./editor @@ -27,13 +27,4 @@ }; programs.home-manager.enable = true; - - dconf = { - enable = true; - settings = { - "org/gnome/desktop/interface" = { - color-scheme = "prefer-dark"; - }; - }; - }; } diff --git a/modules/system/home/editor/helix-config.nix b/modules/system/home/editor/helix-config.nix index a9831d9..51725c1 100644 --- a/modules/system/home/editor/helix-config.nix +++ b/modules/system/home/editor/helix-config.nix @@ -1,6 +1,4 @@ { - theme = "rose_pine"; - editor = { line-number = "relative"; cursorline = true; diff --git a/modules/system/home/niri-setup/default.nix b/modules/system/home/niri-setup/default.nix index aefb846..f7703c2 100644 --- a/modules/system/home/niri-setup/default.nix +++ b/modules/system/home/niri-setup/default.nix @@ -5,17 +5,6 @@ programs.fuzzel= { enable = true; - settings = { - colors = { - background = "191724ee"; - text = "e0def4ff"; - match = "eb6f92ff"; - selection = "524f67ee"; - selection-text = "e0def4ff"; - selection-match = "eb6f92ff"; - border = "26233aff"; - }; - }; }; programs.waybar = { @@ -39,8 +28,6 @@ services.mako = { enable = true; - backgroundColor = "#191724ee"; - borderColor = "#26233a"; }; programs.swaylock = { @@ -55,28 +42,7 @@ indicator-caps-lock = true; indicator-radius = 100; indicator-thickness = 4; - inside-color = "#26233aaa"; - inside-clear-color = "#908caaaa"; - inside-caps-lock-color = "#ebbcbaaa"; - inside-ver-color = "#9ccfd8aa"; - inside-wrong-color = "#eb6f92aa"; line-uses-inside = true; - ring-color = "#1f1d2e"; - ring-clear-color = "#6e6a86"; - ring-caps-lock-color = "#f6c177"; - ring-ver-color = "#31748f"; - ring-wrong-color = "#eb6f92"; - seperator-color = "#191724"; - key-hl-color = "#c4a7e7"; - bs-hl-color = "#eb6f92"; - caps-lock-key-hl-color = "#c4a7e7"; - caps-lock-bs-hl-color = "#eb6f92"; - text-color = "#e0def4"; - text-clear-color = "#e0def4"; - text-caps-lock-color = "#e0def4"; - text-ver-color = "#e0def4"; - text-wrong-color = "#e0def4"; - effect-blur = "30x10"; }; }; } diff --git a/modules/system/home/themes/default.nix b/modules/system/home/themes/default.nix index a113c25..4713e55 100644 --- a/modules/system/home/themes/default.nix +++ b/modules/system/home/themes/default.nix @@ -1,33 +1,26 @@ { pkgs, ... }: { - home.packages = with pkgs; [ - dconf - ]; - - qt = { - enable = true; - platformTheme = "gtk3"; - style.package = pkgs.adwaita-qt; - style.name = "adwaita-dark"; - }; - - gtk = { - enable = true; - gtk3.extraConfig = { - gtk-application-prefer-dark-theme = true; - }; - gtk2.extraConfig = "gtk-application-prefer-dark-theme=1\n"; - gtk4.extraConfig = { - gtk-application-prefer-dark-theme = true; - }; - theme.name = "Adwaita Dark"; - }; - - dconf = { - enable = true; - settings = { - "org/gnome/desktop/interface" = { - color-scheme = "prefer-dark"; + stylix = { + base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml"; + fonts = { + serif = { + package = pkgs.alegreya; + name = "Alegreya"; }; + sansSerif = { + package = pkgs.alegreya; + name = "Alegreya Sans"; + }; + monospace = { + package = pkgs.fira-code; + name = "Fira Code"; + }; + emoji = { + package = pkgs.noto-fonts-emoji; + name = "Noto Color Emoji"; + }; + }; + cursor = { + size = 24; }; }; } diff --git a/modules/system/home/themes/wallpaper.png b/modules/system/home/themes/wallpaper.png new file mode 120000 index 0000000..7d745cf --- /dev/null +++ b/modules/system/home/themes/wallpaper.png @@ -0,0 +1 @@ +../../../../wallpaper/wallpaper.png \ No newline at end of file diff --git a/outputs.nix b/outputs.nix index f25f43f..0bf0ecb 100644 --- a/outputs.nix +++ b/outputs.nix @@ -1,10 +1,11 @@ -{ nixpkgs, home-manager, nixos-hardware, nur, niri, ... }: { +{ nixpkgs, home-manager, nixos-hardware, nur, niri, stylix, ... }: { nixosConfigurations = let clientModules = [ ./modules/system ./options.nix niri.nixosModules.niri + stylix.nixosModules.stylix home-manager.nixosModules.home-manager { nixpkgs.overlays = [ nur.overlay diff --git a/wallpaper/wallpaper.png b/wallpaper/wallpaper.png index b9a3e3b..bd09397 100644 Binary files a/wallpaper/wallpaper.png and b/wallpaper/wallpaper.png differ