Fix flakestat after unstable switch

flake.lock

@@ -26,16 +26,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1716729592,
+        "lastModified": 1716736760,
-        "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=",
+        "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6",
+        "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -57,6 +56,22 @@
       }
     },
     "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1716633019,
+        "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_2": {
       "locked": {
         "lastModified": 1716655032,
         "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=",
@@ -72,7 +87,7 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1716509168,
         "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
@@ -88,22 +103,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1716633019,
-        "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_3": {
       "locked": {
         "lastModified": 1713248628,
@@ -160,7 +159,7 @@
         "ghettoptt": "ghettoptt",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixpkgs-stable": "nixpkgs-stable",
         "notlistener": "notlistener",
         "sops-nix": "sops-nix"
       }
@@ -168,7 +167,7 @@
     "sops-nix": {
       "inputs": {
         "nixpkgs": "nixpkgs_4",
-        "nixpkgs-stable": "nixpkgs-stable"
+        "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
         "lastModified": 1716692524,

flake.nix

@@ -3,10 +3,10 @@
 
   inputs = {
     # nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-23.11";
+    nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-23.11";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     home-manager = {
-      url = "github:nix-community/home-manager?ref=release-23.11";
+      url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     sops-nix.url = "github:Mic92/sops-nix";
@@ -17,7 +17,7 @@
   outputs =
     { self
     , nixpkgs
-    , nixpkgs-unstable
+    , nixpkgs-stable
     , sops-nix
     , notlistener
     , ghettoptt
@@ -26,8 +26,8 @@
     let
       system = "x86_64-linux";
       user = "torjus";
-      overlay-unstable = final: prev: {
+      overlay-stable = final: prev: {
-        unstable = import nixpkgs-unstable {
+        stable = import nixpkgs-stable {
           inherit system;
           config.allowUnfree = true;
         };
@@ -46,7 +46,7 @@
           modules = [
             ({ config, pkgs, ... }: {
               nixpkgs.overlays = [
-                overlay-unstable
+                overlay-stable
                 ghettoptt.overlays.default
               ];
             })
@@ -60,7 +60,7 @@
           modules = [
             ({ config, pkgs, ... }: {
               nixpkgs.overlays = [
-                overlay-unstable
+                overlay-stable
                 notlistener.overlays.default
                 ghettoptt.overlays.default
               ];

home/hyprland/hypridle.nix

@@ -1,7 +1,7 @@
 { config, osConfig, pkgs, ... }: {
 
   home.packages = with pkgs; [
-    unstable.hypridle
+    hypridle
   ];
   xdg.configFile = {
     "hypr/hypridle.conf" = {

home/hyprland/hyprland_gunter.nix

@@ -24,7 +24,7 @@
 
     wayland.windowManager.hyprland = {
       enable = true;
-      package = pkgs.unstable.hyprland;
+      package = pkgs.hyprland;
       settings = {
         "$mainMod" = "SUPER";
         "$shiftMainMod" = "SUPER_SHIFT";

home/hyprland/hyprlock.nix

@@ -1,7 +1,7 @@
 { config, osConfig, pkgs, ... }: {
 
   home.packages = with pkgs; [
-    unstable.hyprlock
+    hyprlock
   ];
   xdg.configFile = {
     "hypr/hyprlock.conf" = {

home/hyprland/waybar/flakestat.sh

@@ -5,22 +5,16 @@ NIXPKGS_DIR="/home/torjus/git/nixpkgs"
 
 flake_metadata=$(nix flake metadata --json "$FLAKE_DIR" 2>/dev/null)
 
-stable_input=$(echo "$flake_metadata" | jq '.locks.nodes.root.inputs.nixpkgs')
+unstable_input=$(echo "$flake_metadata" | jq '.locks.nodes.root.inputs.nixpkgs')
-stable_rev=$(echo "$flake_metadata" | jq -r ".locks.nodes.$stable_input.locked.rev")
-stable_branch=$(echo "$flake_metadata" | jq -r ".locks.nodes.$stable_input.original.ref")
-
-unstable_input=$(echo "$flake_metadata" | jq '.locks.nodes.root.inputs."nixpkgs-unstable"')
 unstable_rev=$(echo "$flake_metadata" | jq -r ".locks.nodes.$unstable_input.locked.rev")
 unstable_branch=$(echo "$flake_metadata" | jq -r ".locks.nodes.$unstable_input.original.ref")
 
 cd "$NIXPKGS_DIR" || exit 1
 git fetch -q --all
-stable_commit_count=$(git rev-list --count "$stable_rev..origin/$stable_branch")
 unstable_commit_count=$(git rev-list --count "$unstable_rev..origin/$unstable_branch")
 
-text="$stable_commit_count|$unstable_commit_count"
+text="$unstable_commit_count"
-tooltip="${stable_branch}: ${stable_commit_count}
+tooltip="${unstable_branch}: ${unstable_commit_count}"
-${unstable_branch}: ${unstable_commit_count}"
 
 output=$(jq -n \
     --arg text "$text" \

home/packages/default.nix

@@ -12,22 +12,24 @@ in
     age
     alacritty
     bat
-    unstable.btop
+    # btop
-    # (unstable.btop.override {
+    (btop.override {
-    #   cudaSupport = true;
+      cudaSupport = withCuda;
-    # })
+    })
     bzip2
     croc
-    unstable.dust
+    distrobox
+    dust
     easyeffects
     eza
     fd
     ffmpeg
     file
-    unstable.fzf
+    fzf
     go-task
     glib
     jq
+    ijq
     kitty
     kubectl
     krita
@@ -39,7 +41,7 @@ in
     pamixer
     pinentry
     pre-commit
-    (unstable.prismlauncher.override {
+    (prismlauncher.override {
       withWaylandGLFW = true;
     })
     pulseaudio
@@ -52,19 +54,19 @@ in
     spotify
     spicetify-cli
     sshfs
-    unstable.tldr
+    tldr
-    unstable.devenv
+    devenv
-    unstable.ventoy
+    ventoy
     discord
     zoxide
 
     # k8s tools
-    unstable.talosctl
+    talosctl
-    unstable.k9s
+    k9s
-    unstable.cilium-cli
+    cilium-cli
-    unstable.kubernetes-helm
+    kubernetes-helm
-    unstable.cmctl
+    cmctl
-    unstable.krew
+    krew
 
     # steam
     # steam-run
@@ -73,8 +75,8 @@ in
     tokei
     unzip
     yt-dlp
-    unstable.zoom-us
+    zoom-us
-    unstable.vmware-horizon-client
+    vmware-horizon-client
 
     # Editors
     # vscode
@@ -90,7 +92,7 @@ in
     typescript
 
     # Py stuff
-    (unstable.python312.withPackages (p: with p; [
+    (python312.withPackages (p: with p; [
       requests
       ipython
     ]))
@@ -103,7 +105,7 @@ in
     rust-analyzer
 
     # blender
-    (unstable.blender.override {
+    (blender.override {
       cudaSupport = withCuda;
     })
 

home/programs/obs-studio/default.nix

@@ -1,25 +1,31 @@
-{ pkgs, ... }:
+{ pkgs, lib, osConfig, ... }:
-# let
+let
-#   obs-backgroundremoval_1_1_10 = (pkgs.obs-studio-plugins.obs-backgroundremoval.overrideAttrs {
+  withCuda = if (osConfig.system.name == "gunter") then true else false;
-#     version = "1.1.10";
+  onnxruntime-gpu = (pkgs.onnxruntime.override {
-#     src = pkgs.fetchFromGitHub {
+    cudaSupport = withCuda;
-#       owner = "occ-ai";
+  });
-#       repo = "obs-backgroundremoval";
+  obs-backgrounremoval-gpu = ((pkgs.obs-studio-plugins.obs-backgroundremoval.override {
-#       rev = "1.1.10";
+    onnxruntime = onnxruntime-gpu;
-#       hash = "sha256-6OTtmjXS3fiorEPUSjjqrS8u9fVJnnZZoD722W3JQO8=";
+  }).overrideAttrs (old: {
-#     };
+    version = "1.1.14-beta";
-#   }).override {
+    src = pkgs.fetchFromGitHub {
-#     onnxruntime = pkgs.unstable.onnxruntime;
+      owner = "occ-ai";
-#   };
+      repo = "obs-backgroundremoval";
-# in
+      rev = "94be8c35fe077be93a6f5ef347a802295a36dddd";
+      hash = "sha256-qnxDNeTWQYiRMqT6jNp8GC8ef6aaAAY+OXAak54dVc8=";
+    };
+    cmakeFlags =
+      if withCuda then
+        (lib.lists.remove "-DDISABLE_ONNXRUNTIME_GPU=ON" old.cmakeFlags)
+      else old.cmakeFlags;
+  }));
+in
 {
   programs.obs-studio = {
     enable = true;
     plugins = with pkgs.obs-studio-plugins; [
-      obs-backgroundremoval
       obs-pipewire-audio-capture
       obs-shaderfilter
-    ];
+    ] ++ [ obs-backgrounremoval-gpu ];
-    #plugins = [ obs-backgroundremoval_1_1_10 ];
   };
 }

home/zsh/default.nix

@@ -3,10 +3,10 @@
   programs.direnv = {
     enable = true;
     enableZshIntegration = true;
-    package = pkgs.unstable.direnv;
+    package = pkgs.direnv;
     nix-direnv = {
       enable = true;
-      package = pkgs.unstable.nix-direnv;
+      package = pkgs.nix-direnv;
     };
   };
   programs.zsh = {

hosts/gunter/configuration.nix

@@ -15,7 +15,7 @@
   # Bootloader stuff
   boot = {
     # Kernel stuff
-    kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = pkgs.linuxPackages_xanmod_latest;
     kernelParams = [
       "quiet"
       "splash"
@@ -66,15 +66,15 @@
     open = false;
     nvidiaSettings = true;
 
-    # package = config.boot.kernelPackages.nvidiaPackages.stable;
+    package = config.boot.kernelPackages.nvidiaPackages.beta;
-    package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+    # package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
-      version = "555.42.02";
+    #   version = "555.42.02";
-      sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk=";
+    #   sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk=";
-      sha256_aarch64 = lib.fakeSha256;
+    #   sha256_aarch64 = lib.fakeSha256;
-      openSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
+    #   openSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
-      settingsSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
+    #   settingsSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
-      persistencedSha256 = lib.fakeSha256;
+    #   persistencedSha256 = lib.fakeSha256;
-    };
+    # };
   };
 
   # Setup hyprland
@@ -94,7 +94,7 @@
   programs.hyprland = {
     enable = true;
     xwayland.enable = true;
-    portalPackage = pkgs.unstable.xdg-desktop-portal-hyprland;
+    portalPackage = pkgs.xdg-desktop-portal-hyprland;
   };
 
   # Setup common XDG env vars

system/security.nix

@@ -5,6 +5,9 @@
     wheelNeedsPassword = false;
   };
 
+  # Enable polkit
+  security.polkit.enable = true;
+
   # Enable rtkit
   security.rtkit.enable = true;
 }