goodbye worlddev

7 files changed, 154 insertions, 21 deletions

diff --git a/flake.lock b/flake.lock
index 9885eb3..55ab2f4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -32,11 +32,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776540672,
-        "narHash": "sha256-D43SN81mM21icdtK/9JDwaXsIhFv+gm4G8KXhJDCxsQ=",
+        "lastModified": 1776597546,
+        "narHash": "sha256-Tjl13yCZeeu/me0k9aEq4qofXUfqGRpJPBTLFfQJmQo=",
         "ref": "refs/heads/master",
-        "rev": "bcd83506ea691861562ade66ce23f57b27e57ee2",
-        "revCount": 12,
+        "rev": "364c022ceee8422e95dd468bf85ec733a02811eb",
+        "revCount": 13,
         "type": "git",
         "url": "https://git.mtgmonkey.net/Andromeda/anki-cli.git"
       },
@@ -129,6 +129,50 @@
         "type": "gitlab"
       }
     },
+    "c3c": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "c3term",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1776896666,
+        "narHash": "sha256-sHuzupUdWHfzzigugxtmKBx+25BtE35012iTLq6cP4I=",
+        "owner": "c3lang",
+        "repo": "c3c",
+        "rev": "453735825c282b419c7e08438a5b7b59d16e5624",
+        "type": "github"
+      },
+      "original": {
+        "owner": "c3lang",
+        "repo": "c3c",
+        "type": "github"
+      }
+    },
+    "c3term": {
+      "inputs": {
+        "c3c": "c3c",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1777150236,
+        "narHash": "sha256-2yrSISNFU/EE4ObaSjcb2hyYad7l2k2/kwgf+/FdgSQ=",
+        "ref": "refs/heads/master",
+        "rev": "c101e6571135cfd963e3c3f9543e64c445af7fd8",
+        "revCount": 7,
+        "submodules": true,
+        "type": "git",
+        "url": "https://git.mtgmonkey.net/Andromeda/c3term.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.mtgmonkey.net/Andromeda/c3term.git"
+      }
+    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -307,6 +351,24 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -484,6 +546,26 @@
         "type": "github"
       }
     },
+    "myPkgs": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1777386959,
+        "narHash": "sha256-Lq0nTHyFIdVX5Or6CCjQ/AIMnv7RkBaLmr3AosPVhAU=",
+        "ref": "refs/heads/master",
+        "rev": "7022a255ade02da7f8d7b2ae69dcc40f6b8eb25d",
+        "revCount": 4,
+        "type": "git",
+        "url": "https://git.mtgmonkey.net/andromeda/pkgs.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.mtgmonkey.net/andromeda/pkgs.git"
+      }
+    },
     "naersk": {
       "inputs": {
         "fenix": "fenix_2",
@@ -654,7 +736,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1776539146,
@@ -677,26 +759,28 @@
         ]
       },
       "locked": {
-        "lastModified": 1776592848,
-        "narHash": "sha256-xpoDCBLPNViU9kxDr8f2z1MuPLvrmCkrJxymUuanv88=",
-        "ref": "refs/heads/pages",
-        "rev": "1c69c28a9b6184529c0f756a386c6fbfde35a150",
-        "revCount": 2812,
+        "lastModified": 1777318705,
+        "narHash": "sha256-cWCBgGPqMpx2z2SKQKJ9Lm8qvHtutKDFCbJnOUcAsEs=",
+        "ref": "dev",
+        "rev": "edc4f8949a35ae63107271aaa01eb5e5f34ef70a",
+        "revCount": 2881,
         "type": "git",
-        "url": "https://codeberg.org/andromeda-fp/Phoenix"
+        "url": "https://codeberg.org/celenity/Phoenix"
       },
       "original": {
-        "rev": "1c69c28a9b6184529c0f756a386c6fbfde35a150",
+        "ref": "dev",
         "type": "git",
-        "url": "https://codeberg.org/andromeda-fp/Phoenix"
+        "url": "https://codeberg.org/celenity/Phoenix"
       }
     },
     "root": {
       "inputs": {
         "agenix": "agenix",
         "anki-cli": "anki-cli",
+        "c3term": "c3term",
         "home-manager": "home-manager_2",
         "impermanence": "impermanence",
+        "myPkgs": "myPkgs",
         "nix-zulip": "nix-zulip",
         "nixos-mailserver": "nixos-mailserver",
         "nixpkgs": "nixpkgs_2",
@@ -753,7 +837,7 @@
           "nixpkgs"
         ],
         "nur": "nur_2",
-        "systems": "systems_3",
+        "systems": "systems_4",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
         "tinted-tmux": "tinted-tmux",
@@ -818,6 +902,21 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tinted-kitty": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index edc6775..6a108be 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,10 @@
       url = "git+https://git.mtgmonkey.net/Andromeda/anki-cli.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    c3term = {
+      url = "git+https://git.mtgmonkey.net/Andromeda/c3term.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -17,6 +21,10 @@
       url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    myPkgs = {
+      url = "git+https://git.mtgmonkey.net/andromeda/pkgs.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nix-zulip = {
       url = "git+https://git.afnix.fr/nix-zulip/nix-zulip";
@@ -31,8 +39,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     phoenix = {
-      # TODO when pull #270 gets merged use celenity again
-      url = "git+https://codeberg.org/andromeda-fp/Phoenix?rev=1c69c28a9b6184529c0f756a386c6fbfde35a150";
+      url = "git+https://codeberg.org/celenity/Phoenix?ref=dev";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     stylix = {
@@ -43,8 +50,10 @@
   outputs = {
     agenix,
     anki-cli,
+    c3term,
     home-manager,
     impermanence,
+    myPkgs,
     nixos-mailserver,
     nixpkgs,
     nix-zulip,
@@ -76,9 +85,14 @@
                 agenix.overlays.default
                 nur.overlays.default
                 nix-zulip'.overlays.default
-                (self: super: {
-                  anki-cli = anki-cli.packages.${machine.system}.default;
-                })
+                (
+                  self: super:
+                    {
+                      anki-cli = anki-cli.packages.${machine.system}.default;
+                      c3term = c3term.packages.${machine.system}.default;
+                    }
+                    // myPkgs.packages.${machine.system}
+                )
               ];
             })
           ]
diff --git a/machines.nix b/machines.nix
index e2bb4b7..d5d6e98 100644
--- a/machines.nix
+++ b/machines.nix
@@ -39,8 +39,8 @@
       {
         services.guix = {
           enable = true;
-          stateDir = "/gnu/var";
         };
+        environment.persistence."/persist".directories = ["/var/guix"];
       }
     ];
   };
diff --git a/modules/nixos/boot/lenovo.nix b/modules/nixos/boot/lenovo.nix
index fdd5e14..92f56c3 100644
--- a/modules/nixos/boot/lenovo.nix
+++ b/modules/nixos/boot/lenovo.nix
@@ -1,6 +1,16 @@
 {
   boot.loader = {
+    grub = {
+      device = "nodev";
+      enable = true;
+      efiSupport = true;
+      extraEntries = ''
+        menuentry "Guix" {
+          search --set=drive1 --fs-uuid F425-55BA
+          chainloader ($drive1)//EFI/Guix/grubx64.efi
+        }
+      '';
+    };
     efi.canTouchEfiVariables = true;
-    systemd-boot.enable = true;
   };
 }
diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix
index 6082d91..b586b77 100644
--- a/modules/nixos/common.nix
+++ b/modules/nixos/common.nix
@@ -9,6 +9,8 @@
     "nix-command"
   ];
 
+  documentation.man.enable = true;
+
   # allows users to customize shell in `$XDG_CONFIG_HOME/shell` rather than
   # needing /etc/shells. Useful for home-manager.
   # programs.noshell.enable = true;
diff --git a/users.nix b/users.nix
index 9e1e9fb..fdbc3b9 100644
--- a/users.nix
+++ b/users.nix
@@ -26,6 +26,7 @@
       "andromeda" = {
         directories = [
           ".backups"
+          ".config/guix"
           ".gnupg"
           ".local/share/AAAAXY"
           ".local/share/Anki2"
diff --git a/users/andromeda/home.nix b/users/andromeda/home.nix
index 4227446..1208b6d 100644
--- a/users/andromeda/home.nix
+++ b/users/andromeda/home.nix
@@ -18,6 +18,10 @@
     };
 in {
   imports = [./stylix.nix];
+  xdg.portal = {
+    enable = true;
+    extraPortals = [pkgs.xdg-desktop-portal-shana];
+  };
   xdg.configFile."sway/config".source = lib.mkForce sway_config;
   wayland.windowManager.sway.enable = true;
   home = {
@@ -31,6 +35,7 @@ in {
       pkgs.alacritty
       pkgs.anki
       pkgs.anki-cli
+      pkgs.c3term
       pkgs.brightnessctl
       pkgs.dust
       pkgs.fluffychat
@@ -46,12 +51,14 @@ in {
       pkgs.nasm
       pkgs.nix-output-monitor
       pkgs.npins
+      pkgs.pciutils
       pkgs.ranger
       pkgs.rip2
       pkgs.ripgrep
       pkgs.slurp
       pkgs.tokei
       pkgs.tree
+      pkgs.usbutils
       pkgs.wget
       pkgs.xxd
     ];