Changed some things, updated everything (w/ some stable pins due to failed hydra builds)
This commit is contained in:
parent
81fbf5b098
commit
862322b4c8
6 changed files with 65 additions and 30 deletions
61
flake.lock
generated
61
flake.lock
generated
|
@ -47,11 +47,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "/pkgs/firefox-addons",
|
||||
"lastModified": 1734943800,
|
||||
"narHash": "sha256-T6tJ1fGRcVksmRqbDRsvYD3Qnw8AU3e2j0Im01twFcI=",
|
||||
"lastModified": 1735202720,
|
||||
"narHash": "sha256-7aEdACqT2B7nZNFjn2Y66Qucfl1AHHVFKxm4yvO0O10=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "2c702b4a038306dce64a90fc011c92ebabb82f63",
|
||||
"rev": "fe816609e68ee1887ee89e43c9ca1aad75362477",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
@ -72,11 +72,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734957157,
|
||||
"narHash": "sha256-5lkf0+owhQhQgj2pAPhAlDja9eLA2i+WVuvlF3P0+bY=",
|
||||
"lastModified": 1735348174,
|
||||
"narHash": "sha256-oqj2oDEKWivHSkZNt0kaNjKQkuIKhYh4MwabJUF+qi0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "flake-firefox-nightly",
|
||||
"rev": "32e0ee526b964e98d2580a6daa053e4a7032f101",
|
||||
"rev": "1bd5470c76e4b8fea616d43ef6aeb3f9602ea0be",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -247,11 +247,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734944412,
|
||||
"narHash": "sha256-36QfCAl8V6nMIRUCgiC79VriJPUXXkHuR8zQA1vAtSU=",
|
||||
"lastModified": 1735343815,
|
||||
"narHash": "sha256-p7IJP/97zJda/wwCn1T2LJBz4olF5LjNf4uwhuyvARo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "8264bfe3a064d704c57df91e34b795b6ac7bad9e",
|
||||
"rev": "b7a7cd5dd1a74a9fe86ed4e016f91c78483b527a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -350,11 +350,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734838217,
|
||||
"narHash": "sha256-zvMLS8BGn+kMG7tLLT3PJ67/S9yqZ9B7V8hKBa9cRRY=",
|
||||
"lastModified": 1735222882,
|
||||
"narHash": "sha256-kWNi45/mRjQMG+UpaZQ7KyPavYrKfle3WgLn9YeBBVg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "d583b2d142f0428313df099f4a2dcf2a0496aa78",
|
||||
"rev": "7e3246f6ad43b44bc1c16d580d7bf6467f971530",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -473,13 +473,29 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1734649271,
|
||||
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
|
||||
"lastModified": 1735141468,
|
||||
"narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
|
||||
"rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1735291276,
|
||||
"narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "634fd46801442d760e09493a794c4f15db2d0cbb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -537,11 +553,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733858086,
|
||||
"narHash": "sha256-h2BDIDKiqgMpA6E+mu0RgMGy3FeM6k+EuJ9xgOQ1+zw=",
|
||||
"lastModified": 1735049224,
|
||||
"narHash": "sha256-fWUd9kyXdepphJ7cCzOsuSo7l0kbFCkUqfgKqZyFZzE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "plasma-manager",
|
||||
"rev": "7e2010249529931a3848054d5ff0dbf24675ab68",
|
||||
"rev": "d16bbded0ae452bc088489e7dca3ef58d8d1830b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -561,6 +577,7 @@
|
|||
"nix-on-droid": "nix-on-droid",
|
||||
"nixos-grub-themes": "nixos-grub-themes",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"plasma-manager": "plasma-manager",
|
||||
"sddm-sugar-candy-nix": "sddm-sugar-candy-nix",
|
||||
"vscode-extensions": "vscode-extensions",
|
||||
|
@ -688,11 +705,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734918633,
|
||||
"narHash": "sha256-9lveBNV+g9UKBY8POH+53cRaslqnjmF2WePg/f2ojBY=",
|
||||
"lastModified": 1735350281,
|
||||
"narHash": "sha256-rNhcGVh6Xnc0DKWR5RTTD9OxucfAotd41LEuMCGz228=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "c21a6eceed82873917324144895491603cf6d457",
|
||||
"rev": "57719f14beefb91c5b58da26bb9cffbdb4f70bfa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -2,8 +2,9 @@
|
|||
description = "NixOS Configuration";
|
||||
|
||||
inputs = {
|
||||
# General NixOS config
|
||||
# Nixpkgs
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; # Used when unstable hydra fails
|
||||
# Colmena unstable
|
||||
colmena = {
|
||||
url = "github:zhaofengli/colmena";
|
||||
|
|
|
@ -1,7 +1,14 @@
|
|||
{ lib, secrets, config, ... }:
|
||||
{ lib, secrets, config, pkgs, ... }:
|
||||
{
|
||||
programs.beets = lib.mkIf config.meta.home-manager.beets.enable {
|
||||
enable = true;
|
||||
package = pkgs.beets.override {
|
||||
pluginOverrides = {
|
||||
# Build for some GPU lang LLVM dependency failed on hydra as of disabling, and I don't use it
|
||||
# TODO: Switch to using disableAllPlugins for an allowlist of plugins
|
||||
autobpm.enable = false;
|
||||
};
|
||||
};
|
||||
|
||||
settings = {
|
||||
directory = "~/Music";
|
||||
|
@ -20,4 +27,4 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, inputs, system, lib, config, ... }:
|
||||
{ pkgs, pkgs-stable, inputs, system, lib, config, ... }:
|
||||
{
|
||||
home.packages =
|
||||
## Packages that are always installed, no matter what
|
||||
|
@ -19,6 +19,7 @@
|
|||
pciutils # `lspci`
|
||||
unzip # Extract zip files
|
||||
xh # HTTPie-like rust cli tool
|
||||
rar
|
||||
|
||||
# Editor
|
||||
neovim # CLI-Based editor
|
||||
|
@ -34,6 +35,7 @@
|
|||
libreoffice-qt6-fresh # Office-style editing
|
||||
hunspell
|
||||
hunspellDicts.en_US-large
|
||||
pkgs-stable.orca-slicer # 3d-printing
|
||||
|
||||
# Video
|
||||
jellyfin-media-player # Jellyfin electron client w/ MPV
|
||||
|
@ -69,6 +71,11 @@
|
|||
pkgs.gamemode
|
||||
pkgs.gamescope
|
||||
];
|
||||
|
||||
# Workaround electron 31 build failure on unstable
|
||||
heroic-unwrapped = (pkgs.heroic-unwrapped.override {
|
||||
electron = pkgs-stable.electron_31;
|
||||
});
|
||||
}) # GOG & Epic Games Launcher
|
||||
|
||||
# UI Tools
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ inputs, system, secrets, config, lib, ... }:
|
||||
{ inputs, system, secrets, config, lib, pkgs-stable, ... }:
|
||||
{
|
||||
imports = [ ./meta.nix ];
|
||||
|
||||
|
@ -31,7 +31,7 @@
|
|||
];
|
||||
# Inherit all of my nixos config custom arguments
|
||||
extraSpecialArgs = {
|
||||
inherit inputs system secrets;
|
||||
inherit inputs system secrets pkgs-stable;
|
||||
};
|
||||
|
||||
# Hopefully avoid file conflicts
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
specialArgs = {
|
||||
inherit inputs system secrets;
|
||||
pkgs-stable = inputs.nixpkgs-stable.legacyPackages.${system};
|
||||
};
|
||||
|
||||
modules = [ entrypoint ];
|
||||
|
@ -32,7 +33,7 @@
|
|||
builtins.foldl'
|
||||
(acc: cur:
|
||||
acc // {
|
||||
${cur.name} = import inputs.nixpkgs { system = cur.system; };
|
||||
${cur.name} = inputs.nixpkgs.legacyPackages.${cur.system};
|
||||
}
|
||||
)
|
||||
{}
|
||||
|
@ -47,6 +48,7 @@
|
|||
${cur.name} = {
|
||||
inherit inputs secrets;
|
||||
system = cur.system;
|
||||
pkgs-stable = inputs.nixpkgs-stable.legacyPackages.${cur.system};
|
||||
};
|
||||
}
|
||||
)
|
||||
|
@ -82,10 +84,11 @@
|
|||
system ? "aarch64-linux",
|
||||
entrypoint
|
||||
}: inputs.nix-on-droid.lib.nixOnDroidConfiguration {
|
||||
pkgs = import inputs.nixpkgs { inherit system; };
|
||||
pkgs = inputs.nixpkgs.legacyPackages.${system};
|
||||
modules = [ entrypoint ];
|
||||
extraSpecialArgs = {
|
||||
inherit inputs system secrets;
|
||||
pkgs-stable = inputs.nixpkgs-stable.legacyPackages.${system};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue