diff --git a/common/globals.nix b/common/globals.nix index b4cbafa..a02341b 100644 --- a/common/globals.nix +++ b/common/globals.nix @@ -13,5 +13,7 @@ username = "willem"; + wallpapers = import ./wallpapers.nix; + sshAuthorizedKeyFiles = [./sshpubkeys/willem-nixbox ./sshpubkeys/willem-thinkpad ./sshpubkeys/willem-zeus]; } diff --git a/common/wallpapers.nix b/common/wallpapers.nix new file mode 100644 index 0000000..73d02f2 --- /dev/null +++ b/common/wallpapers.nix @@ -0,0 +1,16 @@ +rec { + hexflames = { + url = "https://w.wallhaven.cc/full/2y/wallhaven-2y6wwg.jpg"; + sha256 = "sha256-E4DsoDLc0kMfZGAmsmSY4nddsKwFm434maQrnilHeKs="; + }; + fireportal = { + url = "https://w.wallhaven.cc/full/2y/wallhaven-2y6wwg.jpg"; + sha256 = "sha256-E4DsoDLc0kMfZGAmsmSY4nddsKwFm434maQrnilHeKs="; + }; + mapleleaves = { + url = "https://w.wallhaven.cc/full/8x/wallhaven-8xxqey.jpg"; + sha256 = "sha256-ohax2KzOmRt8JyUXO/7pDcy1EHXCdbfmzKzr9T3/hRk="; + }; + + current = hexflames; +} diff --git a/flake.lock b/flake.lock index a5ab0b4..c0a9892 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,135 @@ { "nodes": { + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1689633990, + "narHash": "sha256-iwvQg2Vx0IIDWZaKo8Xmzxlv1YPHg+Kp/QSv8dRv0RY=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "dddf2e1c04845d43c89a8e9e37d574519649a404", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-alacritty": { + "flake": false, + "locked": { + "lastModified": 1674275109, + "narHash": "sha256-Adwx9yP70I6mJrjjODOgZJjt4OPPe8gJu7UuBboXO4M=", + "owner": "aarowill", + "repo": "base16-alacritty", + "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", + "type": "github" + }, + "original": { + "owner": "aarowill", + "repo": "base16-alacritty", + "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" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -93,6 +223,22 @@ "type": "github" } }, + "flake-compat_3": { + "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": "nixpkgs-lib" @@ -147,6 +293,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": [ @@ -189,6 +351,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1691882297, + "narHash": "sha256-e1/LAQSGLnBywfA1TfMl0Vj3tvYka73XOZ/D2/CJowE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c3ab5ea047e6dc73df530948f7367455749d8906", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", @@ -432,7 +615,8 @@ "nix-index-database": "nix-index-database", "nixos-apple-silicon": "nixos-apple-silicon", "nixpkgs": "nixpkgs_3", - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": "pre-commit-hooks", + "stylix": "stylix" } }, "rust-analyzer-src": { @@ -468,6 +652,36 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-alacritty": "base16-alacritty", + "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_3", + "home-manager": "home-manager_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1699477454, + "narHash": "sha256-PueVBJDRM+q/ONSwMptLH4i6cny7BnNcuBpjI2e5rYo=", + "owner": "danth", + "repo": "stylix", + "rev": "5c6f7fd709be441505998fc51a25b645a44d359e", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index eab940f..bd85468 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,9 @@ pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; + + stylix.url = "github:danth/stylix"; + stylix.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { diff --git a/home/default.nix b/home/default.nix index 766bddd..d87d8b6 100644 --- a/home/default.nix +++ b/home/default.nix @@ -14,8 +14,11 @@ in rec { ./modules/nix/pkgs-config.nix ./modules/nix/use-flake-pkgs.nix inputs.nix-index-database.hmModules.nix-index + inputs.stylix.homeManagerModules.stylix ]; + stylix.image = pkgs.fetchurl globals.wallpapers.current; + home = { username = globals.username; diff --git a/home/programs/kitty/default.nix b/home/programs/kitty/default.nix index 1ba3941..dbeb66f 100644 --- a/home/programs/kitty/default.nix +++ b/home/programs/kitty/default.nix @@ -7,7 +7,7 @@ programs.kitty = { enable = true; extraConfig = '' - include themes/draculaplus.conf + #include themes/draculaplus.conf editor "${config.programs.emacs.finalPackage.out}/bin/emacsclient" -nw -c macos_option_as_alt yes @@ -15,11 +15,13 @@ ''; shellIntegration.enableZshIntegration = true; - font = { + /* + font = { package = pkgs.meslo-lgs-nf; name = "MesloLGS NF Regular"; size = 12; }; + */ }; home.file.".config/kitty/themes".source = ./themes; diff --git a/nixos/profiles/default.nix b/nixos/profiles/default.nix index 4d7bdad..4d91f28 100644 --- a/nixos/profiles/default.nix +++ b/nixos/profiles/default.nix @@ -2,6 +2,7 @@ inputs, overlays, pkgs, + globals, ... }: { imports = [ @@ -11,8 +12,11 @@ ../modules/nix/cachix.nix ../modules/comma.nix ../users/willem/linux.nix + inputs.stylix.nixosModules.stylix ]; + stylix.image = pkgs.fetchurl globals.wallpapers.current; + programs.command-not-found.enable = false; console.keyMap = "colemak";