flake.lock

@@ -26,15 +26,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1716736760,
+        "lastModified": 1716729592,
-        "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=",
+        "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239",
+        "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -56,22 +57,6 @@
       }
     },
     "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=",
@@ -87,7 +72,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1716509168,
         "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
@@ -103,6 +88,22 @@
         "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,
@@ -159,7 +160,7 @@
         "ghettoptt": "ghettoptt",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "notlistener": "notlistener",
         "sops-nix": "sops-nix"
       }
@@ -167,7 +168,7 @@
     "sops-nix": {
       "inputs": {
         "nixpkgs": "nixpkgs_4",
-        "nixpkgs-stable": "nixpkgs-stable_2"
+        "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
         "lastModified": 1716692524,

flake.nix

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

home/hyprland/hypridle.nix

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

home/hyprland/hyprland_gunter.nix

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

home/hyprland/hyprlock.nix

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

home/hyprland/waybar/flakestat.sh

@@ -5,16 +5,22 @@ NIXPKGS_DIR="/home/torjus/git/nixpkgs"
 
 flake_metadata=$(nix flake metadata --json "$FLAKE_DIR" 2>/dev/null)
 
-unstable_input=$(echo "$flake_metadata" | jq '.locks.nodes.root.inputs.nixpkgs')
+stable_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="$unstable_commit_count"
+text="$stable_commit_count|$unstable_commit_count"
-tooltip="${unstable_branch}: ${unstable_commit_count}"
+tooltip="${stable_branch}: ${stable_commit_count}
+${unstable_branch}: ${unstable_commit_count}"
 
 output=$(jq -n \
     --arg text "$text" \

home/packages/default.nix

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

home/programs/obs-studio/default.nix

@@ -1,31 +1,25 @@
-{ pkgs, lib, osConfig, ... }:
+{ pkgs, ... }:
-let
+# let
-  withCuda = if (osConfig.system.name == "gunter") then true else false;
+#   obs-backgroundremoval_1_1_10 = (pkgs.obs-studio-plugins.obs-backgroundremoval.overrideAttrs {
-  onnxruntime-gpu = (pkgs.onnxruntime.override {
+#     version = "1.1.10";
-    cudaSupport = withCuda;
+#     src = pkgs.fetchFromGitHub {
-  });
+#       owner = "occ-ai";
-  obs-backgrounremoval-gpu = ((pkgs.obs-studio-plugins.obs-backgroundremoval.override {
+#       repo = "obs-backgroundremoval";
-    onnxruntime = onnxruntime-gpu;
+#       rev = "1.1.10";
-  }).overrideAttrs (old: {
+#       hash = "sha256-6OTtmjXS3fiorEPUSjjqrS8u9fVJnnZZoD722W3JQO8=";
-    version = "1.1.14-beta";
+#     };
-    src = pkgs.fetchFromGitHub {
+#   }).override {
-      owner = "occ-ai";
+#     onnxruntime = pkgs.unstable.onnxruntime;
-      repo = "obs-backgroundremoval";
+#   };
-      rev = "94be8c35fe077be93a6f5ef347a802295a36dddd";
+# in
-      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.direnv;
+    package = pkgs.unstable.direnv;
     nix-direnv = {
       enable = true;
-      package = pkgs.nix-direnv;
+      package = pkgs.unstable.nix-direnv;
     };
   };
   programs.zsh = {

hosts/gunter/configuration.nix

@@ -15,7 +15,7 @@
   # Bootloader stuff
   boot = {
     # Kernel stuff
-    kernelPackages = pkgs.linuxPackages_xanmod_latest;
+    kernelPackages = pkgs.linuxPackages_latest;
     kernelParams = [
       "quiet"
       "splash"
@@ -66,15 +66,15 @@
     open = false;
     nvidiaSettings = true;
 
-    package = config.boot.kernelPackages.nvidiaPackages.beta;
+    # package = config.boot.kernelPackages.nvidiaPackages.stable;
-    # 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.xdg-desktop-portal-hyprland;
+    portalPackage = pkgs.unstable.xdg-desktop-portal-hyprland;
   };
 
   # Setup common XDG env vars

system/security.nix

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