From 23dcfd5290f36e6504ff84ae42b925d084a31b3e Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Sat, 5 Oct 2024 11:48:16 +0200 Subject: [PATCH] Testing --- flake.lock | 313 ++++++++++++++++++++++++-- flake.nix | 2 + home/programs/btop/default.nix | 9 - home/programs/cava/default.nix | 13 -- home/programs/kitty/default.nix | 28 --- home/programs/nvim/colorscheme.nix | 86 +++---- home/programs/qutebrowser/default.nix | 168 +++++++------- home/programs/shell/fzf.nix | 16 +- home/programs/spicetify/default.nix | 21 +- home/system/hyprland/default.nix | 6 +- home/system/wofi/default.nix | 122 +++++----- hosts/laptop/configuration.nix | 35 ++- hosts/laptop/home.nix | 6 +- hosts/modules/grub.nix | 4 +- 14 files changed, 531 insertions(+), 298 deletions(-) delete mode 100644 home/programs/btop/default.nix delete mode 100644 home/programs/cava/default.nix diff --git a/flake.lock b/flake.lock index 937008e..4f50f1f 100644 --- a/flake.lock +++ b/flake.lock @@ -94,6 +94,72 @@ "type": "github" } }, + "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-helix": { + "flake": false, + "locked": { + "lastModified": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "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" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -145,6 +211,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": [ @@ -202,6 +284,43 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "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" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -254,6 +373,23 @@ "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": [ @@ -261,11 +397,11 @@ ] }, "locked": { - "lastModified": 1727817100, - "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", + "lastModified": 1728041527, + "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", + "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "type": "github" }, "original": { @@ -295,6 +431,27 @@ "type": "github" } }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -337,11 +494,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1727900725, - "narHash": "sha256-yS4oC5G/FKrsrRjk03cGzTEXHAwfjP7azFHoKvlFfD8=", + "lastModified": 1728086481, + "narHash": "sha256-+gip/MU9xo/0HzYotsJ28LvCBTsoWlr3h4+vZR3Uycw=", "ref": "refs/heads/main", - "rev": "de68e065fe861d7ca01eca267df4c305bc6e73c2", - "revCount": 5287, + "rev": "595eb89f6e16df0e19916e3c02bf5ceac5a61c57", + "revCount": 5293, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -469,11 +626,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1727926924, - "narHash": "sha256-gU95rYV2ulL1T+UcdPb3uljFcmjbwE7aevLqaL3sec4=", + "lastModified": 1728101408, + "narHash": "sha256-kOZc6KwXs0AzMVAFEst4pIItXqKQs4SI4zoZaMdvXo0=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "fe53b3ebf1767faafbc02016969b0b5da233572d", + "rev": "8a727a080e6917011211fb8616144be44763982a", "type": "github" }, "original": { @@ -555,11 +712,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727665282, - "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", + "lastModified": 1728056216, + "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", + "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", "type": "github" }, "original": { @@ -667,11 +824,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -681,6 +838,22 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -746,11 +919,11 @@ "plugin-markdown": { "flake": false, "locked": { - "lastModified": 1727720711, - "narHash": "sha256-GxlW7/pLaXoh7faAB9bXNG7xONc9L08UzCbkeCuCgfY=", + "lastModified": 1728046164, + "narHash": "sha256-n/sMiz6ztfzAwidL7CaRaUW5m07i9i6cemthE1L4Pes=", "owner": "MeanderingProgrammer", "repo": "markdown.nvim", - "rev": "e91b042b3865d2d040a0e21e0a3b13fb57f24094", + "rev": "fe1002fddc61207e4ef4325d4bc0ca33697bbc7a", "type": "github" }, "original": { @@ -772,7 +945,8 @@ "nixvim": "nixvim", "plugin-markdown": "plugin-markdown", "sops-nix": "sops-nix", - "spicetify-nix": "spicetify-nix" + "spicetify-nix": "spicetify-nix", + "stylix": "stylix" } }, "sf-arabic": { @@ -852,11 +1026,11 @@ ] }, "locked": { - "lastModified": 1727929035, - "narHash": "sha256-buGueZsmGX/TKzSIO8alIK4QWcm0ciZ6j6veO1nxVKM=", + "lastModified": 1728101832, + "narHash": "sha256-0cRtOtkcQvhcKq0vx2C/2uOVUlOmJNZQzcZiK581wto=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "829a81049fb019d12be8daf867c03de2ee52d49f", + "rev": "277107c2bc07582899d53e7fc901e93126d944bd", "type": "github" }, "original": { @@ -865,6 +1039,36 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_3", + "nixpkgs": "nixpkgs_7", + "systems": "systems_5", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" + }, + "locked": { + "lastModified": 1727723275, + "narHash": "sha256-k4HrG8TJQ0RqDS1tlDz71kvWFBNQ7qZI9T5Z0qLR85Y=", + "owner": "danth", + "repo": "stylix", + "rev": "e7e97059776da7e34b739415a7bc8f80f606b803", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -925,6 +1129,69 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 868991c..fe6f120 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,7 @@ url = "github:MeanderingProgrammer/markdown.nvim"; flake = false; }; + stylix.url = "github:danth/stylix"; }; outputs = inputs@{ nixpkgs, ... }: { @@ -49,6 +50,7 @@ } inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME inputs.home-manager.nixosModules.home-manager + inputs.stylix.nixosModules.stylix ./hosts/laptop/configuration.nix # CHANGEME ]; }; diff --git a/home/programs/btop/default.nix b/home/programs/btop/default.nix deleted file mode 100644 index c1a556f..0000000 --- a/home/programs/btop/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - programs.btop = { - enable = true; - settings = { - color_theme = "Default"; - theme_background = false; - }; - }; -} diff --git a/home/programs/cava/default.nix b/home/programs/cava/default.nix deleted file mode 100644 index 5bb2c89..0000000 --- a/home/programs/cava/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, ... }: { - programs.cava = { - enable = true; - settings = { - general.framerate = 60; - smoothing.noise_reduction = 88; - color = { - background = "'#${config.var.theme.colors.bg}'"; - foreground = "'#${config.var.theme.colors.accent}'"; - }; - }; - }; -} diff --git a/home/programs/kitty/default.nix b/home/programs/kitty/default.nix index 47fc6d7..bdef5b7 100644 --- a/home/programs/kitty/default.nix +++ b/home/programs/kitty/default.nix @@ -24,34 +24,6 @@ cursor_shape = "Underline"; cursor_underline_thickness = config.var.theme.border-size; window_padding_width = config.var.theme.gaps-in; - - # Font - font_family = config.var.theme.font-mono; - font_size = config.var.theme.font-size; - - # Colors - background = "#" + config.var.theme.colors.bg; - url_color = "#" + config.var.theme.colors.accent; - color0 = "#" + config.var.theme.colors.c0; - color8 = "#" + config.var.theme.colors.c8; - color1 = "#" + config.var.theme.colors.c1; - color9 = "#" + config.var.theme.colors.c9; - color2 = "#" + config.var.theme.colors.c2; - color10 = "#" + config.var.theme.colors.c10; - color3 = "#" + config.var.theme.colors.c3; - color11 = "#" + config.var.theme.colors.c11; - color4 = "#" + config.var.theme.colors.c4; - color12 = "#" + config.var.theme.colors.c12; - color5 = "#" + config.var.theme.colors.c5; - color13 = "#" + config.var.theme.colors.c13; - color6 = "#" + config.var.theme.colors.c6; - color14 = "#" + config.var.theme.colors.c14; - color7 = "#" + config.var.theme.colors.c7; - color15 = "#" + config.var.theme.colors.c15; - cursor = "#" + config.var.theme.colors.fg; - cursor_text_color = "#" + config.var.theme.colors.bg; - selection_foreground = "#" + config.var.theme.colors.accentFg; - selection_background = "#" + config.var.theme.colors.accent; }; }; } diff --git a/home/programs/nvim/colorscheme.nix b/home/programs/nvim/colorscheme.nix index 1084855..7eb519a 100644 --- a/home/programs/nvim/colorscheme.nix +++ b/home/programs/nvim/colorscheme.nix @@ -1,47 +1,47 @@ { programs.nixvim = { - colorschemes = { - catppuccin = { - enable = true; - settings = { - background = { - light = "macchiato"; - dark = "mocha"; - }; - flavour = - "mocha"; # "latte", "mocha", "frappe", "macchiato" or raw lua code - disable_bold = false; - disable_italic = false; - disable_underline = false; - transparent_background = true; - term_colors = true; - integrations = { - cmp = true; - noice = true; - notify = true; - neotree = true; - harpoon = true; - gitsigns = true; - which_key = true; - illuminate = { enabled = true; }; - treesitter = true; - treesitter_context = true; - telescope.enabled = true; - indent_blankline.enabled = true; - mini.enabled = true; - native_lsp = { - enabled = true; - inlay_hints = { background = true; }; - underlines = { - errors = [ "underline" ]; - hints = [ "underline" ]; - information = [ "underline" ]; - warnings = [ "underline" ]; - }; - }; - }; - }; - }; - }; + # colorschemes = { + # catppuccin = { + # enable = true; + # settings = { + # background = { + # light = "macchiato"; + # dark = "mocha"; + # }; + # flavour = + # "mocha"; # "latte", "mocha", "frappe", "macchiato" or raw lua code + # disable_bold = false; + # disable_italic = false; + # disable_underline = false; + # transparent_background = true; + # term_colors = true; + # integrations = { + # cmp = true; + # noice = true; + # notify = true; + # neotree = true; + # harpoon = true; + # gitsigns = true; + # which_key = true; + # illuminate = { enabled = true; }; + # treesitter = true; + # treesitter_context = true; + # telescope.enabled = true; + # indent_blankline.enabled = true; + # mini.enabled = true; + # native_lsp = { + # enabled = true; + # inlay_hints = { background = true; }; + # underlines = { + # errors = [ "underline" ]; + # hints = [ "underline" ]; + # information = [ "underline" ]; + # warnings = [ "underline" ]; + # }; + # }; + # }; + # }; + # }; + # }; }; } diff --git a/home/programs/qutebrowser/default.nix b/home/programs/qutebrowser/default.nix index 14e5996..e613c42 100644 --- a/home/programs/qutebrowser/default.nix +++ b/home/programs/qutebrowser/default.nix @@ -117,88 +117,88 @@ in { }; colors = { - tabs = { - odd.bg = "#${config.var.theme.colors.bg}"; - odd.fg = "#${config.var.theme.colors.fg}"; - even.bg = "#${config.var.theme.colors.bg}"; - even.fg = "#${config.var.theme.colors.fg}"; - selected = { - odd = { - bg = "#${config.var.theme.colors.accent}"; - fg = "#${config.var.theme.colors.accentFg}"; - }; - even = { - bg = "#${config.var.theme.colors.accent}"; - fg = "#${config.var.theme.colors.accentFg}"; - }; - }; - indicator = { - error = "#${config.var.theme.colors.c1}"; - start = "#${config.var.theme.colors.bgalt}"; - stop = "#${config.var.theme.colors.bgalt}"; - }; - }; - - hints = { - bg = "#${config.var.theme.colors.bgalt}"; - fg = "#${config.var.theme.colors.fgalt}"; - match.fg = "#${config.var.theme.colors.bg}"; - }; - - completion = { - category = { - bg = "#${config.var.theme.colors.bg}"; - fg = "#${config.var.theme.colors.fg}"; - border = { - top = "#${config.var.theme.colors.bg}"; - bottom = "#${config.var.theme.colors.bg}"; - }; - }; - - odd.bg = "#${config.var.theme.colors.bg}"; - even.bg = "#${config.var.theme.colors.bg}"; - - fg = [ "#FFFFFF" "#FFFFFF" "#FFFFFF" ]; - - match.fg = "#${config.var.theme.colors.accent}"; - - item.selected = { - bg = "#${config.var.theme.colors.accent}"; - border.top = "#${config.var.theme.colors.accent}"; - border.bottom = "#${config.var.theme.colors.accent}"; - fg = "#${config.var.theme.colors.accentFg}"; - match.fg = "#${config.var.theme.colors.accentFg}"; - }; - }; - - statusbar = { - normal.bg = "#${config.var.theme.colors.bg}"; - normal.fg = "#${config.var.theme.colors.fg}"; - private.bg = "#${config.var.theme.colors.bg}"; - private.fg = "#${config.var.theme.colors.fg}"; - insert.bg = "#${config.var.theme.colors.accent}"; - insert.fg = "#${config.var.theme.colors.accentFg}"; - command = { - bg = "#${config.var.theme.colors.bgalt}"; - fg = "#${config.var.theme.colors.fgalt}"; - private.bg = "#${config.var.theme.colors.bgalt}"; - private.fg = "#${config.var.theme.colors.fgalt}"; - }; - }; - - messages = { - info = { - bg = "#${config.var.theme.colors.bgalt}"; - fg = "#${config.var.theme.colors.fgalt}"; - border = "#${config.var.theme.colors.bgalt}"; - }; - - error = { - bg = "#${config.var.theme.colors.c1}"; - fg = "#${config.var.theme.colors.fgalt}"; - border = "#${config.var.theme.colors.c1}"; - }; - }; + # tabs = { + # odd.bg = "#${config.var.theme.colors.bg}"; + # odd.fg = "#${config.var.theme.colors.fg}"; + # even.bg = "#${config.var.theme.colors.bg}"; + # even.fg = "#${config.var.theme.colors.fg}"; + # selected = { + # odd = { + # bg = "#${config.var.theme.colors.accent}"; + # fg = "#${config.var.theme.colors.accentFg}"; + # }; + # even = { + # bg = "#${config.var.theme.colors.accent}"; + # fg = "#${config.var.theme.colors.accentFg}"; + # }; + # }; + # indicator = { + # error = "#${config.var.theme.colors.c1}"; + # start = "#${config.var.theme.colors.bgalt}"; + # stop = "#${config.var.theme.colors.bgalt}"; + # }; + # }; + # + # hints = { + # bg = "#${config.var.theme.colors.bgalt}"; + # fg = "#${config.var.theme.colors.fgalt}"; + # match.fg = "#${config.var.theme.colors.bg}"; + # }; + # + # completion = { + # category = { + # bg = "#${config.var.theme.colors.bg}"; + # fg = "#${config.var.theme.colors.fg}"; + # border = { + # top = "#${config.var.theme.colors.bg}"; + # bottom = "#${config.var.theme.colors.bg}"; + # }; + # }; + # + # odd.bg = "#${config.var.theme.colors.bg}"; + # even.bg = "#${config.var.theme.colors.bg}"; + # + # fg = [ "#FFFFFF" "#FFFFFF" "#FFFFFF" ]; + # + # match.fg = "#${config.var.theme.colors.accent}"; + # + # item.selected = { + # bg = "#${config.var.theme.colors.accent}"; + # border.top = "#${config.var.theme.colors.accent}"; + # border.bottom = "#${config.var.theme.colors.accent}"; + # fg = "#${config.var.theme.colors.accentFg}"; + # match.fg = "#${config.var.theme.colors.accentFg}"; + # }; + # }; + # + # statusbar = { + # normal.bg = "#${config.var.theme.colors.bg}"; + # normal.fg = "#${config.var.theme.colors.fg}"; + # private.bg = "#${config.var.theme.colors.bg}"; + # private.fg = "#${config.var.theme.colors.fg}"; + # insert.bg = "#${config.var.theme.colors.accent}"; + # insert.fg = "#${config.var.theme.colors.accentFg}"; + # command = { + # bg = "#${config.var.theme.colors.bgalt}"; + # fg = "#${config.var.theme.colors.fgalt}"; + # private.bg = "#${config.var.theme.colors.bgalt}"; + # private.fg = "#${config.var.theme.colors.fgalt}"; + # }; + # }; + # + # messages = { + # info = { + # bg = "#${config.var.theme.colors.bgalt}"; + # fg = "#${config.var.theme.colors.fgalt}"; + # border = "#${config.var.theme.colors.bgalt}"; + # }; + # + # error = { + # bg = "#${config.var.theme.colors.c1}"; + # fg = "#${config.var.theme.colors.fgalt}"; + # border = "#${config.var.theme.colors.c1}"; + # }; + # }; #webpage.darkmode.enabled = true; # Enable dark mode for all websites (Weird on images) webpage.preferred_color_scheme = @@ -207,7 +207,7 @@ in { statusbar.show = "in-mode"; - fonts = { default_family = "${config.var.theme.font}"; }; + # fonts = { default_family = "${config.var.theme.font}"; }; completion = { height = "30%"; @@ -236,7 +236,7 @@ in { }; hints = { - border = "none"; + # border = "none"; radius = 1; }; diff --git a/home/programs/shell/fzf.nix b/home/programs/shell/fzf.nix index 7b1f76f..b62fa37 100644 --- a/home/programs/shell/fzf.nix +++ b/home/programs/shell/fzf.nix @@ -2,14 +2,14 @@ programs.fzf = { enable = true; enableZshIntegration = true; - colors = { - "fg+" = config.var.theme.colors.accentName; - "bg+" = "-1"; - "fg" = "white"; - "bg" = "-1"; - "prompt" = "grey"; - "pointer" = config.var.theme.colors.accentName; - }; + # colors = { + # "fg+" = config.var.theme.colors.accentName; + # "bg+" = "-1"; + # "fg" = "white"; + # "bg" = "-1"; + # "prompt" = "grey"; + # "pointer" = config.var.theme.colors.accentName; + # }; defaultOptions = [ "--margin=1" "--layout=reverse" diff --git a/home/programs/spicetify/default.nix b/home/programs/spicetify/default.nix index dac9951..c776f26 100644 --- a/home/programs/spicetify/default.nix +++ b/home/programs/spicetify/default.nix @@ -7,26 +7,7 @@ in { builtins.elem (lib.getName pkg) [ "spotify" ]; programs.spicetify = { enable = true; - theme = spicePkgs.themes.text; - colorScheme = "custom"; - - customColorScheme = { - text = "${config.var.theme.colors.fg}"; - subtext = "${config.var.theme.colors.fgalt}"; - sidebar-text = "${config.var.theme.colors.fgalt}"; - main = "${config.var.theme.colors.bg}"; - sidebar = "${config.var.theme.colors.bg}"; - background = "${config.var.theme.colors.bg}"; - player = "${config.var.theme.colors.bg}"; - card = "${config.var.theme.colors.bg}"; - shadow = "000000"; - selected-row = "${config.var.theme.colors.bgalt}"; - button = "${config.var.theme.colors.accent}"; - button-active = "${config.var.theme.colors.accent}"; - button-disabled = "${config.var.theme.colors.bgalt}"; - tab-active = "${config.var.theme.colors.accent}"; - misc = "${config.var.theme.colors.fgalt}"; - }; + theme = lib.mkForce spicePkgs.themes.text; enabledExtensions = with spicePkgs.extensions; [ playlistIcons diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix index d410f0c..c782f47 100644 --- a/home/system/hyprland/default.nix +++ b/home/system/hyprland/default.nix @@ -147,8 +147,8 @@ gaps_in = config.var.theme.gaps-in; gaps_out = config.var.theme.gaps-out; border_size = config.var.theme.border-size; - "col.active_border" = "rgba(${config.var.theme.colors.accent}ff)"; - "col.inactive_border" = "rgba(00000055)"; + # "col.active_border" = "rgba(${config.var.theme.colors.accent}ff)"; + # "col.inactive_border" = "rgba(00000055)"; border_part_of_window = true; layout = "master"; }; @@ -160,7 +160,7 @@ drop_shadow = true; shadow_range = 20; shadow_render_power = 3; - "col.shadow" = "rgba(00000055)"; + # "col.shadow" = "rgba(00000055)"; blur = { enabled = if config.var.theme.blur then "true" else "false"; }; }; diff --git a/home/system/wofi/default.nix b/home/system/wofi/default.nix index 17fd7e7..38b2c31 100644 --- a/home/system/wofi/default.nix +++ b/home/system/wofi/default.nix @@ -33,66 +33,66 @@ key_exit = "Escape"; }; - style = '' - /** ********** Fonts ********** **/ - - * { - font-family: "${config.var.theme.font}"; - font-weight: 500; - font-size: ${toString config.var.theme.font-size}px; - } - - #window { - background-color: #${config.var.theme.colors.bgalt}; - color: #${config.var.theme.colors.fgalt}; - border-radius: ${toString config.var.theme.rounding}px; - } - - #outer-box { - padding: 20px; - } - - #input { - background-color: #${config.var.theme.colors.bg}; - border: 0px solid #${config.var.theme.colors.accent}; - padding: 8px 12px; - } - - #scroll { - margin-top: 20px; - } - - #inner-box {} - - #img { - padding-right: 8px; - } - - #text { - color: #${config.var.theme.colors.c7}; - } - - #text:selected { - color: #${config.var.theme.colors.fg}; - } - - #entry { - padding: 6px; - } - - #entry:selected { - background-color: #${config.var.theme.colors.accent}; - color: #${config.var.theme.colors.accentFg}; - } - - #unselected {} - - #selected {} - - #input, - #entry:selected { - border-radius: ${toString config.var.theme.rounding}px; - } - ''; + # style = '' + # /** ********** Fonts ********** **/ + # + # * { + # font-family: "${config.var.theme.font}"; + # font-weight: 500; + # font-size: ${toString config.var.theme.font-size}px; + # } + # + # #window { + # background-color: #${config.var.theme.colors.bgalt}; + # color: #${config.var.theme.colors.fgalt}; + # border-radius: ${toString config.var.theme.rounding}px; + # } + # + # #outer-box { + # padding: 20px; + # } + # + # #input { + # background-color: #${config.var.theme.colors.bg}; + # border: 0px solid #${config.var.theme.colors.accent}; + # padding: 8px 12px; + # } + # + # #scroll { + # margin-top: 20px; + # } + # + # #inner-box {} + # + # #img { + # padding-right: 8px; + # } + # + # #text { + # color: #${config.var.theme.colors.c7}; + # } + # + # #text:selected { + # color: #${config.var.theme.colors.fg}; + # } + # + # #entry { + # padding: 6px; + # } + # + # #entry:selected { + # background-color: #${config.var.theme.colors.accent}; + # color: #${config.var.theme.colors.accentFg}; + # } + # + # #unselected {} + # + # #selected {} + # + # #input, + # #entry:selected { + # border-radius: ${toString config.var.theme.rounding}px; + # } + # ''; }; } diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index eed2d4a..405d5a8 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -1,4 +1,4 @@ -{ config, ... }: { +{ config, pkgs, ... }: { imports = [ ../modules/fonts.nix ../modules/nvidia.nix @@ -9,7 +9,8 @@ ../modules/auto-upgrade.nix ../modules/timezone.nix ../modules/usb.nix - ../modules/systemd-boot.nix + # ../modules/systemd-boot.nix + ../modules/grub.nix ../modules/users.nix ../modules/audio.nix ../modules/bluetooth.nix @@ -28,6 +29,36 @@ home-manager.users."${config.var.username}" = import ./home.nix; + stylix = { + enable = true; + base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; + cursor = { + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Ice"; + size = 24; + }; + fonts = { + monospace = { + package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }; + name = "JetBrains Mono Nerd Font"; + }; + sansSerif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Sans"; + }; + serif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Serif"; + }; + }; + targets.nixvim.transparentBackground = { + main = true; + signColumn = true; + }; + polarity = "dark"; + image = ../../home/wallpapers/nix.png; + }; + # Don't touch this system.stateVersion = "24.05"; } diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index e171e95..7861e3a 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -11,8 +11,6 @@ ../../home/programs/fetch ../../home/programs/git ../../home/programs/spicetify - ../../home/programs/btop - ../../home/programs/cava ../../home/programs/nextcloud # Scripts @@ -20,7 +18,7 @@ # System (Desktop environment like stuff) ../../home/system/hyprland - ../../home/system/gtk + # ../../home/system/gtk ../../home/system/wlogout ../../home/system/wofi ../../home/system/batsignal @@ -60,6 +58,8 @@ pfetch pandoc tailscale + btop + cava # Just cool peaclock diff --git a/hosts/modules/grub.nix b/hosts/modules/grub.nix index 3a891f9..06d040f 100644 --- a/hosts/modules/grub.nix +++ b/hosts/modules/grub.nix @@ -1,8 +1,10 @@ { pkgs, ... }: { boot = { loader.grub.enable = true; - loader.grub.device = "/dev/sda"; + loader.grub.device = "nodev"; loader.grub.useOSProber = true; + loader.grub.efiSupport = true; + loader.efi.canTouchEfiVariables = true; tmp.cleanOnBoot = true; kernelPackages = pkgs.linuxPackages_latest; # _zen, _hardened, _rt, _rt_latest, etc.