Fix allowUnfree and add obsidian
This commit is contained in:
parent
9aa51a9446
commit
fd45324727
|
@ -15,10 +15,8 @@
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
username = "opdavies";
|
username = "opdavies";
|
||||||
|
|
||||||
pkgs = inputs.nixpkgs.legacyPackages.${system};
|
mkNixos = import ./lib/nixos {inherit inputs self system username;};
|
||||||
|
mkWsl = import ./lib/wsl2 {inherit inputs self system username;};
|
||||||
mkNixos = import ./lib/nixos {inherit inputs pkgs self system username;};
|
|
||||||
mkWsl = import ./lib/wsl2 {inherit inputs pkgs self system username;};
|
|
||||||
in
|
in
|
||||||
flake-parts.lib.mkFlake {inherit inputs;} {
|
flake-parts.lib.mkFlake {inherit inputs;} {
|
||||||
systems = ["x86_64-linux"];
|
systems = ["x86_64-linux"];
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
{
|
{
|
||||||
inputs,
|
inputs,
|
||||||
desktop ? false,
|
desktop ? false,
|
||||||
pkgs,
|
|
||||||
system,
|
system,
|
||||||
}: let
|
}: {pkgs, ...}: let
|
||||||
configure-gtk = pkgs.writeTextFile {
|
configure-gtk = pkgs.writeTextFile {
|
||||||
name = "configure-gtk";
|
name = "configure-gtk";
|
||||||
destination = "/bin/configure-gtk";
|
destination = "/bin/configure-gtk";
|
||||||
|
@ -20,11 +19,7 @@
|
||||||
|
|
||||||
username = "opdavies";
|
username = "opdavies";
|
||||||
in {
|
in {
|
||||||
nixpkgs = {
|
nixpkgs.config.allowUnfree = true;
|
||||||
config = {
|
|
||||||
allowUnfree = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
@ -137,6 +132,7 @@ in {
|
||||||
arandr
|
arandr
|
||||||
dunst
|
dunst
|
||||||
libnotify
|
libnotify
|
||||||
|
obsidian
|
||||||
rclone
|
rclone
|
||||||
rclone-browser
|
rclone-browser
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,12 @@
|
||||||
{
|
{
|
||||||
inputs,
|
inputs,
|
||||||
pkgs,
|
|
||||||
self,
|
self,
|
||||||
system,
|
system,
|
||||||
username,
|
username,
|
||||||
}: {
|
}: {
|
||||||
desktop ? false,
|
desktop ? false,
|
||||||
}: let
|
}: let
|
||||||
configuration = import ./configuration.nix {inherit desktop inputs pkgs system;};
|
configuration = import ./configuration.nix {inherit desktop inputs system;};
|
||||||
hardwareConfiguration = import ./hardware-configuration.nix;
|
hardwareConfiguration = import ./hardware-configuration.nix;
|
||||||
in
|
in
|
||||||
inputs.nixpkgs.lib.nixosSystem {
|
inputs.nixpkgs.lib.nixosSystem {
|
||||||
|
|
Loading…
Reference in a new issue