summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accounts/gkleen@sif/default.nix5
-rw-r--r--installer/default.nix2
-rw-r--r--system-profiles/rebuild-machines/default.nix12
-rw-r--r--user-profiles/core.nix5
4 files changed, 11 insertions, 13 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 4322278e..7c75af98 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -292,11 +292,12 @@ in {
292 google-play-music-desktop-player qt5ct playerctl evince 292 google-play-music-desktop-player qt5ct playerctl evince
293 thunderbird wrappedZulip zoom-us steam steam-run wireshark 293 thunderbird wrappedZulip zoom-us steam steam-run wireshark
294 virt-manager rclone cached-nix-shell xournal xmonad worktime 294 virt-manager rclone cached-nix-shell xournal xmonad worktime
295 fira-code-symbols libreoffice xournalpp 295 fira-code-symbols libreoffice xournalpp wrappedChrome
296 wrappedChrome nixos-shell virt-viewer freerdp gnome-icon-theme 296 nixos-shell virt-viewer freerdp gnome-icon-theme
297 paper-icon-theme sshpassSecret weechat helvum 297 paper-icon-theme sshpassSecret weechat helvum
298 wrappedElementDesktop matrix-synapse-tools.synadm 298 wrappedElementDesktop matrix-synapse-tools.synadm
299 wrappedRocketChatDesktop 299 wrappedRocketChatDesktop
300 flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs
300 ]; 301 ];
301 302
302 file = { 303 file = {
diff --git a/installer/default.nix b/installer/default.nix
index ad0c3849..bf09c8d8 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -28,7 +28,5 @@
28 ]; 28 ];
29 29
30 zramSwap.enable = true; 30 zramSwap.enable = true;
31
32 home-manager.enableSystemd = true;
33 }; 31 };
34} 32}
diff --git a/system-profiles/rebuild-machines/default.nix b/system-profiles/rebuild-machines/default.nix
index fe9a5f14..e434d2e4 100644
--- a/system-profiles/rebuild-machines/default.nix
+++ b/system-profiles/rebuild-machines/default.nix
@@ -68,7 +68,7 @@ in {
68 }; 68 };
69 }; 69 };
70 }; 70 };
71 default = { flake.url = "git+ssh://${cfg.repoHost}/nixos?ref=flakes"; flakeOutput = hostName; }; 71 default = { flake = { type = "git"; url = "ssh://${cfg.repoHost}/nixos"; ref = "flakes"; } flakeOutput = hostName; };
72 description = '' 72 description = ''
73 The Flake URI of the NixOS configuration to build. 73 The Flake URI of the NixOS configuration to build.
74 ''; 74 '';
@@ -122,15 +122,15 @@ in {
122 } 122 }
123 ]; 123 ];
124 124
125 sops.secrets = lib.mkIf (!(isNull cfg.sopsConfig)) { 125 sops.secrets = mkIf (!(isNull cfg.sopsConfig)) {
126 "${cfg.sopsName}" = { 126 "${cfg.sopsName}" = {
127 sopsFile = cfg.repoPrivkey; 127 sopsFile = cfg.repoPrivkey;
128 } // cfg.sopsConfig; 128 } // cfg.sopsConfig;
129 }; 129 };
130 130
131 environment.systemPackages = [ rebuildScript ]; 131 environment.systemPackages = [rebuildScript];
132 132
133 systemd.services."rebuild-${hostName}" = lib.mkIf (cfg.period != null) { 133 systemd.services."rebuild-${hostName}" = mkIf (cfg.period != null) {
134 description = "Upgrade System on Next Boot"; 134 description = "Upgrade System on Next Boot";
135 requisite = [ "network.target" ]; 135 requisite = [ "network.target" ];
136 after = [ "network.target" ]; 136 after = [ "network.target" ];
@@ -144,7 +144,7 @@ in {
144 }; 144 };
145 }; 145 };
146 146
147 systemd.timers."rebuild-${hostName}" = lib.mkIf (cfg.period != null) { 147 systemd.timers."rebuild-${hostName}" = mkIf (cfg.period != null) {
148 wantedBy = [ "timers.target" ]; 148 wantedBy = [ "timers.target" ];
149 timerConfig = { 149 timerConfig = {
150 OnCalendar = cfg.period; 150 OnCalendar = cfg.period;
@@ -152,7 +152,7 @@ in {
152 }; 152 };
153 }; 153 };
154 154
155 nix.registry = lib.mkIf (cfg.flake != null) { 155 nix.registry = mkIf (cfg.flake != null) {
156 ${cfg.flake.name} = { 156 ${cfg.flake.name} = {
157 exact = false; 157 exact = false;
158 to = cfg.flake.flake; 158 to = cfg.flake.flake;
diff --git a/user-profiles/core.nix b/user-profiles/core.nix
index cf5db3b6..29891d12 100644
--- a/user-profiles/core.nix
+++ b/user-profiles/core.nix
@@ -10,12 +10,11 @@
10 manual.manpages.enable = true; 10 manual.manpages.enable = true;
11 home.stateVersion = "20.09"; 11 home.stateVersion = "20.09";
12 systemd.user.startServices = "sd-switch"; 12 systemd.user.startServices = "sd-switch";
13
14 }; 13 };
15 }; 14 };
16 15
17 systemd.services."home-manager-${utils.escapeSystemdPath userName}" = lib.mkIf config.home-manager.enableSystemd { 16 systemd.services."home-manager-${utils.escapeSystemdPath userName}" = lib.mkIf (!config.home-manager.enableSystemd) {
18 enable = false; # deploy with deploy-rs 17 restartIfChanged = false; # only run once on startup, deploy to running system with deploy-rs
19 }; 18 };
20 }; 19 };
21} 20}