From 32ede22babefd33a02dc5f677eb97e7de6356d07 Mon Sep 17 00:00:00 2001 From: Dan Nixon Date: Tue, 24 Oct 2023 08:29:14 +0100 Subject: [PATCH] Add pkgs-unstable to all configurations --- configurations/akane/home-manager/default.nix | 128 +++++++++--------- .../generic/home-manager/default.nix | 30 ++-- .../kawashiro/home-manager/default.nix | 84 ++++++------ .../yukari/home-manager/default.nix | 48 +++---- .../yuyuko/home-manager/default.nix | 68 +++++----- 5 files changed, 184 insertions(+), 174 deletions(-) diff --git a/configurations/akane/home-manager/default.nix b/configurations/akane/home-manager/default.nix index bcf7775..de8179a 100644 --- a/configurations/akane/home-manager/default.nix +++ b/configurations/akane/home-manager/default.nix @@ -1,77 +1,79 @@ { inputs, outputs, -}: -inputs.home-manager.lib.homeManagerConfiguration { - pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = {inherit inputs outputs;}; +}: let + pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux; +in + inputs.home-manager.lib.homeManagerConfiguration { + pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; + extraSpecialArgs = {inherit inputs outputs pkgs-unstable;}; - modules = [ - ../../../modules/home-manager/terminal_environment - ../../../modules/home-manager/borgmatic.nix - ../../../modules/home-manager/media.nix - ../../../modules/home-manager/development.nix - ../../../modules/home-manager/desktop_environment + modules = [ + ../../../modules/home-manager/terminal_environment + ../../../modules/home-manager/borgmatic.nix + ../../../modules/home-manager/media.nix + ../../../modules/home-manager/development.nix + ../../../modules/home-manager/desktop_environment - ({pkgs, ...}: { - programs.borgmatic.backups."main" = { - location = { - sourceDirectories = [ - "/home/dan/docs" - "/home/dan/phone" - "/home/dan/tombs" - ]; - repositories = ["ssh://r4zp295h@r4zp295h.repo.borgbase.com/./repo"]; + ({pkgs, ...}: { + programs.borgmatic.backups."main" = { + location = { + sourceDirectories = [ + "/home/dan/docs" + "/home/dan/phone" + "/home/dan/tombs" + ]; + repositories = ["ssh://r4zp295h@r4zp295h.repo.borgbase.com/./repo"]; + }; + storage.encryptionPasscommand = "pass borg/akane/passphrase"; }; - storage.encryptionPasscommand = "pass borg/akane/passphrase"; - }; - wayland.windowManager.sway.config = { - input."2:7:SynPS/2_Synaptics_TouchPad" = { - events = "disabled"; - }; + wayland.windowManager.sway.config = { + input."2:7:SynPS/2_Synaptics_TouchPad" = { + events = "disabled"; + }; - output = { - LVDS-1 = { - enable = ""; - bg = "~/.local/share/wallpaper.png fill"; + output = { + LVDS-1 = { + enable = ""; + bg = "~/.local/share/wallpaper.png fill"; + }; }; }; - }; - home.file.wallpaper = { - source = ./wallpaper.png; - target = ".local/share/wallpaper.png"; - }; + home.file.wallpaper = { + source = ./wallpaper.png; + target = ".local/share/wallpaper.png"; + }; - programs.i3status-rust.bars.main.blocks = [ - { - block = "sound"; - driver = "pulseaudio"; - device_kind = "sink"; - } - { - block = "sound"; - driver = "pulseaudio"; - device_kind = "source"; - } - { - block = "battery"; - } - { - block = "time"; - interval = 1; - format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M:%S') "; - } - ]; + programs.i3status-rust.bars.main.blocks = [ + { + block = "sound"; + driver = "pulseaudio"; + device_kind = "sink"; + } + { + block = "sound"; + driver = "pulseaudio"; + device_kind = "source"; + } + { + block = "battery"; + } + { + block = "time"; + interval = 1; + format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M:%S') "; + } + ]; - services.mpd.enable = true; + services.mpd.enable = true; - home.packages = with pkgs; [ - lightburn - scrcpy - inputs.satori.packages.${system}.satorictl - ]; - }) - ]; -} + home.packages = with pkgs; [ + lightburn + scrcpy + inputs.satori.packages.${system}.satorictl + ]; + }) + ]; + } diff --git a/configurations/generic/home-manager/default.nix b/configurations/generic/home-manager/default.nix index 194e2a2..6c60efc 100644 --- a/configurations/generic/home-manager/default.nix +++ b/configurations/generic/home-manager/default.nix @@ -1,19 +1,21 @@ { inputs, outputs, -}: -inputs.home-manager.lib.homeManagerConfiguration { - pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = {inherit inputs outputs;}; +}: let + pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux; +in + inputs.home-manager.lib.homeManagerConfiguration { + pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; + extraSpecialArgs = {inherit inputs outputs pkgs-unstable;}; - modules = [ - ../../../modules/home-manager/terminal_environment + modules = [ + ../../../modules/home-manager/terminal_environment - { - # home = { - # username = "dan"; - # homeDirectory = "/home/dan"; - # }; - } - ]; -} + { + # home = { + # username = "dan"; + # homeDirectory = "/home/dan"; + # }; + } + ]; + } diff --git a/configurations/kawashiro/home-manager/default.nix b/configurations/kawashiro/home-manager/default.nix index 1d25b8c..70afd51 100644 --- a/configurations/kawashiro/home-manager/default.nix +++ b/configurations/kawashiro/home-manager/default.nix @@ -1,49 +1,51 @@ { inputs, outputs, -}: -inputs.home-manager.lib.homeManagerConfiguration { - pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = {inherit inputs outputs;}; +}: let + pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux; +in + inputs.home-manager.lib.homeManagerConfiguration { + pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; + extraSpecialArgs = {inherit inputs outputs pkgs-unstable;}; - modules = [ - ../../../modules/home-manager/terminal_environment - ../../../modules/home-manager/media.nix - ../../../modules/home-manager/development.nix - ../../../modules/home-manager/desktop_environment + modules = [ + ../../../modules/home-manager/terminal_environment + ../../../modules/home-manager/media.nix + ../../../modules/home-manager/development.nix + ../../../modules/home-manager/desktop_environment - ({pkgs, ...}: { - wayland.windowManager.sway.config.output = { - eDP-1 = { - enable = ""; - bg = "#006070 solid_color"; + ({pkgs, ...}: { + wayland.windowManager.sway.config.output = { + eDP-1 = { + enable = ""; + bg = "#006070 solid_color"; + }; }; - }; - programs.i3status-rust.bars.main.blocks = [ - { - block = "sound"; - driver = "pulseaudio"; - device_kind = "sink"; - } - { - block = "sound"; - driver = "pulseaudio"; - device_kind = "source"; - } - { - block = "battery"; - } - { - block = "time"; - interval = 1; - format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M:%S') "; - } - ]; + programs.i3status-rust.bars.main.blocks = [ + { + block = "sound"; + driver = "pulseaudio"; + device_kind = "sink"; + } + { + block = "sound"; + driver = "pulseaudio"; + device_kind = "source"; + } + { + block = "battery"; + } + { + block = "time"; + interval = 1; + format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M:%S') "; + } + ]; - home.packages = with pkgs; [ - lightburn - ]; - }) - ]; -} + home.packages = with pkgs; [ + lightburn + ]; + }) + ]; + } diff --git a/configurations/yukari/home-manager/default.nix b/configurations/yukari/home-manager/default.nix index 14de179..a93d1ab 100644 --- a/configurations/yukari/home-manager/default.nix +++ b/configurations/yukari/home-manager/default.nix @@ -1,29 +1,31 @@ { inputs, outputs, -}: -inputs.home-manager.lib.homeManagerConfiguration { - pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = {inherit inputs outputs;}; +}: let + pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux; +in + inputs.home-manager.lib.homeManagerConfiguration { + pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; + extraSpecialArgs = {inherit inputs outputs pkgs-unstable;}; - modules = [ - ../../../modules/home-manager/terminal_environment - ../../../modules/home-manager/borgmatic.nix - ../../../modules/home-manager/email + modules = [ + ../../../modules/home-manager/terminal_environment + ../../../modules/home-manager/borgmatic.nix + ../../../modules/home-manager/email - { - programs.borgmatic.backups."main" = { - location = { - sourceDirectories = [ - "/home/dan/docs" - "/home/dan/git" - "/home/dan/phone" - "/home/dan/tombs" - ]; - repositories = ["ssh://sfxwxlb3@sfxwxlb3.repo.borgbase.com/./repo"]; + { + programs.borgmatic.backups."main" = { + location = { + sourceDirectories = [ + "/home/dan/docs" + "/home/dan/git" + "/home/dan/phone" + "/home/dan/tombs" + ]; + repositories = ["ssh://sfxwxlb3@sfxwxlb3.repo.borgbase.com/./repo"]; + }; + storage.encryptionPasscommand = "pass borg/yukari/passphrase"; }; - storage.encryptionPasscommand = "pass borg/yukari/passphrase"; - }; - } - ]; -} + } + ]; + } diff --git a/configurations/yuyuko/home-manager/default.nix b/configurations/yuyuko/home-manager/default.nix index 791045f..2656073 100644 --- a/configurations/yuyuko/home-manager/default.nix +++ b/configurations/yuyuko/home-manager/default.nix @@ -1,40 +1,42 @@ { inputs, outputs, -}: -inputs.home-manager.lib.homeManagerConfiguration { - pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = {inherit inputs outputs;}; +}: let + pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux; +in + inputs.home-manager.lib.homeManagerConfiguration { + pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; + extraSpecialArgs = {inherit inputs outputs pkgs-unstable;}; - modules = [ - ../../../modules/home-manager/terminal_environment - ../../../modules/home-manager/desktop_environment + modules = [ + ../../../modules/home-manager/terminal_environment + ../../../modules/home-manager/desktop_environment - { - wayland.windowManager.sway.config.output = { - LVDS-1 = { - enable = ""; - bg = "#006070 solid_color"; + { + wayland.windowManager.sway.config.output = { + LVDS-1 = { + enable = ""; + bg = "#006070 solid_color"; + }; }; - }; - programs.i3status-rust.bars.main.blocks = [ - { - block = "sound"; - driver = "pulseaudio"; - device_kind = "sink"; - } - { - block = "sound"; - driver = "pulseaudio"; - device_kind = "source"; - } - { - block = "time"; - interval = 1; - format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M:%S') "; - } - ]; - } - ]; -} + programs.i3status-rust.bars.main.blocks = [ + { + block = "sound"; + driver = "pulseaudio"; + device_kind = "sink"; + } + { + block = "sound"; + driver = "pulseaudio"; + device_kind = "source"; + } + { + block = "time"; + interval = 1; + format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M:%S') "; + } + ]; + } + ]; + }