A bunch of changes. I am not keeping track of this repo.
This commit is contained in:
parent
6544f1e835
commit
157aa8bba7
9 changed files with 127 additions and 83 deletions
12
flake.lock
generated
12
flake.lock
generated
|
|
@ -81,11 +81,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763416652,
|
"lastModified": 1763748372,
|
||||||
"narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=",
|
"narHash": "sha256-AUc78Qv3sWir0hvbmfXoZ7Jzq9VVL97l+sP9Jgms+JU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312",
|
"rev": "d10a9b16b2a3ee28433f3d1c603f4e9f1fecb8e1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -210,11 +210,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763521945,
|
"lastModified": 1763780714,
|
||||||
"narHash": "sha256-Zcrafbe4niRJMbzaVOwg7+iedJhwBFttre2DpyCC6qA=",
|
"narHash": "sha256-n2T7r5HkxofkT3mIbb2bNkzacBdhP/bVeph/yGNnBek=",
|
||||||
"owner": "0xc000022070",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "24d7381b9231c23daceec5d372cc28e877f7785d",
|
"rev": "ef951ed2d976bcd1f57a09f358fdda9fa9425018",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@
|
||||||
../../modules/home-manager/tmux.nix
|
../../modules/home-manager/tmux.nix
|
||||||
../../modules/home-manager/hyprland.nix
|
../../modules/home-manager/hyprland.nix
|
||||||
../../modules/home-manager/homepackages.nix
|
../../modules/home-manager/homepackages.nix
|
||||||
|
../../modules/home-manager/shell-aliases.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
|
@ -40,8 +41,8 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
theme = {
|
theme = {
|
||||||
name = "Graphite-Dark";
|
name = "Kanagawa-B";
|
||||||
package = pkgs.graphite-gtk-theme;
|
package = pkgs.kanagawa-gtk-theme;
|
||||||
};
|
};
|
||||||
|
|
||||||
iconTheme = {
|
iconTheme = {
|
||||||
|
|
@ -67,36 +68,48 @@
|
||||||
"${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css";
|
"${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css";
|
||||||
};
|
};
|
||||||
|
|
||||||
home.file = {
|
programs.ghostty = {
|
||||||
".config/ghostty/config".text = ''
|
enable = true;
|
||||||
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
|
|
||||||
|
|
||||||
background = 181616
|
# If you're on a channel/flake that has ghostty packaged:
|
||||||
foreground = c5c9c5
|
# comment this out if you install ghostty some other way
|
||||||
cursor-color = c8c093
|
package = pkgs.ghostty;
|
||||||
selection-background = 2d4f67
|
|
||||||
selection-foreground = c8c093
|
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.shellAliases = {
|
|
||||||
nixreb = "sudo nixos-rebuild switch --flake /home/jack/nixos/#t480";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
home.packages = with pkgs; [pkgs.sway-contrib.grimshot
|
home.packages = with pkgs; [
|
||||||
|
pkgs.sway-contrib.grimshot
|
||||||
waypaper
|
waypaper
|
||||||
hyprpaper
|
hyprpaper
|
||||||
swaybg
|
swaybg
|
||||||
|
|
@ -11,5 +12,6 @@
|
||||||
stylua
|
stylua
|
||||||
|
|
||||||
lunar-client
|
lunar-client
|
||||||
|
discord
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
@ -28,6 +29,9 @@
|
||||||
exec-once = gtkbar
|
exec-once = gtkbar
|
||||||
exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
|
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 a file (multi-file configs)
|
||||||
# source = ~/.config/hypr/myColors.conf
|
# source = ~/.config/hypr/myColors.conf
|
||||||
|
|
||||||
|
|
@ -46,6 +50,11 @@
|
||||||
# env = XDG_SCREENSHOTS_DIR,/home/jack/Photos/Screenshots
|
# env = XDG_SCREENSHOTS_DIR,/home/jack/Photos/Screenshots
|
||||||
# env = XCURSOR_THEME,Bibata-Modern-Ice
|
# env = XCURSOR_THEME,Bibata-Modern-Ice
|
||||||
|
|
||||||
|
device {
|
||||||
|
name = synaptics-tm3276-022
|
||||||
|
enabled = false
|
||||||
|
}
|
||||||
|
|
||||||
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
|
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
|
||||||
input {
|
input {
|
||||||
kb_layout = us
|
kb_layout = us
|
||||||
|
|
@ -63,6 +72,8 @@
|
||||||
accel_profile = flat
|
accel_profile = flat
|
||||||
|
|
||||||
sensitivity = 1.0 # -1.0 to 1.0, 0 means no modification.
|
sensitivity = 1.0 # -1.0 to 1.0, 0 means no modification.
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
general {
|
general {
|
||||||
|
|
@ -137,11 +148,6 @@
|
||||||
# new_is_master = true
|
# new_is_master = true
|
||||||
# }
|
# }
|
||||||
|
|
||||||
gestures {
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
|
||||||
workspace_swipe = off
|
|
||||||
}
|
|
||||||
|
|
||||||
misc {
|
misc {
|
||||||
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
||||||
force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
|
force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
|
||||||
|
|
|
||||||
13
modules/home-manager/shell-aliases.nix
Normal file
13
modules/home-manager/shell-aliases.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
{
|
||||||
|
home.shellAliases = {
|
||||||
|
nixreb = "sudo nixos-rebuild switch --flake /home/jack/nixos/#t480";
|
||||||
|
v = "nvim";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
programs.tmux = {
|
programs.tmux = {
|
||||||
enable = true;
|
enable = true;
|
||||||
baseIndex = 1;
|
baseIndex = 1;
|
||||||
|
|
@ -66,9 +67,8 @@
|
||||||
set -g status-left-length 50
|
set -g status-left-length 50
|
||||||
set -g status-right-length 140
|
set -g status-right-length 140
|
||||||
set -g status-justify centre # center align window list
|
set -g status-justify centre # center align window list
|
||||||
set -g status-bg "colour8"
|
set -g status-bg "colour11"
|
||||||
set -g status-fg "colour7"
|
set -g status-fg "colour0"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,19 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
# let
|
||||||
shellAliases = {
|
# shellAliases = {
|
||||||
rebuild-nix = "sudo nixos-rebuild switch --flake /home/jack/nixos/#t480";
|
# rebuild-nix = "sudo nixos-rebuild switch --flake /home/jack/nixos/#t480";
|
||||||
};
|
# };
|
||||||
in
|
# in
|
||||||
{
|
{
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
inherit shellAliases;
|
# inherit shellAliases;
|
||||||
syntaxHighlighting.enable = true;
|
syntaxHighlighting.enable = true;
|
||||||
autosuggestion.enable = true;
|
autosuggestion.enable = true;
|
||||||
};
|
initContent = ''
|
||||||
programs.zsh.oh-my-zsh = {
|
fastfetch -c examples/11
|
||||||
|
'';
|
||||||
|
oh-my-zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = "gentoo";
|
theme = "gentoo";
|
||||||
plugins = [
|
plugins = [
|
||||||
|
|
@ -21,8 +23,9 @@ in
|
||||||
"docker"
|
"docker"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
};
|
||||||
programs.bash = {
|
programs.bash = {
|
||||||
enable = true;
|
enable = true;
|
||||||
inherit shellAliases;
|
# inherit shellAliases;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@
|
||||||
tree
|
tree
|
||||||
vim # Both vim and neovim just in case
|
vim # Both vim and neovim just in case
|
||||||
wget
|
wget
|
||||||
ghostty
|
|
||||||
git
|
git
|
||||||
gcc
|
gcc
|
||||||
fastfetch
|
fastfetch
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,15 @@
|
||||||
users.users.jack = {
|
users.users.jack = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user.
|
extraGroups = [
|
||||||
packages = with pkgs; [ zed-editor cargo clang clang-tools ];
|
"wheel"
|
||||||
|
"networkmanager"
|
||||||
|
]; # Enable ‘sudo’ for the user.
|
||||||
|
packages = with pkgs; [
|
||||||
|
zed-editor
|
||||||
|
cargo
|
||||||
|
clang
|
||||||
|
clang-tools
|
||||||
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue