From c7a2895e5aea96fead395bd31695bd927d15f6a6 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Thu, 25 Aug 2022 13:33:35 +0200 Subject: [PATCH] null: add wallpaper --- flake.lock | 27 ++++++++++++++++--- flake.nix | 13 ++++----- nixos/hosts/thalassa/null/configuration.nix | 2 -- nixos/hosts/thalassa/null/home.nix | 5 +--- .../hosts/thalassa/null/hyprland/default.nix | 15 +++++++++-- 5 files changed, 45 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index d8827222..2bb3bbc3 100644 --- a/flake.lock +++ b/flake.lock @@ -219,6 +219,26 @@ "type": "github" } }, + "hyprpaper": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1661277513, + "narHash": "sha256-MnSImhrvAwpGXC85u8juDgTImcrztJ2DEo8nRBhTMfY=", + "owner": "hyprwm", + "repo": "hyprpaper", + "rev": "0faf74054136bb4ffe7c13fefb18ab41dbf62959", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprpaper", + "type": "github" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -349,11 +369,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1661414334, - "narHash": "sha256-9uL8a3v1L9FNCJIhhXZzNQJLS8dq1S0vd03cDrbc0Lw=", + "lastModified": 1661417153, + "narHash": "sha256-wASLYEuPIoInMow71HhPPtDGWllBL8pDlP7l3kg2XII=", "owner": "NULLx76", "repo": "nixpkgs", - "rev": "ed0a4bf92a7b00da1497d87846c068af92919f54", + "rev": "ef0026af97075a88449bfe5cdb762501ff57d233", "type": "github" }, "original": { @@ -414,6 +434,7 @@ "colmena": "colmena", "home-manager": "home-manager", "hyprland": "hyprland", + "hyprpaper": "hyprpaper", "minecraft-servers": "minecraft-servers", "nixpkgs": "nixpkgs_2", "serokell-nix": "serokell-nix", diff --git a/flake.nix b/flake.nix index 32e8b132..4c4dd704 100644 --- a/flake.nix +++ b/flake.nix @@ -20,16 +20,16 @@ minecraft-servers.url = "github:jyooru/nix-minecraft-servers"; minecraft-servers.inputs.nixpkgs.follows = "nixpkgs"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + home-manager.url = "github:nix-community/home-manager"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; hyprland.url = "github:hyprwm/Hyprland"; + hyprpaper.url = "github:hyprwm/hyprpaper"; + hyprpaper.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = - { self, nixpkgs, vault-secrets, serokell-nix, minecraft-servers, colmena, home-manager, ... }@inputs: + { self, nixpkgs, vault-secrets, serokell-nix, minecraft-servers, colmena, home-manager, hyprpaper, ... }@inputs: let inherit (nixpkgs) lib; inherit (builtins) filter mapAttrs attrValues concatLists; @@ -50,6 +50,7 @@ (import ./nixos/pkgs) vault-secrets.overlay minecraft-servers.overlays.default + hyprpaper.overlays.default ]; # Script to apply local colmena deployments @@ -73,7 +74,7 @@ meta = { inherit specialArgs; nixpkgs = pkgs; - }; + }; } nixHosts; diff --git a/nixos/hosts/thalassa/null/configuration.nix b/nixos/hosts/thalassa/null/configuration.nix index 987ad989..38636f67 100644 --- a/nixos/hosts/thalassa/null/configuration.nix +++ b/nixos/hosts/thalassa/null/configuration.nix @@ -45,8 +45,6 @@ in inputs.hyprland.homeManagerModules.default ]; - programs.light.enable = true; - fonts = { fonts = with pkgs; [ material-design-icons diff --git a/nixos/hosts/thalassa/null/home.nix b/nixos/hosts/thalassa/null/home.nix index ec34c88d..455ea502 100644 --- a/nixos/hosts/thalassa/null/home.nix +++ b/nixos/hosts/thalassa/null/home.nix @@ -9,10 +9,6 @@ ./hyprland ]; - home.sessionVariables = { - MOZ_ENABLE_WAYLAND = 1; - }; - home.packages = with pkgs; [ discord rnix-lsp @@ -30,6 +26,7 @@ texlive.combined.scheme-full retroarchFull python3 + element-desktop-wayland ]; programs.alacritty = { diff --git a/nixos/hosts/thalassa/null/hyprland/default.nix b/nixos/hosts/thalassa/null/hyprland/default.nix index 6b9dcdcb..f03d483c 100644 --- a/nixos/hosts/thalassa/null/hyprland/default.nix +++ b/nixos/hosts/thalassa/null/hyprland/default.nix @@ -9,8 +9,11 @@ wf-recorder # Screenrecorder wl-clipboard # Clipboard manager networkmanager_dmenu + brightnessctl ]; + programs.mako.enable = true; + home.file.".config/networkmanager-dmenu/config.ini".text = '' [dmenu] dmenu_command = rofi -dmenu -i @@ -39,9 +42,17 @@ # gui_if_available = (Default: True) ''; + home.file.".config/hypr/hyprpaper.conf".text = '' + ipc = off + preload = ~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix.png + wallpaper = eDP-1,~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix.png + + ''; + wayland.windowManager.hyprland = { enable = true; extraConfig = '' + exec-once=${pkgs.hyprpaper}/bin/hyprpaper exec-once=eww daemon exec-once=eww open bar @@ -123,8 +134,8 @@ windowrule=rounding 3,title:^(\s*)$ windowrule=animation popin,title:^(\s*)$ - bind=,XF86MonBrightnessUp,exec,light -A 5 - bind=,XF86MonBrightnessDown,exec,light -U 5 + bind=,XF86MonBrightnessUp,exec,brightnessctl -q s +5% + bind=,XF86MonBrightnessDown,exec,brightnessctl -q s 5%- bind=,XF86MonRaiseVolume,exec,pamixer -i 5 bind=,XF86MonLowerVolume,exec,pamixer -d 5 bind=,XF86AudioMute,exec,pamixer -t