Rename some folders
This commit is contained in:
parent
e67e85e1a9
commit
42210b1a87
|
@ -1,19 +1,9 @@
|
||||||
{ pkgs, lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
let
|
let
|
||||||
modes = pkgs.lib.attrNames (import ./modes.nix).apollo;
|
modes = pkgs.lib.attrNames (import ./machines.nix).apollo;
|
||||||
autostart-script = pkgs.writeShellScriptBin "home-manager-autostart" ''
|
|
||||||
${pkgs.xorg.xrdb}/bin/xrdb ${builtins.toFile "Xresources" "Xft.dpi: 96"}
|
|
||||||
'';
|
|
||||||
configPath = "/home/maralorn/git/config";
|
configPath = "/home/maralorn/git/config";
|
||||||
in {
|
in {
|
||||||
|
|
||||||
xdg.configFile."autostart/home-manager-autostart.desktop".source = "${
|
|
||||||
pkgs.makeDesktopItem {
|
|
||||||
name = "home-manager-autostart";
|
|
||||||
desktopName = "Home Manager Autostart Job";
|
|
||||||
exec = "${autostart-script}/bin/home-manager-autostart";
|
|
||||||
}
|
|
||||||
}/share/applications/home-manager-autostart.desktop";
|
|
||||||
home.packages = builtins.attrValues rec {
|
home.packages = builtins.attrValues rec {
|
||||||
maintenance = pkgs.writeShellScriptBin "maintenance" ''
|
maintenance = pkgs.writeShellScriptBin "maintenance" ''
|
||||||
set -e
|
set -e
|
||||||
|
@ -40,7 +30,7 @@ in {
|
||||||
main = do
|
main = do
|
||||||
say "Building ~/.modes for apollo"
|
say "Building ~/.modes for apollo"
|
||||||
nixPath <- myNixPath "${configPath}"
|
nixPath <- myNixPath "${configPath}"
|
||||||
nix_build nixPath "${configPath}/home/target.nix" "-A" "apollo" "-o" "/home/maralorn/.modes"
|
nix_build nixPath "${configPath}/home-manager/target.nix" "-A" "apollo" "-o" "/home/maralorn/.modes"
|
||||||
activate_mode
|
activate_mode
|
||||||
'';
|
'';
|
||||||
selectMode = pkgs.writeShellScriptBin "select-mode" ''
|
selectMode = pkgs.writeShellScriptBin "select-mode" ''
|
|
@ -1,7 +1,7 @@
|
||||||
let
|
let
|
||||||
sources = import ../nix/sources.nix;
|
sources = import ../nix/sources.nix;
|
||||||
inherit (import sources.nixpkgs { }) lib pkgs;
|
inherit (import sources.nixpkgs { }) lib pkgs;
|
||||||
modes = import ./modes.nix;
|
modes = import ./machines.nix;
|
||||||
home-manager = import "${sources.home-manager}/home-manager/home-manager.nix";
|
home-manager = import "${sources.home-manager}/home-manager/home-manager.nix";
|
||||||
buildHomeManager = attr:
|
buildHomeManager = attr:
|
||||||
(home-manager {
|
(home-manager {
|
2
home.nix
2
home.nix
|
@ -1,6 +1,6 @@
|
||||||
let
|
let
|
||||||
inherit (import (import ./nix/sources.nix).nixpkgs { }) lib;
|
inherit (import (import ./nix/sources.nix).nixpkgs { }) lib;
|
||||||
modes = import home/modes.nix;
|
modes = import home-manager/machines.nix;
|
||||||
in lib.listToAttrs (lib.flatten (lib.mapAttrsToList (host: configs:
|
in lib.listToAttrs (lib.flatten (lib.mapAttrsToList (host: configs:
|
||||||
lib.mapAttrsToList (mode: config: {
|
lib.mapAttrsToList (mode: config: {
|
||||||
name = "${host}-${mode}";
|
name = "${host}-${mode}";
|
||||||
|
|
|
@ -4,7 +4,7 @@ let
|
||||||
repoSrc = "git@hera.m-0.eu:nixos-config";
|
repoSrc = "git@hera.m-0.eu:nixos-config";
|
||||||
configPath = "/etc/nixos";
|
configPath = "/etc/nixos";
|
||||||
systems = [ "apollo" "hera" ];
|
systems = [ "apollo" "hera" ];
|
||||||
homes = self.lib.attrNames (import ../home/modes.nix);
|
homes = self.lib.attrNames (import ../home-manager/machines.nix);
|
||||||
keys = [ "default" "apollo" "hera" ];
|
keys = [ "default" "apollo" "hera" ];
|
||||||
imports = [ "Control.Exception (onException)" ];
|
imports = [ "Control.Exception (onException)" ];
|
||||||
haskellBody = name: commandline: ''
|
haskellBody = name: commandline: ''
|
||||||
|
@ -32,7 +32,7 @@ in {
|
||||||
name = "test-home-config";
|
name = "test-home-config";
|
||||||
inherit bins;
|
inherit bins;
|
||||||
inherit imports;
|
inherit imports;
|
||||||
} (haskellBody "home" ''nix_build $ paths ++ [[i|#{configDir}/home/target.nix|], "-A", hostname, "-o", [i|result-home-manager-#{hostname}|]] ++ fmap toString args'');
|
} (haskellBody "home" ''nix_build $ paths ++ [[i|#{configDir}/home-manager/target.nix|], "-A", hostname, "-o", [i|result-home-manager-#{hostname}|]] ++ fmap toString args'');
|
||||||
|
|
||||||
test-config = self.writeHaskellScript {
|
test-config = self.writeHaskellScript {
|
||||||
name = "test-config";
|
name = "test-config";
|
||||||
|
|
Loading…
Reference in a new issue