diff --git a/.github/workflows/nix-flake-check.yml b/.github/workflows/nix-flake-check.yml
index 275a23c..6db59e6 100644
--- a/.github/workflows/nix-flake-check.yml
+++ b/.github/workflows/nix-flake-check.yml
@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- - uses: cachix/install-nix-action@v15
+ - uses: cachix/install-nix-action@v18
with:
nix_path: nixpkgs=channel:nixos-stable
extra_nix_config: |
diff --git a/flake.lock b/flake.lock
index f0b79ae..f2340f8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1673301561,
- "narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=",
+ "lastModified": 1665870395,
+ "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68",
+ "rev": "a630400067c6d03c9b3e0455347dc8559db14288",
"type": "github"
},
"original": {
@@ -45,11 +45,11 @@
"utils": "utils"
},
"locked": {
- "lastModified": 1674127017,
- "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=",
+ "lastModified": 1668797197,
+ "narHash": "sha256-0w6iD3GSSQbIeSFVDzAAQZB+hDq670ZTms3d9XI+BtM=",
"owner": "serokell",
"repo": "deploy-rs",
- "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77",
+ "rev": "2a3c5f70eee04a465aa534d8bd4fcc9bb3c4a8ce",
"type": "github"
},
"original": {
@@ -66,11 +66,11 @@
]
},
"locked": {
- "lastModified": 1671489820,
- "narHash": "sha256-qoei5HDJ8psd1YUPD7DhbHdhLIT9L2nadscp4Qk37uk=",
+ "lastModified": 1667210711,
+ "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=",
"owner": "numtide",
"repo": "devshell",
- "rev": "5aa3a8039c68b4bf869327446590f4cdf90bb634",
+ "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7",
"type": "github"
},
"original": {
@@ -194,11 +194,11 @@
"emacs-overlay": {
"flake": false,
"locked": {
- "lastModified": 1674151952,
- "narHash": "sha256-c0dwSGWi8LH2uBsv7ZJK11To1w8oFjTs+d2dtiusGug=",
+ "lastModified": 1669319842,
+ "narHash": "sha256-JSfABiy5/7usgQSy/ua3XbsjJ6F9Dd3P4nJiE56gFME=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "fa7dedfa5e1171a76ff78a1260064e1b20ec93bb",
+ "rev": "49d5cbd389a3fb843793cd7503ad7abdb4f40a9d",
"type": "github"
},
"original": {
@@ -306,11 +306,11 @@
"flake-compat": {
"flake": false,
"locked": {
- "lastModified": 1668681692,
- "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
+ "lastModified": 1648199409,
+ "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "009399224d5e398d03b22badca40a37ac85412a1",
+ "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
"type": "github"
},
"original": {
@@ -322,11 +322,11 @@
"flake-compat_2": {
"flake": false,
"locked": {
- "lastModified": 1673956053,
- "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+ "lastModified": 1668681692,
+ "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+ "rev": "009399224d5e398d03b22badca40a37ac85412a1",
"type": "github"
},
"original": {
@@ -482,20 +482,19 @@
"inputs": {
"nixpkgs": [
"myNixpkgs"
- ],
- "utils": "utils_2"
+ ]
},
"locked": {
- "lastModified": 1672244468,
- "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=",
+ "lastModified": 1667907331,
+ "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706",
+ "rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-22.11",
+ "ref": "release-22.05",
"repo": "home-manager",
"type": "github"
}
@@ -537,16 +536,16 @@
},
"myNixpkgs": {
"locked": {
- "lastModified": 1674242456,
- "narHash": "sha256-yBy7rCH7EiBe9+CHZm9YB5ii5GRa+MOxeW0oDEBO8SE=",
+ "lastModified": 1669418739,
+ "narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "cdead16a444a3e5de7bc9b0af8e198b11bb01804",
+ "rev": "695b3515251873e0a7e2021add4bba643c56cde3",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-22.11",
+ "ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -582,11 +581,11 @@
"ws-butler": "ws-butler"
},
"locked": {
- "lastModified": 1674178427,
- "narHash": "sha256-3bSxHYmHET/6VVnSSzAEGRCV2ZoKCbVAvn/NXnDYOwM=",
+ "lastModified": 1669340080,
+ "narHash": "sha256-/YLYpng6mZ2/NgaCiL3BCQK1cegbUNrQx1Cc1i+nQ8E=",
"owner": "nix-community",
"repo": "nix-doom-emacs",
- "rev": "cac2195c172b084562f028542cd2332ef6d6f27c",
+ "rev": "3c02175dd06714c15ddd2f73708de9b4dacc6aa9",
"type": "github"
},
"original": {
@@ -640,11 +639,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1673803274,
- "narHash": "sha256-zaJDlHFXewT4KUsidMpRcPE+REymGH1Y3Eoc3Pjv4Xs=",
+ "lastModified": 1669146234,
+ "narHash": "sha256-HEby7EG1yaq1oT2Ze6Cvok9CFju1XHkSvVHmkptLW9U=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3",
+ "rev": "0099253ad0b5283f06ffe31cf010af3f9ad7837d",
"type": "github"
},
"original": {
@@ -720,7 +719,7 @@
"locked": {
"lastModified": 1665876905,
"narHash": "sha256-rZJuhvO7hIPezbwFESOEdGm+ZJldrEiPIvyhICJ6xoQ=",
- "ref": "refs/heads/master",
+ "ref": "master",
"rev": "f87f29530beb039d283530ab533d700c53120b83",
"revCount": 25,
"type": "git",
@@ -750,11 +749,11 @@
"org": {
"flake": false,
"locked": {
- "lastModified": 1673519709,
- "narHash": "sha256-XtGk32Lw2iGDgH5Q4Rjhig0Iq5hpIM0EKQoptJ+nT3k=",
+ "lastModified": 1668865287,
+ "narHash": "sha256-q7TfqUuEdZsD+JkF8Cr0Lnn0po6qo2zXMZDieocLpeQ=",
"owner": "emacs-straight",
"repo": "org-mode",
- "rev": "ecb62e2e317b1a4b5b8a6c0f111ed7ef18413040",
+ "rev": "0737112852afe835a5a5833a2dd0a6852c04e0f0",
"type": "github"
},
"original": {
@@ -834,11 +833,11 @@
"revealjs": {
"flake": false,
"locked": {
- "lastModified": 1674035434,
- "narHash": "sha256-z+XxEX+GVcnKt4GAollnHTEHA8YkQfVOLLUuHka6EtA=",
+ "lastModified": 1668674340,
+ "narHash": "sha256-JEXPS67bgKnnRdA37mC18PyGm4EWVQ/BrWeBZLVKPvU=",
"owner": "hakimel",
"repo": "reveal.js",
- "rev": "6510916b9f55a8f3110030bcdd1aee1b7fb77b6f",
+ "rev": "9f1f7789bfbf689d9c1615e523d5c6262771e90f",
"type": "github"
},
"original": {
@@ -946,11 +945,11 @@
"ts-fold": {
"flake": false,
"locked": {
- "lastModified": 1673328482,
- "narHash": "sha256-6yQ35uJDAK531QNQZgloQaOQayRa8azOlOMbO8lXsHE=",
+ "lastModified": 1663136308,
+ "narHash": "sha256-FI25RLoHqhcjA2qel75LVmQH4rTkKiAUR2w9QODT1XM=",
"owner": "jcs-elpa",
"repo": "ts-fold",
- "rev": "75d6f9ed317b042b5bc7cb21503596d1c7a1b8c0",
+ "rev": "c3da5520b988720f7f6e9e5e11b60746598112e0",
"type": "github"
},
"original": {
@@ -961,26 +960,11 @@
},
"utils": {
"locked": {
- "lastModified": 1667395993,
- "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+ "lastModified": 1648297722,
+ "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "utils_2": {
- "locked": {
- "lastModified": 1667395993,
- "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+ "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 4bc1215..823729e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,10 +2,10 @@
description = "dadada's nix flake";
inputs = {
- myNixpkgs.url = github:NixOS/nixpkgs/nixos-22.11;
+ myNixpkgs.url = github:NixOS/nixpkgs/nixos-22.05;
flake-utils.url = github:numtide/flake-utils;
home-manager = {
- url = github:nix-community/home-manager/release-22.11;
+ url = github:nix-community/home-manager/release-22.05;
inputs.nixpkgs.follows = "myNixpkgs";
};
nix-doom-emacs = {
diff --git a/home/configurations.nix b/home/configurations.nix
new file mode 100644
index 0000000..7b086a8
--- /dev/null
+++ b/home/configurations.nix
@@ -0,0 +1,35 @@
+{ self
+, nixpkgs
+, home-manager
+, nix-doom-emacs
+, helix
+, ...
+} @ inputs:
+let
+ hmConfiguration =
+ { homeDirectory ? "/home/dadada"
+ , extraModules ? [ ]
+ , system ? "x86_64-linux"
+ , username ? "dadada"
+ , stateVersion
+ }: (home-manager.lib.homeManagerConfiguration {
+ configuration = { ... }: {
+ imports = (nixpkgs.lib.attrValues self.hmModules) ++ extraModules;
+
+ nixpkgs = {
+ config = import ./nixpkgs-config.nix {
+ pkgs = nixpkgs;
+ };
+ };
+
+ manual.manpages.enable = false;
+ };
+ inherit system homeDirectory username stateVersion;
+ });
+in
+{
+ home = hmConfiguration {
+ extraModules = [ ./home nix-doom-emacs.hmModule ];
+ stateVersion = "20.09";
+ };
+}
diff --git a/home/home/default.nix b/home/home/default.nix
index a870c6b..6968409 100644
--- a/home/home/default.nix
+++ b/home/home/default.nix
@@ -21,8 +21,6 @@ let
];
in
{
- home.stateVersion = "20.09";
-
programs.git = {
signing = {
key = "D68C84695C087E0F733A28D0EEB8D1CE62C4DFEA";
diff --git a/home/home/pkgs.nix b/home/home/pkgs.nix
index 05828b9..bca6a42 100644
--- a/home/home/pkgs.nix
+++ b/home/home/pkgs.nix
@@ -61,6 +61,8 @@ with pkgs; [
irssi
jameica
jc # convert output to json
+ jetbrains.idea-community
+ jetbrains.phpstorm
josm
jq
jq
@@ -95,6 +97,7 @@ with pkgs; [
pandoc # document converter and templater
pass
pavucontrol
+ php74Packages.composer
pinentry-gnome
playerctl
procs # ps in rust
diff --git a/home/modules/helix/config/languages.toml b/home/modules/helix/config/languages.toml
index 7b576c0..e69de29 100644
--- a/home/modules/helix/config/languages.toml
+++ b/home/modules/helix/config/languages.toml
@@ -1,3 +0,0 @@
-[[language]]
-name = "rust"
-config = { rust-analyzer = { checkOnSave = { command = "clippy" } } }
diff --git a/home/modules/session.nix b/home/modules/session.nix
index 879400d..4da85a8 100644
--- a/home/modules/session.nix
+++ b/home/modules/session.nix
@@ -13,7 +13,7 @@ in
type = types.attrs;
default = { };
example = ''
- EDITOR = "hx";
+ EDITOR = "vim";
PAGER = "less";
'';
};
diff --git a/home/modules/zsh.nix b/home/modules/zsh.nix
index 1e73c0a..59453c2 100644
--- a/home/modules/zsh.nix
+++ b/home/modules/zsh.nix
@@ -19,7 +19,7 @@ in
enableVteIntegration = true;
autocd = true;
sessionVariables = {
- EDITOR = "hx";
+ EDITOR = "vim";
};
history = {
extended = true;
diff --git a/hydra-jobs.nix b/hydra-jobs.nix
index 135b95e..078386e 100644
--- a/hydra-jobs.nix
+++ b/hydra-jobs.nix
@@ -2,4 +2,8 @@
(nixpkgs.lib.mapAttrs'
(name: config: nixpkgs.lib.nameValuePair name config.config.system.build.toplevel)
self.nixosConfigurations
+) //
+(nixpkgs.lib.mapAttrs'
+ (name: config: nixpkgs.lib.nameValuePair name config.activation-script)
+ self.hmConfigurations
) // self.checks.x86_64-linux
diff --git a/nixos/agares/configuration.nix b/nixos/agares/configuration.nix
index 0b2e4ed..7bde1ab 100644
--- a/nixos/agares/configuration.nix
+++ b/nixos/agares/configuration.nix
@@ -11,9 +11,6 @@
# to be able to use qemu from substituter
environment.noXlibs = false;
- # libvirtd
- security.polkit.enable = true;
-
dadada = {
admin.enable = true;
networking.localResolver.enable = true;
diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix
index 34da64e..c4cd428 100644
--- a/nixos/gorgon/configuration.nix
+++ b/nixos/gorgon/configuration.nix
@@ -15,14 +15,6 @@ let
echo "Signing paths" $OUT_PATHS
nix store sign --key-file /etc/nix/key.private $OUT_PATHS
'';
-
- xilinxJtag = pkgs.writeTextFile {
- name = "xilinx-jtag";
- text = ''
- ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", TAG+="uaccess"
- '';
- destination = "/etc/udev/rules.d/61-xilinx-jtag.rules";
- };
in
{
imports = [
@@ -87,7 +79,6 @@ in
ghostscript
config.dadada.pkgs.recipemd
config.dadada.pkgs.map
- cachix
];
networking.firewall = {
@@ -100,17 +91,12 @@ in
];
};
- systemd.services.modem-manager.enable = lib.mkForce false;
- systemd.services."dbus-org.freedesktop.ModemManager1".enable = lib.mkForce false;
-
- services.udev.packages = [ xilinxJtag ]; #noMtpUdevRules ];
-
virtualisation.libvirtd.enable = true;
users.users = {
dadada = {
isNormalUser = true;
- extraGroups = [ "wheel" "networkmanager" "libvirtd" "adbusers" "kvm" "video" "scanner" "lp" "docker" "dialout" ];
+ extraGroups = [ "wheel" "networkmanager" "libvirtd" "adbusers" "kvm" "video" "scanner" "lp" "docker" ];
shell = "/run/current-system/sw/bin/zsh";
};
};
diff --git a/nixos/modules/backup.nix b/nixos/modules/backup.nix
index 06cf81d..44087f0 100644
--- a/nixos/modules/backup.nix
+++ b/nixos/modules/backup.nix
@@ -15,7 +15,6 @@ with lib; let
"/mnt"
"/nix"
"/proc"
- "/root"
"/run"
"/sys"
"/tmp"
@@ -59,8 +58,8 @@ in
};
};
- config = {
- fileSystems = mkIf cfg.gs.enable {
+ config = mkIf cfg.gs.enable {
+ fileSystems = mkIf cfg.gs {
"/backup" = {
device = "/dev/disk/by-uuid/0fdab735-cc3e-493a-b4ec-cbf6a77d48d5";
fsType = "ext4";
@@ -68,45 +67,45 @@ in
};
};
- services.borgbackup.jobs.gs = mkIf cfg.gs.enable {
- paths = "/";
- exclude = backupExcludes;
- repo = "/backup/${config.networking.hostName}";
- doInit = false;
- encryption = {
- mode = "repokey";
- passCommand = "cat ${cfg.gs.passphrasePath}";
+ services.borgbackup.jobs.gs =
+ {
+ paths = "/";
+ exclude = backupExcludes;
+ repo = "/backup/${config.networking.hostName}";
+ doInit = false;
+ encryption = {
+ mode = "repokey";
+ passCommand = "cat ${cfg.gs.passphrasePath}";
+ };
+ compression = "auto,lz4";
+ prune.keep = {
+ within = "1d"; # Keep all archives from the last day
+ daily = 7;
+ weekly = 2;
+ monthly = -1; # Keep at least one archive for each month
+ yearly = -1; # Keep at least one archive for each year
+ };
+ startAt = "monthly";
+ }
+ // mkIf cfg.bs.enable {
+ services.borgbackup.jobs.bs = {
+ paths = "/";
+ exclude = backupExcludes;
+ repo = "borg@backup0.dadada.li:/mnt/storage/backup/${config.networking.hostName}";
+ doInit = false;
+ environment = {
+ BORG_RSH = "ssh -i ${cfg.bs.sshIdentityFile} -o 'StrictHostKeyChecking accept-new' -o 'TCPKeepAlive=yes'";
+ };
+ encryption = {
+ mode = "repokey";
+ passCommand = "cat ${cfg.bs.passphrasePath}";
+ };
+ compression = "auto,lz4";
+ startAt = "daily";
+ environment = {
+ BORG_RELOCATED_REPO_ACCESS_IS_OK = "yes";
+ };
+ };
};
- compression = "auto,lz4";
- prune.keep = {
- within = "1d"; # Keep all archives from the last day
- daily = 7;
- weekly = 2;
- monthly = -1; # Keep at least one archive for each month
- yearly = -1; # Keep at least one archive for each year
- };
- startAt = "monthly";
- };
-
- systemd.timers."borgbackup-job-gs".enable = false;
-
- services.borgbackup.jobs.bs = mkIf cfg.bs.enable {
- paths = "/";
- exclude = backupExcludes;
- repo = "borg@backup0.dadada.li:/mnt/storage/backup/${config.networking.hostName}";
- doInit = false;
- environment = {
- BORG_RSH = "ssh -i ${cfg.bs.sshIdentityFile} -o 'StrictHostKeyChecking accept-new' -o 'TCPKeepAlive=yes'";
- };
- encryption = {
- mode = "repokey";
- passCommand = "cat ${cfg.bs.passphrasePath}";
- };
- compression = "auto,lz4";
- startAt = "daily";
- environment = {
- BORG_RELOCATED_REPO_ACCESS_IS_OK = "yes";
- };
- };
};
}
diff --git a/nixos/modules/gitea.nix b/nixos/modules/gitea.nix
index bc4c6a0..28c9983 100644
--- a/nixos/modules/gitea.nix
+++ b/nixos/modules/gitea.nix
@@ -17,6 +17,7 @@ in
rootUrl = "https://git.dadada.li/";
log.level = "Error";
domain = config.networking.domain;
+ ssh.enable = true;
cookieSecure = true;
enableUnixSocket = true;
database = {
@@ -27,7 +28,6 @@ in
server = {
LANDING_PAGE = "explore";
OFFLINE_MODE = true;
- DISABLE_SSH = false;
};
picture = {
DISABLE_GRAVATAR = true;
diff --git a/nixos/modules/networking.nix b/nixos/modules/networking.nix
index 07ad57d..734f964 100644
--- a/nixos/modules/networking.nix
+++ b/nixos/modules/networking.nix
@@ -42,7 +42,7 @@ in
prefetch = true;
prefetch-key = true;
- serve-expired = false;
+ serve-expired = true;
aggressive-nsec = true;
hide-identity = true;
@@ -63,12 +63,12 @@ in
private-domain = [
"dadada.li"
(mkIf cfg.localResolver.uwu "uwu")
- (mkIf cfg.localResolver.s0 "space.stratum0.net")
+ (mkIf cfg.localResolver.s0 "s0")
];
domain-insecure = [
"dadada.li"
(mkIf cfg.localResolver.uwu "uwu")
- (mkIf cfg.localResolver.s0 "space.stratum0.net")
+ (mkIf cfg.localResolver.s0 "s0")
];
interface = [
"127.0.0.1"
@@ -97,7 +97,7 @@ in
)
(
mkIf cfg.localResolver.s0 {
- name = "space.stratum0.net.";
+ name = "s0.";
forward-addr = [
"192.168.178.1"
];
diff --git a/nixos/modules/profiles/backup.nix b/nixos/modules/profiles/backup.nix
index dc57f96..dfa3f2e 100644
--- a/nixos/modules/profiles/backup.nix
+++ b/nixos/modules/profiles/backup.nix
@@ -5,16 +5,10 @@ in
{
dadada.backupClient.bs = {
enable = true;
- passphrasePath = config.age.secrets."${config.networking.hostName}-backup-passphrase".path;
- sshIdentityFile = config.age.secrets."${config.networking.hostName}-backup-ssh-key".path;
- };
-
- dadada.backupClient.gs = {
- enable = true;
- passphrasePath = config.age.secrets."${config.networking.hostName}-backup-passphrase-gs".path;
+ passphrasePath = config.age.secrets."${config.networking.hostName}-backup-passphrase.path";
+ sshIdentityFile = config.age.secrets."${config.networking.hostName}-backup-ssh-key.path";
};
age.secrets."${config.networking.hostName}-backup-passphrase".file = "${secretsPath}/${config.networking.hostName}-backup-passphrase.age";
- age.secrets."${config.networking.hostName}-backup-passphrase-gs".file = "${secretsPath}/${config.networking.hostName}-backup-passphrase-gs.age";
age.secrets."${config.networking.hostName}-backup-ssh-key".file = "${secretsPath}/${config.networking.hostName}-backup-ssh-key.age";
}
diff --git a/nixos/modules/profiles/laptop.nix b/nixos/modules/profiles/laptop.nix
index 07e93b6..1ceca94 100644
--- a/nixos/modules/profiles/laptop.nix
+++ b/nixos/modules/profiles/laptop.nix
@@ -40,8 +40,8 @@ with lib; {
};
virtualisation = {
- libvirtd.enable = mkDefault false;
- docker.enable = mkDefault false;
+ libvirtd.enable = mkDefault true;
+ docker.enable = mkDefault true;
docker.liveRestore = false;
};
diff --git a/outputs.nix b/outputs.nix
index dff9822..7b78694 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -59,6 +59,8 @@
}))
// {
+ hmConfigurations = import ./home/configurations.nix inputs;
+
hmModules = import ./home/modules;
nixosConfigurations = import ./nixos/configurations.nix inputs;
diff --git a/secrets/gorgon-backup-gs-passphrase.age b/secrets/gorgon-backup-gs-passphrase.age
deleted file mode 100644
index 56e974e..0000000
--- a/secrets/gorgon-backup-gs-passphrase.age
+++ /dev/null
@@ -1,10 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 0aOabg 9911l+glO4IHD+/KEqVMfJHNHAxP/iShTVpGHgKC/TY
-9g7vLb+T2079yst1ZKXKlwAVhF9zQd79vl/UWpnBJq8
--> ssh-ed25519 Otklkw egRNXEFrQMSJ5rZTM4ND5LgJjkIW66YKtCeWQ1rkNTE
-YQViNMFpP/S3Tpc1yvIHIWud7QHTnO0RK3FQbPlQ8N4
--> xV2q-grease
-2HGDr4IOqMcYh5ud219N73Gq8lyOWX4irrjCnNe1CR8dpjWN+rnDnCFbEB3Troqp
-4zVnSNw
---- dPWJpPMiJkxAA+H8HmahTdMCGa5HaglmYmgUzhctgUo
-@�B�t]��z�� ��y*}�� ����-A����Pb�v��h�n��
=`-� �4�
\ No newline at end of file
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 7650525..b236900 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -18,7 +18,6 @@ in
"pruflas-wg-hydra-key.age".publicKeys = [ systems.pruflas dadada ];
"hydra-github-authorization.age".publicKeys = [ systems.pruflas dadada ];
"miniflux-admin-credentials.age".publicKeys = [ systems.surgat dadada ];
- "gorgon-backup-gs-passphrase.age".publicKeys = [ systems.gorgon dadada ];
} //
backupSecrets "gorgon" //
backupSecrets "ifrit" //