diff --git a/flake.lock b/flake.lock index 6c700a5c..5b65f386 100644 --- a/flake.lock +++ b/flake.lock @@ -80,12 +80,12 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1722538719, - "narHash": "sha256-peVQ3brCtYbYmMW/LPGlqDsqds/Aekfc6Y6ApWYVSm0=", - "rev": "8798898a792391949c04a758d97d7e792900828f", - "revCount": 1312, + "lastModified": 1722542796, + "narHash": "sha256-l+XBDAxLXPdEqPASKjyDbgBQys9IijCtHjXcEXN6YeU=", + "rev": "a44b84390425928d2282676e63eed3a1ee528178", + "revCount": 1313, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1312%2Brev-8798898a792391949c04a758d97d7e792900828f/01910f51-e1d9-7c4f-b6e9-c0a7cb0db469/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1313%2Brev-a44b84390425928d2282676e63eed3a1ee528178/01910f91-404f-76fe-b3f8-8f4b86465e96/source.tar.gz" }, "original": { "type": "tarball", @@ -159,11 +159,11 @@ ] }, "locked": { - "lastModified": 1722515345, - "narHash": "sha256-RGUIK0Z9VgZCLQlMOuTX+iy6uVxlkZ9lNUMndy2cQE8=", + "lastModified": 1722564602, + "narHash": "sha256-5I9JS9he9v+uq57PwLmWoJBBsRIm+Ek4FZtACWQsmfM=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "030aeb39d0770524ec59cf376b8d74c1281f1703", + "rev": "e98396265bfb6d81034ca0546d7ada8afbd3d291", "type": "github" }, "original": { @@ -260,11 +260,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -629,11 +629,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1722519799, - "narHash": "sha256-NXeB/KgCbklksgTfHNef0/CfTXmw88YOrh2Q/87S2RM=", + "lastModified": 1722551504, + "narHash": "sha256-/N8voFoU8ALTK8C1esM6MM+lj9zZGCG4lbvH0mNBQUE=", "ref": "refs/heads/main", - "rev": "ab0a3268e04f2295ec4455be90ce8d0c2b107b8d", - "revCount": 5040, + "rev": "09bb5658b7fa6c0dc4e2744797e51ad4dd25af42", + "revCount": 5041, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" diff --git a/home/core/tui/kitty/default.nix b/home/core/tui/kitty/default.nix index 5af32bc4..2eb770bc 100644 --- a/home/core/tui/kitty/default.nix +++ b/home/core/tui/kitty/default.nix @@ -1,8 +1,8 @@ { programs.kitty = { enable = true; - theme = "Gruvbox Material Dark Soft"; settings = { + # include = "theme.conf"; enable_audio_bell = false; open_url_with = "firefox-nightly"; font_family = "Input Mono Compressed Extra Light"; @@ -15,27 +15,80 @@ background_opacity = "0.95"; background_blur = "32"; window_padding_width = 3; - tab_bar_min_tabs = 1; - tab_bar_edge = "bottom"; + # tab_bar_min_tabs = 1; + # tab_bar_edge = "bottom"; tab_bar_style = "separator"; tab_bar_margin_width = "0.0"; tab_bar_margin_height = "0.0 0.0"; - active_tab_font_style = "bold"; - tab_title_max_length = 30; - # colors - active_tab_foreground = "#32302f"; - active_tab_background = "#A89984"; - inactive_tab_foreground = "#665C54"; - inactive_tab_background = "#373432"; + active_tab_font_style = "normal"; + inactive_tab_font_style = "normal"; + # tab_title_max_length = 30; + # # colors + # active_tab_foreground = "#32302f"; + # active_tab_background = "#282828"; + # inactive_tab_foreground = "#282828"; + # inactive_tab_background = "#504945"; tab_bar_background = "#504945"; + tab_bar_min_tabs = 1; + tab_bar_edge = "bottom"; + # tab_powerline_style = "slanted"; }; extraConfig = '' kitty_mod shift+ctrl map kitty_mod+q close_tab map ctrl+shift+c copy_to_clipboard map ctrl+shift+v paste_from_clipboard - tab_separator " | " - tab_title_template "{fmt.fg.tab}{title[:30]}" + tab_separator "" + tab_title_template "{fmt.fg._504945}{fmt.bg.default}▓{fmt.fg._282828}{fmt.bg.default}{index}{fmt.fg._282828}{fmt.bg._504945} {title[:15] + (title[15:] and '…')} {fmt.fg._504945}{fmt.bg.default}▓ " + active_tab_title_template "{fmt.fg._282828}{fmt.bg.default}▓{fmt.fg._A89984}{fmt.bg._282828}{fmt.fg._A89984}{fmt.bg._282828} {title[:40] + (title[40:] and '…')} {fmt.fg._282828}{fmt.bg.default}▓ " + + # vim:ft=kitty + ## name: Gruvbox Material Dark Cnst + ## author: Sainnhe Park + ## license: MIT + ## upstream: https://raw.githubusercontent.com/rsaihe/gruvbox-material-kitty/main/colors/gruvbox-material-dark-medium.conf + ## blurb: A modified version of Gruvbox with softer contrasts + + background #282828 + foreground #d4be98 + + selection_background #d4be98 + selection_foreground #282828 + + cursor #a89984 + cursor_text_color background + + # Black + color0 #665c54 + color8 #928374 + + # Red + color1 #ea6962 + color9 #ea6962 + + # Green + color2 #a9b665 + color10 #a9b665 + + # Yellow + color3 #e78a4e + color11 #d8a657 + + # Blue + color4 #7daea3 + color12 #7daea3 + + # Magenta + color5 #d3869b + color13 #d3869b + + # Cyan + color6 #89b482 + color14 #89b482 + + # White + color7 #d4be98 + color15 #d4be98 ''; }; } diff --git a/home/core/tui/neovim/plugins/lsp.nix b/home/core/tui/neovim/plugins/lsp.nix index e4bd5750..1e599913 100644 --- a/home/core/tui/neovim/plugins/lsp.nix +++ b/home/core/tui/neovim/plugins/lsp.nix @@ -40,7 +40,7 @@ marksman.enable = true; # Nix - nil-ls.enable = true; + nixd.enable = true; # Docker dockerls.enable = true; diff --git a/nixos/hosts/adampad/hardware-configuration.nix b/nixos/hosts/adampad/hardware-configuration.nix index d9883535..7d47ae01 100644 --- a/nixos/hosts/adampad/hardware-configuration.nix +++ b/nixos/hosts/adampad/hardware-configuration.nix @@ -13,6 +13,8 @@ availableKernelModules = [ "nvme" "xhci_pci" + "ahci" + "usbhid" "usb_storage" "sd_mod" ]; diff --git a/nixos/hosts/default.nix b/nixos/hosts/default.nix index bcc4a5bd..6e0a4172 100644 --- a/nixos/hosts/default.nix +++ b/nixos/hosts/default.nix @@ -74,6 +74,7 @@ adampad ++ [ ./adampad + "${mod}/core/boot.nix" "${mod}/core/network/adampad.nix" "${mod}/core/boot.nix"