Merge branch 'main' of github.com:FredzyW/nix

shared/alacritty.nix

@@ -0,0 +1,86 @@
+{ pkgs, lib, myhostname, ... }:
+{
+	programs.alacritty = {
+		enable = true;
+		settings = {
+  colors = {
+		primary = {
+		  background = "#1e1e2e";
+		  foreground = "#cdd6f4";
+		  dim_foreground = "#7f849c";
+		  bright_foreground = "#cdd6f4";
+		};
+		cursor = {
+		  text = "#1e1e2e";
+		  cursor = "#f5e0dc";
+		};
+		vi_mode_cursor = {
+		  text = "#1e1e2e";
+		  cursor = "#b4befe";
+		};
+		search = {
+		  matches = {
+			foreground = "#1e1e2e";
+			background = "#a6adc8";
+		  };
+		  focused_match = {
+			foreground = "#1e1e2e";
+			background = "#a6e3a1";
+		  };
+		};
+		footer_bar = {
+		  foreground = "#1e1e2e";
+		  background = "#a6adc8";
+		};
+		hints = {
+		  start = {
+			foreground = "#1e1e2e";
+			background = "#f9e2af";
+		  };
+		  end = {
+			foreground = "#1e1e2e";
+			background = "#a6adc8";
+		  };
+		};
+		selection = {
+		  text = "#1e1e2e";
+		  background = "#f5e0dc";
+		};
+		normal = {
+		  black = "#45475a";
+		  red = "#f38ba8";
+		  green = "#a6e3a1";
+		  yellow = "#f9e2af";
+		  blue = "#89b4fa";
+		  magenta = "#f5c2e7";
+		  cyan = "#94e2d5";
+		  white = "#bac2de";
+		};
+		bright = {
+		  black = "#585b70";
+		  red = "#f38ba8";
+		  green = "#a6e3a1";
+		  yellow = "#f9e2af";
+		  blue = "#89b4fa";
+		  magenta = "#f5c2e7";
+		  cyan = "#94e2d5";
+		  white = "#a6adc8";
+		};
+		dim = {
+		  black = "#45475a";
+		  red = "#f38ba8";
+		  green = "#a6e3a1";
+		  yellow = "#f9e2af";
+		  blue = "#89b4fa";
+		  magenta = "#f5c2e7";
+		  cyan = "#94e2d5";
+		  white = "#bac2de";
+		};
+		indexed_colors = [
+		  { index = 16; color = "#fab387"; }
+		  { index = 17; color = "#f5e0dc"; }
+		];
+	  };
+	};
+	};
+}

shared/fish.nix

@@ -43,9 +43,18 @@
 		  dev="nix develop --command fish";
 		  spot="steam-run ~/program/spotify_player";
 		  sc="sc-im";
+		  e="nvim";
+		  c="ssh";
+		  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";
 	  };
 	  interactiveShellInit = ''
 		set fish_greeting # Disable greeting
+		set FLAKE_DIR "/home/fw/nix"
+		set HM_DIR "$FLAKE_DIR#fw@jobb"
+		set SYSTEM_DIR "$FLAKE_DIR#jobb"
+		set GOPRIVATE "github.com/iFacts"
 		# Macchiato
 		set -Ux FZF_DEFAULT_OPTS "--color=fg:#f8f8f2,bg:#282a36,hl:#bd93f9 --color=fg+:#f8f8f2,bg+:#44475a,hl+:#bd93f9 --color=info:#ffb86c,prompt:#50fa7b,pointer:#ff79c6 --color=marker:#ff79c6,spinner:#ffb86c,header:#6272a4"
 
@@ -54,6 +63,7 @@
 # --color=bg+:#ccd0da,bg:#eff1f5,spinner:#dc8a78,hl:#d20f39 \
 # --color=fg:#4c4f69,header:#d20f39,info:#8839ef,pointer:#dc8a78 \
 # --color=marker:#dc8a78,fg+:#4c4f69,prompt:#8839ef,hl+:#d20f39"
+		fish_add_path /home/fw/.cargo/bin
 	  '';
 	};
 }

shared/git.nix

@@ -4,5 +4,8 @@
     enable = true;
     userName = "FredzyW";
     userEmail = "fredrik@wastring.com";
+	extraConfig = {
+		url."git@github.com:".insteadOf = "https://github.com/";
+	};
   };
 }

shared/kitty.nix

@@ -13,7 +13,8 @@
       mode = "no-cursor";
     };
     # theme = "Catppuccin-Latte";
-    theme = "Catppuccin-Macchiato";
+    theme = "Catppuccin-Mocha";
+    # theme = "Catppuccin-Macchiato";
     settings = {
       confirm_os_window_close = 2;
       cursor_shape = "block";

shared/ssh.nix

@@ -50,6 +50,18 @@
         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";
+      };
     };
   };
 }