Fix & Update versions
All checks were successful
Nix Build / build-nixos (push) Successful in 26m31s

This commit is contained in:
soraefir 2024-11-21 01:21:48 +01:00
parent 1e89d5880b
commit 5d68b291ba
8 changed files with 41 additions and 44 deletions

64
flake.lock generated
View File

@ -79,11 +79,11 @@
]
},
"locked": {
"lastModified": 1731768170,
"narHash": "sha256-9Zj2baKY3KaKzs5+nqZgIwr/o/iibhENFxjOnpU+IOU=",
"lastModified": 1732016537,
"narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "2bcef10f4319f34ddebadb5f37eaa81ca2510730",
"rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4",
"type": "github"
},
"original": {
@ -233,15 +233,16 @@
]
},
"locked": {
"lastModified": 1731786860,
"narHash": "sha256-130gQ5k8kZlxjBEeLpE+SvWFgSOFgQFeZlqIik7KgtQ=",
"lastModified": 1731880681,
"narHash": "sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1bd5616e33c0c54d7a5b37db94160635a9b27aeb",
"rev": "aecd341dfead1c3ef7a3c15468ecd71e8343b7c6",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.11",
"repo": "home-manager",
"type": "github"
}
@ -291,11 +292,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1731799110,
"narHash": "sha256-wwFbcWfVYGwemw/GeSdXrSXmNjjdTUw0N8DU8McyZU8=",
"lastModified": 1732100541,
"narHash": "sha256-vFeNbKUstvSZbe9TD4bDYozZd+A/bKD+fxCye+p/Mp8=",
"ref": "refs/heads/main",
"rev": "af83c825138386d269d69b3ef755b844a2eacb22",
"revCount": 5462,
"rev": "940f7aa990dbc99815bab8d355999d8277534b17",
"revCount": 5484,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@ -429,34 +430,34 @@
"type": "github"
}
},
"nixMaster": {
"nixUnstable": {
"locked": {
"lastModified": 1731799881,
"narHash": "sha256-GRlDXqmwJoW3F0Ymn0ETLsxujLD5idvdaDEzIjF5EEs=",
"lastModified": 1731890469,
"narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cd43d6867192ddfb98ba106065a89790e2722b3f",
"rev": "5083ec887760adfe12af64830a66807423a859a7",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1731676054,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"lastModified": 1731755305,
"narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
@ -494,11 +495,11 @@
},
"nur": {
"locked": {
"lastModified": 1731793520,
"narHash": "sha256-Axw4wfIcG1m8/kAb3k4LCBJKfNCpdXUCtjPsXEzSMWk=",
"lastModified": 1732140964,
"narHash": "sha256-OrmDjtdoUqsWE7DPwEgn+a3qcPMX21f7uCzMnDjxdFs=",
"owner": "nix-community",
"repo": "nur",
"rev": "908451fa847a4e3f74c409dff4721465de695253",
"rev": "a1d4c79a93b4a56127c152f4eec71eee63f8f5e6",
"type": "github"
},
"original": {
@ -539,7 +540,7 @@
"home-manager": "home-manager",
"hyprland": "hyprland",
"nix-colors": "nix-colors",
"nixMaster": "nixMaster",
"nixUnstable": "nixUnstable",
"nixpkgs": "nixpkgs",
"nur": "nur",
"sops-nix": "sops-nix",
@ -550,17 +551,14 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1731748189,
"narHash": "sha256-Zd/Uukvpcu26M6YGhpbsgqm6LUSLz+Q8mDZ5LOEGdiE=",
"lastModified": 1731954233,
"narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "d2bd7f433b28db6bc7ae03d5eca43564da0af054",
"rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e",
"type": "github"
},
"original": {
@ -592,11 +590,11 @@
},
"locked": {
"dir": "packaging/nix",
"lastModified": 1731556042,
"narHash": "sha256-eUFmLbf06Dph//IbB9KsJio3dJNADt+EhcfNFXjiJjU=",
"lastModified": 1731893168,
"narHash": "sha256-nijDZdYKT9UWF+kMgM3lq1OkbFKvDs6JXKRXI8cpprE=",
"ref": "refs/heads/main",
"rev": "66a1088194bb13c2d86d2c0af316b280a7235640",
"revCount": 839,
"rev": "9f580b251ca66950bb436c09afd2b9585eed74ba",
"revCount": 840,
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"

View File

@ -2,13 +2,13 @@
description = "SoraFlake";
inputs = {
# Trick renovate into working: "github:NixOS/nixpkgs/nixpkgs-unstable"
nixMaster.url = "github:nixos/nixpkgs/master";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixUnstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
hardware.url = "github:nixos/nixos-hardware";
nur.url = "github:nix-community/nur";
home-manager = {
url = "github:nix-community/home-manager";
url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -28,7 +28,6 @@
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-stable.follows = "nixpkgs";
};
nix-colors.url = "github:misterio77/nix-colors";

View File

@ -7,6 +7,6 @@
username = "${config.usercfg.username}";
homeDirectory = "/home/${config.usercfg.username}";
stateVersion = "23.11";
stateVersion = "24.11";
};
}

View File

@ -12,7 +12,7 @@
cbonsai
pipes-rs
cmatrix
cava
#cava
sl
];
}

View File

@ -2,6 +2,6 @@
imports = [ ./vscodium ];
config = lib.mkIf (config.syscfg.make.develop) {
home.packages = with pkgs; [ blender godot_4 ];
home.packages = with pkgs; [ blender godot_4 openscad bambu-studio ];
};
}

View File

@ -10,7 +10,7 @@
xfce.tumbler
telegram-desktop
discord
discord-canary
pavucontrol
keepassxc
nextcloud-client

View File

@ -8,8 +8,8 @@ let
in {
config = lib.mkIf (config.syscfg.make.develop) {
environment.systemPackages = with pkgs; [
android-tools
androidStudioPackages.canary
# android-tools
# androidStudioPackages.canary
];
};
}

View File

@ -5,7 +5,7 @@
yarn-berry = import ./yarn-berry { inherit final prev; };
eww = import ./eww { inherit final prev; };
wine = final.unstable.wineWow64Packages.unstableFull;
unstable = import inputs.nixMaster {
unstable = import inputs.nixUnstable {
system = final.system;
config.allowUnfree = true;
};