Merge branch 'master' of ssh://bosco:2200/srv/git/.flake

10 files changed, 49 insertions, 64 deletions

diff --git a/flake.lock b/flake.lock
index 371b9e3..ddbecfe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -262,16 +262,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1747688870,
-        "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
+        "lastModified": 1749154018,
+        "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d5f1f641b289553927b3801580598d200a501863",
+        "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -279,7 +279,7 @@
     "hugo-congo": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-eLN3oHOtJRbHYaLr6CUhhRHFnSPTdAppv5AfSne8GUU=",
+        "narHash": "sha256-O7DVGCvc1hChpueQayFj4okv7xbqo36h24y36WJz1X4=",
         "type": "file",
         "url": "https://github.com/jpanther/congo"
       },
@@ -333,11 +333,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749145600,
-        "narHash": "sha256-v2kY5RDk9oyo1x9m8u83GdklC96xlJ7ka1rrvZoYL78=",
+        "lastModified": 1749238452,
+        "narHash": "sha256-8qiKEWcxUrjpUpK+WyFNg/72C8rp70LUuyTD23T+SdQ=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "80b754e38e836777ad3a9d5d1ffc3491b0332471",
+        "rev": "c7225d73755a6c4c7c72f4d4f3925ea426e325a8",
         "type": "github"
       },
       "original": {
@@ -364,11 +364,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1749237813,
-        "narHash": "sha256-TDJHaf01IpP3dN+CC/GGuKRLPLFS9w4v9BufplyJkSY=",
+        "lastModified": 1750373382,
+        "narHash": "sha256-HsBt7sl2ODSHv1LxKxA47j7klCqY4k3fE4SQGnEO0Ac=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "2794f485cb5d52b3ff572953ddcfaf7fd3c25182",
+        "rev": "8ebff1948ff665ff6a1b49fb715b7de0797fae04",
         "type": "github"
       },
       "original": {
@@ -511,11 +511,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749135356,
-        "narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=",
+        "lastModified": 1749819919,
+        "narHash": "sha256-7F/KG8dwSH9JXdlpOVrEEArS+PJSn0iEnx5eVCk89/I=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb",
+        "rev": "57ab2a867d8b554ad89f29060c15efd11631db91",
         "type": "github"
       },
       "original": {
@@ -593,11 +593,11 @@
         "spectrum": "spectrum"
       },
       "locked": {
-        "lastModified": 1748464257,
-        "narHash": "sha256-PdnQSE2vPfql9WEjunj2qQnDpuuvk7HH+4djgXJSwFs=",
+        "lastModified": 1750358184,
+        "narHash": "sha256-17EYMeY5v8KRk9HW6Z4dExY8Wg4y/zM2eM2wbbx+vMs=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "e238645b6f0447a2eb1d538d300d5049d4006f9f",
+        "rev": "fd9f5dba1ffee5ad6f29394b2a9e4c66c1ce77dc",
         "type": "github"
       },
       "original": {
@@ -663,16 +663,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748995628,
-        "narHash": "sha256-bFufQGSAEYQgjtc4wMrobS5HWN0hDP+ZX+zthYcml9U=",
+        "lastModified": 1750259320,
+        "narHash": "sha256-H8J4H2XCIMEJ5g6fZ179QfQvsc2dUqhqfBjC8RAHNRY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b",
+        "rev": "9ba04bda9249d5d5e5238303c9755de5a49a79c5",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -694,11 +694,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1749143949,
-        "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
+        "lastModified": 1750365781,
+        "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
+        "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
         "type": "github"
       },
       "original": {
@@ -734,11 +734,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747372754,
-        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
+        "lastModified": 1749636823,
+        "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
+        "rev": "623c56286de5a3193aa38891a6991b28f9bab056",
         "type": "github"
       },
       "original": {
@@ -874,11 +874,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749155346,
-        "narHash": "sha256-KIkJu3zF8MF3DuGwzAmo3Ww9wsWXolwV30SjJRTAxYE=",
+        "lastModified": 1749490041,
+        "narHash": "sha256-R9Dn9IyUdPaJHD2Oqd7XJnnxpka6M6UYw4Ld0iA46HM=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "44bf29f1df45786098920c655af523535a9191ae",
+        "rev": "3cf35e178bc192ee51e3fddfd69e531e2c106a30",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 37c8b79..aab7306 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,11 +2,11 @@
   description = "NixOS configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.11"; 
+      url = "github:nix-community/home-manager/release-25.05"; 
       # The `follows` keyword in inputs is used for inheritance.
       # Here, `inputs.nixpkgs` of home-manager isn't kept consistent with the `inputs.nixpkgs` of the current flake,
       # to not avoid problems caused by different versions of nixpkgs dependencies.
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 3dfcaf9..864f877 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -12,12 +12,6 @@
     ../modules/home-manager/bat.nix
   ];
 
-  nixpkgs = {
-    # texlive.combined.scheme-medium;
-    # system = "x84_64-linux";
-    config.allowUnfree = true;
-  };
-
   # home-manager.users.defin= {
     home = {
       # Home Manager needs a bit of information about you and the paths it should
diff --git a/home-manager/doretta.nix b/home-manager/doretta.nix
index 3096662..3a144be 100644
--- a/home-manager/doretta.nix
+++ b/home-manager/doretta.nix
@@ -13,12 +13,6 @@
     ../modules/home-manager/virt-manager.nix
   ];
 
-  nixpkgs = {
-    # texlive.combined.scheme-medium;
-    # system = "x84_64-linux";
-    config.allowUnfree = true;
-  };
-
   # home-manager.users.defin= {
     home = {
       # Home Manager needs a bit of information about you and the paths it should
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 967de7c..a569419 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -16,11 +16,6 @@
     ../modules/home-manager/hypridle.nix
   ];
 
-  nixpkgs = {
-    # texlive.combined.scheme-medium;
-    # system = "x84_64-linux";
-    config.allowUnfree = true;
-  };
 
       # xdg.mimeApps = {
       #   enable = true;
@@ -68,15 +63,16 @@
         })
         # qutebrowser
         neofetch
-        yakuake
-        pass
+        kdePackages.yakuake
+        (pass.withExtensions (ext: with ext; [ pass-audit pass-otp pass-update]))
         passExtensions.pass-audit
         passExtensions.pass-otp
         passExtensions.pass-update
+        # pass
         btop
         cava
         helvum
-        filelight
+        kdePackages.filelight
         easyeffects
         mpv
         lutris
diff --git a/machines/betsy/default.nix b/machines/betsy/default.nix
index 19d3b35..4791186 100644
--- a/machines/betsy/default.nix
+++ b/machines/betsy/default.nix
@@ -93,7 +93,7 @@
   services.printing.enable = true;
 
   # Enable sound.
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   # OR
   services.pipewire = {
   # enable = true;
diff --git a/machines/khad/default.nix b/machines/khad/default.nix
index cd6f22f..0f3e32f 100644
--- a/machines/khad/default.nix
+++ b/machines/khad/default.nix
@@ -124,6 +124,11 @@
   #   # docker
     android-tools
     adbfs-rootless
+    xorg.xrandr
+    glxinfo
+    gpu-viewer
+    hardinfo2
+    starsector
   ];
   virtualisation.docker = {
     enable = true;
diff --git a/machines/picast/default.nix b/machines/picast/default.nix
index ff10ad5..4d24de8 100644
--- a/machines/picast/default.nix
+++ b/machines/picast/default.nix
@@ -28,11 +28,7 @@
   # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
 
   # Set your time zone.
-<<<<<<< HEAD
-  time.timeZone = "US/Mountain";
-=======
   time.timeZone = "America/Denver";
->>>>>>> 7d7f5905769c488d2129b2ec0ade6451f0765d84
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix
index 3c95763..4a446c1 100644
--- a/modules/nixos/hyprland.nix
+++ b/modules/nixos/hyprland.nix
@@ -3,7 +3,7 @@
     enable = true;
     wlr.enable = true;
     extraPortals = [
-      pkgs.xdg-desktop-portal-kde
+      pkgs.kdePackages.xdg-desktop-portal-kde
       pkgs.xdg-desktop-portal-gnome
       (pkgs.xdg-desktop-portal-gtk.override {
         # Do not build portals that we already have.
@@ -75,7 +75,7 @@
     hyprpicker # color picker
 
     wf-recorder # screen recording
-    xwaylandvideobridge # lets xwayland programs see wayland applications for screensharing
+    kdePackages.xwaylandvideobridge # lets xwayland programs see wayland applications for screensharing
     grim # taking screenshots
     slurp # selecting a region to screenshot
     # TODO replace by 'flameshot gui --raw | wl-copy'
@@ -93,7 +93,7 @@
     networkmanagerapplet # provide GUI app: nm-connection-editor
 
     xfce.thunar # sfce4's file manager
-    polkit-kde-agent
+    kdePackages.polkit-kde-agent-1
   ];
   fonts.packages = with pkgs; [
     font-awesome # fixes waybar fonts
diff --git a/resources/nushell/config.nu b/resources/nushell/config.nu
index 34b883a..132db0e 100644
--- a/resources/nushell/config.nu
+++ b/resources/nushell/config.nu
@@ -224,10 +224,10 @@ $env.config = {
         use_ls_colors: true # set this to true to enable file/path/directory completions using LS_COLORS
     }
 
-    filesize: {
-        metric: false # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard)
-        format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, auto
-    }
+    # filesize: {
+    #     metric: false # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard)
+    #     format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, auto
+    # }
 
     cursor_shape: {
         emacs: line # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (line is the default)