config sync

22 files changed, 141 insertions, 76 deletions

diff --git a/.gitmodules b/.gitmodules
index 60dafb7..08ace1f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,9 +22,6 @@
 [submodule "config/nvim"]
 	path = config/nvim
 	url = git@github.com:phenax/peepeepoopoo-nvim-config.git
-[submodule "extras/wallpapers"]
-	path = extras/wallpapers
-	url = git@github.com:phenax/wallpapers.git
 [submodule "extras/notes"]
 	path = extras/notes
 	url = git@github.com:phenax/personal-notes.git
diff --git a/config/nvim b/config/nvim
-Subproject 2d3c26c0b4d116f3e5690660f90de36706c2e7d
+Subproject c410b8783002949856b47053b183d937c6f494e
diff --git a/config/qutebrowser/config.py b/config/qutebrowser/config.py
index a6d7ef6..ad412f2 100644
--- a/config/qutebrowser/config.py
+++ b/config/qutebrowser/config.py
@@ -16,12 +16,12 @@ localleader = ' '
 config.load_autoconfig()
 
 # Helper Functions {{{
-# def toggle_stylesheets(stylesheets):
-    # return 'config-cycle content.user_stylesheets \'' \
-    # + json.dumps(c.content.user_stylesheets) \
-    # + '\' \'' \
-    # + json.dumps(c.content.user_stylesheets + stylesheets) \
-    # + '\''
+def toggle_stylesheets(stylesheets):
+    return 'config-cycle content.user_stylesheets \'' \
+    + json.dumps(c.content.user_stylesheets) \
+    + '\' \'' \
+    + json.dumps(c.content.user_stylesheets + stylesheets) \
+    + '\''
 
 def bind(key, command, mode):  # noqa: E302
     """Bind key to command in mode."""
@@ -72,6 +72,7 @@ c.content.autoplay = True
 c.url.open_base_url = True
 
 c.scrolling.bar = 'always'
+c.tabs.mousewheel_switching = False
 c.scrolling.smooth = True
 c.keyhint.delay = 250
 c.input.partial_timeout = 0
@@ -105,7 +106,10 @@ imap('<Ctrl-e>', 'edit-text')
 nmap('<Ctrl-e>', 'edit-text')
 nmap(localleader+'e', 'edit-url')
 
-nmap('<Ctrl-p>', 'enter-mode passthrough')
+# Pass through actions
+nmap('<Ctrl-p>', 'mode-enter passthrough')
+pmap('<Ctrl-j>', 'tab-next')
+pmap('<Ctrl-k>', 'tab-prev')
 # pmap('<Shift-Escape>', 'enter-mode normal') # Default
 
 nunmap("+")
@@ -144,7 +148,7 @@ c.content.user_stylesheets = [
 ]
 
 # Dark mode
-# c.aliases['toggle-darkmode'] = toggle_stylesheets(['styles/dark.css'])
+c.aliases['toggle-darkmode'] = toggle_stylesheets(['styles/dark.css'])
 
 nmap(localleader + 'td', ':toggle-darkmode')
 # }}}
diff --git a/config/qutebrowser/quickmarks b/config/qutebrowser/quickmarks
index fcddad6..8ac3fb0 100644
--- a/config/qutebrowser/quickmarks
+++ b/config/qutebrowser/quickmarks
@@ -1,4 +1,3 @@
 Whatsapp https://web.whatsapp.com/
-Gmail:personal https://mail.google.com/mail/u/0/#inbox
-Gmail:work https://mail.google.com/mail/u/1/#inbox
-Gmail:colabra https://mail.google.com/mail/u/3
+Gmail:personal https://mail.google.com/mail/u/0
+Gmail:colabra https://mail.google.com/mail/u/1
diff --git a/configuration.nix b/configuration.nix
index bc3c467..c71508d 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -27,6 +27,31 @@ in
     enable = true;
   };
 
+  services.borgbackup =
+    let
+      homeDir = config.users.users.imsohexy.home;
+      user = config.users.users.imsohexy.name;
+    in
+    {
+      jobs = {
+        testBkup = {
+          paths = "${homeDir}/dump/elm-worker-tmp";
+          repo = "${homeDir}/dump/backups";
+          compression = "none";
+          startAt = "weekly";
+          user = user;
+          group = "users";
+          encryption = {
+            mode = "none";
+          };
+          # encryption = {
+          #   mode = "repokey";
+          #   passCommand = "pass show BorgBackup/imsohexy";
+          # };
+        };
+      };
+    };
+
   hardware.bluetooth.enable = false;
   #hardware.bluetooth.package = pkgs.bluezFull;
 
@@ -109,7 +134,7 @@ in
     noto-fonts-emoji
   ];
 
-  nix.autoOptimiseStore = true;
+  nix.settings.auto-optimise-store = true;
   nix.gc = {
     automatic = true;
     dates = "weekly";
diff --git a/extras/notes b/extras/notes
-Subproject 3f55b2381ca162191d602b2a888c9a1ae68db9a
+Subproject 91f7a3ceedca4c1ece1060dc48d3b593cb929eb
diff --git a/extras/wallpapers b/extras/wallpapers
deleted file mode 160000
-Subproject 9e8cade917b14e9a27e6d45e87a695bf0421720
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 960306f..6beaa45 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -10,7 +10,7 @@
   boot.kernelPackages = pkgs.linuxPackages_5_10;
   boot.initrd = {
     availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" ];
-    kernelModules = [];
+    kernelModules = [ ];
   };
   boot.kernelModules = [
     "kvm-intel"
@@ -20,15 +20,21 @@
     "snd-rawmidi"
   ];
   boot.kernelParams = [ "i8042.nopnp=1" "pci=nocrs" "i915.enable_dpcd_backlight=1" "acpi_backlight=vendor" ];
-  boot.extraModulePackages = [];
+  boot.extraModulePackages = [ ];
   boot.extraModprobeConfig = ''
     options snd slots=snd-hda-intel
   '';
 
-  services.udev.extraRules = ''
-    # DualShock 4 over bluetooth hidraw
-    KERNEL=="hidraw*", KERNELS=="*054C:05C4*", MODE="0666"
-  '';
+  services.udev = {
+    packages = [
+      pkgs.android-udev-rules
+    ];
+
+    extraRules = ''
+      # DualShock 4 over bluetooth hidraw
+      KERNEL=="hidraw*", KERNELS=="*054C:05C4*", MODE="0666"
+    '';
+  };
 
   hardware = {
     enableAllFirmware = true;
diff --git a/modules/login.nix b/modules/login.nix
index b86c6bd..d22d67f 100644
--- a/modules/login.nix
+++ b/modules/login.nix
@@ -33,6 +33,8 @@ in
       "transmission"
       "lxd"
       "jackaudio"
+      "plugdev"
+      "adbusers"
     ];
     shell = pkgs.zsh;
   };
@@ -41,9 +43,10 @@ in
   #'';
 
   # Global
-  environment.variables = let
-    apps = (import ../packages/sensible-apps/sensible-apps.nix).apps;
-  in
+  environment.variables =
+    let
+      apps = (import ../packages/sensible-apps/sensible-apps.nix).apps;
+    in
     {
       EDITOR = apps.EDITOR;
       VISUAL = apps.EDITOR;
@@ -63,22 +66,24 @@ in
     interactiveShellInit = ''source ~/.config/zsh/zshrc'';
     promptInit = "";
     loginShellInit = with builtins; let
-      cases = map (
-        s: ''
-          /dev/${elemAt s 0})
-            echo "~/.config/xorg/init.sh; ${elemAt s 1}" > ~/.xinitrc;
-            sleep 0.2;
-            startx;
-          ;;
-        ''
-      ) sessions;
+      cases = map
+        (
+          s: ''
+            /dev/${elemAt s 0})
+              echo "~/.config/xorg/init.sh; ${elemAt s 1}" > ~/.xinitrc;
+              sleep 0.2;
+              startx;
+            ;;
+          ''
+        )
+        sessions;
     in
-      ''
-        case "$(tty)" in
-          ${toString cases}
-          *) echo "Only tty for you, $(tty)" ;;
-        esac;
-      '';
+    ''
+      case "$(tty)" in
+        ${toString cases}
+        *) echo "Only tty for you, $(tty)" ;;
+      esac;
+    '';
   };
   services = {
     getty = {
diff --git a/modules/music.home.nix b/modules/music.home.nix
index 8c5fbcc..c5cc205 100644
--- a/modules/music.home.nix
+++ b/modules/music.home.nix
@@ -3,7 +3,7 @@
   home.packages = with pkgs; [ mpc_cli ];
 
   services.mpd = {
-    enable = true;
+    enable = false;
     musicDirectory = "${config.home.homeDirectory}/Downloads/music";
     playlistDirectory = "${config.home.homeDirectory}/Downloads/music/playlist";
     network = {
@@ -38,7 +38,7 @@
   };
 
   programs.ncmpcpp = {
-    enable = true;
+    enable = false;
     settings = {
       # visualizer_type = "spectrum";
       user_interface = "alternative";
diff --git a/modules/torrent.home.nix b/modules/torrent.home.nix
index 99f43d6..9266f44 100644
--- a/modules/torrent.home.nix
+++ b/modules/torrent.home.nix
@@ -3,7 +3,8 @@ let
   downloadsDir = "/home/imsohexy/Downloads/dl";
   incompleteDownloadsDir = "/home/imsohexy/Downloads/dl/incomplete";
   watchTorrentFilesOn = "/home/an/Downloads/qute";
-in {
+in
+{
   services.transmission = {
     enable = true;
     settings = {
@@ -23,7 +24,6 @@ in {
       "rpc-port" = 9091;
       "rpc-whitelist-enabled" = true;
       "script-torrent-done-enabled" = false;
-      "script-torrent-done-filename" = "";
       "start-added-torrents" = true;
       "trash-original-torrent-files" = false;
       "umask" = 18;
diff --git a/modules/xresources.home.nix b/modules/xresources.home.nix
index 5517d47..a570599 100644
--- a/modules/xresources.home.nix
+++ b/modules/xresources.home.nix
@@ -1,17 +1,18 @@
 { config, pkgs, epkgs, ... }:
 {
-  xresources.properties = let
-    bg = "#0f0c19";
-    fg = "#d8dee9";
-    accent = "#4e3aA3";
-    ##A22F3E
-    ##A1313F
-    ##A82E3D
-    ##AE2E3D
-    ##EB4960
-    ##B22337
-    ##F32929
-  in
+  xresources.properties =
+    let
+      bg = "#0f0c19";
+      fg = "#d8dee9";
+      accent = "#4e3aA3";
+      ##A22F3E
+      ##A1313F
+      ##A82E3D
+      ##AE2E3D
+      ##EB4960
+      ##B22337
+      ##F32929
+    in
     {
       "*.foreground" = fg;
       "*.background" = bg;
diff --git a/overlays-system.nix b/overlays-system.nix
index e30ddfe..1c4d4ed 100644
--- a/overlays-system.nix
+++ b/overlays-system.nix
@@ -1,9 +1,10 @@
 { pkgs, ... }:
 let
   overlays = import ./overlays/default.nix {};
-in {
+in
+{
   nixpkgs.overlays = with overlays; [
-    neovim-nightly
+    # neovim-nightly
     qutebrowser
   ];
 }
diff --git a/overlays/neovim.nix b/overlays/neovim.nix
index c97c1f9..2cf8b5a 100644
--- a/overlays/neovim.nix
+++ b/overlays/neovim.nix
@@ -12,7 +12,7 @@ self: super: {
         owner = "neovim";
         repo = "neovim";
         rev = "nightly";
-        sha256 = "05aswlzgqjy2v6ryh9mn0gskxq12xsl31pds6r69d0hdx9hcv1sj";
+        sha256 = "145mzl1pzqy0ic9gm0322z9ssvbyj0v9xiqs7k0wmi8b0590xg8s";
       };
 
       nativeBuildInputs = with self.pkgs; [ unzip cmake pkgconfig gettext tree-sitter-updated ];
diff --git a/overlays/qutebrowser.nix b/overlays/qutebrowser.nix
index 67192f6..71b3312 100644
--- a/overlays/qutebrowser.nix
+++ b/overlays/qutebrowser.nix
@@ -1,13 +1,19 @@
 self: super: {
-  qutebrowser = super.qutebrowser.override {
-    python3 = super.python3.override {
-      packageOverrides = self: super: {
-        tldextract = super.tldextract.overridePythonAttrs(_: {
-          propagatedBuildInputs = with super; [ requests requests-file idna filelock ];
-          doCheck = false;
-          pythonImportsCheck = ["tldextract"];
-        });
+  qutebrowser =
+    let oldPkg = super.qutebrowser.override {
+      python3 = super.python3.override {
+        packageOverrides = self: super: {
+          tldextract = super.tldextract.overridePythonAttrs (_: {
+            propagatedBuildInputs = with super; [ requests requests-file idna filelock ];
+            doCheck = false;
+            pythonImportsCheck = [ "tldextract" ];
+          });
+        };
       };
     };
-  };
+    in oldPkg;
+  #mesa = super.mesa.overrideAttrs (_: {
+  #version = "21.2.5";
+  #});
 }
+# 21.2.5-1
diff --git a/packages.nix b/packages.nix
index 6a68168..bb01006 100644
--- a/packages.nix
+++ b/packages.nix
@@ -42,6 +42,7 @@ let
       typescript
       typescript-language-server
       vscode-json-languageserver
+      vscode-langservers-extracted
       # bash-language-server
     ]
   );
@@ -125,12 +126,6 @@ in
   #programs.steam.enable = true;
   #hardware.steam-hardware.enable = true;
 
-  # TODO: Remove after https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14505 gets merged and released
-  # system.replaceRuntimeDependencies = [
-  #   ({ original = pkgs.mesa; replacement = (import /etc/nixos/tmp-extras/mesa-nixpkgs { }).pkgs.mesa; })
-  #   ({ original = pkgs.mesa.drivers; replacement = (import /etc/nixos/tmp-extras/mesa-nixpkgs { }).pkgs.mesa.drivers; })
-  # ];
-
   # Security wrappers
   security.wrappers = {
     bslock = {
diff --git a/packages/shotkey/source b/packages/shotkey/source
-Subproject c02d52ebe34e482d285debbf5abb70d3b2450f0
+Subproject 9a47b6a6c19bf40487f2c29cbce86e4d84fc556
diff --git a/packages/xmonad/pkg.nix b/packages/xmonad/pkg.nix
index b7e4d3a..cf4aa04 100644
--- a/packages/xmonad/pkg.nix
+++ b/packages/xmonad/pkg.nix
@@ -20,7 +20,7 @@ let
 in
 haskellPackages.mkDerivation rec {
   pname = "local-xmonad-${version}";
-  version = "0.0.0";
+  version = "0.0.1";
   license = lib.licenses.mit;
 
   src = ./source;
diff --git a/packages/xmonad/source b/packages/xmonad/source
-Subproject bd6e810dc5965fa9e9b75c04bae8d5a468d1f70
+Subproject 67fd3a2534ebabb9cd6035603267b5ce7a87fec
diff --git a/scripts/bin/clocks b/scripts/bin/clocks
new file mode 100755
index 0000000..ee10ac1
--- /dev/null
+++ b/scripts/bin/clocks
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+format="%H:%M"
+current_time=$(date +"$format")
+time="${1:-$current_time}"
+
+C_RESET=`tput sgr0`
+C_GRAY="$(tput setaf 7)$(tput dim)";
+C_HIGHLIGHT="$(tput setaf 7)$(tput bold)"
+
+label() { printf "$C_GRAY$1: $C_HIGHLIGHT"; }
+space() { echo -e "$C_RESET"; }
+
+space
+
+label "IST -> CET"
+TZ=CET date --date="$time IST" +"$format CET"
+
+space
+
+label "CET -> IST"
+date --date="$time CET" +"$format IST"
+
+space
diff --git a/scripts/commands/:music b/scripts/commands/:music
index 8ac1653..300a39f 100755
--- a/scripts/commands/:music
+++ b/scripts/commands/:music
@@ -1,3 +1,5 @@
 #!/usr/bin/env sh
 
-sensible-terminal -e ncmpcpp
+#sensible-terminal -e ncmpcpp
+
+spotify
diff --git a/scripts/sessions/project.sh b/scripts/sessions/project.sh
index f642a9e..4250f67 100755
--- a/scripts/sessions/project.sh
+++ b/scripts/sessions/project.sh
@@ -9,7 +9,7 @@ if [[ -f "$dir/default.nix" ]]; then
 fi;
 
 term() { sensible-terminal -d "$dir" "$@"; }
-editor() { term -e sh -c "echo 'Loading...'; $editor"; }
+editor() { term -e sh -c "echo 'Loading...'; $editor; zsh"; }
 
 editor &
 sleep 0.1;