From 9b0cff715f186f9a3d7403cabcbb36d6b2f753b1 Mon Sep 17 00:00:00 2001 From: LunarAkai Date: Sat, 29 Mar 2025 13:48:46 +0100 Subject: [PATCH] hmm --- flake.lock | 24 +++++++++---------- home-manager/luna/categories/cli/atuin.nix | 8 +++++++ home-manager/luna/categories/cli/default.nix | 1 + .../categories/desktop/common/default.nix | 2 +- hosts/common/optional/distrobox.nix | 3 +++ hosts/common/optional/gnome.nix | 10 +++++++- hosts/common/optional/spotify.nix | 9 +++++++ hosts/common/users/luna/default.nix | 5 ++++ hosts/hummingbird/configuration.nix | 3 +++ 9 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 home-manager/luna/categories/cli/atuin.nix create mode 100644 hosts/common/optional/distrobox.nix create mode 100644 hosts/common/optional/spotify.nix diff --git a/flake.lock b/flake.lock index 2d37867..52f2f90 100644 --- a/flake.lock +++ b/flake.lock @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1741877836, - "narHash": "sha256-dInGmyx0eG9ETEyyLZ6J+S7Mj9HNhT9wuh/iYHM1l/k=", + "lastModified": 1743136572, + "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", "owner": "nix-community", "repo": "home-manager", - "rev": "56374cc64d58451b359bb4e8502387d3a96e7c7b", + "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", "type": "github" }, "original": { @@ -193,11 +193,11 @@ ] }, "locked": { - "lastModified": 1742090119, - "narHash": "sha256-I+NlLtHpTsItYkHo4fFdM6moBHF156wM11TPWLcwdic=", + "lastModified": 1743213162, + "narHash": "sha256-9UU0x2fZORsX6PEpzkIAD/7+bwm+javJtZA/411ZmLg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "adcb8b54d64484bb74f1480acefc3c686f318917", + "rev": "1b2a53e3478225bc35d14ae75ea9e7b749c16d5b", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1741862977, - "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { @@ -302,11 +302,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { diff --git a/home-manager/luna/categories/cli/atuin.nix b/home-manager/luna/categories/cli/atuin.nix new file mode 100644 index 0000000..a4e6774 --- /dev/null +++ b/home-manager/luna/categories/cli/atuin.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + programs.atuin = { + enable = true; + settings = { + search_mode = "fuzzy"; + }; + }; +} diff --git a/home-manager/luna/categories/cli/default.nix b/home-manager/luna/categories/cli/default.nix index 12e818e..b82221b 100644 --- a/home-manager/luna/categories/cli/default.nix +++ b/home-manager/luna/categories/cli/default.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { imports = [ ./zsh + ./atuin.nix ./gh.nix ./git.nix ./oh-my-posh.nix diff --git a/home-manager/luna/categories/desktop/common/default.nix b/home-manager/luna/categories/desktop/common/default.nix index ac0faf9..cc25d43 100644 --- a/home-manager/luna/categories/desktop/common/default.nix +++ b/home-manager/luna/categories/desktop/common/default.nix @@ -1,4 +1,4 @@ -{...}: { +{pkgs, ...}: { imports = [ ./alacritty.nix ./fonts.nix diff --git a/hosts/common/optional/distrobox.nix b/hosts/common/optional/distrobox.nix new file mode 100644 index 0000000..a53fe84 --- /dev/null +++ b/hosts/common/optional/distrobox.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + environment.systemPackages = [pkgs.distrobox]; +} diff --git a/hosts/common/optional/gnome.nix b/hosts/common/optional/gnome.nix index 5279305..6340c5f 100644 --- a/hosts/common/optional/gnome.nix +++ b/hosts/common/optional/gnome.nix @@ -1,4 +1,4 @@ -{ +{pkgs, ...}: { # Enable the GNOME Desktop Environment. services = { xserver = { @@ -13,6 +13,14 @@ }; }; + environment.systemPackages = with pkgs; [ + gnome-tweaks + + # Extension + gnomeExtensions.arcmenu + gnomeExtensions.blur-my-shell + ]; + # adds alacritty to nautilus programs.nautilus-open-any-terminal = { enable = true; diff --git a/hosts/common/optional/spotify.nix b/hosts/common/optional/spotify.nix new file mode 100644 index 0000000..779b625 --- /dev/null +++ b/hosts/common/optional/spotify.nix @@ -0,0 +1,9 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + spotifyd + spotify-player + ncspot + ]; + # Local Discovery + networking.firewall.allowedTCPPorts = [57621]; +} diff --git a/hosts/common/users/luna/default.nix b/hosts/common/users/luna/default.nix index 752ec8b..b8ce2c3 100644 --- a/hosts/common/users/luna/default.nix +++ b/hosts/common/users/luna/default.nix @@ -21,9 +21,14 @@ in { # thunderbird gnome-software neovim + gcc + cmake rustup + pkg-config + openssl protonvpn-gui ansible + godot ]; }; diff --git a/hosts/hummingbird/configuration.nix b/hosts/hummingbird/configuration.nix index 127cb2a..2f8a750 100644 --- a/hosts/hummingbird/configuration.nix +++ b/hosts/hummingbird/configuration.nix @@ -18,7 +18,9 @@ ../common/optional/flatpak.nix ../common/optional/ckb-next.nix ../common/optional/docker.nix + ../common/optional/distrobox.nix ../common/optional/virt-manager.nix + ../common/optional/spotify.nix # Include the results of the hardware scan. ./hardware-configuration.nix @@ -59,6 +61,7 @@ gnome-menus inputs.nix-software-center.packages.${system}.nix-software-center inputs.nixos-conf-editor.packages.${system}.nixos-conf-editor + xorg.libX11 ]; # ssh agent