Update

9 files changed, 51 insertions, 23 deletions

diff --git a/home.nix b/home.nix
index d75b3c2..017bc7d 100644
--- a/home.nix
+++ b/home.nix
@@ -51,18 +51,20 @@ in
     pnvim
     nur.repos.pn.larbs-mail
     nur.repos.pn.larbs-news
+    nur.repos.pn.larbs-music
     nur.repos.pn.dmenu
     amfora
     translate-shell
     nix-index
-    minecraft
+    fzf
+
 
     # Misc
-    teams
     zoom-us
     weechat
     todoist
     browserpass
+    minecraft
     spotify-tui
     # gimp
     slack-dark
diff --git a/overlays.nix b/overlays.nix
index 87042fc..16fbb87 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -12,16 +12,5 @@
         sha256 = "0lg9hwvcaiwj9z6wp9rw80czfs7l3bwvcc916fz87jxafp683m37";
       };
     });
-    teams = super.teams.overrideAttrs (oldAttrs: rec {
-      installPhase = ''
-        mkdir -p $out/{opt,bin}
-        rm share/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay
-        mv share/teams $out/opt/
-        mv share $out/share
-        substituteInPlace $out/share/applications/teams.desktop \
-        --replace /usr/bin/ $out/bin/
-        ln -s $out/opt/teams/teams $out/bin/
-      '';
-    });
   })
 ]
diff --git a/platforms/linux/aliases.nix b/platforms/linux/aliases.nix
index 60948e3..189e3f7 100644
--- a/platforms/linux/aliases.nix
+++ b/platforms/linux/aliases.nix
@@ -1,4 +1,4 @@
 {
   nixos-rebuild = "sudo nixos-rebuild -I nixos-config=$HOME/.config/nixpkgs/platforms/linux/configuration.nix";
-  cf = "vim $HOME/.config/nixpkgs/platforms/linux/configuration.nix";
+  cf = "v $HOME/.config/nixpkgs/platforms/linux/configuration.nix";
 }
diff --git a/platforms/linux/configuration.nix b/platforms/linux/configuration.nix
index c74d03d..b5810da 100644
--- a/platforms/linux/configuration.nix
+++ b/platforms/linux/configuration.nix
@@ -3,6 +3,17 @@
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
 { config, pkgs, ... }:
+let
+  busybox_utils = pkgs.stdenv.mkDerivation {
+    name = "strings";
+    unpackPhase = "true";
+    installPhase = ''
+      mkdir -p $out/bin
+      cp ${pkgs.busybox}/bin/strings $out/bin/strings
+      cp ${pkgs.busybox}/bin/telnet $out/bin/telnet
+    '';
+  };
+in
 {
   nix.useSandbox = true;
 
@@ -55,6 +66,14 @@
       device = "/dev/disk/by-label/docker";
       fsType = "ext4";
     };
+    "/media" {
+      device = "/dev/disk/by-label/media";
+      fsType = "ext4";
+    };
+    "/backup" {
+      device = "/dev/disk/by-label/backup";
+      fsType = "ext4";
+    };
     "/mnt/qnap" = {
       device = "//192.168.1.119/Patryk";
       fsType = "cifs";
@@ -71,6 +90,11 @@
      enable = true;
      wifi.backend = "iwd";
     };
+
+    nameservers = [
+      "1.1.1.1"
+      "8.8.8.8"
+    ];
   };
 
   networking.hostName = "nixos"; # Define your hostname.
@@ -83,8 +107,8 @@
   # Per-interface useDHCP will be mandatory in the future, so this generated config
   # replicates the default behaviour.
   networking.useDHCP = false;
-  networking.interfaces.enp0s25.useDHCP = true;
-  networking.interfaces.wlp3s0.useDHCP = true;
+  #networking.interfaces.enp0s25.useDHCP = true;
+  #networking.interfaces.wlp3s0.useDHCP = true;
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
@@ -110,7 +134,7 @@
     # Basic tools
     stdenv wget vim curl htop dnsutils zip unzip
     zsh neovim ripgrep jq groff file pinentry_gnome
-    ssh-ident
+    ssh-ident busybox_utils
 
     # XORG perfs
     xorg.xorgserver xorg.xf86inputevdev xorg.xf86inputsynaptics xorg.xf86inputlibinput
@@ -119,7 +143,7 @@
     xwallpaper xdotool
 
     # UI apps
-    zathura ncmpcpp brave sxiv pulsemixer
+    zathura brave sxiv pulsemixer
     lynx lf nur.repos.pn.st arandr wpa_supplicant_gui
     system-config-printer libreoffice
     vscodium abook
@@ -129,7 +153,7 @@
 
     # CLIs
     lm_sensors
-    fzf gitAndTools.gh docker-compose xsel
+    gitAndTools.gh docker-compose xsel
     bc libnotify
     pamixer maim killall
     quickserve ueberzug chafa
@@ -208,7 +232,7 @@
   };
 
   services.cron.enable = true;
-  services.fcron.enable = true;
+  # services.fcron.enable = true;
 
   services.acpid.enable = true;
 
diff --git a/platforms/linux/xorg/config.h b/platforms/linux/xorg/config.h
index 497c3b5..b8d1bab 100644
--- a/platforms/linux/xorg/config.h
+++ b/platforms/linux/xorg/config.h
@@ -144,7 +144,7 @@ static Key keys[] = {
 	{ MODKEY,			XK_w,		spawn,		SHCMD("$BROWSER") },
 	{ MODKEY|ShiftMask,		XK_w,		spawn,		SHCMD(TERMINAL " -e sudo nmtui") },
 	{ MODKEY,			XK_e,		spawn,		SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook") },
-	{ MODKEY|ShiftMask,		XK_e,		spawn,		SHCMD(TERMINAL " -e abook -C ~/.config/abook/abookrc --datafile ~/.config/abook/addressbook") },
+	{ MODKEY|ShiftMask,		XK_e,		spawn,		SHCMD(TERMINAL " -e abook") },
 	{ MODKEY,			XK_r,		spawn,		SHCMD(TERMINAL " -e lf") },
 	{ MODKEY|ShiftMask,		XK_r,		spawn,		SHCMD(TERMINAL " -e htop") },
 	{ MODKEY,			XK_t,		setlayout,	{.v = &layouts[1]} }, /* tile */
diff --git a/programs/aliases.nix b/programs/aliases.nix
index 492e3c2..59d94b2 100644
--- a/programs/aliases.nix
+++ b/programs/aliases.nix
@@ -1,6 +1,7 @@
 {
+  vim = "nvim";
   cfd = "cd ~/.config/nixpkgs";
-  ch = "vim ~/.config/nixpkgs/home.nix";
+  ch = "v ~/.config/nixpkgs/home.nix";
   github = "gh repo view --web";
 
   cp = "cp -iv";
diff --git a/programs/git.nix b/programs/git.nix
index f773a82..6b0b331 100755
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -1,6 +1,8 @@
+{ pkgs, ... }:
 {
   programs.git = {
     enable = true;
+    package = pkgs.gitAndTools.gitFull;
     userName = "Patryk Niedźwiedziński";
     userEmail = "pniedzwiedzinski19@gmail.com";
     signing = {
@@ -13,8 +15,14 @@
 
     extraConfig = {
       url."ssh://git@github.com/".insteadOf = "https://github.com/";
+      url."ssh://git@github.com/pniedzwiedzinski/".insteadOf = "pn:";
       url."ssh://git@gitlab.com/".insteadOf = "https://gitlab.com/";
       url."ssh://git@bitbucket.org/".insteadOf = "https://bitbucket.org/";
+
+      sendemail = {
+        smtpserver = "${pkgs.msmtp}/bin/msmtp";
+        smtpserveroption  = [ "-a" "pniedzwiedzinski19@gmail.com" ];
+      };
     };
   };
 }
diff --git a/programs/nvim.nix b/programs/nvim.nix
index 63e923b..d903c4d 100644
--- a/programs/nvim.nix
+++ b/programs/nvim.nix
@@ -137,6 +137,9 @@ pkgs.neovim.override {
       map <C-n> :NERDTreeToggle<CR>
 
       map <F9> gg=G
+
+      " Fuzzy finding
+      set path+=**
     '';
 
     packages.myVimPackage = with pkgs.vimPlugins; {
@@ -156,6 +159,7 @@ pkgs.neovim.override {
         YouCompleteMe
         Supertab
         fzf-vim
+        pkgs.nur.repos.pn.gemini-vim-syntax
 
       ];
       opt = [];
diff --git a/programs/zsh/zprofile b/programs/zsh/zprofile
index 58900c6..bc409d3 100644
--- a/programs/zsh/zprofile
+++ b/programs/zsh/zprofile
@@ -12,7 +12,7 @@ export PATH=$PATH:/apps
 # Adds gopath to $PATH
 export PATH=$PATH:~/.local/share/go/bin
 # Adds scripts to $PATH
-export PATH=$PATH:~/scripts
+export PATH=~/scripts:$PATH
 
 # Default programs:
 export EDITOR="nvim"