new flake.lock and update

3 files changed, 33 insertions, 62 deletions

diff --git a/configuration.nix b/configuration.nix
index 303e697..0ad9399 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -188,7 +188,8 @@
 
     jitterentropy-rngd.enable = true;
     resolved.dnssec = true;
-    usbguard.enable = true;
+    # usbguard.enable = true;
+    usbguard.enable = false;
     dbus = {
       apparmor = "enabled";
     };
@@ -367,7 +368,7 @@
       preston = {
         isNormalUser = true;
         description = "Preston Pan";
-        extraGroups = [ "networkmanager" "wheel" "video" "docker" "jackaudio" "tss" ];
+        extraGroups = [ "networkmanager" "wheel" "video" "docker" "jackaudio" "tss" "dialout" ];
         shell = pkgs.zsh;
         packages = [
         ];
diff --git a/flake.lock b/flake.lock
index d4f978e..4ff3256 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734701201,
-        "narHash": "sha256-hk0roBX10j/hospoWIJIJj3i2skd7Oml6yKQBx7mTFk=",
+        "lastModified": 1735468753,
+        "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "2ee76c861af3b895b3b104bae04777b61397485b",
+        "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21",
         "type": "github"
       },
       "original": {
@@ -189,11 +189,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734529975,
-        "narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=",
+        "lastModified": 1735563628,
+        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a",
+        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
         "type": "github"
       },
       "original": {
@@ -221,11 +221,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1734424634,
-        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
+        "lastModified": 1735471104,
+        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
+        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1734702355,
-        "narHash": "sha256-MakJkKkxwbtPdekqi3GgS5apYvgzXtRFD9UkANwYEM8=",
+        "lastModified": 1735705238,
+        "narHash": "sha256-b7iPAqFGwY1rRv0xdT/vsZjo8UnbJFPf9U9PC2OuU4U=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "a34b164e68571dc686f256ef32cc4c3755749fb0",
+        "rev": "21096db6c9ba41cd300a22ee42b86851366bd94f",
         "type": "github"
       },
       "original": {
@@ -355,11 +355,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1734546875,
-        "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
+        "lastModified": 1735468296,
+        "narHash": "sha256-ZjUjbvS06jf4fElOF4ve8EHjbpbRVHHypStoY8HGzk8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
+        "rev": "bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27",
         "type": "github"
       },
       "original": {
diff --git a/home.nix b/home.nix
index 26c64c1..7b0b23f 100644
--- a/home.nix
+++ b/home.nix
@@ -22,6 +22,7 @@
       fira-code
       font-awesome_6
       fswebcam
+      gdb
       ghostscript
       git
       gnumake
@@ -31,7 +32,7 @@
       helvum
       imagemagick
       inkscape
-      kicad
+      # kicad
       krita
       libnotify
       miniserve
@@ -49,6 +50,7 @@
       openscad
       openscad-lsp
       passExtensions.pass-otp
+      pandoc
       pavucontrol
       pfetch
       pinentry
@@ -58,6 +60,7 @@
       rsync
       rust-analyzer
       rustfmt
+      solc
       sox
       swww
       texliveFull
@@ -164,48 +167,6 @@ on-notify=exec mpv /home/preston/sounds/notification.wav --no-config --no-video
       ];
     };
 
-    nushell = {
-      enable = true;
-      extraConfig = ''
-      let carapace_completer = {|spans|
-      carapace $spans.0 nushell $spans | from json
-                               }
-      $env.config = {
-       show_banner: false,
-       completions: {
-       case_sensitive: false # case-sensitive completions
-       quick: true    # set to false to prevent auto-selecting completions
-       partial: true    # set to false to prevent partial filling of the prompt
-       algorithm: "fuzzy"    # prefix or fuzzy
-       external: {
-       # set to false to prevent nushell looking into $env.PATH to find more suggestions
-           enable: true 
-       # set to lower can improve completion performance at the cost of omitting some options
-           max_results: 100 
-           completer: $carapace_completer # check 'carapace_completer' 
-       }
-       }
-                               } 
-      $env.PATH = ($env.PATH | 
-      split row (char esep) |
-      prepend /home/myuser/.apps |
-      append /usr/bin/env
-                    )
-    '';
-
-      shellAliases = {
-        c = "clear";
-        g = "git";
-        v = "vim";
-        h = "Hyprland";
-        r = "gammastep -O 3000";
-        ns = "nix-shell";
-        n = "nix";
-        nfu = "cd /etc/nixos/ && doas nix flake update";
-        rb = "doas nixos-rebuild switch";
-      };
-    };
-
     mpv = {
       enable = true;
       config = {
@@ -1026,7 +987,8 @@ on-notify=exec mpv /home/preston/sounds/notification.wav --no-config --no-video
         v = "vim";
         py = "python3";
         rb = "doas nixos-rebuild switch";
-        nfu = "cd /etc/nixos/ && doas nix flake update";
+        nfu = "cd ~/src/hyprnixmacs && git add . && git commit -m \"new flake lock\" && cd /etc/nixos/ && doas nix flake update";
+        sai = "eval \"$(ssh-agent -s)\" && ssh-add ~/.ssh/id_ed25519 && ssh-add -l";
         i3 = "exec ${pkgs.i3-gaps}/bin/i3";
       };
       loginExtra = ''
@@ -1052,6 +1014,7 @@ on-notify=exec mpv /home/preston/sounds/notification.wav --no-config --no-video
         epkgs.counsel
         epkgs.dashboard
         epkgs.doom-modeline
+        epkgs.irony-eldoc
         epkgs.elfeed
         epkgs.elfeed-org
         epkgs.ellama
@@ -1090,7 +1053,14 @@ on-notify=exec mpv /home/preston/sounds/notification.wav --no-config --no-video
         epkgs.pdf-tools
         epkgs.pinentry
         epkgs.projectile
+        epkgs.platformio-mode
         epkgs.rustic
+
+        epkgs.flycheck
+        epkgs.solidity-mode
+        epkgs.solidity-flycheck
+        epkgs.company-solidity
+
         epkgs.scad-mode
         epkgs.simple-httpd
         epkgs.sudo-edit
@@ -1176,7 +1146,7 @@ on-notify=exec mpv /home/preston/sounds/notification.wav --no-config --no-video
       userName = "Preston Pan";
       userEmail = "ret2pop@gmail.com";
       signing = {
-        key = "EF4256FD266616F6D4FB82475B1AF1DE1FA6FEF2";
+        key = "AEC273BF75B6F54D81343A1AC1FE6CED393AE6C1";
         signByDefault = true;
       };