Merge
This commit is contained in:
commit
8a3c9f593b
11 changed files with 109 additions and 205 deletions
|
@ -3,7 +3,7 @@ let
|
|||
dwm = pkgs.dwm.overrideAttrs (old: {
|
||||
src = builtins.fetchGit {
|
||||
url = "https://github.com/FredzyW/dwm-conf.git";
|
||||
rev = "48302683403ca7457590c0a55c73ab5cc7e4113a";
|
||||
rev = "3b9d96ece2c814a1c50d59de68587b2a4eee4ff8";
|
||||
};
|
||||
nativeBuildInputs = with pkgs; [
|
||||
xorg.libX11.dev
|
||||
|
|
|
@ -48,7 +48,9 @@
|
|||
home="home-manager switch --flake $HM_DIR";
|
||||
reb="sudo nixos-rebuild switch --flake $SYSTEM_DIR";
|
||||
cam="jira issue create && jira issue assign && jira issue move";
|
||||
latest="git log | head -1 | awk '{print $2;}' | xsel -i";
|
||||
latest="git log | head -1 | awk '{print $2;}' | xsel -ib";
|
||||
vpnup="nmcli con up 'iFacts VPN'";
|
||||
vpndown="nmcli con down 'iFacts VPN'";
|
||||
};
|
||||
interactiveShellInit = ''
|
||||
fish_vi_key_bindings
|
||||
|
|
|
@ -3,18 +3,18 @@
|
|||
programs.kitty = {
|
||||
enable = true;
|
||||
font = if myhostname == "laptop" then {
|
||||
name = "FiraCode Nerd Font Bold";
|
||||
size = 24;
|
||||
# name = "Iosevka Nerd Font Bold";
|
||||
name = "ComicShannsMono Nerd Font Bold";
|
||||
size = 20;
|
||||
} else {
|
||||
name = "FiraCode Nerd Font Bold";
|
||||
# name = "Iosevka Nerd Font Bold";
|
||||
name = "ComicShannsMono Nerd Font Bold";
|
||||
size = 13;
|
||||
};
|
||||
shellIntegration = {
|
||||
mode = "no-cursor";
|
||||
};
|
||||
# theme = "Catppuccin-Latte";
|
||||
theme = "Catppuccin-Mocha";
|
||||
# theme = "Catppuccin-Macchiato";
|
||||
settings = {
|
||||
confirm_os_window_close = 2;
|
||||
cursor_shape = "block";
|
||||
|
|
|
@ -19,15 +19,16 @@
|
|||
hostname = "login.student.lth.se";
|
||||
port = 22;
|
||||
user = "fr7658wa-s";
|
||||
identityFile = "/home/fw/.ssh/id_rsa";
|
||||
};
|
||||
"dm2" = {
|
||||
hostname = "docker-master2";
|
||||
hostname = "192.168.0.190";
|
||||
port = 22;
|
||||
user = "fw";
|
||||
identityFile = "/home/fw/.ssh/fw-ssh-key";
|
||||
};
|
||||
"ha1" = {
|
||||
hostname = "hosted-agent-1";
|
||||
hostname = "192.168.0.180";
|
||||
port = 22;
|
||||
user = "fw";
|
||||
identityFile = "/home/fw/.ssh/fw-ssh-key";
|
||||
|
@ -62,18 +63,6 @@
|
|||
user = "github";
|
||||
identityFile = "/home/fw/.ssh/github-ssh-key";
|
||||
};
|
||||
"backup1" = {
|
||||
hostname = "192.168.0.220";
|
||||
port = 22;
|
||||
user = "fw";
|
||||
identityFile = "/home/fw/.ssh/fw-ssh-key";
|
||||
};
|
||||
"dashboard" = {
|
||||
hostname = "192.168.0.159";
|
||||
port = 22;
|
||||
user = "fw";
|
||||
identityFile = "/home/fw/.ssh/fw-ssh-key";
|
||||
};
|
||||
"malmo" = {
|
||||
hostname = "192.168.0.138";
|
||||
port = 22;
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
'';
|
||||
}
|
||||
fw-pkgs.tmuxPlugins.spotify
|
||||
fw-pkgs.tmuxPlugins.tmux-fzf-window
|
||||
{
|
||||
plugin = fw-pkgs.tmuxPlugins.minimal;
|
||||
extraConfig = ''
|
||||
|
|
11
shared/vscode.nix
Normal file
11
shared/vscode.nix
Normal file
|
@ -0,0 +1,11 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
vscodevim.vim
|
||||
jebbs.plantuml
|
||||
];
|
||||
};
|
||||
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue