Structure(sys,users): Move userpackages to user

5 files changed, 103 insertions, 66 deletions

diff --git a/sys/packages/default.nix b/sys/packages/default.nix
index b63c3a3..ed5c1c5 100644
--- a/sys/packages/default.nix
+++ b/sys/packages/default.nix
@@ -8,86 +8,23 @@
     killall # kill programs by name
     wget # download stuff
     curl # download stuff – reloaded
-    fd # faster find
-    neofetch # a must-have
     zsh # the one and only shell
 
-    # archives
-    unzip
-    zip
-    _7zz
-
     neovim # edit nix files ;)
-    inkscape # vector graphics
 
     restic # backups
-    thunderbird # emails
-    firefox # my browser
-    librewolf # privacy friendly firefox
-    ungoogled-chromium # the only chromium-based browser I'd ever use.
-    element-desktop # chat
-    libreoffice # convert doc to pdf xD
-    pdfarranger # gui for pdf arranging
-
-    keepassxc # passwords
-    bitwarden # cloud passwords
 
     gnome.gnome-keyring # to tired to migrate to kwallet
     gnome.simple-scan # scanning, obiously
-    lsd # ls in good
-    jq # xdg-ninja requieres that
-    glow # markdown rendering
-    xdg-ninja # home cleaning
     git # versioning
-    signal-desktop # the ecosystem is moving :(
-    signal-cli # use signal without phone
-    mumble # voice chat
-
-    #Nix Stuff
-    alejandra # nix code formatter
-    nil # nix language-server
-    statix # nix linter
 
     # SSH Stuff
     openssh # ssh
     mosh # ssh in great
 
-    jdk17 # openjdk17 to satisfy mr.antoine
-    rustc # rust, obiously
-    cargo # cargo, the best compiler ever"
-    lf # a file manager
-
-    gnupg # encryprtion and so on
-    pinentry # needed for gpg
-
-    tor-browser-bundle-bin # tor-browser
-    tdesktop # another messenger (telegram)
     libsForQt5.kdeconnect-kde # communicate with my phone
-    imagemagick # convertion and so on
     #nerdfonts # nice fonts, u know
-    alacritty # terminal
-    konsole # terminal
 
     zsh-you-should-use # reminder for aliasses
-    jetbrains.idea-community # Java-IDE
-    python39 # python programming language
-    sayonara # audioplayer
-    vlc # audio, again
-    nmap # network scanning
-    tree # tree view of directories
-    youtube-dl # download videos
-    mpv # play videos
-    texlive.combined.scheme-full # LaTeX
-    gparted # partitioning :(
-    musescore # notesetting program
-    # Compiler
-    gcc
-    execline
-
-    ltex-ls # lsp language server for languagetool
-    texlab # latex language server
-    html-tidy # html formatter
-
-    bottles # run windows software
   ];
 }
diff --git a/users/sils/default.nix b/users/sils/default.nix
index c5fa572..e4dc5c2 100644
--- a/users/sils/default.nix
+++ b/users/sils/default.nix
@@ -6,6 +6,7 @@
   imports = [
     ./packages
     ./gpg
+    ./git
   ];
 
   home = {
diff --git a/users/sils/git/default.nix b/users/sils/git/default.nix
new file mode 100644
index 0000000..9e411da
--- /dev/null
+++ b/users/sils/git/default.nix
@@ -0,0 +1,26 @@
+{...}: {
+  programs.git = {
+    enable = true;
+    userEmail = "sils@sils.li";
+    userName = "sils";
+    signing = {
+      key = "DF1878E6D9C3B27F";
+      signByDefault = true;
+    };
+    extraConfig = {
+      core = {
+        autocrlf = "input";
+      };
+      safe = {
+        directory = "/etc/nixos";
+      };
+      push = {
+        autoSetupRemote = true;
+      };
+      init = {
+        defaultBranch = "main";
+      };
+      credential.helper = "store";
+    };
+  };
+}
diff --git a/users/sils/gpg/default.nix b/users/sils/gpg/default.nix
index 7c592d0..5c93735 100644
--- a/users/sils/gpg/default.nix
+++ b/users/sils/gpg/default.nix
@@ -5,5 +5,6 @@
   };
   services.gpg-agent = {
     enable = true;
+    pinentryFlavor = "curses";
   };
 }
diff --git a/users/sils/packages/default.nix b/users/sils/packages/default.nix
index 103e978..96d0b51 100644
--- a/users/sils/packages/default.nix
+++ b/users/sils/packages/default.nix
@@ -1,6 +1,78 @@
 {pkgs, ...}: {
-  home.packages = [
-    pkgs.styx
-    pkgs.cmatrix
+  home.packages = with pkgs; [
+    # core tools
+    neofetch # a must-have
+    fd # fast find
+    lsd # ls in good
+    lf # file manager
+    alacritty # terminal
+    glow # markdown rendering
+    restic # backups
+    tree # tree view of directories
+    nmap # network scanning
+
+    # text production/office
+    libreoffice # graphical office suite
+    neovim # text editor
+    pdfarranger # gui for pdf arranging
+
+    # LaTeX
+    texlive.combined.scheme-full # LaTeX
+    texlab # latex language server
+
+    html-tidy # html formatter
+    ltex-ls # lsp language server for languagetool
+
+    musescore # notesetting program
+
+    # communication
+    signal-desktop # the ecosystem is moving :(
+    signal-cli # use signal without phone
+    mumble # voice chat
+    element-desktop # chat
+    tdesktop # telegram messenger
+    thunderbird # emails
+
+    # Browser
+    ungoogled-chromium # just in case
+    firefox # my browser
+    tor-browser-bundle-bin # tor-browser
+
+    # archives
+    unzip
+    zip
+    _7zz
+
+    # image editing
+    inkscape # vector graphics
+    imagemagick # powerful cli-tool
+
+    # multimedia
+    sayonara # audioplayer
+    vlc # audio and video
+    mpv # videos
+    youtube-dl # download videos
+
+    # Compiler
+    gcc
+    execline
+
+    # Programming Languages
+    rustc # rust
+    cargo # compiler for rust
+    jdk # java
+    python39 # python
+
+    # Nix Stuff
+    alejandra # nix code formatter
+    nil # nix language-server
+    statix # nix linter
+
+    keepassxc # password manager
+
+    styx # static site generator in nix
+    cmatrix # hacker tool
+
+    bottles # run windows software
   ];
 }