diff --git a/flake.nix b/flake.nix index 660d71c..ba084b3 100644 --- a/flake.nix +++ b/flake.nix @@ -51,9 +51,12 @@ url = "github:nix-community/emacs-overlay"; }; nix-inst = { - url = "git+http://git.envs.net/binarycat/nix-inst"; + url = "git+https://git.envs.net/binarycat/nix-inst"; inputs.nixpkgs.follows = "nixpkgs"; }; + niri = { + url = "github:sodiboo/niri-flake"; + }; }; outputs = { self, nixpkgs, home-manager, ... }@inputs: { diff --git a/hosts/hermes/configuration.nix b/hosts/hermes/configuration.nix index b1fa830..d5717e4 100644 --- a/hosts/hermes/configuration.nix +++ b/hosts/hermes/configuration.nix @@ -9,6 +9,7 @@ in { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + inputs.niri.nixosModules.niri ]; # qt.platformTheme = lib.mkForce "gtk2"; @@ -70,7 +71,12 @@ in { libinput.enable = true; }; flatpak.enable = true; - printing.enable = true; + printing = { + enable = true; + drivers = with pkgs; [ + hplip + ]; + }; openssh.enable = true; guix = { enable = false; @@ -83,6 +89,9 @@ in { tailscale = { enable = true; }; + gnome = { + gnome-remote-desktop.enable = true; + }; }; qt.platformTheme = lib.mkForce "gnome"; @@ -126,8 +135,8 @@ in { remmina arduino-ide prusa-slicer - solaar - niri + weylus + deskreen ]; shell = pkgs.zsh; ignoreShellProgramCheck = true; # I configured zsh with home-manager @@ -142,6 +151,12 @@ in { # Allow unfree packages nixpkgs.config.allowUnfree = true; + nixpkgs = { + overlays = [ + inputs.niri.overlays.niri + ]; + }; + # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ @@ -155,6 +170,7 @@ in { gnomeExtensions.gsconnect gnomeExtensions.media-controls gnomeExtensions.solaar-extension + gnomeExtensions.paperwm nerdfonts everblush bibata-cursors @@ -163,6 +179,10 @@ in { gnome.gnome-software evtest appimagekit + solaar + hplip + cozette + gnome.gnome-remote-desktop ]; # Some programs need SUID wrappers, can be configured further or are @@ -245,4 +265,16 @@ in { hardware.wooting.enable = true; hardware.flipperzero.enable = true; + hardware = { + logitech = { + wireless = { + enable = true; + enableGraphical = true; + }; + }; + }; + + programs = { + niri.enable = true; + }; } diff --git a/users/ultra/home.nix b/users/ultra/home.nix index f0fe247..9bb1928 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -88,11 +88,13 @@ in { imports = [ inputs.hyprland.homeManagerModules.default inputs.nix-index-database.hmModules.nix-index + inputs.niri.homeModules.niri ]; # Allow unfree packages nixpkgs = { overlays = [ (import inputs.emacs-overlay) + inputs.niri.overlays.niri ]; config = { allowUnfree = true; @@ -203,7 +205,7 @@ in { withWayland = true; }) */ - # eww + eww # (eww.override { withWayland = true; }) notify-desktop libnotify @@ -221,7 +223,7 @@ in { amfora weechat filezilla - fluffychat + # fluffychat # insecure apparently bitwarden akregator # bitwarden @@ -274,7 +276,10 @@ in { tea thefuck playerctl + fuzzel # nyxt + lmms + cozette ]; file = { "emacs.d/everblush-theme.el".source = ./configs/emacs/everblush-theme.el; @@ -486,6 +491,36 @@ in { enable = true; }; }; + niri = { + enable = true; + package = pkgs.niri-stable; + settings = { + outputs = { + eDP-1 = { + enable = true; + scale = 2.25; + position = { x = 0; y = 0; }; + }; + DP-2 = { + enable = true; + scale = 2.25; + position = { x = 0; y = 960; }; + }; + }; + binds = with config.lib.niri.actions; { + "Mod+T".action.spawn = "alacritty"; + "Mod+D".action.spawn = "fuzzel"; + "Mod+Shift+E".action = quit; + "Mod+Ctrl+shift+E".action = quit { skip-confirmation = true; }; + "Mod+Shift+Slash".action = show-hotkey-overlay; + "Mod+F".action = fullscreen-window; + }; + }; + }; + eww = { + enable = true; + configDir = ./configs/eww; + }; }; services = { dunst.enable = false;