From b7795b31ec0c938f4f45ebe9d7a547a9cb4fe22c Mon Sep 17 00:00:00 2001 From: Aria Nolan Date: Mon, 6 Nov 2023 21:43:16 -0500 Subject: [PATCH 1/2] updated flake --- flake.lock | 24 ++++++++++++------------ hosts/JWST/configuration.nix | 25 +++++-------------------- users/tacocat/home.nix | 1 + users/tacocat/shell/zsh.nix | 1 + users/tacocat/wayland/default.nix | 2 +- 5 files changed, 20 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 70cc70d..bf4dca9 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1697810188, - "narHash": "sha256-9MR0VYClllADRmyYTypI6Qri6G+LACwYpzz/b5KePR8=", + "lastModified": 1699235665, + "narHash": "sha256-sG1LdPcOROC4iwK6IMuqZDosrL3yNmX2x19f/GcyWYs=", "owner": "helix-editor", "repo": "helix", - "rev": "6d598d32398943718b4943a452ae6dd8490fa439", + "rev": "f73e9a8d15fd5a87d472a49808baf42ba403f9bf", "type": "github" }, "original": { @@ -95,11 +95,11 @@ ] }, "locked": { - "lastModified": 1697838989, - "narHash": "sha256-hwVlO+st8vWJO6iy3/JbMHrUyY4Ak7xUSmffoWqBPUg=", + "lastModified": 1699025595, + "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae631b0b20f06f7d239d160723d228891ddb2fe0", + "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", "type": "github" }, "original": { @@ -110,11 +110,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1698053470, - "narHash": "sha256-sP8D/41UiwC2qn0X40oi+DfuVzNHMROqIWdSdCI/AYA=", + "lastModified": 1699159446, + "narHash": "sha256-cL63IjsbPl2otS7R4kdXbVOJOXYMpGw5KGZoWgdCuCM=", "owner": "NixOs", "repo": "nixos-hardware", - "rev": "80d98a7d55c6e27954a166cb583a41325e9512d7", + "rev": "627bc9b88256379578885a7028c9e791c29fb581", "type": "github" }, "original": { @@ -126,11 +126,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1699099776, + "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "type": "github" }, "original": { diff --git a/hosts/JWST/configuration.nix b/hosts/JWST/configuration.nix index 7d46d5c..0386d9e 100644 --- a/hosts/JWST/configuration.nix +++ b/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; [ - # intel-compute-runtime - #]; + extraPackages = with pkgs; [ + 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 diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix index 426f293..20e70a0 100644 --- a/users/tacocat/home.nix +++ b/users/tacocat/home.nix @@ -30,6 +30,7 @@ networkmanagerapplet htop p7zip + cachix ]; }; diff --git a/users/tacocat/shell/zsh.nix b/users/tacocat/shell/zsh.nix index 8951b9e..ade5f88 100644 --- a/users/tacocat/shell/zsh.nix +++ b/users/tacocat/shell/zsh.nix @@ -29,6 +29,7 @@ }; } + # TODO change vi-mode cursor { name = "zsh-vi-mode"; src = pkgs.fetchFromGitHub { diff --git a/users/tacocat/wayland/default.nix b/users/tacocat/wayland/default.nix index 875d292..6abfc50 100644 --- a/users/tacocat/wayland/default.nix +++ b/users/tacocat/wayland/default.nix @@ -22,5 +22,5 @@ slurp ]; - programs.rofi.package = pkgs.rofi-wayland-unwrapped; + programs.rofi.package = pkgs.rofi-wayland; } From 4aedbd228b4bf592a4aef1eabae1be6b1545784e Mon Sep 17 00:00:00 2001 From: Aria Nolan Date: Mon, 6 Nov 2023 21:44:22 -0500 Subject: [PATCH 2/2] updated flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index bf4dca9..2b57f19 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1699235665, - "narHash": "sha256-sG1LdPcOROC4iwK6IMuqZDosrL3yNmX2x19f/GcyWYs=", + "lastModified": 1699306398, + "narHash": "sha256-7HwWZWquyb68RtuVv0a6VaUKi42ivm8o46v9ALjNTHM=", "owner": "helix-editor", "repo": "helix", - "rev": "f73e9a8d15fd5a87d472a49808baf42ba403f9bf", + "rev": "7bc564d3dcdee69555578bbec75d08e6ce227a9e", "type": "github" }, "original": { @@ -95,11 +95,11 @@ ] }, "locked": { - "lastModified": 1699025595, - "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", + "lastModified": 1699290318, + "narHash": "sha256-weH8oEJo+g0yJtGGU+Zo2pg5kOxPUCAFl8v/5dEnH00=", "owner": "nix-community", "repo": "home-manager", - "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", + "rev": "c067d57fc4552835987fd7611c3a6741ee32ebd5", "type": "github" }, "original": {