opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Switch back to nixpkgs-unstable by default

Browse source
This commit is contained in:
Oliver Davies 2024-11-12 20:03:29 +00:00
parent 1a081a956b
commit abc0e5d429
6 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
flake.lock
View file

@ -7,16 +7,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1731235328,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "60bb110917844d354f3c18e05450606a435d2d10",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "master",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -39,16 +39,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729691686, "lastModified": 1731139594,
"narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

5
flake.nix
View file

@ -1,12 +1,11 @@
{ {
inputs = { inputs = {
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.url = "github:nix-community/home-manager/master";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
}; };

3
lib/shared/home-manager-packages.nix
View file

@ -32,6 +32,7 @@ with pkgs;
cachix cachix
ctop ctop
delta delta
devenv
dog dog
doppler doppler
entr entr
@ -68,8 +69,6 @@ with pkgs;
xh xh
yarn yarn
unstable.devenv
# Scripts. # Scripts.
create-zellij-session create-zellij-session
deliver deliver

11
lib/shared/home-manager.nix
View file

@ -11,6 +11,17 @@
# Nicely reload system units when changing configs. # Nicely reload system units when changing configs.
systemd.user.startServices = "sd-switch"; systemd.user.startServices = "sd-switch";
# See https://github.com/nix-community/home-manager/issues/2064#issuecomment-2259307514.
# This is a workaround for the following errors that appeared when switching back to unstable:
# - 1: Failed to start unit flameshot.service
# - 2: org.freedesktop.systemd1.NoSuchUnit: Unit tray.target not found.
systemd.user.targets.tray = {
Unit = {
Description = "Home Manager System Tray";
Requires = [ "graphical-session-pre.target" ];
};
};
home.stateVersion = "22.05"; home.stateVersion = "22.05";
programs.home-manager.enable = true; programs.home-manager.enable = true;

2
modules/home-manager/neovim.nix
View file

@ -4,8 +4,6 @@
programs.neovim = { programs.neovim = {
enable = true; enable = true;
package = pkgs.unstable.neovim-unwrapped;
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
comment-nvim comment-nvim
dial-nvim dial-nvim

1
modules/nixos/desktop/gitea.nix
View file

@ -3,7 +3,6 @@
{ {
services.gitea = { services.gitea = {
enable = true; enable = true;
package = pkgs.unstable.gitea;
settings = { settings = {
server = { server = {