From fdcf413707ebf936510f8926aca7db40b9d699a2 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Tue, 25 Mar 2025 02:18:44 +1100 Subject: [PATCH 1/2] Trying to figure out unstable packages --- nixos/configuration.nix | 17 ++++------- nixos/flake.lock | 65 +++++++++++++++++++++++++++++++++++++++++ nixos/flake.nix | 35 ++++++++++++++++++++++ 3 files changed, 105 insertions(+), 12 deletions(-) create mode 100644 nixos/flake.lock create mode 100644 nixos/flake.nix diff --git a/nixos/configuration.nix b/nixos/configuration.nix index d20d1a0..c00a4d4 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -2,19 +2,12 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ config, pkgs, inputs, ... }: # let # berkeley-mono-typeface = pkgs.callPackage ./packages/berkeley-mono-typeface.nix; # in -let - unstable = import { - config = { - allowUnfree = true; - }; - }; -in { nix.settings.experimental-features = [ "nix-command" @@ -183,10 +176,10 @@ in amdgpu_top mangohud - unstable.svt-av1-psy - unstable.ffmpeg-full - unstable.ab-av1 - unstable.whisper-cpp-vulkan + inputs.unstable.legacyPackages.${pkgs.system}.svt-av1-psy + inputs.unstable.legacyPackages.${pkgs.system}.ffmpeg-full + inputs.unstable.legacyPackages.${pkgs.system}.ab-av1 + inputs.unstable.legacyPackages.${pkgs.system}.whisper-cpp-vulkan vscode.fhs # .fhs version will be more compatable even if slightly less nix flavoured diff --git a/nixos/flake.lock b/nixos/flake.lock new file mode 100644 index 0000000..e099e34 --- /dev/null +++ b/nixos/flake.lock @@ -0,0 +1,65 @@ +{ + "nodes": { + "home-manger": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742825959, + "narHash": "sha256-wgnQZMrLLQJlZ+htTXzoQtoz9EzL15Z2crH3+OnRmMk=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "908e055e157a0b35466faf4125d7e7410ff56160", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1742751704, + "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manger": "home-manger", + "nixpkgs": "nixpkgs", + "unstable": "unstable" + } + }, + "unstable": { + "locked": { + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/nixos/flake.nix b/nixos/flake.nix new file mode 100644 index 0000000..d7c97d7 --- /dev/null +++ b/nixos/flake.nix @@ -0,0 +1,35 @@ +{ + description = "Aria's system flake"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.11"; + unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + + home-manger.url = "github:nix-community/home-manager"; + home-manger.inputs.nixpkgs.follows = "nixpkgs"; + }; + + outputs = + { nixpkgs, unstable, ... }@inputs: + # let + # system = "x86_64-linux"; + # pkgs = import nixpkgs { + # inherit system; + # config.allowUnfree = true; + # }; + # unstable = import nixpkgs-unstable { + # inherit system; + # config.allowUnfree = true; + # }; + # in + { + + nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs; }; + modules = [ + ./configuration.nix + ]; + }; + + }; +} From ec48f357df16d17c1fe7e396c7bd2df2967c0348 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Tue, 25 Mar 2025 02:37:29 +1100 Subject: [PATCH 2/2] Very basic flake setup --- nixos/configuration.nix | 15 ++++++++------- nixos/flake.nix | 26 ++++++++++++++------------ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index c00a4d4..8761d1c 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, inputs, ... }: +{ config, pkgs, unstable, ... }: # let # berkeley-mono-typeface = pkgs.callPackage ./packages/berkeley-mono-typeface.nix; @@ -158,11 +158,12 @@ programs.noisetorch.enable = true; # Allow unfree packages - nixpkgs.config.allowUnfree = true; + # nixpkgs.config.allowUnfree = true; + # unstable.config.allowUnfree = true; # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [ + environment.systemPackages = with pkgs; with unstable; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget fzf @@ -176,10 +177,10 @@ amdgpu_top mangohud - inputs.unstable.legacyPackages.${pkgs.system}.svt-av1-psy - inputs.unstable.legacyPackages.${pkgs.system}.ffmpeg-full - inputs.unstable.legacyPackages.${pkgs.system}.ab-av1 - inputs.unstable.legacyPackages.${pkgs.system}.whisper-cpp-vulkan + unstable.svt-av1-psy + unstable.ffmpeg-full + unstable.ab-av1 + unstable.whisper-cpp-vulkan vscode.fhs # .fhs version will be more compatable even if slightly less nix flavoured diff --git a/nixos/flake.nix b/nixos/flake.nix index d7c97d7..7001169 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -11,21 +11,23 @@ outputs = { nixpkgs, unstable, ... }@inputs: - # let - # system = "x86_64-linux"; - # pkgs = import nixpkgs { - # inherit system; - # config.allowUnfree = true; - # }; - # unstable = import nixpkgs-unstable { - # inherit system; - # config.allowUnfree = true; - # }; - # in + let + system = "x86_64-linux"; + + in { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; }; + specialArgs = { + pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; + }; + unstable = import unstable { + inherit system; + config.allowUnfree = true; + }; + }; modules = [ ./configuration.nix ];