diff --git a/flake.nix b/flake.nix index ddefb40..316c7fc 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,8 @@ 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-unstable"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-23.11"; + nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable"; home-manager = { url = "github:nix-community/home-manager?ref=release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; @@ -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: { - stable = import nixpkgs-stable { + overlay-unstable = final: prev: { + 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 ]; diff --git a/home/hyprland/hypridle.nix b/home/hyprland/hypridle.nix index 8def097..0998d69 100644 --- a/home/hyprland/hypridle.nix +++ b/home/hyprland/hypridle.nix @@ -1,7 +1,7 @@ { config, osConfig, pkgs, ... }: { home.packages = with pkgs; [ - hypridle + unstable.hypridle ]; xdg.configFile = { "hypr/hypridle.conf" = { diff --git a/home/hyprland/hyprland_gunter.nix b/home/hyprland/hyprland_gunter.nix index 50ed671..adb87fd 100644 --- a/home/hyprland/hyprland_gunter.nix +++ b/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"; diff --git a/home/hyprland/hyprland_magicman.nix b/home/hyprland/hyprland_magicman.nix index 5ee73fd..a2f4d1e 100644 --- a/home/hyprland/hyprland_magicman.nix +++ b/home/hyprland/hyprland_magicman.nix @@ -24,7 +24,7 @@ wayland.windowManager.hyprland = { enable = true; - package = pkgs.hyprland; + package = pkgs.unstable.hyprland; settings = { "$mainMod" = "SUPER"; "$shiftMainMod" = "SUPER_SHIFT"; diff --git a/home/hyprland/hyprland_prismo.nix b/home/hyprland/hyprland_prismo.nix index 3406344..35edd59 100644 --- a/home/hyprland/hyprland_prismo.nix +++ b/home/hyprland/hyprland_prismo.nix @@ -20,7 +20,7 @@ wayland.windowManager.hyprland = { enable = true; - package = pkgs.hyprland; + package = pkgs.unstable.hyprland; settings = { "$mainMod" = "SUPER"; "$shiftMainMod" = "SUPER_SHIFT"; diff --git a/home/hyprland/hyprlock.nix b/home/hyprland/hyprlock.nix index f9b52fc..c4a7427 100644 --- a/home/hyprland/hyprlock.nix +++ b/home/hyprland/hyprlock.nix @@ -1,7 +1,7 @@ { config, osConfig, pkgs, ... }: { home.packages = with pkgs; [ - hyprlock + unstable.hyprlock ]; xdg.configFile = { "hypr/hyprlock.conf" = { diff --git a/home/packages/default.nix b/home/packages/default.nix index adfa5a9..24403f2 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -12,19 +12,19 @@ in age alacritty bat - btop + unstable.btop # (unstable.btop.override { # cudaSupport = true; # }) bzip2 croc - dust + unstable.dust easyeffects eza fd ffmpeg file - fzf + unstable.fzf go-task glib jq @@ -39,7 +39,7 @@ in pamixer pinentry pre-commit - (prismlauncher.override { + (unstable.prismlauncher.override { withWaylandGLFW = true; }) pulseaudio @@ -52,19 +52,19 @@ in spotify spicetify-cli sshfs - tldr - devenv - ventoy + unstable.tldr + unstable.devenv + unstable.ventoy discord zoxide # k8s tools - talosctl - k9s - cilium-cli - kubernetes-helm - cmctl - krew + unstable.talosctl + unstable.k9s + unstable.cilium-cli + unstable.kubernetes-helm + unstable.cmctl + unstable.krew # steam # steam-run @@ -73,8 +73,8 @@ in tokei unzip yt-dlp - zoom-us - vmware-horizon-client + unstable.zoom-us + unstable.vmware-horizon-client # Editors # vscode @@ -90,7 +90,7 @@ in typescript # Py stuff - (python312.withPackages (p: with p; [ + (unstable.python312.withPackages (p: with p; [ requests ipython ])) @@ -103,7 +103,7 @@ in rust-analyzer # blender - (blender.override { + (unstable.blender.override { cudaSupport = withCuda; }) diff --git a/home/zsh/default.nix b/home/zsh/default.nix index f48f46e..b183836 100644 --- a/home/zsh/default.nix +++ b/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 = { diff --git a/hosts/gunter/configuration.nix b/hosts/gunter/configuration.nix index 70a12c6..3e686fc 100644 --- a/hosts/gunter/configuration.nix +++ b/hosts/gunter/configuration.nix @@ -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