Merge branch 'main' into firefox

flake.lock

@@ -74,11 +74,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1697810188,
+        "lastModified": 1699306398,
-        "narHash": "sha256-9MR0VYClllADRmyYTypI6Qri6G+LACwYpzz/b5KePR8=",
+        "narHash": "sha256-7HwWZWquyb68RtuVv0a6VaUKi42ivm8o46v9ALjNTHM=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "6d598d32398943718b4943a452ae6dd8490fa439",
+        "rev": "7bc564d3dcdee69555578bbec75d08e6ce227a9e",
         "type": "github"
       },
       "original": {
@@ -95,11 +95,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1697838989,
+        "lastModified": 1699290318,
-        "narHash": "sha256-hwVlO+st8vWJO6iy3/JbMHrUyY4Ak7xUSmffoWqBPUg=",
+        "narHash": "sha256-weH8oEJo+g0yJtGGU+Zo2pg5kOxPUCAFl8v/5dEnH00=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ae631b0b20f06f7d239d160723d228891ddb2fe0",
+        "rev": "c067d57fc4552835987fd7611c3a6741ee32ebd5",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1698053470,
+        "lastModified": 1699159446,
-        "narHash": "sha256-sP8D/41UiwC2qn0X40oi+DfuVzNHMROqIWdSdCI/AYA=",
+        "narHash": "sha256-cL63IjsbPl2otS7R4kdXbVOJOXYMpGw5KGZoWgdCuCM=",
         "owner": "NixOs",
         "repo": "nixos-hardware",
-        "rev": "80d98a7d55c6e27954a166cb583a41325e9512d7",
+        "rev": "627bc9b88256379578885a7028c9e791c29fb581",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1697723726,
+        "lastModified": 1699099776,
-        "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
+        "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
+        "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
         "type": "github"
       },
       "original": {

hosts/JWST/configuration.nix

@@ -14,7 +14,6 @@
 
   boot.loader = {
     efi.canTouchEfiVariables = false;
-    # efi.efiSysMountPoint = "/boot/efi";
     grub = {
       efiSupport = true;
       configurationLimit = 10;
@@ -69,9 +68,9 @@
 
   hardware.opengl = {
     enable = true;
-    #extraPackages = with pkgs; [
+    extraPackages = with pkgs; [
-    #  intel-compute-runtime
+      intel-compute-runtime
-    #];
+    ];
   };
 
   hardware.opentabletdriver.enable = true;
@@ -82,9 +81,6 @@
     extraGroups = ["wheel" "networkmanager" "audio" "video" "bluetooth" "kvm"];
     home = "/home/tacocat";
     description = "Aria Nolan";
-    packages = with pkgs; [
-      kitty
-    ];
   };
 
   programs.river.enable = true;
@@ -93,6 +89,8 @@
     swayidle
   ];
 
+  programs.waybar.enable = true;
+
   environment = {
     systemPackages = with pkgs; [
       vim
@@ -104,19 +102,6 @@
     ];
   };
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  # system.copySystemConfiguration = true;
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It's perfectly fine and recommended to leave

users/tacocat/home.nix

@@ -30,6 +30,7 @@
       networkmanagerapplet
       htop
       p7zip
+      cachix
     ];
   };
 

users/tacocat/shell/zsh.nix

@@ -29,6 +29,7 @@
         };
       }
 
+      # TODO change vi-mode cursor
       {
         name = "zsh-vi-mode";
         src = pkgs.fetchFromGitHub {

users/tacocat/wayland/default.nix

@@ -22,5 +22,5 @@
     slurp
   ];
 
-  programs.rofi.package = pkgs.rofi-wayland-unwrapped;
+  programs.rofi.package = pkgs.rofi-wayland;
 }