unstable & "stuff"
This commit is contained in:
parent
f0d39dd0a5
commit
a351d46f29
6 changed files with 47 additions and 15 deletions
31
flake.lock
generated
31
flake.lock
generated
|
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1790742243,
|
"lastModified": 1790996401,
|
||||||
"narHash": "sha256-kaNo6xHiL31AbNNEreG0OTKf4j6Cxlo5bPawjX7lnbQ=",
|
"narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "e5fcd298a00f08b6e8390baf04aa8edb62203070",
|
"rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -23,11 +23,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1790750587,
|
"lastModified": 1791426274,
|
||||||
"narHash": "sha256-VfjaoJ1Uyb7JZTrBgE5Jf2nhjtQPmD9KOd19HJwmZwM=",
|
"narHash": "sha256-MWhktfFtFE8Jl7bf9Pkp7TR5MSdYCjCswSo0Gkb4ywc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "78e9c786dc08cd4f3420c2395cd977206a9b1da2",
|
"rev": "7c8764b7c7b09b34f632464276218ef9090eaa11",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -37,10 +37,27 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-unstable": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1791260994,
|
||||||
|
"narHash": "sha256-Miqqk/ammqnTUxaoCyvtwoPeLbI1ksFyLxi/CazZpWY=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs",
|
||||||
|
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,9 @@
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
url = "github:nixos/nixpkgs/nixos-26.05";
|
url = "github:nixos/nixpkgs/nixos-26.05";
|
||||||
};
|
};
|
||||||
|
nixpkgs-unstable = {
|
||||||
|
url = "github:nixos/nixpkgs/151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4";
|
||||||
|
};
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-26.05";
|
url = "github:nix-community/home-manager/release-26.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
@ -14,6 +17,7 @@
|
||||||
outputs = inputs @ {
|
outputs = inputs @ {
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
|
nixpkgs-unstable,
|
||||||
home-manager,
|
home-manager,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
|
|
||||||
|
|
@ -29,16 +29,18 @@
|
||||||
subtitlecomposer
|
subtitlecomposer
|
||||||
kid3
|
kid3
|
||||||
kdePackages.kdenlive
|
kdePackages.kdenlive
|
||||||
audacity
|
unstable.audacity
|
||||||
# games
|
# games
|
||||||
osu-lazer-bin
|
osu-lazer-bin
|
||||||
pcsx2
|
pcsx2
|
||||||
# emulation
|
# emulation
|
||||||
(bottles.override {removeWarningPopup = true;})
|
(unstable.bottles.override {removeWarningPopup = true;})
|
||||||
# devel
|
# devel
|
||||||
ocaml
|
unstable.ocaml
|
||||||
racket
|
unstable.racket
|
||||||
lazygit
|
unstable.lazygit
|
||||||
|
unstable.opencode
|
||||||
|
unstable.nodejs
|
||||||
];
|
];
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
|
|
@ -62,6 +64,9 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
yt-dlp.enable = true;
|
yt-dlp.enable = true;
|
||||||
|
yt-dlp.package = pkgs.unstable.yt-dlp;
|
||||||
|
|
||||||
|
starship.package = pkgs.unstable.starship;
|
||||||
|
|
||||||
obs-studio.enable = true;
|
obs-studio.enable = true;
|
||||||
obs-studio.plugins = with pkgs.obs-studio-plugins; [
|
obs-studio.plugins = with pkgs.obs-studio-plugins; [
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
programs.vim = {
|
programs.vim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
packageConfigurable = pkgs.vim-full;
|
packageConfigurable = pkgs.unstable.vim-full;
|
||||||
defaultEditor = true;
|
defaultEditor = true;
|
||||||
|
|
||||||
plugins = with pkgs.vimPlugins; [
|
plugins = with pkgs.unstable.vimPlugins; [
|
||||||
gruvbox
|
gruvbox
|
||||||
rainbow
|
rainbow
|
||||||
undotree
|
undotree
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,12 @@
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
|
(final: prev: {
|
||||||
|
unstable = import inputs.nixpkgs-unstable {
|
||||||
|
system = prev.stdenv.hostPlatform.system;
|
||||||
|
config.allowUnfree = true;
|
||||||
|
};
|
||||||
|
})
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
inherit
|
inherit
|
||||||
(prev.lixPackageSets.stable)
|
(prev.lixPackageSets.stable)
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ in {
|
||||||
extraGroups = ["wheel" "networkmanager" "lp" "scanner"];
|
extraGroups = ["wheel" "networkmanager" "lp" "scanner"];
|
||||||
uid = USER_ID;
|
uid = USER_ID;
|
||||||
};
|
};
|
||||||
users.defaultUserShell = pkgs.fish;
|
users.defaultUserShell = pkgs.unstable.fish;
|
||||||
|
|
||||||
# daemon blurb to get SSH for Git working
|
# daemon blurb to get SSH for Git working
|
||||||
environment.sessionVariables.SSH_AUTH_SOCK = "/run/user/${builtins.toString USER_ID}/ssh-agent";
|
environment.sessionVariables.SSH_AUTH_SOCK = "/run/user/${builtins.toString USER_ID}/ssh-agent";
|
||||||
|
|
|
||||||
Reference in a new issue