41 files changed, 243 insertions, 49 deletions
diff --git a/home-manager/home/home.nix b/home-manager/home.nix
index 1a1f3fa..8bf7006 100644
--- a/home-manager/home/home.nix
+++ b/home-manager/home.nix
@@ -4,25 +4,49 @@ let
   username = "jerpo";
   homeDirectory = "/home/${username}";
   configHome = "${homeDirectory}/.config";
-  defaultPkgs = with pkgs; [
+  sysPkgs = with pkgs; [
+    ripgrep
+    fd
+    tldr
+    unzip
+    wget
+    htop
+    jq
     bat
-    emacs
-    nerdfonts
+    rustup
+    python3Full
+    silver-searcher
+    fzf
+    wineWowPackages.full
+    wineWowPackages.fonts
+    winetricks
+    pamixer
+    nix-prefetch-scripts
+    libtool
+  ];
+  yeahGamingPkgs = with pkgs; [
+    vkd3d
+    nvtop-nvidia
+    dxvk
+    lutris
+    steam
+    mangohud
+    gamemode
+  ];
+  defaultPkgs = with pkgs; [
+    firefox
+    minicava
+    droidcam
+    source-code-pro
     pokemon-colorscripts-mac
     kitty
+    libreoffice
     telegram-desktop
     feh
-    htop
-    ranger
     betterlockscreen
-    polybar
     xdragon
     obsidian
     xclip
-    lutris
-    steam
-    mangohud
-    gamemode
     vkdt
     transmission-gtk
     rubik
@@ -43,7 +67,7 @@ in
   home = {
     inherit username homeDirectory;
     stateVersion = "23.05";
-    packages = defaultPkgs ++ pythonPkgs;
+    packages = defaultPkgs ++ pythonPkgs ++ yeahGamingPkgs ++ sysPkgs;
     sessionVariables = {
       DISPLAY = ":0";
     };
diff --git a/home-manager/home/services/default.nix b/home-manager/home/services/default.nix
deleted file mode 100644
index b097260..0000000
--- a/home-manager/home/services/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-let
-  more = {
-    services = {
-      clipmenu.enable = true;
-      emacs = {
-        enable = true;
-        defaultEditor = true;
-      };
-    };
-  };
-in
-[
-  ./picom
-  ./sxhkd
-  more
-]
diff --git a/home-manager/home/homeold.nix b/home-manager/homeold.nix
index 2e7a9bc..2e7a9bc 100755
--- a/home-manager/home/homeold.nix
+++ b/home-manager/homeold.nix
diff --git a/home-manager/programs/default.nix b/home-manager/programs/default.nix
new file mode 100644
index 0000000..f819054
--- /dev/null
+++ b/home-manager/programs/default.nix
@@ -0,0 +1,22 @@
+let
+  more = { pkgs, ... }: {
+    programs = {
+      kitty = {
+        enable = true;
+        font.name = "Source Code Pro";
+        font.size = 11.3;
+        theme = "Rosé Pine Moon";
+        shellIntegration.enableFishIntegration = true;
+        extraConfig = "cursor_shape underline";
+      };
+    };
+  };
+in
+[
+  ./fish
+  ./firefox
+  ./rofi
+  ./emacs
+  ./ranger
+  more
+]   
diff --git a/home-manager/home/programs/default.nix b/home-manager/programs/default.nix~
index b519da2..c904e18 100644
--- a/home-manager/home/programs/default.nix
+++ b/home-manager/programs/default.nix~
@@ -14,8 +14,8 @@ let
   progConfig = { config, ... }: "${config.home.homeDirectory}/.nixfiles/home-manager/home/programs/";
   nonNixConfigs = { config, ... }: {
     xdg.configFile = {
-      "ranger".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.nixfiles/home-manager/programs/ranger";
-      "emacs/init.el".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.nixfiles/home-manager/programs/emacs/init.el";
+      "ranger".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.nixfiles/home-manager/home/programs/ranger";
+      "emacs/init.el".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.nixfiles/home-manager/home/programs/emacs/init.el";
     };
   };
 in
diff --git a/home-manager/programs/emacs/default.nix b/home-manager/programs/emacs/default.nix
new file mode 100644
index 0000000..d74c93a
--- /dev/null
+++ b/home-manager/programs/emacs/default.nix
@@ -0,0 +1,29 @@
+{ pkgs, ... }:
+let
+  service = {
+    client = {
+      enable = true;
+      arguments = [ "-c" "-a emacs" ];
+    };
+    defaultEditor = true;
+    startWithUserSession = "graphical";
+    package = pkgs.emacs-gtk;
+  };
+  configs = {
+    "emacs/init.el".text = builtins.readFile ./init.el;
+    "emacs/early-init.el".text = builtins.readFile ./init.el;
+  };
+in
+{
+  services.emacs = {
+    enable = true;
+    inherit (service);
+  };
+  programs.emacs = {
+    enable = true;
+    inherit (service) package;
+  };
+  xdg.configFile = {
+    inherit (configs); 
+  };
+}
diff --git a/home-manager/home/programs/emacs/early-init.el b/home-manager/programs/emacs/early-init.el
index 00e3392..00e3392 100644
--- a/home-manager/home/programs/emacs/early-init.el
+++ b/home-manager/programs/emacs/early-init.el
diff --git a/home-manager/home/programs/emacs/init.el b/home-manager/programs/emacs/init.el
index b291e5a..8e39bb2 100644
--- a/home-manager/home/programs/emacs/init.el
+++ b/home-manager/programs/emacs/init.el
@@ -396,11 +396,19 @@
 (use-package lsp-mode
   :hook
   (python-mode . lsp)
+  (rust-mode . lsp)
   (lsp-mode . lsp-enable-which-key-integration)
+  (sh-mode . lsp)
   :commands lsp)
 (use-package lsp-pyright
   :ensure t)
-(use-package lsp-ui)
+(use-package lsp-ui
+  :hook (lsp-mode-hook . lsp-ui-mode)
+  :custom
+  (lsp-ui-peek-always-show t)
+  (lsp-ui-sideline-show-hover t)
+  (lsp-ui-doc-enable t))
+
 (use-package lsp-treemacs)
 
 ;; Flycheck
@@ -460,22 +468,60 @@
 
 ;; NixOS
 (use-package nix-mode
-  :mode ".nix")
-(use-package nix-drv-mode :elpaca nil
-  :ensure nix-mode
-  :mode ".drv")
-(use-package nix-shell :elpaca nil
-  :ensure nix-mode
-  :commands (nix-shell-unpack nix-shell-configure nix-shell-build))
-(use-package nix-repl :elpaca nil
-  :ensure nix-mode
-  :commands (nix-repl))
+  :mode "(.nix)$")
+;; (use-package nix-drv-mode :elpaca nil
+;;   :ensure nix-mode
+;;   :mode ".drv")
+;; (use-package nix-shell :elpaca nil
+;;   :ensure nix-mode
+;;   :commands (nix-shell-unpack nix-shell-configure nix-shell-build))
+;; (use-package nix-repl :elpaca nil
+;;   :ensure nix-mode
+;;   :commands (nix-repl))
 
 ;; Reload config
 (defun reload-init-file () (interactive)
        (load-file user-init-file)
        (load-file user-init-file))
 
+;; Magit
+(use-package magit)
+
+;; Fish
+(use-package fish-mode
+  :mode "(.fish)$")
+
+;; Rust
+(use-package rustic
+  :ensure
+  :bind (:map rustic-mode-map
+              ("M-j" . lsp-ui-imenu)
+              ("M-?" . lsp-find-references)
+              ("C-c C-c l" . flycheck-list-errors)
+              ("C-c C-c a" . lsp-execute-code-action)
+              ("C-c C-c r" . lsp-rename)
+              ("C-c C-c q" . lsp-workspace-restart)
+              ("C-c C-c Q" . lsp-workspace-shutdown)
+              ("C-c C-c s" . lsp-rust-analyzer-status))
+  :config
+  ;; uncomment for less flashiness
+  ;; (setq lsp-eldoc-hook nil)
+  ;; (setq lsp-enable-symbol-highlighting nil)
+  ;; (setq lsp-signature-auto-activate nil)
+
+  ;; comment to disable rustfmt on save
+  (setq rustic-format-on-save t)
+  (add-hook 'rustic-mode-hook 'rk/rustic-mode-hook))
+
+(defun rk/rustic-mode-hook ()
+  ;; so that run C-c C-c C-r works without having to confirm, but don't try to
+  ;; save rust buffers that are not file visiting. Once
+  ;; https://github.com/brotzeit/rustic/issues/253 has been resolved this should
+  ;; no longer be necessary.
+  (when buffer-file-name
+    (setq-local buffer-save-without-query t))
+  (add-hook 'before-save-hook 'lsp-format-buffer nil t))
+
 ;; GUI tweaks
 ;; Disable bars (no alcohol here.. maybe just a litle bit)
 (menu-bar-mode -1)
diff --git a/home-manager/home/programs/firefox/default.nix b/home-manager/programs/firefox/default.nix
index 58bd4c9..58bd4c9 100644
--- a/home-manager/home/programs/firefox/default.nix
+++ b/home-manager/programs/firefox/default.nix
diff --git a/home-manager/home/programs/firefox/user.js b/home-manager/programs/firefox/user.js
index dac2158..dac2158 100644
--- a/home-manager/home/programs/firefox/user.js
+++ b/home-manager/programs/firefox/user.js
diff --git a/home-manager/home/programs/fish/default.nix b/home-manager/programs/fish/default.nix
index f63fbc4..f63fbc4 100644
--- a/home-manager/home/programs/fish/default.nix
+++ b/home-manager/programs/fish/default.nix
diff --git a/home-manager/home/programs/ranger/commands.py b/home-manager/programs/ranger/commands.py
index a41d42f..a41d42f 100644
--- a/home-manager/home/programs/ranger/commands.py
+++ b/home-manager/programs/ranger/commands.py
diff --git a/home-manager/programs/ranger/default.nix b/home-manager/programs/ranger/default.nix
new file mode 100644
index 0000000..8e8ef1d
--- /dev/null
+++ b/home-manager/programs/ranger/default.nix
@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+let
+  configFiles = {
+    "ranger/rc.conf".text = builtins.readFile ./rc.conf;
+    "ranger/rifle.conf".text = builtins.readFile ./rifle.conf;
+    "ranger/scope.sh".text = builtins.readFile ./scope.sh;
+    "ranger/commands.py".source = ./commands.py; 
+    "ranger/plugins".source = ./plugins;
+  };
+in
+{
+  home.packages = [ pkgs.ranger ];
+  xdg.configFile = {
+    inherit (configFiles);
+  };
+}
diff --git a/home-manager/home/programs/ranger/plugins/__init__.py b/home-manager/programs/ranger/plugins/__init__.py
index e69de29..e69de29 100644
--- a/home-manager/home/programs/ranger/plugins/__init__.py
+++ b/home-manager/programs/ranger/plugins/__init__.py
diff --git a/home-manager/home/programs/ranger/plugins/__pycache__/__init__.cpython-310.pyc b/home-manager/programs/ranger/plugins/__pycache__/__init__.cpython-310.pyc
index 1a26aa3..1a26aa3 100644
--- a/home-manager/home/programs/ranger/plugins/__pycache__/__init__.cpython-310.pyc
+++ b/home-manager/programs/ranger/plugins/__pycache__/__init__.cpython-310.pyc
diff --git a/home-manager/home/programs/ranger/plugins/__pycache__/__init__.cpython-311.pyc b/home-manager/programs/ranger/plugins/__pycache__/__init__.cpython-311.pyc
index 87b2e7f..87b2e7f 100644
--- a/home-manager/home/programs/ranger/plugins/__pycache__/__init__.cpython-311.pyc
+++ b/home-manager/programs/ranger/plugins/__pycache__/__init__.cpython-311.pyc
diff --git a/home-manager/home/programs/ranger/plugins/__pycache__/fd.cpython-311.pyc b/home-manager/programs/ranger/plugins/__pycache__/fd.cpython-311.pyc
index 146af23..146af23 100644
--- a/home-manager/home/programs/ranger/plugins/__pycache__/fd.cpython-311.pyc
+++ b/home-manager/programs/ranger/plugins/__pycache__/fd.cpython-311.pyc
diff --git a/home-manager/home/programs/ranger/plugins/__pycache__/quit_cd_wd.cpython-310.pyc b/home-manager/programs/ranger/plugins/__pycache__/quit_cd_wd.cpython-310.pyc
index 49d1db9..49d1db9 100644
--- a/home-manager/home/programs/ranger/plugins/__pycache__/quit_cd_wd.cpython-310.pyc
+++ b/home-manager/programs/ranger/plugins/__pycache__/quit_cd_wd.cpython-310.pyc
diff --git a/home-manager/home/programs/ranger/plugins/__pycache__/quit_cd_wd.cpython-311.pyc b/home-manager/programs/ranger/plugins/__pycache__/quit_cd_wd.cpython-311.pyc
index 7b3ac1c..7b3ac1c 100644
--- a/home-manager/home/programs/ranger/plugins/__pycache__/quit_cd_wd.cpython-311.pyc
+++ b/home-manager/programs/ranger/plugins/__pycache__/quit_cd_wd.cpython-311.pyc
diff --git a/home-manager/home/programs/ranger/plugins/quit_cd_wd.py b/home-manager/programs/ranger/plugins/quit_cd_wd.py
index e47837f..e47837f 100644
--- a/home-manager/home/programs/ranger/plugins/quit_cd_wd.py
+++ b/home-manager/programs/ranger/plugins/quit_cd_wd.py
diff --git a/home-manager/home/programs/ranger/plugins/ranger_fzf_filter/.gitignore b/home-manager/programs/ranger/plugins/ranger_fzf_filter/.gitignore
index 846dc44..846dc44 100644
--- a/home-manager/home/programs/ranger/plugins/ranger_fzf_filter/.gitignore
+++ b/home-manager/programs/ranger/plugins/ranger_fzf_filter/.gitignore
diff --git a/home-manager/home/programs/ranger/plugins/ranger_fzf_filter/LICENSE b/home-manager/programs/ranger/plugins/ranger_fzf_filter/LICENSE
index bd840f1..bd840f1 100644
--- a/home-manager/home/programs/ranger/plugins/ranger_fzf_filter/LICENSE
+++ b/home-manager/programs/ranger/plugins/ranger_fzf_filter/LICENSE
diff --git a/home-manager/home/programs/ranger/plugins/ranger_fzf_filter/README.md b/home-manager/programs/ranger/plugins/ranger_fzf_filter/README.md
index 6a65e17..6a65e17 100644
--- a/home-manager/home/programs/ranger/plugins/ranger_fzf_filter/README.md
+++ b/home-manager/programs/ranger/plugins/ranger_fzf_filter/README.md
diff --git a/home-manager/home/programs/ranger/plugins/ranger_fzf_filter/__init__.py b/home-manager/programs/ranger/plugins/ranger_fzf_filter/__init__.py
index b5d5b46..b5d5b46 100644
--- a/home-manager/home/programs/ranger/plugins/ranger_fzf_filter/__init__.py
+++ b/home-manager/programs/ranger/plugins/ranger_fzf_filter/__init__.py
diff --git a/home-manager/home/programs/ranger/plugins/ranger_fzf_filter/command.py b/home-manager/programs/ranger/plugins/ranger_fzf_filter/command.py
index 92aee83..92aee83 100644
--- a/home-manager/home/programs/ranger/plugins/ranger_fzf_filter/command.py
+++ b/home-manager/programs/ranger/plugins/ranger_fzf_filter/command.py
diff --git a/home-manager/home/programs/ranger/plugins/ranger_fzf_filter/filter.py b/home-manager/programs/ranger/plugins/ranger_fzf_filter/filter.py
index 3d12756..3d12756 100644
--- a/home-manager/home/programs/ranger/plugins/ranger_fzf_filter/filter.py
+++ b/home-manager/programs/ranger/plugins/ranger_fzf_filter/filter.py
diff --git a/home-manager/home/programs/ranger/rc.conf b/home-manager/programs/ranger/rc.conf
index 271d239..271d239 100644
--- a/home-manager/home/programs/ranger/rc.conf
+++ b/home-manager/programs/ranger/rc.conf
diff --git a/home-manager/home/programs/ranger/rifle.conf b/home-manager/programs/ranger/rifle.conf
index 3b565af..3b565af 100644
--- a/home-manager/home/programs/ranger/rifle.conf
+++ b/home-manager/programs/ranger/rifle.conf
diff --git a/home-manager/home/programs/ranger/scope.sh b/home-manager/programs/ranger/scope.sh
index f9c7648..f9c7648 100755
--- a/home-manager/home/programs/ranger/scope.sh
+++ b/home-manager/programs/ranger/scope.sh
diff --git a/home-manager/home/programs/rofi/default.nix b/home-manager/programs/rofi/default.nix
index 8d417ba..8d417ba 100644
--- a/home-manager/home/programs/rofi/default.nix
+++ b/home-manager/programs/rofi/default.nix
diff --git a/home-manager/home/programs/rofi/squared-material-pine.rasi b/home-manager/programs/rofi/squared-material-pine.rasi
index 55434cf..55434cf 100644
--- a/home-manager/home/programs/rofi/squared-material-pine.rasi
+++ b/home-manager/programs/rofi/squared-material-pine.rasi
diff --git a/home-manager/services/default.nix b/home-manager/services/default.nix
new file mode 100644
index 0000000..6c40af4
--- /dev/null
+++ b/home-manager/services/default.nix
@@ -0,0 +1,24 @@
+let
+  more = { pkgs, ... }: {
+    services = {
+      clipmenu.enable = true;
+      emacs = {
+        enable = true;
+        defaultEditor = true;
+      };
+      polybar = {
+        enable = true;
+        package = pkgs.polybar.override {
+          pulseSupport = true;
+        };
+        script = "polybar example &";
+      };
+    };
+  };
+in
+[
+  ./picom
+  ./sxhkd
+  ./dunst
+  more
+]
diff --git a/home-manager/services/dunst/default.nix b/home-manager/services/dunst/default.nix
new file mode 100644
index 0000000..1ed03f4
--- /dev/null
+++ b/home-manager/services/dunst/default.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+let
+  settings = {
+    global = {
+      origin = "bottom-right";
+      frame_color = "#c4a7e7";
+      notification_limit = 5;
+      progress_bar = true;
+      background = "#232136";
+      foreground = "#e0def4";
+      separator_color = "foreground";
+    };
+  };
+  iconTheme = {
+  };
+in
+{
+  home.packages = [ pkgs.libnotify ];
+  services.dunst = {
+    enable = true;
+    inherit settings;
+  };
+}
diff --git a/home-manager/services/dunst/default.nix~ b/home-manager/services/dunst/default.nix~
new file mode 100644
index 0000000..e02ab35
--- /dev/null
+++ b/home-manager/services/dunst/default.nix~
@@ -0,0 +1,14 @@
+let
+  settings = {
+    
+  };
+  iconTheme = {
+    
+  };
+in
+{
+  services.dunst = {
+    enable = true;
+    inherit configFile iconTheme;
+  };
+}
diff --git a/home-manager/home/services/picom/default.nix b/home-manager/services/picom/default.nix
index 03e751d..1b02f49 100644
--- a/home-manager/home/services/picom/default.nix
+++ b/home-manager/services/picom/default.nix
@@ -3,15 +3,15 @@ let
     fading = true;
     fade-in-step = 0.05;
     fade-out-step = 0.05;
-    blur-background = true;
+    blur-background = false;
     corner-radius = 8;
-    blur = {
-      method = "dual_kawase";
-      size = 12;
-      deviation = false;
-      strength = 2;
-      kern = "3x3box";
-    };
+    # blur = {
+    #   method = "dual_kawase";
+    #   size = 12;
+    #   deviation = false;
+    #   strength = 2;
+    #   kern = "3x3box";
+    # };
     backend = "glx";
     vsync = true;
     mark = {
diff --git a/home-manager/services/polybar/hide.fish b/home-manager/services/polybar/hide.fish
new file mode 100755
index 0000000..f0a1a1b
--- /dev/null
+++ b/home-manager/services/polybar/hide.fish
@@ -0,0 +1,10 @@
+if ls /tmp/polhide
+    polybar-msg cmd hide
+    sleep 0.1
+    bspc config -m focused top_padding 3
+    rm /tmp/polhide
+else
+    polybar-msg cmd show
+    touch /tmp/polhide
+end
+    
diff --git a/home-manager/services/polybar/hide.fish~ b/home-manager/services/polybar/hide.fish~
new file mode 100644
index 0000000..31984e1
--- /dev/null
+++ b/home-manager/services/polybar/hide.fish~
@@ -0,0 +1 @@
+#!/bin/env fish
diff --git a/home-manager/services/polybar/hide~ b/home-manager/services/polybar/hide~
new file mode 100644
index 0000000..31984e1
--- /dev/null
+++ b/home-manager/services/polybar/hide~
@@ -0,0 +1 @@
+#!/bin/env fish
diff --git a/home-manager/home/services/sxhkd/default.nix b/home-manager/services/sxhkd/default.nix
index 0f0d5e9..6b7878e 100644
--- a/home-manager/home/services/sxhkd/default.nix
+++ b/home-manager/services/sxhkd/default.nix
@@ -26,6 +26,7 @@ let
     "super + o" = "bspc node -m last -f"; # Send window to the last used monitor
     "super + ctrl + {1-9}" = "bspc node -o 0.{1-9}"; # Preselect the window ratio
     "super + ctrl + space" = "bspc node -p cancel"; # Cansel the preselected ratio
+    "super + n" = "fish ~/.nixfiles/home-manager/home/services/polybar/hide.fish";
   };
   keybindings = apps // bspwm;
 in
diff --git a/home-manager/home/wm/bspwm/default.nix b/home-manager/wm/bspwm/default.nix
index 1a8a863..8aab6d7 100644
--- a/home-manager/home/wm/bspwm/default.nix
+++ b/home-manager/wm/bspwm/default.nix
@@ -21,7 +21,6 @@ let
   };
   startupPrograms = [
     "picom -b"
-    "setxkbmap -option grp:alt_shift_toggle,grp:win_space_toggle us,ru"
     "emacs --daemon"
     "feh --bg-fill ~/dotfiles/cat.png"
   ];
diff --git a/home-manager/home/wm/default.nix b/home-manager/wm/default.nix
index c604b9a..c604b9a 100644
--- a/home-manager/home/wm/default.nix
+++ b/home-manager/wm/default.nix