diff --git a/flake.lock b/flake.lock index cd724fc..11472cb 100644 --- a/flake.lock +++ b/flake.lock @@ -26,14 +26,18 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1636508828, + "lastModified": 1636667637, "narHash": "sha256-qgjgowDhUF3Kb4KKzJGd5VtKEHkDqn4unEexPauPvgs=", + "ref": "main", + "rev": "7c057b93965fb730f73628d46d509797a93e32d9", + "revCount": 10, "type": "git", - "url": "file:///home/daniel/go/src/i3utils" + "url": "https://git.sr.ht/~dpatterbee/i3utils" }, "original": { + "ref": "main", "type": "git", - "url": "file:///home/daniel/go/src/i3utils" + "url": "https://git.sr.ht/~dpatterbee/i3utils" } }, "nixpkgs": { diff --git a/flake.nix b/flake.nix index 8db7c1d..08e5192 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - i3utils.url = "git+file:///home/daniel/go/src/i3utils"; + i3utils.url = "git+https://git.sr.ht/~dpatterbee/i3utils?ref=main"; home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -55,7 +55,10 @@ in { homeConfigurations = { - daniel-dingbox = mkUserConf { hostname = "dingbox"; }; + daniel-dingbox = mkUserConf { + hostname = "dingbox"; + extraSauce = [ ./user/host-specific/dingbox ]; + }; daniel-miniding = mkUserConf { hostname = "miniding"; extraSauce = [ ./user/host-specific/miniding ]; diff --git a/user/host-specific/dingbox/default.nix b/user/host-specific/dingbox/default.nix new file mode 100644 index 0000000..6deb8b3 --- /dev/null +++ b/user/host-specific/dingbox/default.nix @@ -0,0 +1,9 @@ +{ config, lib, pkgs, ...}: + +{ + home.file = { + "wallpapers" = { + source = ./wallpapers; + }; + }; +} diff --git a/user/host-specific/dingbox/wallpapers/lock.png b/user/host-specific/dingbox/wallpapers/lock.png new file mode 100644 index 0000000..d7bb4cc Binary files /dev/null and b/user/host-specific/dingbox/wallpapers/lock.png differ diff --git a/user/host-specific/dingbox/wallpapers/wallpaper.jpg b/user/host-specific/dingbox/wallpapers/wallpaper.jpg new file mode 100644 index 0000000..6222c31 Binary files /dev/null and b/user/host-specific/dingbox/wallpapers/wallpaper.jpg differ diff --git a/user/host-specific/miniding/default.nix b/user/host-specific/miniding/default.nix index c8d2b44..818909d 100644 --- a/user/host-specific/miniding/default.nix +++ b/user/host-specific/miniding/default.nix @@ -1,10 +1,14 @@ { config, lib, pkgs, ...}: -let - mod = "Mod4"; -in { +{ services.picom = { enable = true; vSync = true; }; + + home.file = { + wallpapers = { + source = ./wallpapers; + }; + }; } diff --git a/user/host-specific/miniding/wallpapers/lock.png b/user/host-specific/miniding/wallpapers/lock.png new file mode 100644 index 0000000..a3dbf64 Binary files /dev/null and b/user/host-specific/miniding/wallpapers/lock.png differ diff --git a/user/host-specific/miniding/wallpapers/wallpaper.jpg b/user/host-specific/miniding/wallpapers/wallpaper.jpg new file mode 100644 index 0000000..4d164e4 Binary files /dev/null and b/user/host-specific/miniding/wallpapers/wallpaper.jpg differ diff --git a/user/progs/i3/default.nix b/user/progs/i3/default.nix index 717bcdf..ee4b5bd 100644 --- a/user/progs/i3/default.nix +++ b/user/progs/i3/default.nix @@ -56,8 +56,8 @@ in { "${mod}+Shift+j" = "exec --no-startup-id i3utils window move next"; "${mod}+p" = "scratchpad show"; - "${mod}+Escape" = "exec i3lock -i /home/daniel/Pictures/wallpapers/wallpaper_3840x2160_blur.png"; - "${mod}+Shift+Escape" = "exec i3lock -i /home/daniel/Pictures/wallpapers/wallpaper_3840x2160_blur.png && systemctl suspend"; + "${mod}+Escape" = "exec i3lock -i /home/daniel/wallpapers/lock.png"; + "${mod}+Shift+Escape" = "exec i3lock -i /home/daniel/wallpapers/lock.png && systemctl suspend"; }; modifier = mod;