diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 8761d1c..d20d1a0 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -2,12 +2,19 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, unstable, ... }: +{ config, pkgs, ... }: # 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" @@ -158,12 +165,11 @@ programs.noisetorch.enable = true; # Allow unfree packages - # nixpkgs.config.allowUnfree = true; - # unstable.config.allowUnfree = true; + nixpkgs.config.allowUnfree = true; # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; with unstable; [ + environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget fzf diff --git a/nixos/flake.lock b/nixos/flake.lock deleted file mode 100644 index e099e34..0000000 --- a/nixos/flake.lock +++ /dev/null @@ -1,65 +0,0 @@ -{ - "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 deleted file mode 100644 index 7001169..0000000 --- a/nixos/flake.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - 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"; - - in - { - - nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - specialArgs = { - pkgs = import nixpkgs { - inherit system; - config.allowUnfree = true; - }; - unstable = import unstable { - inherit system; - config.allowUnfree = true; - }; - }; - modules = [ - ./configuration.nix - ]; - }; - - }; -}