lemptop changes

7 files changed, 13 insertions, 36 deletions

diff --git a/flake.lock b/flake.lock
index 34a478d..7aebaec 100644
--- a/flake.lock
+++ b/flake.lock
@@ -399,23 +399,6 @@
         "type": "github"
       }
     },
-    "nix-darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1736966448,
-        "narHash": "sha256-M8NfrMc5wmbS9CzVoySZR1mNSAhhKfdfa1vZb90mQTA=",
-        "path": "/home/ivi/nix-darwin",
-        "type": "path"
-      },
-      "original": {
-        "path": "/home/ivi/nix-darwin",
-        "type": "path"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1702272962,
@@ -566,7 +549,6 @@
         "ghostty": "ghostty",
         "home-manager": "home-manager",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
-        "nix-darwin": "nix-darwin",
         "nixpkgs": "nixpkgs_4",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "sops-nix": "sops-nix"
diff --git a/flake.nix b/flake.nix
index 9e24b22..617304e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,10 +16,6 @@
     simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
     drduh-yubikey-guide.url = "github:drduh/YubiKey-Guide";
-    nix-darwin = {
-      url = "path:/home/ivi/nix-darwin";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     ghostty = {
       url = "github:ghostty-org/ghostty";
     };
@@ -42,7 +38,7 @@
 
     lib =
       (withLibs [
-        inputs.nix-darwin.lib
+        # inputs.nix-darwin.lib
         home-manager.lib
       ])
       .extend
@@ -54,6 +50,11 @@
         modules =
           [
             ./machines/lemptop.nix
+            {
+              environment.systemPackages = [
+                ghostty.packages.x86_64-linux.default
+              ];
+            }
           ]
           ++ modulesIn ./profiles/core
           ++ modulesIn ./profiles/graphical
diff --git a/lib/my.nix b/lib/my.nix
index 5033ae9..04cfc1c 100644
--- a/lib/my.nix
+++ b/lib/my.nix
@@ -10,7 +10,7 @@ self: lib: with lib; let
         domain = "vinkies.net";
         email = "ivi@vinkies.net";
         sshKeys = [
-          "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIPZHOBNQdo5oBnQ8f147QtelhLmYItiruoNfoHF89qrJAAAABHNzaDo= ivi@lemptop"
+          "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIOF/b1fDKIKsjEIC5nfshd3PkzqnD672Miyo/3fyrxMfAAAABHNzaDo= ivi@vm-aarch64"
           "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDqsfYS7sOLfLWvGTmxT2QYGkbXJ5kREFl42n3jtte5sLps76KECgKqEjA4OLhNZ51lKFBDzcn1QOUl3RN4+qHsBtkr+02a7hhf1bBLeb1sx6+FVXdsarln5lUF/NMcpj6stUi8mqY4aQ21jQKxZsGip9fI8fx3HtXYCVhIarRbshQlwDqTplJBLDtrnmWTprxVnz1xSZRr3euXsIh1FFQZI6klPPBa6qFJtWWtGNBCRr8Sruo6I4on7QjNyW/s1OgiNAR0N2IO9wCdjlXrjNnFEAaMrpDpZde7eULbiFP2pHYVVy/InwNhhePYkeBh/4BzlaUZVv6gXsX7wOC5OyWaXbbMzWEopbnqeXXLwNyOZ88YpN/c+kZk2/1CHl+xmlVGAr9TnZ9VST5Y4ZAEqq8OKoP3ZcchAWxWjzTgPogSfiIAP/n5xrgB+8uRZb/gkN+I7RTQKGrS2Ex7gfkj39beDeevQj3XVQ1U2kp3n+jUBHItCCpZyHISgTYW2Ct6lrziJpD0kPlAOrN3BGQtkStHYK+4EE1PrrwWGkG7Ue+tlETe8FTg+AMv1VjLV9b3pHZJCrao5/cY2MxkfGzf4HTfeueqSLSsrYuiogHAPvvzfvOV5un+dWX8HyeBjmKTBwDBFuhdca/wzk0ArHSgEYUmh2NXj/G4gaSF3EX5ZSxmMQ== ${my.email}"
         ];
 
diff --git a/machines/lemptop.nix b/machines/lemptop.nix
index 7f820ec..bd24dd7 100644
--- a/machines/lemptop.nix
+++ b/machines/lemptop.nix
@@ -36,8 +36,8 @@ with lib;
       -----END CERTIFICATE-----
     '';
   };
-  my.shell = pkgs.zsh;
-  environment.shells = [pkgs.bashInteractive pkgs.zsh];
+  my.shell = pkgs.nushell;
+  environment.shells = [pkgs.bashInteractive pkgs.zsh pkgs.nushell];
   environment.pathsToLink = [ "/share/zsh" ];
   programs.zsh.enable = true;
 
@@ -66,7 +66,6 @@ with lib;
   virtualisation.docker.enable = true;
   programs.nix-ld.enable = true;
 
-  sound.enable = false;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
@@ -84,7 +83,7 @@ with lib;
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  # boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix
index 3d000f1..fdbb94c 100644
--- a/profiles/core/configuration.nix
+++ b/profiles/core/configuration.nix
@@ -7,6 +7,8 @@
 }: with lib; {
   imports = [ (mkAliasOptionModule [ "my" ] [ "users" "users" my.username ]) ];
 
+  nixpkgs.config.allowUnfree = true;
+
   services = {
     resolved.fallbackDns = [
       "1.1.1.1#one.one.one.one"
diff --git a/profiles/core/neovim.nix b/profiles/core/neovim.nix
index b5531c1..2fbdd8b 100644
--- a/profiles/core/neovim.nix
+++ b/profiles/core/neovim.nix
@@ -80,13 +80,7 @@
         vim-easy-align
         nvim-comment
 
-        # cmp
-        nvim-cmp
-        cmp-cmdline
-        cmp-nvim-lsp
-        cmp-buffer
-        cmp-path
-        cmp_luasnip
+        blink-cmp
 
         # trying out lisp
         conjure
diff --git a/profiles/station/packages.nix b/profiles/station/packages.nix
index 26ed4a8..0be6dd7 100644
--- a/profiles/station/packages.nix
+++ b/profiles/station/packages.nix
@@ -31,7 +31,6 @@
       raylib
       maim
       profanity
-      mypaint
       lynx
       sent
       initool