diff --git a/nixos/.config/nixos/core.nix b/nixos/.config/nixos/core.nix index 4aeec6e..98f2880 100644 --- a/nixos/.config/nixos/core.nix +++ b/nixos/.config/nixos/core.nix @@ -128,14 +128,14 @@ in { dev.enable = true; # Allow whatis, apropos, and man -k to work, but breaks mandb - man.generateCaches = true; + man.cache.enable = true; }; # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ # General programs that I like and use - bluetuith # TUI bluetooth manager + bluetui # TUI bluetooth manager bear # Generate Clang compilation database devour # Opens new program on top of terminal dash # Fast, posix compliant shell @@ -152,7 +152,6 @@ in { killall # Easy way to kill a process man-pages # Documentation man-pages-posix # Documentation - neofetch # Aesthetic sysinfo openconnect # Connect to VPNs p7zip # Open 7z files pass-nodmenu # CLI password store (without dmenu dependency) diff --git a/nixos/.config/nixos/profiles/lf.nix b/nixos/.config/nixos/profiles/lf.nix index a48dd79..e59019e 100644 --- a/nixos/.config/nixos/profiles/lf.nix +++ b/nixos/.config/nixos/profiles/lf.nix @@ -16,11 +16,11 @@ mpv # Audio and video player nsxiv # Image viewer odt2txt # Convert open documents to text - perl540Packages.FileMimeInfo # Provides mimeopen, to ask what program to open files in - poppler_utils # Provides pdftoppm, to turn pdfs into images + perl5Packages.FileMimeInfo # Provides mimeopen, to ask what program to open files in + poppler-utils # Provides pdftoppm, to turn pdfs into images unrar-wrapper # Extract .rar files xclip # Copy file name to clip - xdragon # Drag and drop utility + dragon-drop # Drag and drop utility zathura # PDF viewer ]; } diff --git a/nixos/.config/nixos/profiles/offsec.nix b/nixos/.config/nixos/profiles/offsec.nix index e608569..4c679a5 100644 --- a/nixos/.config/nixos/profiles/offsec.nix +++ b/nixos/.config/nixos/profiles/offsec.nix @@ -2,8 +2,6 @@ { environment.systemPackages = with pkgs; [ - bitbucket-cli # BitBucket Enterprise CLI - bitbucket-server-cli # Interact with BitBucket Server (stash) evil-winrm # WinRM shell, for interacting with Windows machines feroxbuster # Directory enumerator, for Local File Inclusion exploits hashcat # Password hash-cracker. More GPU optimized than John @@ -17,23 +15,5 @@ samba # Talk to SMB services (Microsoft's file sharing protocol) wordlists # Common wordlists, for dictionary attacks and the such ]; - - nixpkgs.overlays = [ - (final: prev: { - # The nix definition just imports Ruby, but running this with - # Ruby >= 3.0 causes a runtime error due to lack of backwards - # compatability for SortedSets. - bitbucket-server-cli = prev.bitbucket-server-cli.override(o: { - ruby = (import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/c407032be28ca2236f45c49cfb2b8b3885294f7f.tar.gz"; - }) { - config.permittedInsecurePackages = [ - "ruby-2.7.8" - "openssl-1.1.1w" - ]; - }).ruby_2_7; - }); - }) - ]; } diff --git a/nixos/.config/nixos/profiles/virtualbox.nix b/nixos/.config/nixos/profiles/virtualbox.nix index 128bef1..fa03583 100644 --- a/nixos/.config/nixos/profiles/virtualbox.nix +++ b/nixos/.config/nixos/profiles/virtualbox.nix @@ -4,8 +4,10 @@ virtualisation.docker.enable = true; virtualisation.docker.storageDriver = "btrfs"; - # Implicitly downloads virtualbox virtualisation.virtualbox.host.enable = true; + virtualisation.virtualbox.host.enableKvm = true; + virtualisation.virtualbox.host.addNetworkInterface = false; + # virtualisation.virtualbox.host.enableExtensionPack = true; users.extraGroups.vboxusers.members = [ "user-with-access-to-virtualbox" ]; } diff --git a/nixos/.config/nixos/profiles/wm/hyprland.nix b/nixos/.config/nixos/profiles/wm/hyprland.nix index a61c6ad..de19545 100644 --- a/nixos/.config/nixos/profiles/wm/hyprland.nix +++ b/nixos/.config/nixos/profiles/wm/hyprland.nix @@ -8,9 +8,9 @@ let src = builtins.fetchTarball "https://github.com/hyprwm/Hyprland/archive/main.tar.gz"; }).defaultNix; in { - # Trusted Hyprland cache, as to not have to rebuild nightly nix.settings = { substituters = ["https://hyprland.cachix.org"]; + trusted-substituters = ["https://hyprland.cachix.org"]; trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; }; @@ -106,7 +106,7 @@ in { slurp # Screen selection utility st # Suckless Simple Terminal swaylock # Wayland session locker - swww # Sets background images + awww # Sets background images texlive.combined.scheme-full # LaTeX to create documents tor-browser # Onion network browser typst # Cool, minimal LaTeX alternative @@ -116,14 +116,14 @@ in { wdisplays # Arnadr substitute wl-clipboard # Copy/paste utility wlr-randr # Xrandr substitute - xorg.xcursorthemes + xcursor-themes zathura # Minimalist PDF reader zen-browser # Better firefox intel-gpu-tools # Tools for intel GPU mesa-demos # Tools for Mesa drivers - xfce.thunar # Graphical file manager - xfce.tumbler # Thumbnailer service + thunar # Graphical file manager + tumbler # Thumbnailer service # libsForQt5.qt5.qtsvg # Allow for svg icons in QT applications kdePackages.qt6ct @@ -138,9 +138,7 @@ in { nixpkgs.overlays = [ (final: prev: { - hyprland-autoname-workspaces = nixos-unstable.hyprland-autoname-workspaces; - typst = nixos-unstable.typst; - swww = nixos-unstable.swww; + typst = nixos-unstable.typst; zen-browser = (import flake-compat { src = builtins.fetchGit { url = "https://github.com/0xc000022070/zen-browser-flake.git"; @@ -148,12 +146,6 @@ in { }).outputs.packages.${pkgs.stdenv.hostPlatform.system}.default; st = prev.callPackage /home/vince/.config/st/default.nix {}; extra-icons = prev.callPackage ../../derivations/extra-icons {}; - # quickshell = (nixos-unstable.callPackage "${builtins.fetchGit { - # url = "https://git.outfoxxed.me/outfoxxed/quickshell.git"; - # ref = "master"; - # }}/" {}).overrideAttrs (oa: { - # buildInputs = (oa.buildInputs or []) ++ [ nixos-unstable.qt6.qt5compat ]; - # }); quickshell = nixos-unstable.quickshell.overrideAttrs(oa: { buildInputs = (oa.buildInputs or []) ++ [ nixos-unstable.qt6.qt5compat ]; });