Ch-ch-ch-ch-changes

work
Matthew Ess 2021-05-05 11:21:02 -04:00
parent d81cfec619
commit 463759c7ef
23 changed files with 129 additions and 109 deletions

12
cachix/fenix.nix Normal file
View File

@ -0,0 +1,12 @@
{
nix = {
binaryCaches = [
"https://fenix.cachix.org"
];
binaryCachePublicKeys = [
"fenix.cachix.org-1:SVfCRUmFZ8kdAjJKShEYoyWHb/M0pxVkCjGXsFDHLk4="
];
};
}

View File

@ -1,8 +0,0 @@
{
nix = {
binaryCaches = [ "https://ghcide-nix.cachix.org" ];
binaryCachePublicKeys = [
"ghcide-nix.cachix.org-1:ibAY5FD+XWLzbLr8fxK6n8fL9zZe7jS+gYeyxyWYK5c="
];
};
}

View File

@ -1,8 +0,0 @@
{
nix = {
binaryCaches = [ "https://hercules-ci.cachix.org" ];
binaryCachePublicKeys = [
"hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0="
];
};
}

View File

@ -1,7 +0,0 @@
{
nix = {
binaryCaches = [ "https://iohk.cachix.org" ];
binaryCachePublicKeys =
[ "iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo=" ];
};
}

View File

@ -1,8 +0,0 @@
{
nix = {
binaryCaches = [ "https://miso-haskell.cachix.org" ];
binaryCachePublicKeys = [
"miso-haskell.cachix.org-1:6N2DooyFlZOHUfJtAx1Q09H0P5XXYzoxxQYiwn6W1e8="
];
};
}

View File

@ -1,8 +0,0 @@
{
nix = {
binaryCaches = [ "https://neovim-nightly.cachix.org" ];
binaryCachePublicKeys = [
"neovim-nightly.cachix.org-1:feIoInHRevVEplgdZvQDjhp11kYASYCE2NGY9hNrwxY="
];
};
}

12
cachix/nix-community.nix Normal file
View File

@ -0,0 +1,12 @@
{
nix = {
binaryCaches = [
"https://nix-community.cachix.org"
];
binaryCachePublicKeys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};
}

View File

@ -1,7 +0,0 @@
{
nix = {
binaryCaches = [ "https://nix-tools.cachix.org" ];
binaryCachePublicKeys =
[ "nix-tools.cachix.org-1:ebBEBZLogLxcCvipq2MTvuHlP7ZRdkazFSQsbs0Px1A=" ];
};
}

View File

@ -1,7 +0,0 @@
{
nix = {
binaryCaches = [ "https://pynchon.cachix.org" ];
binaryCachePublicKeys =
[ "pynchon.cachix.org-1:9Cj9t6FxSOQKMkjdd12Q2n7djp8CYBx+J2bIwzwaW+8=" ];
};
}

View File

@ -1,7 +0,0 @@
{
nix = {
binaryCaches = [ "https://todo-cli.cachix.org" ];
binaryCachePublicKeys =
[ "todo-cli.cachix.org-1:4nlgpKFUyaacIwtthY7DJtdvudzZRS5uDu+41xiXFys=" ];
};
}

View File

@ -17,7 +17,7 @@
matthewess/fish-autovenv matthewess/fish-autovenv
''; '';
".config/fish/completions/pijul.fish".source = ../assets/pijul.fish; ".config/fish/completions/pijul.fish".source = ../assets/pijul.fish;
".config/fish/completions/systemctl.fish".source = ../assets/systemctl.fish; # ".config/fish/completions/systemctl.fish".source = ../assets/systemctl.fish;
".config/fish/functions/colortest.fish".source = ../assets/colortest.fish; ".config/fish/functions/colortest.fish".source = ../assets/colortest.fish;
".config/fish/functions/mkdcd.fish".text = '' ".config/fish/functions/mkdcd.fish".text = ''
function mkdcd -a target function mkdcd -a target

View File

@ -13,6 +13,7 @@
font_family Fira Code Regular font_family Fira Code Regular
bold_font Fira Code Bold bold_font Fira Code Bold
font_size 15.0 font_size 15.0
clipboard_control write-clipboard write-primary no-append
include ./theme.conf include ./theme.conf
''; '';
".config/kitty/theme.conf".source = ../assets/kitty-theme.conf; ".config/kitty/theme.conf".source = ../assets/kitty-theme.conf;

View File

@ -17,22 +17,25 @@
alias bigscreen="xrandr --output eDP1 --off --output HDMI2 --auto" alias bigscreen="xrandr --output eDP1 --off --output HDMI2 --auto"
alias smallscreen="xrandr --output eDP1 --auto --output HDMI2 --off" alias smallscreen="xrandr --output eDP1 --auto --output HDMI2 --off"
function tmux-ssh -a user -a host function tmux-ssh -a user -a host -a no_local
if test -z "$no_local"
set host "$host.local"
end
set target "$user@$host" set target "$user@$host"
set session "$user-$host" set session_host (string replace . - "$host" --all)
set session "$user-$session_host"
env TERM=tmux-256color ssh $target -t "tmux -2 attach -t $session || tmux -2 new -s $session" env TERM=tmux-256color ssh $target -t "tmux -2 attach -t $session || tmux -2 new -s $session"
end end
alias pi="tmux-ssh pi pi" alias pi="tmux-ssh pi pi y"
alias mir="tmux-ssh mat mir" alias yuri="tmux-ssh root gagarin"
alias drop=mir alias tmssh="tmux-ssh mat"
alias soviet="tmux-ssh mat soviet" alias soviet="tmssh soviet y"
alias gagarin="tmux-ssh mat gagarin"
alias yuri=gagarin
alias gaga=gagarin
alias wifi="nmcli r w off; nmcli r w on" alias wifi="nmcli r w off; nmcli r w on"
alias nixops=~/dev/nixops/result/bin/nixops alias nixops=~/dev/nixops/result/bin/nixops
kitty + complete setup fish | source
''; '';
} }

View File

@ -104,6 +104,8 @@
{ class = "Firefox"; } { class = "Firefox"; }
{ class = "(?i)castor"; } { class = "(?i)castor"; }
{ class = "(?i)lagrange"; } { class = "(?i)lagrange"; }
{ title = "Enpass Assistant"; }
{ class = "(?i)Vivaldi"; }
]; ];
"2: devel" = [ "2: devel" = [
{ class = "(?i)kitty"; } { class = "(?i)kitty"; }
@ -121,14 +123,14 @@
}; };
}; };
extraConfig = '' extraConfig = ''
exec --no-startup-id firefox exec --no-startup-id vivaldi
exec --no-startup-id kitty exec --no-startup-id kitty
exec --no-startup-id Enpass exec --no-startup-id Enpass
exec --no-startup-id deluged exec --no-startup-id deluged
exec --no-startup-id mullvad-vpn # exec --no-startup-id mullvad-vpn
# exec --no-startup-id slack # exec --no-startup-id slack
# exec --no-startup-id nheko # exec --no-startup-id nheko
# exec --no-startup-id Discord # exec --no-startup-id Discord
for_window [class="Firefox"] focus for_window [class="Vivaldi"] focus
''; '';
} }

View File

@ -32,6 +32,13 @@
}; };
}; };
nix = {
package = pkgs.nixFlakes;
extraOptions = ''
experimental-features = nix-command flakes
'';
};
# This value determines the NixOS release with which your system is to be # This value determines the NixOS release with which your system is to be
# compatible, in order to avoid breaking some software such as database # compatible, in order to avoid breaking some software such as database
# servers. You should change this only after NixOS release notes say you # servers. You should change this only after NixOS release notes say you

View File

@ -1,9 +0,0 @@
{ config, pkgs, ... }:
{
imports = [
<nixpkgs/nixos/modules/virtualisation/lxc-container.nix>
../profiles/server.nix
];
}

View File

@ -17,6 +17,7 @@
fish fish
git git
htop htop
ripgrep
tmux tmux
tree tree
unzip unzip

View File

@ -14,7 +14,6 @@
}; };
services = { services = {
clipmenu.enable = true;
geoclue2.enable = true; geoclue2.enable = true;
gvfs.enable = true; gvfs.enable = true;
xserver = { xserver = {

View File

@ -14,8 +14,10 @@
# Enable touchpad support. # Enable touchpad support.
libinput = { libinput = {
enable = true; enable = true;
naturalScrolling = true; touchpad = {
disableWhileTyping = true; naturalScrolling = true;
disableWhileTyping = false;
};
}; };
}; };
}; };

View File

@ -1,7 +1,16 @@
{ config, ... }: { { config, ... }:
let local = name: [ "${name}" "${name}.local" ];
in {
networking.hosts = { networking.hosts = {
"192.168.1.246" = [ "gagarin.local" ]; "192.168.1.99" = [ "pi.hole" ];
"192.168.1.250" = [ "vostok-1.local" ]; "192.168.1.98" = local "gagarin";
"192.168.1.165" = [ "pi.hole" ]; "192.168.1.10" = local "gemini";
"192.168.1.11" = local "deluge";
"192.168.1.12" = local "jackett";
"192.168.1.13" = local "sonarr";
"192.168.1.14" = local "radarr";
"192.168.1.15" = local "plex";
}; };
} }

View File

@ -1,4 +1,7 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
networking.wireguard.enable = true; networking.wireguard.enable = true;
services.mullvad-vpn.enable = true; # services.mullvad-vpn.enable = true;
networking.wg-quick.interfaces = {
wg-mullvad = import ./mullvad.secret.nix;
};
} }

View File

@ -8,38 +8,48 @@ in {
home-manager.users.mat = { pkgs, lib, ... }: { home-manager.users.mat = { pkgs, lib, ... }: {
home = { home = {
sessionVariables = { sessionVariables = {
BROWSER = "firefox"; BROWSER = "vivaldi";
TERMINAL = "kitty"; TERMINAL = "kitty";
CM_LAUNCHER = "rofi";
}; };
packages = with pkgs; [ packages = with pkgs; [
# command line utilities # command line utilities
asuka asuka
bottom bottom
dbus
du-dust du-dust
fzy fzy
httpie httpie
imagemagick imagemagick
jq jq
mdcat
neofetch
procs procs
unrar unrar
wireguard-tools
# graphical applications # graphical applications
deluge deluge
discord discord
(dunst.override { dunstify = true; }) dunst
element-desktop
enpass enpass
fractal
firefox
kitty kitty
lagrange
# mullvad-vpn
okular
signal-desktop signal-desktop
slack slack
# steam steam
steam-run-native
vivaldi
vivaldi-ffmpeg-codecs
# vivaldi-widevine
vlc vlc
xfce.thunar xfce.thunar
xfce.thunar-archive-plugin xfce.thunar-archive-plugin
# graphical utilities # graphical utilities
clipmenu clipmenu
clipnotify clipnotify
dmenu # needed for clipmenu
gnome3.gnome-disk-utility gnome3.gnome-disk-utility
i3status-rust i3status-rust
libappindicator libappindicator
@ -47,6 +57,7 @@ in {
lxappearance lxappearance
rofi rofi
xclip xclip
xdg-dbus-proxy
]; ];
file = import ../hm-configs/files.nix; file = import ../hm-configs/files.nix;
}; };
@ -61,9 +72,10 @@ in {
}; };
}; };
feh.enable = true; feh.enable = true;
firefox.enable = true; firefox.enable = false;
fish = import ../hm-configs/fish.nix { inherit pkgs; }; fish = import ../hm-configs/fish.nix { inherit pkgs; };
go.enable = false;
jq.enable = true; jq.enable = true;
rofi = { rofi = {
enable = true; enable = true;
@ -75,12 +87,11 @@ in {
ssh = { ssh = {
enable = true; enable = true;
matchBlocks = { matchBlocks = {
"pi".hostname = "192.168.1.165"; "pi".hostname = "192.168.1.99";
"gagarin" = { "gagarin" = {
hostname = "192.168.1.246"; hostname = "gagarin.local";
forwardAgent = true; forwardAgent = true;
}; };
"mir".hostname = "138.197.58.58";
"soviet".hostname = "soviet.circumlunar.space"; "soviet".hostname = "soviet.circumlunar.space";
}; };
}; };
@ -91,7 +102,12 @@ in {
enable = true; enable = true;
provider = "geoclue2"; provider = "geoclue2";
}; };
dunst = import ../hm-configs/dunst.nix;
clipmenu.enable = true;
# disabled in favor of flakes
lorri.enable = false;
}; };
xdg = { mime.enable = true; };
xsession = { xsession = {
enable = true; enable = true;
scriptPath = ".hm-xsession"; scriptPath = ".hm-xsession";

View File

@ -10,20 +10,20 @@ in {
home-manager.users.mat = { pkgs, ... }: { home-manager.users.mat = { pkgs, ... }: {
home = { home = {
sessionVariables = { EDITOR = "vim"; }; sessionVariables = { EDITOR = "nvim"; };
packages = with pkgs; [ packages = with pkgs; [
# nix utilities # nix utilities
cachix cachix
niv niv
nixfmt nixfmt
nix-prefetch-git nix-prefetch-git
fish-foreign-env fishPlugins.foreign-env
# command line utils # command line utils
ripgrep dnsutils
fd
rlwrap rlwrap
tealdeer tealdeer
pijul pijul
mullvad-vpn
]; ];
file = import ../hm-configs/files-all.nix; file = import ../hm-configs/files-all.nix;
}; };
@ -32,7 +32,10 @@ in {
bat.enable = true; bat.enable = true;
broot.enable = true; broot.enable = true;
command-not-found.enable = true; command-not-found.enable = true;
direnv.enable = true; direnv = {
enable = true;
enableNixDirenvIntegration = true;
};
fish = { fish = {
enable = true; enable = true;
@ -88,10 +91,32 @@ in {
highlightBaseName = true; highlightBaseName = true;
}; };
kakoune = {
enable = false;
config = {
numberLines = {
enable = true;
highlightCursor = true;
relative = true;
};
ui = {
enableMouse = true;
assistant = "cat";
};
wrapLines = {
enable = true;
indent = true;
marker = "";
word = true;
};
};
};
keychain = { keychain = {
enable = true; enable = true;
extraFlags = [ "--quiet" "--nogui" ];
enableFishIntegration = true; enableFishIntegration = true;
enableXsessionIntegration = true; enableXsessionIntegration = false;
}; };
man.enable = true; man.enable = true;
@ -121,8 +146,5 @@ in {
''; '';
}; };
}; };
services = { lorri.enable = true; };
}; };
} }