From 4264f92c19766b2d5094d54f624460f2cdad8151 Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Thu, 2 Apr 2026 15:34:12 -0400 Subject: [PATCH] switch from stable as default to unstable as default --- flake.lock | 15 ++- flake.nix | 4 +- home/crow/common/core/direnv.nix | 9 +- home/crow/common/core/git.nix | 2 +- home/crow/common/core/xdg.nix | 5 +- home/crow/common/optional/deferred-apps.nix | 22 ++-- .../common/optional/desktops/awww/default.nix | 6 + .../common/optional/desktops/dank/default.nix | 3 +- .../common/optional/desktops/swww/default.nix | 6 - .../common/optional/desktops/xorg/default.nix | 8 -- .../optional/desktops/xorg/herbstluftwm.nix | 107 ------------------ .../common/optional/desktops/xorg/rofi.nix | 17 --- home/crow/common/optional/gaming/default.nix | 2 +- home/handler/common/core/direnv.nix | 9 +- home/handler/common/core/git.nix | 2 +- hosts/common/optional/gaming.nix | 8 +- hosts/common/optional/pentesting.nix | 2 +- .../common/optional/services/monero/miner.nix | 4 +- .../common/optional/services/monero/node.nix | 4 +- hosts/common/users/primary/default.nix | 2 +- modules/home/monitors.nix | 2 +- modules/services/auth-provider/default.nix | 9 +- modules/services/matrix/default.nix | 8 +- modules/services/mealie/default.nix | 2 +- modules/services/mesh/client.nix | 4 +- 25 files changed, 61 insertions(+), 201 deletions(-) create mode 100644 home/crow/common/optional/desktops/awww/default.nix delete mode 100644 home/crow/common/optional/desktops/swww/default.nix delete mode 100644 home/crow/common/optional/desktops/xorg/default.nix delete mode 100644 home/crow/common/optional/desktops/xorg/herbstluftwm.nix delete mode 100644 home/crow/common/optional/desktops/xorg/rofi.nix diff --git a/flake.lock b/flake.lock index 1abc305..e55b079 100644 --- a/flake.lock +++ b/flake.lock @@ -193,16 +193,15 @@ ] }, "locked": { - "lastModified": 1772985280, - "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=", + "lastModified": 1775143651, + "narHash": "sha256-S0RqAyDPMTcv9vASMaE8eY1QexFysAOdnxUxFHIPOyE=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f736f007139d7f70752657dff6a401a585d6cbc", + "rev": "d166a078541982a76f14d3e06e9665fa5c9ed85e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -484,16 +483,16 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1774388614, - "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=", + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 73f8c32..c17a82b 100644 --- a/flake.nix +++ b/flake.nix @@ -90,7 +90,7 @@ inputs = { # Official inputs - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -103,7 +103,7 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; impermanence.url = "github:nix-community/impermanence"; diff --git a/home/crow/common/core/direnv.nix b/home/crow/common/core/direnv.nix index bd6efe5..bfb78db 100644 --- a/home/crow/common/core/direnv.nix +++ b/home/crow/common/core/direnv.nix @@ -1,12 +1,15 @@ -{ pkgs, ... }: +{ config, pkgs, ... }: { home.packages = builtins.attrValues { - inherit (pkgs.unstable) + inherit (pkgs) devenv ; }; programs = { - zsh.enable = true; + zsh = { + enable = true; + dotDir = "${config.xdg.configHome}/zsh"; + }; direnv = { enable = true; nix-direnv.enable = true; diff --git a/home/crow/common/core/git.nix b/home/crow/common/core/git.nix index dfe2bab..19ede17 100644 --- a/home/crow/common/core/git.nix +++ b/home/crow/common/core/git.nix @@ -20,7 +20,7 @@ programs.jujutsu = { enable = true; - package = pkgs.unstable.jujutsu; + package = pkgs.jujutsu; settings = { user = { email = "contact@wanderingcrow.net"; diff --git a/home/crow/common/core/xdg.nix b/home/crow/common/core/xdg.nix index ca15cdb..0e4575f 100644 --- a/home/crow/common/core/xdg.nix +++ b/home/crow/common/core/xdg.nix @@ -12,6 +12,7 @@ enable = true; userDirs = { enable = true; + setSessionVariables = false; createDirectories = true; desktop = "${config.home.homeDirectory}/.desktop"; documents = "${config.home.homeDirectory}/Documents"; @@ -20,8 +21,8 @@ pictures = "${config.home.homeDirectory}/media/images"; videos = "${config.home.homeDirectory}/media/video"; extraConfig = { - XDG_PUBLICSHARE_DIR = "/var/empty"; - XDG_TEMPLATES_DIR = "/var/empty"; + PUBLICSHARE = "/var/empty"; + TEMPLATES = "/var/empty"; }; }; }; diff --git a/home/crow/common/optional/deferred-apps.nix b/home/crow/common/optional/deferred-apps.nix index 765e3bb..34a0d6a 100644 --- a/home/crow/common/optional/deferred-apps.nix +++ b/home/crow/common/optional/deferred-apps.nix @@ -13,24 +13,12 @@ programs.deferredApps = { enable = true; packages = builtins.attrValues { - inherit (pkgs.unstable) - # CAD - orca-slicer - super-slicer - meshlab - openscad-unstable - freecad - blender - dune3d - # Local AI - lmstudio - ; inherit (pkgs) # Utilities appimage-run steam-run bitwarden-cli - protonvpn-gui + proton-vpn imagemagick httpie distrobox @@ -38,6 +26,14 @@ # Art gimp krita + # CAD + orca-slicer + super-slicer + meshlab + openscad-unstable + blender + # Local AI + lmstudio ; }; apps = [ diff --git a/home/crow/common/optional/desktops/awww/default.nix b/home/crow/common/optional/desktops/awww/default.nix new file mode 100644 index 0000000..3cbbdce --- /dev/null +++ b/home/crow/common/optional/desktops/awww/default.nix @@ -0,0 +1,6 @@ +{pkgs, ...}: { + services.swww= { + enable = true; + package = pkgs.awww; + }; +} diff --git a/home/crow/common/optional/desktops/dank/default.nix b/home/crow/common/optional/desktops/dank/default.nix index 1f0fe0e..31c2ac1 100644 --- a/home/crow/common/optional/desktops/dank/default.nix +++ b/home/crow/common/optional/desktops/dank/default.nix @@ -2,11 +2,10 @@ { imports = [ inputs.dms.homeModules.dank-material-shell - ../swww + ../awww ]; programs.dank-material-shell = { enable = true; - dgop.package = pkgs.unstable.dgop; }; } diff --git a/home/crow/common/optional/desktops/swww/default.nix b/home/crow/common/optional/desktops/swww/default.nix deleted file mode 100644 index 1eb64ae..0000000 --- a/home/crow/common/optional/desktops/swww/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{pkgs, ...}: { - services.swww = { - enable = true; - package = pkgs.swww; - }; -} diff --git a/home/crow/common/optional/desktops/xorg/default.nix b/home/crow/common/optional/desktops/xorg/default.nix deleted file mode 100644 index 7f15bb6..0000000 --- a/home/crow/common/optional/desktops/xorg/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{lib, ...}: { - # This file exists to define the options. - # The configuration is done via the imported files. - imports = [ - ./herbstluftwm.nix - ./rofi.nix - ]; -} diff --git a/home/crow/common/optional/desktops/xorg/herbstluftwm.nix b/home/crow/common/optional/desktops/xorg/herbstluftwm.nix deleted file mode 100644 index 21c3015..0000000 --- a/home/crow/common/optional/desktops/xorg/herbstluftwm.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ - config, - lib, - osConfig, - pkgs, - ... -}: { - home.packages = with pkgs; [ - # To set wallpaper - hsetroot - # For xinput - perl - gnugrep - xorg.xinput - ]; - - xsession.windowManager.herbstluftwm = let - mod = "Mod4"; - in { - enable = true; - - tags = ["1" "2" "3" "4" "5" "6" "7" "8" "9"]; - - keybinds = lib.mkMerge [ - { - "${mod}-q" = "close"; - "${mod}-r" = "remove"; - "${mod}-Return" = "spawn wezterm"; - "${mod}-b" = "spawn ${config.programs.firefox.finalPackage}/bin/firefox"; - "${mod}-d" = "spawn rofi -show drun"; - "${mod}-Shift-s" = let - screenshot = pkgs.writeShellScriptBin "screenshot" '' - sleep 0.2 - exec ${pkgs.maim}/bin/maim -s | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png - ''; - in "spawn ${screenshot}/bin/screenshot"; - "${mod}-Shift-Ctrl-l" = let - lock = pkgs.writeShellScriptBin "lock" '' - exec ${pkgs.xsecurelock}/bin/xsecurelock - ''; - in "spawn ${lock}/bin/lock"; - # Shift-Ctrl-odiaeresis = Shift+Ctrl+รถ - "${mod}-Shift-Ctrl-odiaeresis" = "spawn ${pkgs.xsecurelock}/bin/xsecurelock"; - "XF86Display" = "spawn autorandr -c"; - "${mod}-Shift-d" = "spawn autorandr -c"; - "${mod}-l" = "focus right"; - "${mod}-k" = "focus up"; - "${mod}-j" = "focus down"; - "${mod}-h" = "focus left"; - "${mod}-Shift-l" = "shift right"; - "${mod}-Shift-k" = "shift up"; - "${mod}-Shift-j" = "shift down"; - "${mod}-Shift-h" = "shift left"; - "${mod}-u" = "split bottom 0.5"; - "${mod}-o" = "split right 0.5"; - "${mod}-Ctrl-space" = "split explode"; - "${mod}-f" = "fullscreen toggle"; - "${mod}-s" = "floating toggle"; - "${mod}-p" = "pseudotile toggle"; - "${mod}-space" = "or , and . compare tags.focus.curframe_wcount = 2 . cycle_layout +1 vertical horizontal max vertical grid , cycle_layout +1"; - } - (lib.mkMerge (lib.lists.imap0 - # this won't work if tags has more than 9 elements - (i: _: let - index = builtins.toString i; - key = builtins.toString (i + 1); - in { - "${mod}-${key}" = "use_index ${index}"; - "${mod}-Shift-${key}" = "move_index ${index}"; - }) - config.xsession.windowManager.herbstluftwm.tags)) - ]; - - mousebinds = { - "${mod}-Button1" = "move"; - "${mod}-Button2" = "zoom"; - "${mod}-Button3" = "resize"; - }; - - rules = [ - "focus=on" # focus new windows by default - "windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)' pseudotile=on" - "windowtype='_NET_WM_WINDOW_TYPE_DIALOG' focus=on" - "windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK|DESKTOP)' manage=off" - "class=Spotify focus=off tag=4" - "class=Slack focus=off tag=2" - "class=zoom focus=off tag=2" - "class=firefox tag=1" - ]; - - settings = { - frame_border_active_color = "#ed8796"; - frame_border_normal_color = "#181926"; - }; - - extraConfig = '' - autorandr -c - - xsetroot -cursor_name left_ptr & - polybar & - ${config.programs.firefox.finalPackage}/bin/firefox & - ${lib.optionalString config.modules.social.slack.enable "slack &"} - ${lib.optionalString config.modules.nifty.media.spotify.enable "spotify &"} - ${lib.optionalString ((builtins.length osConfig.modules.mouse.settings) > 0) "marimouse &"} - ''; - }; -} diff --git a/home/crow/common/optional/desktops/xorg/rofi.nix b/home/crow/common/optional/desktops/xorg/rofi.nix deleted file mode 100644 index 4e5f6b2..0000000 --- a/home/crow/common/optional/desktops/xorg/rofi.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - config, - lib, - ... -}: { - programs.rofi = { - enable = true; - extraConfig = { - modi = "window,run,drun"; - lines = 16; - padding = 30; - width = 45; - location = 0; - columns = 3; - }; - }; -} diff --git a/home/crow/common/optional/gaming/default.nix b/home/crow/common/optional/gaming/default.nix index c1e448b..fc37648 100644 --- a/home/crow/common/optional/gaming/default.nix +++ b/home/crow/common/optional/gaming/default.nix @@ -38,7 +38,7 @@ in { home.packages = [ steam-session - pkgs.unstable.vintagestory + pkgs.vintagestory pkgs.r2modman pkgs.prismlauncher pkgs.heroic diff --git a/home/handler/common/core/direnv.nix b/home/handler/common/core/direnv.nix index bd6efe5..bfb78db 100644 --- a/home/handler/common/core/direnv.nix +++ b/home/handler/common/core/direnv.nix @@ -1,12 +1,15 @@ -{ pkgs, ... }: +{ config, pkgs, ... }: { home.packages = builtins.attrValues { - inherit (pkgs.unstable) + inherit (pkgs) devenv ; }; programs = { - zsh.enable = true; + zsh = { + enable = true; + dotDir = "${config.xdg.configHome}/zsh"; + }; direnv = { enable = true; nix-direnv.enable = true; diff --git a/home/handler/common/core/git.nix b/home/handler/common/core/git.nix index dfe2bab..19ede17 100644 --- a/home/handler/common/core/git.nix +++ b/home/handler/common/core/git.nix @@ -20,7 +20,7 @@ programs.jujutsu = { enable = true; - package = pkgs.unstable.jujutsu; + package = pkgs.jujutsu; settings = { user = { email = "contact@wanderingcrow.net"; diff --git a/hosts/common/optional/gaming.nix b/hosts/common/optional/gaming.nix index 968d9ce..8371ab2 100644 --- a/hosts/common/optional/gaming.nix +++ b/hosts/common/optional/gaming.nix @@ -1,17 +1,15 @@ { pkgs, ... }: { environment.systemPackages = [ - pkgs.unstable.protontricks - pkgs.unstable.winetricks - pkgs.wineWowPackages.stable - pkgs.wineWowPackages.waylandFull + pkgs.protontricks + pkgs.winetricks pkgs.steamtinkerlaunch ]; programs = { steam = { enable = true; - extraCompatPackages = [ pkgs.unstable.proton-ge-bin ]; + extraCompatPackages = [ pkgs.proton-ge-bin ]; }; gamescope = { enable = true; diff --git a/hosts/common/optional/pentesting.nix b/hosts/common/optional/pentesting.nix index c8defd0..796efce 100644 --- a/hosts/common/optional/pentesting.nix +++ b/hosts/common/optional/pentesting.nix @@ -11,7 +11,7 @@ services.postgresql.enable = true; # for msf environment.systemPackages = builtins.attrValues { - inherit (pkgs.unstable) + inherit (pkgs) metasploit exploitdb termshark diff --git a/hosts/common/optional/services/monero/miner.nix b/hosts/common/optional/services/monero/miner.nix index ab31f8f..f6ea42c 100644 --- a/hosts/common/optional/services/monero/miner.nix +++ b/hosts/common/optional/services/monero/miner.nix @@ -6,7 +6,7 @@ { environment.systemPackages = builtins.attrValues { - inherit (pkgs.unstable) + inherit (pkgs) monero-gui monero-cli p2pool @@ -32,7 +32,7 @@ serviceConfig = { User = "p2pool"; Group = "p2pool"; - ExecStart = "${pkgs.unstable.p2pool}/bin/p2pool --host 127.0.0.1 --wallet 48kwCPHhnbXfriMCtGHu4BRrc8dwmhUxVdD1ycATtDigW4Fjrsfhi7wQ2QSNyvspxaN7Tt2dApAEbFhTeSPD9w1x4JmyzTg --nano"; + ExecStart = "${pkgs.p2pool}/bin/p2pool --host 127.0.0.1 --wallet 48kwCPHhnbXfriMCtGHu4BRrc8dwmhUxVdD1ycATtDigW4Fjrsfhi7wQ2QSNyvspxaN7Tt2dApAEbFhTeSPD9w1x4JmyzTg --nano"; Restart = "always"; }; }; diff --git a/hosts/common/optional/services/monero/node.nix b/hosts/common/optional/services/monero/node.nix index ad2ab8f..cd7a603 100644 --- a/hosts/common/optional/services/monero/node.nix +++ b/hosts/common/optional/services/monero/node.nix @@ -6,7 +6,7 @@ }: { environment.systemPackages = builtins.attrValues { - inherit (pkgs.unstable) + inherit (pkgs) monero-cli ; }; @@ -39,7 +39,7 @@ { User = "monero"; Group = "monero"; - ExecStart = "${pkgs.unstable.monero-cli}/bin/monerod --config-file=${moneroConfig} --non-interactive"; + ExecStart = "${pkgs.monero-cli}/bin/monerod --config-file=${moneroConfig} --non-interactive"; Restart = "always"; SuccessExitStatus = [ 0 diff --git a/hosts/common/users/primary/default.nix b/hosts/common/users/primary/default.nix index deb8be6..a8d7462 100644 --- a/hosts/common/users/primary/default.nix +++ b/hosts/common/users/primary/default.nix @@ -29,7 +29,7 @@ in programs.zsh.enable = true; environment.systemPackages = [ - pkgs.unstable.jujutsu + pkgs.jujutsu pkgs.vim pkgs.just ]; diff --git a/modules/home/monitors.nix b/modules/home/monitors.nix index 91ab8fb..eb4e604 100644 --- a/modules/home/monitors.nix +++ b/modules/home/monitors.nix @@ -63,7 +63,7 @@ }; background = lib.mkOption { type = lib.types.path; - description = "Path to background in assets to get handled with swww"; + description = "Path to background in assets to get handled with awww"; default = null; }; }; diff --git a/modules/services/auth-provider/default.nix b/modules/services/auth-provider/default.nix index 118e913..3fa09bf 100644 --- a/modules/services/auth-provider/default.nix +++ b/modules/services/auth-provider/default.nix @@ -12,13 +12,6 @@ in sopsFile = "${sopsFolder}/services.yaml"; }; - disabledModules = [ - "${inputs.nixpkgs}/nixos/modules/services/security/pocket-id.nix" - ]; - imports = [ - "${inputs.nixpkgs-unstable}/nixos/modules/services/security/pocket-id.nix" - ]; - services.caddy = { enable = true; virtualHosts."auth.wanderingcrow.net".extraConfig = '' @@ -28,7 +21,7 @@ in services.pocket-id = { enable = true; - package = pkgs.unstable.pocket-id; + package = pkgs.pocket-id; settings = { ANALYTICS_DISABLED = true; APP_URL = "https://auth.wanderingcrow.net"; diff --git a/modules/services/matrix/default.nix b/modules/services/matrix/default.nix index 79cd068..21a89c0 100644 --- a/modules/services/matrix/default.nix +++ b/modules/services/matrix/default.nix @@ -11,7 +11,7 @@ let defaultHomeserver = "psychal.link"; } ); - customFluffy = pkgs.unstable.fluffychat-web.overrideAttrs ( + customFluffy = pkgs.fluffychat-web.overrideAttrs ( final: prev: { postInstall = '' @@ -23,7 +23,7 @@ in { environment.systemPackages = [ customFluffy - pkgs.unstable.element-web + pkgs.element-web ]; sops.secrets."matrix/registration_token" = { @@ -33,7 +33,7 @@ in services.matrix-tuwunel = { enable = true; - package = pkgs.unstable.matrix-tuwunel; + package = pkgs.matrix-tuwunel; stateDirectory = "tuwunel"; settings = { global = { @@ -66,7 +66,7 @@ in file_server ''; "em.psychal.link".extraConfig = '' - root * ${pkgs.unstable.element-web} + root * ${pkgs.element-web} file_server ''; }; diff --git a/modules/services/mealie/default.nix b/modules/services/mealie/default.nix index 408c82f..9127a83 100644 --- a/modules/services/mealie/default.nix +++ b/modules/services/mealie/default.nix @@ -28,7 +28,7 @@ in ''; services.mealie = { enable = true; - package = pkgs.unstable.mealie; + package = pkgs.mealie; settings = { BASE_URL = "https://mealie.wanderingcrow.net"; ALLOW_SIGNUP = "false"; diff --git a/modules/services/mesh/client.nix b/modules/services/mesh/client.nix index eccb3fc..15e35d1 100644 --- a/modules/services/mesh/client.nix +++ b/modules/services/mesh/client.nix @@ -21,12 +21,12 @@ in services.tailscale = { enable = true; - package = pkgs.unstable.tailscale; + package = pkgs.tailscale; authKeyFile = config.sops.secrets."tailscale-key".path; }; services.netbird = { - package = pkgs.unstable.netbird; + package = pkgs.netbird; clients.blackbridge = { login = {