diff --git a/configuration.nix b/configuration.nix index 3b51a6f..77d99f8 100644 --- a/configuration.nix +++ b/configuration.nix @@ -77,7 +77,7 @@ ]; documentation.dev.enable = true; programs.bash = { - enableCompletion = true; + completion.enable = true; promptInit = ''PS1="[\u \W] \[\e[32;1m\]\$\[\e[0m\] "''; }; environment.etc.bashrc.text = lib.mkAfter ''[ -f ~/.config/bash/bashrc ] && . ~/.config/bash/bashrc''; @@ -115,7 +115,7 @@ ]; }; security.polkit.enable = true; - hardware.opengl.driSupport32Bit = true; + hardware.graphics.enable32Bit = true; programs.nix-ld.enable = true; xdg.terminal-exec = { enable = true; diff --git a/flake.lock b/flake.lock index 162ea9e..dce785e 100644 --- a/flake.lock +++ b/flake.lock @@ -7,27 +7,42 @@ ] }, "locked": { - "lastModified": 1725703823, - "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", + "lastModified": 1727817100, + "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", + "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1725826545, - "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "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" }, "original": { @@ -40,7 +55,8 @@ "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" } } }, diff --git a/flake.nix b/flake.nix index 7fb9b3e..e610704 100644 --- a/flake.nix +++ b/flake.nix @@ -2,18 +2,28 @@ description = "NixOS config"; 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 = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { nixpkgs, home-manager, ... }@inputs: { + outputs = { nixpkgs, nixpkgs-stable, home-manager, ... }@inputs: { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./configuration.nix + { + nixpkgs.overlays = [ + (final: prev: { + stable = import nixpkgs-stable { + system = prev.system; + }; + }) + ]; + } home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/home.nix b/home.nix index 6483440..8ab6a67 100644 --- a/home.nix +++ b/home.nix @@ -12,7 +12,7 @@ in home.packages = with pkgs; [ (pkgs.symlinkJoin { name = "firefox"; - paths = [ pkgs.firefox ]; + paths = [ pkgs.stable.firefox ]; buildInputs = [ pkgs.makeWrapper ]; postBuild = '' wrapProgram $out/bin/firefox \ @@ -39,7 +39,7 @@ in qpwgraph qbittorrent xournalpp - gnome.adwaita-icon-theme + adwaita-icon-theme lsd bat