diff --git a/flake.lock b/flake.lock index cf818ab..c56cda6 100644 --- a/flake.lock +++ b/flake.lock @@ -531,16 +531,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1762498405, - "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", + "lastModified": 1764983851, + "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", + "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 8370606..587ef60 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "moons nix configurations and development shells"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-wsl.url = "github:nix-community/NixOS-WSL"; diff --git a/modules/core/fonts.nix b/modules/core/fonts.nix index d134d7d..466ceb4 100644 --- a/modules/core/fonts.nix +++ b/modules/core/fonts.nix @@ -4,7 +4,7 @@ packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji + noto-fonts-color-emoji terminus_font cantarell-fonts font-awesome diff --git a/modules/core/greetd.nix b/modules/core/greetd.nix index af03b63..09ca405 100644 --- a/modules/core/greetd.nix +++ b/modules/core/greetd.nix @@ -1,11 +1,10 @@ { pkgs, username, ... }: { services.greetd = { enable = true; - vt = 3; settings = { default_session = { user = "greeter"; - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --cmd niri-session"; + command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd niri-session"; }; }; }; diff --git a/modules/core/i18n.nix b/modules/core/i18n.nix index 3887919..7d3a526 100644 --- a/modules/core/i18n.nix +++ b/modules/core/i18n.nix @@ -7,7 +7,7 @@ addons = with pkgs; [ fcitx5-mozc fcitx5-gtk - fcitx5-configtool + qt6Packages.fcitx5-configtool ]; settings.inputMethod = { GroupOrder = { diff --git a/modules/core/network.nix b/modules/core/network.nix index f167d55..97f981e 100644 --- a/modules/core/network.nix +++ b/modules/core/network.nix @@ -31,7 +31,7 @@ security.pki.certificateFiles = [ ./ca/root_ca.crt ]; - services.dnscrypt-proxy2 = { + services.dnscrypt-proxy = { enable = true; settings = { doh_servers = true; diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 3967c4b..bed1896 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -22,13 +22,13 @@ in enable = true; }; java.enable = true; - java.package = pkgs.jdk24; + java.package = pkgs.jdk25; }; nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ - greetd.tuigreet # The Login Manager (Sometimes Referred To As Display Manager) + tuigreet # The Login Manager (Sometimes Referred To As Display Manager) htop btop # Simple Terminal Based System Monitor unrar # Tool For Handling .rar Files unzip # Tool For Handling .zip Files @@ -48,6 +48,6 @@ in sbctl xwayland-satellite slurp grim wf-recorder sqlite # Vscode Raycast Extension Dependency - jdk24 maven gradle + jdk25 maven gradle ]; } diff --git a/modules/core/services.nix b/modules/core/services.nix index cb04b64..bdb6e77 100644 --- a/modules/core/services.nix +++ b/modules/core/services.nix @@ -29,12 +29,12 @@ }; logind = { - lidSwitch = "suspend"; # Lock when lid is closed - lidSwitchDocked = "ignore"; # Ignore when docked - extraConfig = '' - HandleLidSwitchExternalPower=lock - LidSwitchIgnoreInhibited=no - ''; + settings.Login = { + HandleLidSwitch = "suspend"; + HandleLidSwitchDocked = "ignore"; + HandleLidSwitchExternalPower = "ignore"; + LidSwitchIgnoreInhibited = "no"; + }; }; }; diff --git a/modules/core/system.nix b/modules/core/system.nix index d10ace1..5e208a2 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -29,5 +29,5 @@ }; console.keyMap = "jp106"; - system.stateVersion = "25.05"; + stdenv.hostPlatform.system.stateVersion = "25.05"; } \ No newline at end of file diff --git a/modules/home/nautilus.nix b/modules/home/nautilus.nix index 2ba96d0..d3c5d01 100644 --- a/modules/home/nautilus.nix +++ b/modules/home/nautilus.nix @@ -3,7 +3,6 @@ home.packages = with pkgs; [ nautilus gvfs sushi - gradience ]; diff --git a/modules/home/vscode.nix b/modules/home/vscode.nix index f38e9a9..179449b 100644 --- a/modules/home/vscode.nix +++ b/modules/home/vscode.nix @@ -120,11 +120,11 @@ let ]); userSettings = { - "java.jdt.ls.java.home" = "${pkgs.jdk24.home}"; + "java.jdt.ls.java.home" = "${pkgs.jdk25.home}"; "java.configuration.runtimes" = [ { - "name" = "JavaSE-24"; - "path" = "${pkgs.jdk24.home}"; + "name" = "JavaSE-25"; + "path" = "${pkgs.jdk25.home}"; "default" = true; } ]; diff --git a/modules/home/wallpaper.nix b/modules/home/wallpaper.nix index 367bf0c..f34c348 100644 --- a/modules/home/wallpaper.nix +++ b/modules/home/wallpaper.nix @@ -3,7 +3,7 @@ let walls = pkgs.fetchFromGitHub { owner = "moons-14"; repo = "wallpapers"; - rev = "7bb2bd7b904c497de8ceeb0213e0e9d513c8bd06"; + rev = "cc3256f4aaf2c8e7d16fb000b1ee251af54085db"; hash = "sha256-/Q8tiV7iegm366/7sfJv2ze7rRNriaQilvpK+91krVY="; }; in {