From 67f1a6809013c2cf8bf2e23b44b3de17ef0943ba Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Mon, 19 Jun 2023 20:49:16 -0400
Subject: [PATCH] feat: use services instead of packages and fix gdm bug no1

---
 README.md                  |  3 +-
 nixos/cfg/home-manager.nix | 12 ++-----
 nixos/configuration.nix    | 64 +++++++++++++++++++++++++++++---------
 3 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 9628430..64ffe91 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,7 @@
 what is currently not working:
-- gdm doesn't let me use other tty
 - gdm thinks i tried to login when pressing on the user
 
 what i want to do:
-- split up configs
+- split up configs well
 - learn flakes
 - give more stuff over to home-manager
diff --git a/nixos/cfg/home-manager.nix b/nixos/cfg/home-manager.nix
index 9511601..b9ccfdf 100644
--- a/nixos/cfg/home-manager.nix
+++ b/nixos/cfg/home-manager.nix
@@ -32,6 +32,7 @@
 
       ]) ++
       (with python311Packages; [
+        python
         pyclip
 
       ]) ++
@@ -81,19 +82,12 @@
       wget
       firefox
       tree
-      mlocate
       mosh
       rsync
-      tmux
-      git
-      git-lfs
       killall
-      htop
-      fzf
-      jq
-      ripgrep
+      jq # enable using home-manager?
+      ripgrep-all
       hyprpaper
-      python3
       rofi-wayland
       networkmanagerapplet
       nextcloud-client
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 910619d..08504bf 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -17,10 +17,55 @@
     displayManager = {
       gdm.enable = true;
       gdm.wayland = true;
-      sessionPackages = [ pkgs.hyprland ];
+      sessionPackages = [ pkgs.hyprland pkgs.gnome.gnome-session.sessions ];
     };
   };
 
+  services.locate = {
+    enable = true;
+    interval = "hourly";
+    prunePaths = [
+      "/tmp"
+      "/var/tmp"
+      "/var/cache"
+      "/var/lock"
+      "/var/run"
+      "/var/spool"
+      "/nix/var/log/nix"
+      "/proc"
+    ];
+  };
+
+  programs.tmux = {
+    enable = true;
+    keyMode = "vi";
+    terminal = "screen-256color";
+    newSession = true;
+    historyLimit = 30000;
+    extraConfig = ''
+      bind-key -n Home send Escape "OH"
+      bind-key -n End send Escape "OF"
+      set -g mouse on
+      set -ga terminal-overrides ',xterm*:smcup@:rmcup@'
+      bind -T root WheelUpPane   if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; copy-mode -e; send-keys -M"
+      bind -T root WheelDownPane if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; send-keys -M"
+    '';
+  };
+  
+  programs.git = { # TODO: make better config
+    enable = true;
+    lfs.enable = true;
+  };
+
+  programs.htop = {
+    enable = true;
+  };
+
+  programs.fzf = {
+    fuzzyCompletion = true;
+    keybindings = true;
+  };
+
   networking.hostName = "wim";
   networking.networkmanager.enable = true;
   networking.networkmanager.wifi.backend = "iwd";
@@ -69,29 +114,18 @@
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   nixpkgs.config.allowUnfree = true;
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
+  # List packages in root user PATH
   environment.systemPackages = with pkgs; [
     wl-clipboard
-    pulseaudio
     alsa-utils
     wget
     tree
-    mlocate
     rsync
-    tmux
-    git
-    git-lfs
     killall
-    htop
-    fzf
-    jq
-    ripgrep
-    python3
-    neovim
+    ripgrep-all
+    neovim # TODO: use nix
     imagemagick
     usbutils
-    catppuccin-plymouth
     evtest
   ];