misc updates

This commit is contained in:
The Hedgehog 2022-10-12 15:05:37 -04:00
parent f6aee8d0f7
commit 0ae9909259
Signed by: thehedgehog
GPG key ID: 8CDF3F7CAA53A0F5
7 changed files with 142 additions and 95 deletions

View file

@ -93,17 +93,17 @@
"colmena": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs",
"stable": "stable",
"utils": "utils"
"stable": "stable"
},
"locked": {
"lastModified": 1664434988,
"narHash": "sha256-C+xK3ZEfw502nwm1KLWcXKiiKy7UKsf0oD78tOwQvbk=",
"lastModified": 1665350797,
"narHash": "sha256-7XAcfqRlsJf+y7174WcKJzHoZlq5ChrrymShL0xj8QY=",
"owner": "zhaofengli",
"repo": "colmena",
"rev": "241b61dcc0dda46f16515abe905322bab42520d7",
"rev": "872949504befb9b5540e69f846c6965def7150f9",
"type": "github"
},
"original": {
@ -216,11 +216,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1664793678,
"narHash": "sha256-RCSaFgr3ClSNuPyYRWcnUfFVud9vJsGMf5oB+9CA0SA=",
"lastModified": 1665572899,
"narHash": "sha256-k9q3RAv9i4R51F1CZAIUi9AePeeUwYYkJur6Q8YRX0s=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "be61e5636f4c7478c0093ace59bc7512e320feaa",
"rev": "63e405c4207a8ff3d3739e3a0f6f7ff7e8b37844",
"type": "github"
},
"original": {
@ -363,6 +363,22 @@
"type": "github"
}
},
"firefox": {
"locked": {
"lastModified": 1663678741,
"narHash": "sha256-TY5KEwk3kRNJnqzF3NpDmfCD0B0I6ekRkRNbTlViSV8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "11b3d696526c97246a9cc5b2aaa42a0acf7bed8d",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "11b3d696526c97246a9cc5b2aaa42a0acf7bed8d",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
@ -571,14 +587,14 @@
"nixpkgs": [
"nixpkgs"
],
"utils": "utils_2"
"utils": "utils"
},
"locked": {
"lastModified": 1664783440,
"narHash": "sha256-KlMwR7mUf5h8MPnzV7nGFUAt6ih/euW5xgvZ5x+hwvI=",
"lastModified": 1665520899,
"narHash": "sha256-N8BYMgvrAYhiXeyrcEeLgngZZaU6MVVocSa+tIfyMyg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e4e639dd4dc3e431aa5b5f95325f9a66ac7e0dd9",
"rev": "5597b3a7425a9e3f41128308cb1105d3e780f633",
"type": "github"
},
"original": {
@ -593,11 +609,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1664712710,
"narHash": "sha256-TScFRDUO7vuHhPpMe1GNjHD+ciF0qgFWYGc0YM+HAds=",
"lastModified": 1665317514,
"narHash": "sha256-Kk1uPg/yRm6gweBwNn5HrXbgm/tJ6ClHp7a00yQh7gI=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "9b3defbae219e67143f89db6a3540ebaf3cf017a",
"rev": "d6f8e6456ec59ff51034d3e434739926470af7aa",
"type": "github"
},
"original": {
@ -611,7 +627,7 @@
"blobs": "blobs",
"nixpkgs": "nixpkgs_3",
"nixpkgs-22_05": "nixpkgs-22_05",
"utils": "utils_3"
"utils": "utils_2"
},
"locked": {
"lastModified": 1658267644,
@ -657,11 +673,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1664785227,
"narHash": "sha256-A2YGAxuT3WY+tPA/ww6JbYvld0acsicvxAIC/5r1gFk=",
"lastModified": 1665562768,
"narHash": "sha256-/2wag5vXeieg7YRR431tMaZwB9oAnrQ2Hy7zriRWjd4=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "acc75b05773963b245e49f5e51e4fae9dbeea0a5",
"rev": "e3841a95c1b6bb49ef634ed496c9489c5f48d8cf",
"type": "github"
},
"original": {
@ -680,11 +696,11 @@
},
"locked": {
"dir": "contrib",
"lastModified": 1664752840,
"narHash": "sha256-dxecs+FwU8MWvTOjUiDM1VZh/z8SdDTwVXXMVYI0JVY=",
"lastModified": 1665548414,
"narHash": "sha256-MZTZLz4DTGnehY6JCbJzx9EtvNuOPg/dOMvMKawaFBY=",
"owner": "neovim",
"repo": "neovim",
"rev": "56998feebd6f7ec0ab68e44cba3425bf39d448b4",
"rev": "f175ca9f7cc29054b1c6fe1fd1076edd78af5684",
"type": "github"
},
"original": {
@ -714,7 +730,10 @@
},
"nix-eval-jobs": {
"inputs": {
"flake-utils": "flake-utils",
"flake-utils": [
"colmena",
"flake-utils"
],
"nixpkgs": [
"colmena",
"nixpkgs"
@ -753,11 +772,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1664628729,
"narHash": "sha256-A1J0ZPhBfZZiWI6ipjKJ8+RpMllzOMu/An/8Tk3t4oo=",
"lastModified": 1665321371,
"narHash": "sha256-0SO6MTW0bX6lxZmz1AZW/Xmk+hnTd7/hp1vF7Tp7jg0=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "3024c67a2e9a35450558426c42e7419ab37efd95",
"rev": "236ba4df714131059945d7754c0aa3fbe9d2f74c",
"type": "github"
},
"original": {
@ -768,11 +787,11 @@
},
"nixos-unstable": {
"locked": {
"lastModified": 1664687381,
"narHash": "sha256-9czSuDzS+OGGwq2kC4KXBLXWfYaup+oLB+AA1Md25U4=",
"lastModified": 1665449268,
"narHash": "sha256-cw4xrQIAZUyJGj58Dp5VLICI0rscd+uap83afiFzlcA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "59d2991d4256cdca1c0cda45d876c80a0fe45c31",
"rev": "285e77efe87df64105ec14b204de6636fb0a7a27",
"type": "github"
},
"original": {
@ -831,11 +850,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1664673153,
"narHash": "sha256-Cx2eBUEXt8Q0L+0MSiajhpuVkwDf/4zbP8J0zLQAMNQ=",
"lastModified": 1665277441,
"narHash": "sha256-TTuO5F7sStTBL/twYMSnRakrw1l7FqAYulN7+HPYjqc=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "31f704cbbdb277df25ad2642876c485bc0d8f883",
"rev": "76ef73e385f96bb438676cf5f21f220694fd3d73",
"type": "github"
},
"original": {
@ -866,11 +885,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1664753041,
"narHash": "sha256-0ogaD8PaGHluARFeupofvk1Nq9gpVeZdlFM0Kcwguys=",
"lastModified": 1665483364,
"narHash": "sha256-sisuhAPPjYB92YlcyoVEcTh5teuAkL9NW8UVexRsfoo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a62844b302507c7531ad68a86cb7aa54704c9cb4",
"rev": "e0ed589d7422c1d7a1bdd1e81289e2428c6ec2a3",
"type": "github"
},
"original": {
@ -895,11 +914,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1664753041,
"narHash": "sha256-0ogaD8PaGHluARFeupofvk1Nq9gpVeZdlFM0Kcwguys=",
"lastModified": 1665483364,
"narHash": "sha256-sisuhAPPjYB92YlcyoVEcTh5teuAkL9NW8UVexRsfoo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a62844b302507c7531ad68a86cb7aa54704c9cb4",
"rev": "e0ed589d7422c1d7a1bdd1e81289e2428c6ec2a3",
"type": "github"
},
"original": {
@ -911,11 +930,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1664753041,
"narHash": "sha256-0ogaD8PaGHluARFeupofvk1Nq9gpVeZdlFM0Kcwguys=",
"lastModified": 1665483364,
"narHash": "sha256-sisuhAPPjYB92YlcyoVEcTh5teuAkL9NW8UVexRsfoo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a62844b302507c7531ad68a86cb7aa54704c9cb4",
"rev": "e0ed589d7422c1d7a1bdd1e81289e2428c6ec2a3",
"type": "github"
},
"original": {
@ -942,11 +961,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1664687381,
"narHash": "sha256-9czSuDzS+OGGwq2kC4KXBLXWfYaup+oLB+AA1Md25U4=",
"lastModified": 1665449268,
"narHash": "sha256-cw4xrQIAZUyJGj58Dp5VLICI0rscd+uap83afiFzlcA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "59d2991d4256cdca1c0cda45d876c80a0fe45c31",
"rev": "285e77efe87df64105ec14b204de6636fb0a7a27",
"type": "github"
},
"original": {
@ -974,11 +993,11 @@
},
"nur": {
"locked": {
"lastModified": 1664783789,
"narHash": "sha256-buQ0uzeo9ntjhg99tOkkEm7Pyee57JtKxhVkQVcoLM4=",
"lastModified": 1665565609,
"narHash": "sha256-6J1vvWjRacPDy+pc8rJ7sCt/wRhrou9ZUcqM+ZoOGAM=",
"owner": "nix-community",
"repo": "nur",
"rev": "1f68e5245428cb171ac0d48e6808da3b03d1d987",
"rev": "f21e77a17e84d827f9f00b35db443e9d6b988162",
"type": "github"
},
"original": {
@ -1091,6 +1110,7 @@
"dns": "dns",
"doom-emacs": "doom-emacs",
"emacs": "emacs",
"firefox": "firefox",
"home-manager": "home-manager",
"mailserver": "mailserver",
"neovim": "neovim",
@ -1217,21 +1237,6 @@
}
},
"utils_2": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_3": {
"locked": {
"lastModified": 1605370193,
"narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
@ -1254,11 +1259,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1664760167,
"narHash": "sha256-BH5hGciG/2h9uaQTSvFmtX+1iqRdTYAQLL6IOtvAkig=",
"lastModified": 1665582965,
"narHash": "sha256-LNPdEJPAwmJXx8qGVgI23B0jJBgMvgjI7NZ35XlFQtw=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "a2d5d7f966aa488def49c255e5c93908ae59750a",
"rev": "84ba4b02ad024f3d8ad283051897e2bf62c6d3c7",
"type": "github"
},
"original": {

View file

@ -23,6 +23,7 @@
doom-emacs.url = "github:nix-community/nix-doom-emacs";
doom-emacs.inputs.nixpkgs.follows = "nixpkgs";
emacs.url = "github:nix-community/emacs-overlay";
firefox.url = "github:nixos/nixpkgs?rev=11b3d696526c97246a9cc5b2aaa42a0acf7bed8d";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
@ -46,6 +47,7 @@
dns,
doom-emacs,
emacs,
firefox,
home-manager,
mailserver,
neovim,
@ -82,6 +84,26 @@
wayland.overlays.default
];
};
firefoxPkg = import firefox {
localSystem = "x86_64-linux";
config = {
allowUnfree = true;
input-fonts.acceptLicense = true;
joypixels.acceptLicense = true;
};
overlays = [
(import ./overlays/treesitter.nix)
(import ./overlays/sumneko.nix)
my-pkgs
alejandra-overlay
colmena-overlay
emacs.overlay
neovim.overlay
nixpkgs-update-overlay
nur.overlay
wayland.overlays.default
];
};
lib = nixpkgs.lib;
in {
@ -132,7 +154,7 @@
doom-emacs.hmModule
nix-colors.homeManagerModule
];
home-manager.extraSpecialArgs = {inherit pkgs system inputs nix-colors;};
home-manager.extraSpecialArgs = {inherit pkgs system inputs nix-colors firefoxPkg;};
}
];
specialArgs = {inherit self inputs nix-colors;};

View file

@ -13,7 +13,7 @@
"file:///home/thehedgehog/Downloads"
];
theme = {
name = "CatppuccinMocha";
name = "Catppuccin-Mocha";
package = pkgs.catppuccin-gtk;
};
iconTheme = {

View file

@ -1,7 +1,7 @@
{pkgs, ...}: {
{pkgs, firefoxPkg, ...}: {
programs.firefox = {
enable = true;
package = pkgs.firefox-wayland.override {
package = firefoxPkg.firefox-wayland.override {
cfg = {
enableBukubrow = true;
smartcardSupport = true;

View file

@ -10,17 +10,52 @@ in {
font.name = "IBM Plex Mono Regular";
font.size = 12;
extraConfig = ''
include ~/.cache/wal/colors-kitty.conf
foreground #CDD6F4
background #1E1E2E
selection_foreground #1E1E2E
selection_background #F5E0DC
cursor #F5E0DC
cursor_text_color #1E1E2E
url_color #F5E0DC
active_border_color #B4BEFE
inactive_border_color #6C7086
bell_border_color #F9E2AF
wayland_titlebar_color system
macos_titlebar_color system
active_tab_foreground #11111B
active_tab_background #CBA6F7
inactive_tab_foreground #CDD6F4
inactive_tab_background #181825
tab_bar_background #11111B
mark1_foreground #1E1E2E
mark1_background #B4BEFE
mark2_foreground #1E1E2E
mark2_background #CBA6F7
mark3_foreground #1E1E2E
mark3_background #74C7EC
color0 #45475A
color8 #585B70
color1 #F38BA8
color9 #F38BA8
color2 #A6E3A1
color10 #A6E3A1
color3 #F9E2AF
color11 #F9E2AF
color4 #89B4FA
color12 #89B4FA
color5 #F5C2E7
color13 #F5C2E7
color6 #94E2D5
color14 #94E2D5
color7 #BAC2DE
color15 #A6ADC8
'';
settings = {
# Font settings
bold_font = "IBM Plex Mono:style=Bold";
italic_font = "IBM Plex Mono:style=Light";
bold_italic_font = "auto";
symbol_map = "U+276f 3270-Medium Nerd Font Complete";
# Cursor Settings
cursor_shape = "block";
# Scrollback settings
scrollback_lines = 10000;
wheel_scroll_multiplier = 3;
touch_scroll_multiplier = 2;
@ -44,26 +79,6 @@ in {
tab_bar_style = "powerline";
tab_bar_min_tabs = 2;
foreground = "#CDD6F4";
background = "#1E1E2E";
title_fg = "#A6ADC8";
title_bg = "#181825";
margin_bg = "#181825";
margin_fg = "#A6ADC8";
filler_bg = "#181825";
removed_bg = "#5D3E52";
highlight_removed_bg = "#5D3E52";
removed_margin_bg = "#5D3E52";
added_bg = "#465950";
highlight_added_bg = "#465950";
added_margin_bg = "#465950";
hunk_margin_bg = "#181825";
hunk_bg = "#181825";
search_bg = "#A1937B";
search_fg = "#CDD6F4";
select_bg = "#45475A";
select_fg = "#CDD6F4";
shell = "fish";
editor = "${pkgs.neovim}";
allow_remote_control = "socket-only";
@ -71,7 +86,10 @@ in {
update_check_interval = 0;
allow_hyperlinks = true;
term = "xterm-kitty";
remember_window_size = "no";
linux_display_server = "wayland";
# Color scheme
};
};
}

View file

@ -12,7 +12,8 @@ in {
wayland.windowManager.sway.config.keybindings = lib.mkOptionDefault {
"${mod}+d" = "${menu}";
"${mod}+Shift+F" = "exec MOZ_DISABLE_RDD_SANDBOX=1 firefox";
"${mod}+Return" = "exec ${term}";
"${mod}+Return" = "exec ${term} --debug-rendering > /home/thehedgehog/kitty.log";
"${mod}+Shift+Return" = "exec ${pkgs.wezterm}/bin/wezterm";
"${mod}+x" = "exec wlogout";
"XF86MonBrightnessDown" = "exec brightnessctl set 5%-";
"XF86MonBrightnessUp" = "exec brightnessctl set +5%";

View file

@ -17,9 +17,10 @@
"0.0.0.0"
];
upstream_dns = [
"https://dns.quad9.net/dns-query"
"9.9.9.9"
"https://doh.dns.sb/dns-query"
"https://mozilla.cloudflare-dns.com/dns-query"
"https://dns.quad9.net/dns-query"
];
trusted_proxies = [
"103.21.244.0/22"