refactor: change hosts to devices and separate hm modules from nix modules
This commit is contained in:
parent
80eec12883
commit
0e4c446438
127 changed files with 33 additions and 49 deletions
|
|
@ -13,13 +13,14 @@
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
./cachix.nix
|
./cachix.nix
|
||||||
|
./overlays
|
||||||
|
./device-vars.nix
|
||||||
|
|
||||||
home-manager.nixosModules.default
|
home-manager.nixosModules.default
|
||||||
nh.nixosModules.default
|
nh.nixosModules.default
|
||||||
|
|
||||||
./modules/programs.nix
|
./modules/programs.nix
|
||||||
./modules/locale.nix
|
./modules/locale.nix
|
||||||
./overlays
|
|
||||||
|
|
||||||
./hostvars.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
@ -64,14 +65,14 @@
|
||||||
default = {
|
default = {
|
||||||
imports = [
|
imports = [
|
||||||
nur.hmModules.nur
|
nur.hmModules.nur
|
||||||
./modules/bash
|
./home/bash
|
||||||
./modules/git.nix
|
./home/git.nix
|
||||||
./modules/neovim
|
./home/neovim
|
||||||
./modules/tmux.nix
|
./home/tmux.nix
|
||||||
|
|
||||||
./hostvars.nix
|
./device-vars.nix
|
||||||
({ osConfig, ... }: {
|
({ osConfig, ... }: {
|
||||||
services.hostvars = osConfig.services.hostvars;
|
services.device-vars = osConfig.services.device-vars;
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib, ... }: {
|
{ lib, ... }: {
|
||||||
options.services.hostvars = with lib; {
|
options.services.device-vars = with lib; {
|
||||||
username = mkOption {
|
username = mkOption {
|
||||||
description = ''
|
description = ''
|
||||||
Username that was defined at the initial setup process
|
Username that was defined at the initial setup process
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
configDir = mkOption {
|
configDir = mkOption {
|
||||||
description = ''
|
description = ''
|
||||||
The path to where most of the hosts' configs are in the .nix folder
|
The path to where most of the devices' configs are in the .nix folder
|
||||||
'';
|
'';
|
||||||
type = types.nullOr types.str;
|
type = types.nullOr types.str;
|
||||||
};
|
};
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
# Home-manager module
|
|
||||||
|
|
||||||
{ config, lib, ... }: {
|
{ config, lib, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
./programs.nix
|
./programs.nix
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
# Home-manager module
|
|
||||||
|
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
programs = {
|
programs = {
|
||||||
fzf = {
|
fzf = {
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
# Home-manager module
|
|
||||||
|
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
programs = {
|
programs = {
|
||||||
|
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
# Home-manager module
|
|
||||||
|
|
||||||
{ pkgs, lib, ... }: let
|
{ pkgs, lib, ... }: let
|
||||||
# installs a vim plugin from git with a given tag / branch
|
# installs a vim plugin from git with a given tag / branch
|
||||||
plugin = owner: repo: rev: hash: pkgs.vimUtils.buildVimPlugin {
|
plugin = owner: repo: rev: hash: pkgs.vimUtils.buildVimPlugin {
|
||||||
|
|
@ -11,7 +9,7 @@
|
||||||
};
|
};
|
||||||
fileContents = lib.strings.fileContents;
|
fileContents = lib.strings.fileContents;
|
||||||
in {
|
in {
|
||||||
# TODO: make a gradle module and have java in hostvars.nix
|
# TODO: make a gradle module and have java in device-vars.nix
|
||||||
xdg.dataFile = {
|
xdg.dataFile = {
|
||||||
".gradle/gradle.properties".source =
|
".gradle/gradle.properties".source =
|
||||||
pkgs.writeText "gradle.properties" ''
|
pkgs.writeText "gradle.properties" ''
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
# Home-manager module
|
|
||||||
|
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
programs = {
|
programs = {
|
||||||
tmux = {
|
tmux = {
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
./modules/nvidia.nix
|
./modules/nvidia.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
services.hostvars = {
|
services.device-vars = {
|
||||||
username = "matt";
|
username = "matt";
|
||||||
fontSize = 10.0;
|
fontSize = 10.0;
|
||||||
};
|
};
|
||||||
|
|
@ -33,9 +33,9 @@
|
||||||
matt = {
|
matt = {
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
../../modules/alacritty.nix
|
../../home/alacritty.nix
|
||||||
../../modules/dconf.nix
|
../../home/dconf.nix
|
||||||
../../modules/firefox
|
../../home/firefox
|
||||||
];
|
];
|
||||||
|
|
||||||
# No touchy
|
# No touchy
|
||||||
|
|
@ -47,12 +47,12 @@ export default ({
|
||||||
margin-bottom: -70px; margin-top: -70px; opacity: 0;`;
|
margin-bottom: -70px; margin-top: -70px; opacity: 0;`;
|
||||||
|
|
||||||
const rightAnim1 = `transition: margin 0.5s ease, opacity 0.5s ease;
|
const rightAnim1 = `transition: margin 0.5s ease, opacity 0.5s ease;
|
||||||
margin-left: ${Number(maxOffset + endMargin)}px;
|
margin-left: ${Number(maxOffset + endMargin)}px;
|
||||||
margin-right: -${Number(maxOffset + endMargin)}px;
|
margin-right: -${Number(maxOffset + endMargin)}px;
|
||||||
opacity: 0;`;
|
opacity: 0;`;
|
||||||
|
|
||||||
const rightAnim2 = `transition: margin 0.5s ease, opacity 0.5s ease;
|
const rightAnim2 = `transition: margin 0.5s ease, opacity 0.5s ease;
|
||||||
margin-left: ${Number(maxOffset + endMargin)}px;
|
margin-left: ${Number(maxOffset + endMargin)}px;
|
||||||
margin-right: -${Number(maxOffset + endMargin)}px;
|
margin-right: -${Number(maxOffset + endMargin)}px;
|
||||||
margin-bottom: -70px; margin-top: -70px; opacity: 0;`;
|
margin-bottom: -70px; margin-top: -70px; opacity: 0;`;
|
||||||
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue