diff --git a/flake.lock b/flake.lock index bad48e1..88a754b 100644 --- a/flake.lock +++ b/flake.lock @@ -297,11 +297,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -446,11 +446,11 @@ ] }, "locked": { - "lastModified": 1763319842, - "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -504,16 +504,16 @@ ] }, "locked": { - "lastModified": 1767280655, - "narHash": "sha256-YmaYMduV5ko8zURUT1VLGDbVC1L/bxHS0NsiPoZ6bBM=", + "lastModified": 1763992789, + "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d49d2543f02dbd789ed032188c84570d929223cb", + "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -585,19 +585,20 @@ "git-hooks": "git-hooks", "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1766537863, - "narHash": "sha256-HEt+wbazRgJYeY+lgj65bxhPyVc4x7NEB2bs5NU6DF8=", + "lastModified": 1763302796, + "narHash": "sha256-mEc3SBjRYfMcbNFLxmCc5tRtlu3j+1q7zRz+nRraSFE=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "23f0a53ca6e58e61e1ea2b86791c69b79c91656d", + "rev": "5b38fb599f50e9d78325d1d2706e36303c166047", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-25.11", + "ref": "nixos-25.05", "repo": "nixos-mailserver", "type": "gitlab" } @@ -618,6 +619,22 @@ "type": "github" } }, + "nixpkgs-25_05": { + "locked": { + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1764242076, @@ -681,16 +698,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1767047869, - "narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", + "lastModified": 1764316264, + "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", + "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-25.11", + "ref": "nixos-25.05", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 8fc0636..eccc0de 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { description = "My system config"; inputs = { - nixpkgs.url = "nixpkgs/nixos-25.11"; + nixpkgs.url = "nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager/release-25.11"; + home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; vpsadminos.url = "github:vpsfreecz/vpsadminos"; @@ -32,7 +32,7 @@ }; nixos-mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11"; + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/phantom/email.nix b/hosts/phantom/email.nix index 60207e5..105113b 100644 --- a/hosts/phantom/email.nix +++ b/hosts/phantom/email.nix @@ -38,14 +38,12 @@ }; enableManageSieve = true; - - stateVersion = 3; }; # Prefer ipv4 and use main ipv6 to avoid reverse DNS issues - services.postfix.settings.main = { - smtp_address_preference = "ipv4"; - }; + services.postfix.extraConfig = '' + smtp_address_preference = ipv4 + ''; # Webmail services.roundcube = { diff --git a/pkgs/caffeinated/default.nix b/pkgs/caffeinated/default.nix index baba589..2545a5c 100644 --- a/pkgs/caffeinated/default.nix +++ b/pkgs/caffeinated/default.nix @@ -11,7 +11,6 @@ libbsd, wayland, wayland-protocols, - libcap, }: stdenv.mkDerivation { @@ -36,7 +35,6 @@ stdenv.mkDerivation { libbsd wayland wayland-protocols - libcap ]; makeFlags = [ "WAYLAND=1" ]; diff --git a/pkgs/gnome-pass-search-provider.nix b/pkgs/gnome-pass-search-provider.nix index 9acd6f4..ab2e94a 100644 --- a/pkgs/gnome-pass-search-provider.nix +++ b/pkgs/gnome-pass-search-provider.nix @@ -2,7 +2,7 @@ stdenv, fetchFromGitHub, python3Packages, - wrapGAppsHook3, + wrapGAppsHook, gtk3, gobject-introspection, }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3Packages.wrapPython - wrapGAppsHook3 + wrapGAppsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/lipsum.nix b/pkgs/lipsum.nix index ba4961f..de1b75a 100644 --- a/pkgs/lipsum.nix +++ b/pkgs/lipsum.nix @@ -3,7 +3,7 @@ fetchFromGitHub, pkg-config, vala, - wrapGAppsHook3, + wrapGAppsHook, }: stdenv.mkDerivation rec { pname = "lipsum"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config vala - wrapGAppsHook3 + wrapGAppsHook ]; makeFlags = [ "PRG=${pname}" ]; diff --git a/scripts/default.nix b/scripts/default.nix index dca8862..a94f939 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -55,7 +55,7 @@ helix-man-pager = [ helix-pager ]; bcrypt = [ apacheHttpd ]; musmenu = [ - mpc + mpc-cli wdmenu trash-cli xdg-user-dirs @@ -113,11 +113,11 @@ mpv pqiv python3Packages.deemix - mpc + mpc-cli mpdDup ]; mpdDup = [ - mpc + mpc-cli perl ]; readQrCode = [ diff --git a/system/android.nix b/system/android.nix index 8f0b494..3cce4af 100644 --- a/system/android.nix +++ b/system/android.nix @@ -12,5 +12,6 @@ programs.kdeconnect.enable = true; programs.adb.enable = true; + services.udev.packages = [ pkgs.android-udev-rules ]; }; } diff --git a/system/configuration.nix b/system/configuration.nix index 3ab8143..ec44aed 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -43,12 +43,12 @@ services.geoclue2.enable = true; - systemd.settings.Manager = { - DefaultTimeoutStopSec = "10s"; - }; - services.logind.settings.Login = { - HandlePowerKey = "suspend"; - }; + systemd.extraConfig = '' + DefaultTimeoutStopSec=10s + ''; + services.logind.extraConfig = '' + HandlePowerKey=suspend + ''; services.upower.enable = true; # This value determines the NixOS release from which the default diff --git a/system/fonts.nix b/system/fonts.nix index d9ef3d8..73aa8f7 100644 --- a/system/fonts.nix +++ b/system/fonts.nix @@ -4,7 +4,7 @@ fonts.packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans - noto-fonts-color-emoji + noto-fonts-emoji nerd-fonts.fira-code nerd-fonts.hack ]; diff --git a/system/media-packages.nix b/system/media-packages.nix index e35503e..e452a0b 100644 --- a/system/media-packages.nix +++ b/system/media-packages.nix @@ -18,7 +18,7 @@ in ffmpeg obs-studio imagemagick - mpc + mpc-cli helvum gimp inkscape diff --git a/system/monolith-forgejo-runner.nix b/system/monolith-forgejo-runner.nix index 3297514..fa2b3c6 100644 --- a/system/monolith-forgejo-runner.nix +++ b/system/monolith-forgejo-runner.nix @@ -1,7 +1,7 @@ { pkgs, config, ... }: { services.gitea-actions-runner = { - package = pkgs.forgejo-runner; + package = pkgs.forgejo-actions-runner; instances.default = { enable = true; name = "monolith"; diff --git a/user/chat.nix b/user/chat.nix index a001b2b..b42f6fd 100644 --- a/user/chat.nix +++ b/user/chat.nix @@ -15,7 +15,7 @@ }; home.packages = with pkgs; [ - telegram-desktop + tdesktop discord-canary thunderbird element-desktop diff --git a/user/gaming.nix b/user/gaming.nix index 7acda23..3e89361 100644 --- a/user/gaming.nix +++ b/user/gaming.nix @@ -17,7 +17,7 @@ in # steam # It's enabled in the system config tlauncher gamescope - mesa-demos + glxinfo vulkan-tools ]; }; diff --git a/user/home.nix b/user/home.nix index 783b0d4..5683510 100644 --- a/user/home.nix +++ b/user/home.nix @@ -73,7 +73,7 @@ gavin-bc file jq - dust + du-dust p7zip tealdeer micro diff --git a/user/kakoune/default.nix b/user/kakoune/default.nix index c5274c1..090246d 100644 --- a/user/kakoune/default.nix +++ b/user/kakoune/default.nix @@ -130,7 +130,7 @@ in terminal ranger bmenu - kakoune-lsp + kak-lsp kak-tree-sitter kak-pager kak-man-pager diff --git a/user/ranger/default.nix b/user/ranger/default.nix index 2877888..4b97170 100644 --- a/user/ranger/default.nix +++ b/user/ranger/default.nix @@ -19,7 +19,7 @@ wl-clipboard highlight # syntax highlight - poppler-utils # pdf preview + poppler_utils # pdf preview ffmpeg # audio preview ffmpegthumbnailer # video preview fontforge # font preview diff --git a/user/rofi.nix b/user/rofi.nix index 9a60f81..c24a0ce 100644 --- a/user/rofi.nix +++ b/user/rofi.nix @@ -18,7 +18,7 @@ in config = { programs.rofi = { enable = true; - package = pkgs.rofi.override { + package = pkgs.rofi-wayland.override { plugins = with pkgs; [ rofi-emoji rofi-file-browser diff --git a/user/sway/swayidle.nix b/user/sway/swayidle.nix index 365b63f..b6541f3 100644 --- a/user/sway/swayidle.nix +++ b/user/sway/swayidle.nix @@ -22,7 +22,7 @@ in { timeout = 1800; command = asScript "swayidle-suspend-monitors" '' - ${pkgs.mpc}/bin/mpc status | grep "^[playing]" > /dev/null || ${pkgs.sway}/bin/swaymsg "output * dpms off" + ${pkgs.mpc_cli}/bin/mpc status | grep "^[playing]" > /dev/null || ${pkgs.sway}/bin/swaymsg "output * dpms off" ''; resumeCommand = asScript "swayidle-wakeup-monitors" '' ${pkgs.sway}/bin/swaymsg "output * dpms on" diff --git a/user/waybar/default.nix b/user/waybar/default.nix index df9048f..c9ec809 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -136,7 +136,7 @@ in }; mpd = let - mpc = "${pkgs.mpc}/bin/mpc"; + mpc = "${pkgs.mpc-cli}/bin/mpc"; in { format = "{stateIcon} {title} - {artist}";