nixos version bump

nixos/.config/nixos/core.nix

@@ -1,26 +1,27 @@
 { config, pkgs, ... }:
 
 let
-  nixos-unstable = (import <nixos-unstable> {});
+  # # Only allowing unfree for a useUasm yazi fix.  Remove once patched.
+  # nixos-unstable = (import <nixos-unstable> {config.allowUnfree = true;});
+  flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz";
 in {
   # Nix settings
   nix = {
-    package = pkgs.nixFlakes;
     settings.auto-optimise-store = true;
     gc = {
       automatic = true;
       dates = "weekly";
       options = "--delete-older-than 7d";
     };
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
   };
 
   # Files to add to /etc
   environment = {
     binsh = "${pkgs.dash}/bin/dash";
     etc = {
+      "profile.local".text = ''
+          export FOO=bar
+      '';
       "zshenv.local".text = ''
           export ZDOTDIR="$HOME/.config/zsh"
       '';
@@ -52,6 +53,7 @@ in {
     hack-font
     fira-code
     inter
+    fira-code-nerdfont
   ];
 
   networking.networkmanager.enable = true;
@@ -62,6 +64,7 @@ in {
   hardware.bluetooth.powerOnBoot = true;
 
   # Audio daemon
+  hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
@@ -69,6 +72,7 @@ in {
     alsa.support32Bit = true;
     pulse.enable = true;
     jack.enable = true;
+    wireplumber.enable = true;
   };
 
   # Udev service
@@ -143,6 +147,7 @@ in {
     man-pages # Documentation
     man-pages-posix # Documentation
     neofetch # Aesthetic sysinfo
+    openconnect # Connect to VPNs
     pass-nodmenu # CLI password store (without dmenu dependency)
     pinentry-curses # Terminal-based pinentry program
     python311 # Python
@@ -162,7 +167,7 @@ in {
     zsh-syntax-highlighting # Shell syntax highlighting
 
     # Silly programs
-    asciiquarium
+    asciiquarium-transparent # ASCII fish tank animation
     bsdgames # Fun collection of command-line games
     neo-cowsay # The cow says moo
     sl # Choo choo
@@ -218,19 +223,6 @@ in {
     )
   ];
 
-  nixpkgs.overlays = [
-    (self: super: {
-      asciiquarium = super.asciiquarium.overrideAttrs (oa: {
-        src = pkgs.fetchgit {
-          url = "https://github.com/nothub/asciiquarium";
-          rev = "204090ff4c97b2e00cd67f26b1a37ca7accd4f95";
-          hash = "sha256-0Y0bcsa6GfP/A+gZe6o94WNWfQNHVEtMZfMuvWVBu0c=";
-        };
-      });
-      yazi = nixos-unstable.yazi;
-    })
-  ];
-
   nixpkgs.config.packageOverrides = pkgs: {
     nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
       inherit pkgs;

nixos/.config/nixos/custom/quickshell.nix

@@ -1,6 +0,0 @@
-{ lib, stdenv }:
-
-stdenv.mkDerivation {
-
-}
-

nixos/.config/nixos/profiles/emacs.nix

@@ -1,8 +1,10 @@
 { config, lib, pkgs, modulesPath, ... }:
 
-{
+let
+  nixos-unstable = (import <nixos-unstable> {});
+in {
   environment.systemPackages = with pkgs; [
-    emacs29-pgtk # Transparency on Wayland requires Pure GTK
+    nixos-unstable.emacs30-pgtk # Transparency on Wayland requires Pure GTK
 
     # Misc
     ispell # Spellchecker
@@ -13,7 +15,7 @@
     libtool
 
     ## LSPs
-    nodePackages.pyright
+    pyright
   ];
 }
 

nixos/.config/nixos/profiles/fcitx.nix

@@ -1,17 +1,21 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-let
+{
-  nixos-unstable = import <nixos-unstable> {};
+  i18n.inputMethod = {
-in {
+    # Have to install fcitx5 through here so that the binary is patched to be
-  i18n = {
+    # able to see the addons. If also installed through system packages, the
-    inputMethod = {
+    # binary without addonds will take precedence.
-      # Have to install fcitx5 through here so that the binary is patched to be able to see the addons.
+    enable = true;
-      # If also installed through system packages, the binary without addonds will take precedence.
+    type = "fcitx5";
-      enabled = "fcitx5";
+    fcitx5 = {
-      fcitx5.addons = with pkgs; [
+      waylandFrontend = true;
+      plasma6Support = false;
+      addons = with pkgs; [
+        fcitx5-with-addons
         fcitx5-configtool
         fcitx5-rime
         fcitx5-chinese-addons
+        fcitx5-m17n
       ];
     };
   };
@@ -20,11 +24,5 @@ in {
     source-han-sans
     source-han-serif
   ];
-
-  nixpkgs.overlays = [
-    (self: super: {
-      fcitx5-with-addons = nixos-unstable.fcitx5-with-addons;
-    })
-  ];
 }
 

nixos/.config/nixos/profiles/lf.nix

@@ -16,7 +16,7 @@
     mpv # Audio and video player
     nsxiv # Image viewer
     odt2txt # Convert open documents to text
-    perl536Packages.FileMimeInfo # Provides mimeopen, to ask what program to open files in
+    perl540Packages.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

nixos/.config/nixos/profiles/offsec.nix

@@ -2,6 +2,8 @@
 
 {
   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
@@ -15,5 +17,23 @@
     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;
+      });
+    })
+  ];
 }
 

nixos/.config/nixos/profiles/wm/hyprland.nix

@@ -2,15 +2,9 @@
 
 let
   # Current verison causes segfault.
-  hyprpicker_0_1_1 = (import (builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/9957cd48326fe8dbd52fdc50dd2502307f188b0d.tar.gz";
-  }) {}).hyprpicker; # v0.1.1.
   nixos-unstable = (import <nixos-unstable> {});
-
   flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz";
-
   hyprland_nightly = (import flake-compat {
-    # we're not using pkgs.fetchgit as that requires a hash to be provided
     src = builtins.fetchGit {
       url = "https://github.com/hyprwm/Hyprland.git";
       submodules = true;
@@ -30,8 +24,10 @@ in {
     hyprland = { # Dynamic tiling window manager
       enable = true;
       xwayland.enable = true;
-      # package = nixos-unstable.hyprland;
+      package = nixos-unstable.hyprland.override(o: {
-      package = hyprland_nightly.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+        aquamarine = nixos-unstable.aquamarine;
+      });
+      # package = hyprland_nightly.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
     };
   };
 
@@ -58,7 +54,6 @@ in {
   };
 
   environment.systemPackages = with pkgs; [
-    ags # GTK shell for status bar and widgets
     blueman # Bluetooth manager
     dunst # Notification daemon
     firefox # My browser of choice
@@ -69,12 +64,14 @@ in {
     grim # Screenshot tool
     hicolor-icon-theme # Icons
     hyprland-autoname-workspaces # Add icons to workspace titles
+    hyprlock # Screen locking utility
     hyprpaper
     hyprpicker # Colorpicker utility
     kanshi # Autorandr substitute
     libnotify # Send messages to notification daemon
     libreoffice # MSOffice btfo
     networkmanagerapplet # Wifi dropdown menu
+    networkmanager_dmenu # Manage wifi with dmenu
     nsxiv # Image viewer
     nwg-displays
     pinentry-rofi # Rofi frontend for pinentry program
@@ -83,7 +80,6 @@ in {
     rofi-pass # Rofi frontend for password store
     sassc # SCSS interpreter
     slurp # Screen selection utility
-    sassc # Styling language for AGS
     swaylock # Wayland session locker
     swww # Sets background images
     texlive.combined.scheme-full # LaTeX to create documents
@@ -109,14 +105,6 @@ in {
       hyprland-autoname-workspaces = nixos-unstable.hyprland-autoname-workspaces;
       waybar                       = nixos-unstable.waybar;
       typst                        = nixos-unstable.typst;
-      hyprpicker = hyprpicker_0_1_1;
-      grimblast = super.grimblast.override (o: {
-        hyprpicker = hyprpicker_0_1_1;
-      });
-      ags = pkgs.callPackage "${builtins.fetchGit {
-        url = "https://github.com/Aylur/ags.git";
-        ref = "main";
-      }}/nix" {};
     })
   ];
 }