diff --git a/flake.nix b/flake.nix index aa63f52..96ba41d 100644 --- a/flake.nix +++ b/flake.nix @@ -6,15 +6,15 @@ # - https://github.com/Misterio77/nix-config/ inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's a working example: - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - # Also see the 'unstable-packages' overlay at 'nix/overlays/default.nix'. + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05"; + # Also see the 'stable-packages' overlay at 'nix/overlays/default.nix'. # Home manager home-manager = { - url = "github:nix-community/home-manager/release-23.05"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix index 9895587..be70c4a 100644 --- a/home/features/desktop/default.nix +++ b/home/features/desktop/default.nix @@ -2,11 +2,11 @@ # Common GUI apps imports = [ ./firefox.nix - ./obsidian.nix ./vscode.nix ]; home.packages = with pkgs; [ + obsidian qFlipper ]; } \ No newline at end of file diff --git a/home/features/desktop/obsidian.nix b/home/features/desktop/obsidian.nix deleted file mode 100644 index f6ccf21..0000000 --- a/home/features/desktop/obsidian.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, inputs, outputs, lib, ... }: { - home.packages = with pkgs.unstable; [ - obsidian - ]; -} \ No newline at end of file diff --git a/home/features/desktop/vscode.nix b/home/features/desktop/vscode.nix index 1944df0..6239ec4 100644 --- a/home/features/desktop/vscode.nix +++ b/home/features/desktop/vscode.nix @@ -8,7 +8,7 @@ enable = true; enableExtensionUpdateCheck = false; enableUpdateCheck = false; - package = pkgs.unstable.vscode; + package = pkgs.vscode; extensions = with pkgs.vscode-extensions; [ # extensions available as nix packages bbenoist.nix diff --git a/overlays/default.nix b/overlays/default.nix index b143ce9..6d03fac 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -13,10 +13,10 @@ # }); }; - # When applied, the unstable nixpkgs set (declared in the flake inputs) will - # be accessible through 'pkgs.unstable' - unstable-packages = final: _prev: { - unstable = import inputs.nixpkgs-unstable { + # When applied, the stable nixpkgs set (declared in the flake inputs) will + # be accessible through 'pkgs.stable' + stable-packages = final: _prev: { + stable = import inputs.nixpkgs-stable { system = final.system; config.allowUnfree = true; };