moving things into sensible places

5 files changed, 21 insertions, 18 deletions

diff --git a/nixos/apps.nix b/nixos/apps.nix
index f9585b5..13d9135 100644
--- a/nixos/apps.nix
+++ b/nixos/apps.nix
@@ -7,15 +7,11 @@
     localsend
     bitwarden
     obsidian
-    jetbrains.pycharm-professional
-    jetbrains.clion
-    wineWowPackages.stable
-    sqlite
+    # jetbrains.pycharm-professional
+    # jetbrains.clion
     libreoffice-qt6-fresh
     kdePackages.dolphin
-    yazi
-    android-tools
-    scrcpy
+    wineWowPackages.stable
   ];
 
   xdg = {
diff --git a/nixos/desktop-environment.nix b/nixos/desktop-environment.nix
index 5bbd4dd..217e94c 100644
--- a/nixos/desktop-environment.nix
+++ b/nixos/desktop-environment.nix
@@ -20,5 +20,7 @@ in {
     grim
     slurp
     hyprsunset
+    playerctl
+    libnotify
   ];
 }
diff --git a/nixos/environment.nix b/nixos/environment.nix
index 6d59998..a90c5ba 100644
--- a/nixos/environment.nix
+++ b/nixos/environment.nix
@@ -2,24 +2,27 @@
 {
   environment.systemPackages = with pkgs; [
     fastfetch
+    pipes
     vim
+    dust
+    btop
+    yazi
+    scrcpy
+
     wget
     git
+    git-lfs
     nmap
-    dust
-    home-manager
+    inetutils
+    android-tools
+    sqlite
+
     zoxide
     starship
-    git-lfs
-    inetutils
-    btop
-    pipes
-    playerctl
-    libnotify
-    termusic
     eza
-    lazygit
     fzf
+    termusic
+    lazygit
   ];
   fonts.packages = with pkgs; [
     nerd-fonts.jetbrains-mono
diff --git a/nixos/home.nix b/nixos/home.nix
index c0af1b6..0a5fdd4 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -19,4 +19,7 @@
     dates = "weekly";
     options = "--delete-older-than 10d";
   };
+  environment.systemPackages = with pkgs; [
+    home-manager
+  ];
 }
diff --git a/nixos/tmux.nix b/nixos/tmux.nix
index f9ed249..fa59ec4 100644
--- a/nixos/tmux.nix
+++ b/nixos/tmux.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-# let unstable = import <nixos-unstable> { config.allowUnfree = true; };
 {
   programs.tmux.enable = true;
   programs.tmux.plugins = with pkgs.tmuxPlugins; [