From dcac17fa063a6dae44c8be6c296fd246809a4585 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 21 Feb 2024 22:10:05 +0100 Subject: [PATCH] Fixup of packages --- modules/default.nix | 2 +- modules/intel/default.nix | 25 ---- modules/neo4j/default.nix | 19 --- modules/packages/default.nix | 229 ++++++++++++++++++++++-------- modules/podman/default.nix | 12 -- modules/podman/podman/default.nix | 12 -- 6 files changed, 168 insertions(+), 131 deletions(-) delete mode 100644 modules/intel/default.nix delete mode 100644 modules/neo4j/default.nix delete mode 100644 modules/podman/default.nix delete mode 100644 modules/podman/podman/default.nix diff --git a/modules/default.nix b/modules/default.nix index 21464c4..f143b39 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,7 +1,7 @@ { inputs, pkgs, config, ... }: { - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; imports = [ ./hyprland ./packages diff --git a/modules/intel/default.nix b/modules/intel/default.nix deleted file mode 100644 index f748851..0000000 --- a/modules/intel/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: { - - environment.systemPackages = with pkgs; [ - vulkan-loader - vulkan-validation-layers - vulkan-tools - libva-utils - ]; - - hardware.opengl = { - enable = true; - extraPackages = with pkgs; [ - intel-media-driver - vaapiIntel - vaapiVdpau - libvdpau-va-gl - intel-compute-runtime - ]; - }; - } diff --git a/modules/neo4j/default.nix b/modules/neo4j/default.nix deleted file mode 100644 index 9d823e5..0000000 --- a/modules/neo4j/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: - -{ - services.neo4j.enable = true; - services.neo4j.bolt.listenAddress = "127.0.0.1:7687"; # Local Addresses for http and bolt - services.neo4j.http.listenAddress = "127.0.0.1:7474"; - services.neo4j.http.enable = true; - services.neo4j.https.enable = false; - services.neo4j.bolt.enable = true; - services.neo4j.bolt.tlsLevel = "DISABLED"; - - # This is so that the service is disabled at startup - systemd.services.neo4j.wantedBy = lib.mkForce []; -} diff --git a/modules/packages/default.nix b/modules/packages/default.nix index b68dc4c..586041b 100644 --- a/modules/packages/default.nix +++ b/modules/packages/default.nix @@ -1,68 +1,173 @@ { inputs, pkgs, lib, config, python3, ... }: with lib; -let +let cfg = config.modules.packages; - pyenv = ps: with ps; [ - impacket - dsinternals - pypykatz - lsassy - pip - ldapdomaindump - requests - ]; + pyenv = ps: + with ps; [ + impacket + dsinternals + pypykatz + lsassy + pip + ldapdomaindump + requests + ]; in { - options.modules.packages = { enable = mkEnableOption "packages"; }; - config = mkIf cfg.enable { - home.packages = with pkgs; [ - # Basic Tools - eza - fzf - ripgrep - ffmpeg - gnupg - imagemagick - libnotify - git - file - bat - wget - neovim - gcc - cmake - unzip - pavucontrol - playerctl - gtklock - brightnessctl - inputs.hypr-contrib.packages.${pkgs.system}.grimblast - openssl - cifs-utils - mlocate - nfs-utils - openvpn - wireguard-tools - p7zip - samba - net-snmp - tcpdump - inetutils - unrar - distrobox - dig - moreutils - jq - perl - binutils - zlib - jdk - # GUI Applications - brave - discord - firefox - nixfmt - ]; - }; - } + options.modules.packages = { enable = mkEnableOption "packages"; }; + config = mkIf cfg.enable { + home.packages = with pkgs; [ + # Basic Tools + fzf + ffmpeg + gnupg + libnotify + git + file + wget + neovim + gcc + cmake + gtklock + inputs.hypr-contrib.packages.${pkgs.system}.grimblast + openssl + cifs-utils + mlocate + nfs-utils + openvpn + wireguard-tools + net-snmp + inetutils + unrar + distrobox + dig + moreutils + perl + binutils + zlib + jdk + # Development + dbeaver + libreoffice + zathura + okular + conda + vscode + joplin-desktop + # Tools / File managenemt + sshpass + gparted + transmission-gtk + xournalpp + pdftk + pandoc + texlive.combined.scheme-full + remmina + pcmanfm + jq + feh + ranger + uget + stow + bat + eza + # Statistics + btop + nvitop + cava + acpi + brightnessctl + neofetch + htop-vim + # Programming languages + ansible + # Database connection tools + mysql + sqlite + postgresql + # Audio video image + playerctl + easyeffects + krita + spotify + shotwell + fdupes # find image duplicates based on their contents + mpv + imagemagick + vlc + blueberry # Bluetooth client (GUI) + # Voice chat + discord + zoom-us + slack + teams-for-linux + # Shell extras + starship + lsd + # Learning + anki-bin + # Games + superTuxKart + # Security + steghide + exiftool + fcrackzip + ghidra-bin + tshark + tcpdump + gdb + gef + nmap + # Format tools + black + nixfmt + # Maths + R + # Wayland shit + wdisplays + wl-mirror + # Rofi plugins + rofi-bluetooth + # Audo control + pulsemixer + pavucontrol + nextcloud-client + # Mailing + thunderbird-bin + # Flameshot + xdg-desktop-portal + xdg-desktop-portal-wlr + grim + flameshot + # Networking statistics + nload + # Disk usage + ncdu + # Compression + zip + unzip + pigz + p7zip + ddrescue + ripgrep + # Browsers + brave + firefox + google-chrome + # colored output in terminal + grc + # Fonts + fira-code + fira + cooper-hewitt + ibm-plex + jetbrains-mono + iosevka + spleen + fira-code-symbols + powerline-fonts + nerdfonts + ]; + }; +} diff --git a/modules/podman/default.nix b/modules/podman/default.nix deleted file mode 100644 index 2d23206..0000000 --- a/modules/podman/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -{ - virtualisation = { - podman = { - enable = true; - - dockerCompat = true; - - defaultNetwork.settings.dns_enabled = true; - }; - }; - } diff --git a/modules/podman/podman/default.nix b/modules/podman/podman/default.nix deleted file mode 100644 index 2d23206..0000000 --- a/modules/podman/podman/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -{ - virtualisation = { - podman = { - enable = true; - - dockerCompat = true; - - defaultNetwork.settings.dns_enabled = true; - }; - }; - }