switch to unstable

This commit is contained in:
caandt 2024-10-04 19:07:34 -05:00
parent b64795270a
commit 8b4e1a659e
4 changed files with 41 additions and 15 deletions

View file

@ -77,7 +77,7 @@
]; ];
documentation.dev.enable = true; documentation.dev.enable = true;
programs.bash = { programs.bash = {
enableCompletion = true; completion.enable = true;
promptInit = ''PS1="[\u \W] \[\e[32;1m\]\$\[\e[0m\] "''; promptInit = ''PS1="[\u \W] \[\e[32;1m\]\$\[\e[0m\] "'';
}; };
environment.etc.bashrc.text = lib.mkAfter ''[ -f ~/.config/bash/bashrc ] && . ~/.config/bash/bashrc''; environment.etc.bashrc.text = lib.mkAfter ''[ -f ~/.config/bash/bashrc ] && . ~/.config/bash/bashrc'';
@ -115,7 +115,7 @@
]; ];
}; };
security.polkit.enable = true; security.polkit.enable = true;
hardware.opengl.driSupport32Bit = true; hardware.graphics.enable32Bit = true;
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
xdg.terminal-exec = { xdg.terminal-exec = {
enable = true; enable = true;

View file

@ -7,27 +7,42 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725703823, "lastModified": 1727817100,
"narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1725826545, "lastModified": 1727802920,
"narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=", "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9", "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1727907660,
"narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5966581aa04be7eff830b9e1457d56dc70a0b798",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -40,7 +55,8 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable"
} }
} }
}, },

View file

@ -2,18 +2,28 @@
description = "NixOS config"; description = "NixOS config";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { nixpkgs, home-manager, ... }@inputs: { outputs = { nixpkgs, nixpkgs-stable, home-manager, ... }@inputs: {
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./configuration.nix ./configuration.nix
{
nixpkgs.overlays = [
(final: prev: {
stable = import nixpkgs-stable {
system = prev.system;
};
})
];
}
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;

View file

@ -12,7 +12,7 @@ in
home.packages = with pkgs; [ home.packages = with pkgs; [
(pkgs.symlinkJoin { (pkgs.symlinkJoin {
name = "firefox"; name = "firefox";
paths = [ pkgs.firefox ]; paths = [ pkgs.stable.firefox ];
buildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.makeWrapper ];
postBuild = '' postBuild = ''
wrapProgram $out/bin/firefox \ wrapProgram $out/bin/firefox \
@ -39,7 +39,7 @@ in
qpwgraph qpwgraph
qbittorrent qbittorrent
xournalpp xournalpp
gnome.adwaita-icon-theme adwaita-icon-theme
lsd lsd
bat bat