diff --git a/flake.lock b/flake.lock index 1534f41..bd321bd 100755 --- a/flake.lock +++ b/flake.lock @@ -81,11 +81,11 @@ ] }, "locked": { - "lastModified": 1763416652, - "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", + "lastModified": 1763748372, + "narHash": "sha256-AUc78Qv3sWir0hvbmfXoZ7Jzq9VVL97l+sP9Jgms+JU=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", + "rev": "d10a9b16b2a3ee28433f3d1c603f4e9f1fecb8e1", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1763521945, - "narHash": "sha256-Zcrafbe4niRJMbzaVOwg7+iedJhwBFttre2DpyCC6qA=", + "lastModified": 1763780714, + "narHash": "sha256-n2T7r5HkxofkT3mIbb2bNkzacBdhP/bVeph/yGNnBek=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "24d7381b9231c23daceec5d372cc28e877f7785d", + "rev": "ef951ed2d976bcd1f57a09f358fdda9fa9425018", "type": "github" }, "original": { diff --git a/hosts/t480/home.nix b/hosts/t480/home.nix index ce899c1..8257d12 100644 --- a/hosts/t480/home.nix +++ b/hosts/t480/home.nix @@ -13,6 +13,7 @@ ../../modules/home-manager/tmux.nix ../../modules/home-manager/hyprland.nix ../../modules/home-manager/homepackages.nix + ../../modules/home-manager/shell-aliases.nix ]; programs.home-manager.enable = true; @@ -40,8 +41,8 @@ enable = true; theme = { - name = "Graphite-Dark"; - package = pkgs.graphite-gtk-theme; + name = "Kanagawa-B"; + package = pkgs.kanagawa-gtk-theme; }; iconTheme = { @@ -67,36 +68,48 @@ "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css"; }; - home.file = { - ".config/ghostty/config".text = '' - font-size = 15 - palette = 0=#0d0c0c - palette = 1=#c4746e - palette = 2=#8a9a7b - palette = 3=#c4b28a - palette = 4=#8ba4b0 - palette = 5=#a292a3 - palette = 6=#8ea4a2 - palette = 7=#c8c093 - palette = 8=#a6a69c - palette = 9=#e46876 - palette = 10=#87a987 - palette = 11=#e6c384 - palette = 12=#7fb4ca - palette = 13=#938aa9 - palette = 14=#7aa89f - palette = 15=#c5c9c5 + programs.ghostty = { + enable = true; - background = 181616 - foreground = c5c9c5 - cursor-color = c8c093 - selection-background = 2d4f67 - selection-foreground = c8c093 - ''; - }; + # If you're on a channel/flake that has ghostty packaged: + # comment this out if you install ghostty some other way + package = pkgs.ghostty; - home.shellAliases = { - nixreb = "sudo nixos-rebuild switch --flake /home/jack/nixos/#t480"; + settings = { + # ----- basic look ----- + "font-family" = "JetBrainsMono Nerd Font"; + "font-size" = 14; + + "window-padding-x" = 8; + "window-padding-y" = 8; + + # ----- your theme ----- + # repeated keys like `palette` become a list + palette = [ + "0=#181616" + "1=#c4746e" + "2=#8a9a7b" + "3=#c4b28a" + "4=#8ba4b0" + "5=#a292a3" + "6=#8ea4a2" + "7=#bcb093" + "8=#a6a69c" + "9=#e46876" + "10=#87a987" + "11=#6c8384" + "12=#7fb4ca" + "13=#938aa9" + "14=#7aa89f" + "15=#c5c9c5" + ]; + + background = "#181616"; + foreground = "#c5c9c5"; + "cursor-color" = "#c8c093"; + "selection-background" = "#2d4f67"; + "selection-foreground" = "#c8c093"; + }; }; home.sessionVariables = { diff --git a/modules/home-manager/homepackages.nix b/modules/home-manager/homepackages.nix index f7bc364..9fe031f 100644 --- a/modules/home-manager/homepackages.nix +++ b/modules/home-manager/homepackages.nix @@ -1,15 +1,17 @@ { pkgs, ... }: { - home.packages = with pkgs; [pkgs.sway-contrib.grimshot - waypaper - hyprpaper - swaybg - lua-language-server - nil - nixfmt-rfc-style - stylua + home.packages = with pkgs; [ + pkgs.sway-contrib.grimshot + waypaper + hyprpaper + swaybg + lua-language-server + nil + nixfmt-rfc-style + stylua - lunar-client - ]; + lunar-client + discord + ]; } diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix index d664f32..c0d66a4 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/hyprland.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ wayland.windowManager.hyprland = { enable = true; extraConfig = '' @@ -28,6 +29,9 @@ exec-once = gtkbar exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP + #env = XDG_CONFIG_HOME,/home/jack/.config + + # Source a file (multi-file configs) # source = ~/.config/hypr/myColors.conf @@ -46,6 +50,11 @@ # env = XDG_SCREENSHOTS_DIR,/home/jack/Photos/Screenshots # env = XCURSOR_THEME,Bibata-Modern-Ice + device { + name = synaptics-tm3276-022 + enabled = false + } + # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ input { kb_layout = us @@ -63,6 +72,8 @@ accel_profile = flat sensitivity = 1.0 # -1.0 to 1.0, 0 means no modification. + + } general { @@ -137,11 +148,6 @@ # new_is_master = true # } - gestures { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = off - } - misc { # See https://wiki.hyprland.org/Configuring/Variables/ for more force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers diff --git a/modules/home-manager/shell-aliases.nix b/modules/home-manager/shell-aliases.nix new file mode 100644 index 0000000..223917f --- /dev/null +++ b/modules/home-manager/shell-aliases.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + pkgs, + ... +}: + +{ + home.shellAliases = { + nixreb = "sudo nixos-rebuild switch --flake /home/jack/nixos/#t480"; + v = "nvim"; + }; +} diff --git a/modules/home-manager/tmux.nix b/modules/home-manager/tmux.nix index 004e639..950489c 100644 --- a/modules/home-manager/tmux.nix +++ b/modules/home-manager/tmux.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ programs.tmux = { enable = true; baseIndex = 1; @@ -66,9 +67,8 @@ set -g status-left-length 50 set -g status-right-length 140 set -g status-justify centre # center align window list - set -g status-bg "colour8" - set -g status-fg "colour7" + set -g status-bg "colour11" + set -g status-fg "colour0" ''; }; } - diff --git a/modules/home-manager/zsh.nix b/modules/home-manager/zsh.nix index aef17f1..be336a2 100644 --- a/modules/home-manager/zsh.nix +++ b/modules/home-manager/zsh.nix @@ -1,28 +1,31 @@ { pkgs, ... }: - let - shellAliases = { - rebuild-nix = "sudo nixos-rebuild switch --flake /home/jack/nixos/#t480"; - }; -in - { - programs.zsh = { +# let +# shellAliases = { +# rebuild-nix = "sudo nixos-rebuild switch --flake /home/jack/nixos/#t480"; +# }; +# in +{ + programs.zsh = { + enable = true; + # inherit shellAliases; + syntaxHighlighting.enable = true; + autosuggestion.enable = true; + initContent = '' + fastfetch -c examples/11 + ''; + oh-my-zsh = { enable = true; - inherit shellAliases; - syntaxHighlighting.enable = true; - autosuggestion.enable = true; - }; - programs.zsh.oh-my-zsh = { - enable = true; - theme = "gentoo"; - plugins = [ - "git" - "kubectl" - "helm" - "docker" - ]; - }; - programs.bash = { - enable = true; - inherit shellAliases; + theme = "gentoo"; + plugins = [ + "git" + "kubectl" + "helm" + "docker" + ]; }; + }; + programs.bash = { + enable = true; + # inherit shellAliases; + }; } diff --git a/modules/nixos/system-packages.nix b/modules/nixos/system-packages.nix index 9846033..6155dc4 100644 --- a/modules/nixos/system-packages.nix +++ b/modules/nixos/system-packages.nix @@ -14,7 +14,6 @@ tree vim # Both vim and neovim just in case wget - ghostty git gcc fastfetch diff --git a/modules/nixos/user-jack.nix b/modules/nixos/user-jack.nix index 1799be5..4674a67 100644 --- a/modules/nixos/user-jack.nix +++ b/modules/nixos/user-jack.nix @@ -5,7 +5,15 @@ users.users.jack = { isNormalUser = true; shell = pkgs.zsh; - extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user. - packages = with pkgs; [ zed-editor cargo clang clang-tools ]; + extraGroups = [ + "wheel" + "networkmanager" + ]; # Enable ‘sudo’ for the user. + packages = with pkgs; [ + zed-editor + cargo + clang + clang-tools + ]; }; }