diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix index 250d58b..e3b390f 100644 --- a/hosts/t480/configuration.nix +++ b/hosts/t480/configuration.nix @@ -35,12 +35,22 @@ programs.dconf.enable = true; + nixpkgs.config.allowUnfree = true; + + xdg.portal = { + enable = true; + wlr.enable = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + xdg-desktop-portal-hyprland + ]; + }; + home-manager = { extraSpecialArgs = { inherit inputs; }; users = { "jack" = import ./home.nix; }; }; - nixpkgs.config.allowUnfree = true; services.libinput.enable = true; diff --git a/hosts/t480/home.nix b/hosts/t480/home.nix index c3fa625..1ee50b6 100644 --- a/hosts/t480/home.nix +++ b/hosts/t480/home.nix @@ -7,6 +7,7 @@ ../../modules/home-manager/zsh.nix ../../modules/home-manager/tmux.nix ../../modules/home-manager/hyprland.nix + ../../modules/home-manager/homepackages.nix ]; programs.home-manager.enable = true; @@ -17,10 +18,6 @@ home.stateVersion = "25.05"; # Please read the comment before changing. - # The home.packages option allows you to install Nix packages into your - # environment. - home.packages = - [ pkgs.sway-contrib.grimshot pkgs.waypaper pkgs.hyprpaper pkgs.swaybg ]; programs.zen-browser.enable = true; @@ -28,6 +25,13 @@ # plain files is through 'home.file'. home.file = { }; + nixpkgs = { + config = { + allowUnfree = true; + allowUnfreePredicate = (_: true); + }; + }; + gtk = { enable = true; diff --git a/modules/home-manager/homepackages.nix b/modules/home-manager/homepackages.nix new file mode 100644 index 0000000..7412d4c --- /dev/null +++ b/modules/home-manager/homepackages.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: + +{ + home.packages = with pkgs; [pkgs.sway-contrib.grimshot + waypaper + hyprpaper + swaybg + lua-language-server + nil + stylua + + lunar-client + ]; +} diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix index 57f511d..d664f32 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/hyprland.nix @@ -22,6 +22,7 @@ # Start Shit # exec-once = sh /home/jack/.config/waybar/launch-waybar.sh & waypaper --restore + exec-once = waypaper --restore #exec-once = ags run /home/jack/.config/ags/simple-bar/ # exec-once = hyprpanel exec-once = gtkbar @@ -167,6 +168,9 @@ # Rice Settings (Developed by me) bind = SUPER, grave, exec, rice-settings + # Bar relaunch + bind = $mainMod, B, exec, gtkbar + # Multimedia Keys bindle = , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.2 @DEFAULT_AUDIO_SINK@ 5%+ diff --git a/modules/nixos/system-packages.nix b/modules/nixos/system-packages.nix index 2975b45..9846033 100644 --- a/modules/nixos/system-packages.nix +++ b/modules/nixos/system-packages.nix @@ -19,5 +19,9 @@ gcc fastfetch brightnessctl + killall + unzip + python3 + nodejs ]; } diff --git a/modules/nixos/user-jack.nix b/modules/nixos/user-jack.nix index 62eb3af..d792f06 100644 --- a/modules/nixos/user-jack.nix +++ b/modules/nixos/user-jack.nix @@ -6,6 +6,6 @@ isNormalUser = true; shell = pkgs.zsh; extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user. - packages = with pkgs; [ zed-editor cargo ]; + packages = with pkgs; [ zed-editor cargo clang clang-tools nil ]; }; }