Upgrade to 25.05
This commit is contained in:
parent
4346ec7232
commit
db69b419b6
28
flake.lock
generated
28
flake.lock
generated
@ -139,16 +139,16 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747688870,
|
"lastModified": 1749154018,
|
||||||
"narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
|
"narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "d5f1f641b289553927b3801580598d200a501863",
|
"rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-24.11",
|
"ref": "release-25.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@ -174,11 +174,11 @@
|
|||||||
},
|
},
|
||||||
"nixUnstable": {
|
"nixUnstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749213349,
|
"lastModified": 1749369410,
|
||||||
"narHash": "sha256-UAaWOyQhdp7nXzsbmLVC67fo+QetzoTm9hsPf9X3yr4=",
|
"narHash": "sha256-P1eYm8bewiyWg3QaPCHrOp6iWg/7ESi/aGHT4yilyNo=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a4ff0e3c64846abea89662bfbacf037ef4b34207",
|
"rev": "8207ad0d501dd3590e0e81a7c56b386a5c4342c9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -190,16 +190,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749173751,
|
"lastModified": 1749237914,
|
||||||
"narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=",
|
"narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91",
|
"rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-24.11",
|
"ref": "nixos-25.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@ -242,11 +242,11 @@
|
|||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749334897,
|
"lastModified": 1749388083,
|
||||||
"narHash": "sha256-EC30zWG/tCKgEbjLplrjQMbhydLm46833/u9viGKbKQ=",
|
"narHash": "sha256-WVbICtwfjwr/dPeWjvJkPpI6kaE2Aeg+nDM6faRKZME=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "e3a61a9079d9808cb69e19051e7410d45cefe2dc",
|
"rev": "7502ee791dfee0ed3f32382eaabb4d73451f472b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -3,12 +3,12 @@
|
|||||||
inputs = {
|
inputs = {
|
||||||
# Trick renovate into working: "github:NixOS/nixpkgs/nixpkgs-unstable"
|
# Trick renovate into working: "github:NixOS/nixpkgs/nixpkgs-unstable"
|
||||||
nixUnstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
nixUnstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||||
hardware.url = "github:nixos/nixos-hardware";
|
hardware.url = "github:nixos/nixos-hardware";
|
||||||
nur.url = "github:nix-community/nur";
|
nur.url = "github:nix-community/nur";
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-24.11";
|
url = "github:nix-community/home-manager/release-25.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ in {
|
|||||||
"ssh" = "TERM=xterm-256color ${pkgs.openssh}/bin/ssh";
|
"ssh" = "TERM=xterm-256color ${pkgs.openssh}/bin/ssh";
|
||||||
"top" = "btop";
|
"top" = "btop";
|
||||||
};
|
};
|
||||||
initExtra = ''
|
initContent = ''
|
||||||
sopsu() {nix-shell -p sops --run "sops updatekeys $1";}
|
sopsu() {nix-shell -p sops --run "sops updatekeys $1";}
|
||||||
sopsn() {nix-shell -p sops --run "sops $1";}
|
sopsn() {nix-shell -p sops --run "sops $1";}
|
||||||
'';
|
'';
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.vscodium;
|
package = pkgs.vscodium;
|
||||||
#profiles.default = {
|
#profiles.default = {
|
||||||
extensions = with pkgs.vscode-extensions; [
|
profiles.default.extensions = with pkgs.vscode-extensions; [
|
||||||
bbenoist.nix
|
bbenoist.nix
|
||||||
esbenp.prettier-vscode
|
esbenp.prettier-vscode
|
||||||
golang.go
|
golang.go
|
||||||
|
@ -4,7 +4,7 @@ in {
|
|||||||
config = lib.mkIf cfg {
|
config = lib.mkIf cfg {
|
||||||
# sound.enable = true;
|
# sound.enable = true;
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
hardware.pulseaudio.enable = false; #25.05 change to services
|
services.pulseaudio.enable = false; #25.05 change to services
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
alsa.enable = true;
|
alsa.enable = true;
|
||||||
|
@ -2,16 +2,16 @@
|
|||||||
let old = prev.eww;
|
let old = prev.eww;
|
||||||
in final.rustPlatform.buildRustPackage rec {
|
in final.rustPlatform.buildRustPackage rec {
|
||||||
pname = "eww";
|
pname = "eww";
|
||||||
version = "8661abf2bf07f5a809fc995233d93810cc1ac871";
|
version = "98c220126d912b935987766f56650b55f3e226eb";
|
||||||
|
|
||||||
src = prev.fetchFromGitHub {
|
src = prev.fetchFromGitHub {
|
||||||
owner = "elkowar";
|
owner = "elkowar";
|
||||||
repo = "eww";
|
repo = "eww";
|
||||||
rev = "${version}";
|
rev = "${version}";
|
||||||
hash = "sha256-q82u3/pcP5T++TMdDmaeDKYuCyky1Bo5BjHY1/NVHbY=";
|
hash = "sha256-zi+5G05aakh8GBdfHL1qcNo/15VEm5mXtHGgKMAyp1U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-wKTaskKRyPfzKSLxhfyn6DybmUVFMHV5MrixKUBhno4=";
|
cargoHash = "sha256-SEdr9nW5nBm1g6fjC5fZhqPbHQ7H6Kk0RL1V6OEQRdA=";
|
||||||
|
|
||||||
nativeBuildInputs = old.nativeBuildInputs;
|
nativeBuildInputs = old.nativeBuildInputs;
|
||||||
buildInputs = old.buildInputs ++ [ final.libdbusmenu-gtk3 ];
|
buildInputs = old.buildInputs ++ [ final.libdbusmenu-gtk3 ];
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
{ final, prev, ... }:
|
{ final, prev, ... }:
|
||||||
prev.openttd-jgrpp.overrideAttrs (old: rec {
|
prev.openttd-jgrpp.overrideAttrs (old: rec {
|
||||||
version = "0.55.3";
|
version = "0.65.3";
|
||||||
src = prev.fetchFromGitHub rec {
|
src = prev.fetchFromGitHub rec {
|
||||||
owner = "JGRennison";
|
owner = "JGRennison";
|
||||||
repo = "OpenTTD-patches";
|
repo = "OpenTTD-patches";
|
||||||
rev = "jgrpp-${version}";
|
rev = "jgrpp-${version}";
|
||||||
hash = "sha256-E1+pXpXNHOu9nPTGSY8baVaKf1Um6IGDjpi1MmENez8=";
|
hash = "sha256-lmDkYrk7qjUSTtCQQCN/pbuLDt3+2RI1K8A1H1GJRjw=";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user