diff --git a/flake.lock b/flake.lock index 174ae9a..0aba971 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" + } + }, "beautysh": { "inputs": { "nixpkgs": [ @@ -59,6 +206,22 @@ "type": "github" } }, + "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-utils": { "inputs": { "systems": "systems" @@ -95,6 +258,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": [ @@ -138,6 +317,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714981474, + "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1716034089, @@ -201,6 +401,22 @@ "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" + } + }, "nixvim": { "inputs": { "beautysh": "beautysh", @@ -284,7 +500,38 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", - "nixvim": "nixvim" + "nixvim": "nixvim", + "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", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1715514886, + "narHash": "sha256-KZkl9aTYcuCM4okpeCIaJCuS4WkE+mVG3EMyNaidyQI=", + "owner": "danth", + "repo": "stylix", + "rev": "f1c49b9b4d371e03273465a54dd434ac8611ee90", + "type": "github" + }, + "original": { + "owner": "danth", + "ref": "release-23.11", + "repo": "stylix", + "type": "github" } }, "systems": { diff --git a/flake.nix b/flake.nix index be73384..c71b084 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,7 @@ url = "github:nix-community/nixvim/nixos-23.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + stylix.url = "github:danth/stylix/release-23.11"; }; outputs = @@ -29,6 +30,7 @@ , nixpkgs , nixpkgs-unstable , nixos-hardware + , stylix , ... } @ inputs: { nixosConfigurations = @@ -50,6 +52,7 @@ ./services/netdata/default.nix ./upgrade-diff.nix home-manager.nixosModules.home-manager + stylix.nixosModules.stylix ({ config , lib @@ -110,6 +113,7 @@ modules = [ home-manager.darwinModules.home-manager + stylix.darwinModules.stylix ./machines/zelus/configuration.nix ./packages.nix ./upgrade-diff.nix diff --git a/home/default.nix b/home/default.nix index 0b88a98..da8d0f0 100644 --- a/home/default.nix +++ b/home/default.nix @@ -12,6 +12,14 @@ in home.packages = with pkgs; [ just ]; + stylix = { + base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml"; + # Disable nixvim due to tokyonight module missing + targets.nixvim.enable = false; + targets.vim.enable = false; + }; + + services = { gpg-agent = { enable = stdenv.isLinux; @@ -198,17 +206,6 @@ in live_config_reload = true; mouse.hide_when_typing = false; - font = - if stdenv.isLinux - then { - normal.family = "Fira Code"; - size = 12; - } - else { - normal.family = "FiraCode Nerd Font"; - size = 16; - }; - shell = { program = "zsh"; args = [ "-l" "-c" "tmux" "u" ]; @@ -353,8 +350,7 @@ in enable = stdenv.isLinux; plugins = [ pkgs.rofi-emoji ]; terminal = "${pkgs.alacritty}/bin/alacritty"; - font = "Fira Font Mono 24"; - theme = "gruvbox-dark"; + extraConfig = { modi = "drun,run"; show-icons = true; @@ -445,7 +441,9 @@ in nvim-tree.enable = true; packer = { enable = true; - plugins = [ ]; + plugins = [ + "folke/tokyonight.nvim" + ]; }; rainbow-delimiters.enable = true; treesitter.enable = true; diff --git a/machines/hephaestus/configuration.nix b/machines/hephaestus/configuration.nix index 589b428..54c6d1f 100644 --- a/machines/hephaestus/configuration.nix +++ b/machines/hephaestus/configuration.nix @@ -23,6 +23,13 @@ in imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + stylix = { + base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml"; + image = "/run/current-system/sw/share/backgrounds/gnome/blobs-l.svg"; + # Disable nixvim due to tokyonight module missing + targets.nixvim.enable = false; + }; + boot = { extraModulePackages = with config.boot.kernelPackages; [ xpadneo @@ -244,11 +251,7 @@ in wayland = false; }; }; - desktopManager = { - gnome = { - enable = true; - }; - }; + desktopManager.gnome.enable = true; videoDrivers = [ "amdgpu" ]; }; };