diff --git a/devshell/flake-module.nix b/devshell/flake-module.nix index e927820..09e1a91 100644 --- a/devshell/flake-module.nix +++ b/devshell/flake-module.nix @@ -19,6 +19,7 @@ deadnix.enable = true; nixpkgs-fmt.enable = true; prettier.enable = true; + stylua.enable = true; }; }; }; diff --git a/flake.lock b/flake.lock index f7e299a..854c9ef 100644 --- a/flake.lock +++ b/flake.lock @@ -1,168 +1,5 @@ { "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" - } - }, - "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" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -181,39 +18,6 @@ "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": 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": [ @@ -234,27 +38,6 @@ "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" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -325,22 +108,6 @@ "type": "github" } }, - "nixpkgs_2": { - "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" - } - }, "root": { "inputs": { "flake-parts": "flake-parts", @@ -348,40 +115,9 @@ "nix-darwin": "nix-darwin", "nixos-flake": "nixos-flake", "nixpkgs": "nixpkgs", - "stylix": "stylix", "treefmt-nix": "treefmt-nix" } }, - "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", - "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1710774666, - "narHash": "sha256-ZkaYqxHcSBlSpehz7PTO8KP47YoLuUU4/4RfDm3VR1Y=", - "owner": "danth", - "repo": "stylix", - "rev": "2221c7d61b2e10b17df6c6795b4678fb59a0a92a", - "type": "github" - }, - "original": { - "owner": "danth", - "repo": "stylix", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 8d4566f..8897704 100644 --- a/flake.nix +++ b/flake.nix @@ -14,8 +14,6 @@ flake-parts.url = "github:hercules-ci/flake-parts"; nixos-flake.url = "github:srid/nixos-flake"; - - stylix.url = "github:danth/stylix"; }; outputs = inputs@{ self, ... }: diff --git a/home-manager/flake-module.nix b/home-manager/flake-module.nix index c70c5e4..8d1aef8 100644 --- a/home-manager/flake-module.nix +++ b/home-manager/flake-module.nix @@ -14,7 +14,6 @@ ./modules/helix.nix ./modules/ssh.nix ./modules/starship.nix - ./modules/stylix.nix ./modules/terminal.nix ./modules/vscode.nix ./modules/wezterm.nix diff --git a/home-manager/modules/bat.nix b/home-manager/modules/bat.nix index 9e7aeb5..a541eac 100644 --- a/home-manager/modules/bat.nix +++ b/home-manager/modules/bat.nix @@ -1,5 +1,8 @@ { ... }: { - programs.bat.enable = true; + programs.bat = { + enable = true; + config.theme = "Nord"; + }; } diff --git a/home-manager/modules/fzf.nix b/home-manager/modules/fzf.nix index 6babe22..b2209fd 100644 --- a/home-manager/modules/fzf.nix +++ b/home-manager/modules/fzf.nix @@ -1,13 +1,15 @@ { pkgs, ... }: { - home.packages = [ - pkgs.zsh-fzf-tab - ]; + home = { + packages = [ pkgs.zsh-fzf-tab ]; + sessionVariables.FZF_DEFAULT_OPTS = "--color=bg+:#3B4252,bg:#2E3440,spinner:#81A1C1,hl:#616E88,fg:#D8DEE9,header:#616E88,info:#81A1C1,pointer:#81A1C1,marker:#81A1C1,fg+:#D8DEE9,prompt:#81A1C1,hl+:#81A1C1"; + }; - programs.zsh.initExtra = '' - source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh - ''; - - programs.fzf.enable = true; + programs = { + fzf.enable = true; + zsh.initExtra = '' + source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh + ''; + }; } diff --git a/home-manager/modules/helix.nix b/home-manager/modules/helix.nix index 16566c3..1ebfe5c 100644 --- a/home-manager/modules/helix.nix +++ b/home-manager/modules/helix.nix @@ -55,6 +55,7 @@ in end = "no_op"; }; }; + theme = "nord"; }; }; } diff --git a/home-manager/modules/stylix.nix b/home-manager/modules/stylix.nix deleted file mode 100644 index f109ff6..0000000 --- a/home-manager/modules/stylix.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ flake, pkgs, ... }: - -{ - imports = [ flake.inputs.stylix.homeManagerModules.stylix ]; - - stylix = { - autoEnable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml"; - fonts = { - monospace = { - name = "FiraCode Nerd Font"; - package = (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }); - }; - sizes.terminal = 14; - }; - - # Disabling VSCode styling because the generated style is not great... - targets.vscode.enable = false; - }; -} diff --git a/home-manager/modules/wezterm/wezterm.lua b/home-manager/modules/wezterm/wezterm.lua index 31822bc..47ae799 100644 --- a/home-manager/modules/wezterm/wezterm.lua +++ b/home-manager/modules/wezterm/wezterm.lua @@ -1,14 +1,18 @@ -local wezterm = require 'wezterm' -local config = wezterm.config_builder() +local wezterm = require("wezterm") wezterm.on("gui-startup", function() - local tab, pane, window = wezterm.mux.spawn_window {} - window:gui_window():maximize() + local tab, pane, window = wezterm.mux.spawn_window({}) + window:gui_window():maximize() end) +local config = wezterm.config_builder() + +config.color_scheme = "nord" config.enable_tab_bar = false -config.front_end = 'WebGpu' -config.window_close_confirmation = 'NeverPrompt' -config.window_decorations = 'RESIZE' +config.font = wezterm.font("FiraCode Nerd Font") +config.font_size = 14.0 +config.front_end = "WebGpu" +config.window_close_confirmation = "NeverPrompt" +config.window_decorations = "RESIZE" return config diff --git a/home-manager/modules/zellij.nix b/home-manager/modules/zellij.nix index f40e6f1..f362617 100644 --- a/home-manager/modules/zellij.nix +++ b/home-manager/modules/zellij.nix @@ -7,6 +7,7 @@ settings = { default_layout = "compact"; on_force_close = "quit"; + theme = "nord"; ui.pane_frames.rounded_corners = true; }; };