Install pridefetch, rofi-wayland and glpaper from pkgs-unstable (removing the glpaper overlay & nur package)
diff --git a/flake.lock b/flake.lock
index 9f6c50e..dd60ea1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -44,11 +44,11 @@
]
},
"locked": {
- "lastModified": 1653937612,
- "narHash": "sha256-HybwffYKOM3UwlY54ZVCZgX7o5xpp2KhbZyyOnvwFMo=",
+ "lastModified": 1654113405,
+ "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "bda2c80b4c1a8d85c84c343a25ac7303fbc7999d",
+ "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675",
"type": "github"
},
"original": {
@@ -98,11 +98,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1653060744,
- "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
+ "lastModified": 1654230545,
+ "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "dfd82985c273aac6eced03625f454b334daae2e8",
+ "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
"type": "github"
},
"original": {
@@ -114,11 +114,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1653819559,
- "narHash": "sha256-KzIZ1uaLR7vsBlcT0VWd8toFTC3yunSveNK+l2MQqrI=",
+ "lastModified": 1654181793,
+ "narHash": "sha256-kP4m7ZgFYj8fh7oW2L0uW0sJw/e0k1HY26HYJcvNEKM=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "2a64cd672b2706fbca461870cc9ac708b49d9016",
+ "rev": "40e2b1ae0535885507ab01d7a58969934cf2713c",
"type": "github"
},
"original": {
@@ -130,11 +130,11 @@
},
"nurpkgs": {
"locked": {
- "lastModified": 1653157530,
- "narHash": "sha256-9JC7EGOBwkxQ+MUuKXNvCjaQZzZxXYyG9kPlTNVziak=",
+ "lastModified": 1654315625,
+ "narHash": "sha256-6fjodiKyTa15g4Q7K62ROiYEgiyzmj9aVyAHUPQz8m0=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "768c7d968dc9b90b6fa6f85374669de3e57d70ca",
+ "rev": "4f0c24a4790a02f943fcaeb47823fc035d7b4184",
"type": "github"
},
"original": {
diff --git a/src/apps/personal/overlays/glpaper.nix b/src/apps/personal/overlays/glpaper.nix
deleted file mode 100644
index 7c184e0..0000000
--- a/src/apps/personal/overlays/glpaper.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-final: prev: {
- glpaper = prev.glpaper.overrideAttrs (old: rec {
- src = final.fetchFromSourcehut {
- owner = "~scoopta";
- repo = old.pname;
- vc = "hg";
- rev = "f89e60b7941fb60f1069ed51af9c5bb4917aab35";
- sha256 = "sha256-E7FKjt3NL0aAEibfaq+YS2IVvpjNjInA+Rs8SU63/3M=";
- };
- });
-}
diff --git a/src/apps/personal/pridefetch.nix b/src/apps/personal/pridefetch.nix
index e35b13c..41da055 100644
--- a/src/apps/personal/pridefetch.nix
+++ b/src/apps/personal/pridefetch.nix
@@ -1,5 +1,5 @@
-{ pkgs, ... }: {
- home.packages = with pkgs; [
-# pridefetch
+{ pkgs-unstable, ... }: {
+ home.packages = with pkgs-unstable; [
+ pridefetch
];
}
diff --git a/src/apps/personal/sway.nix b/src/apps/personal/sway.nix
index a0ca363..ed43929 100644
--- a/src/apps/personal/sway.nix
+++ b/src/apps/personal/sway.nix
@@ -136,7 +136,7 @@
startup = [
{ command = "dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK"; }
{ command = "\"pkill swaync; pkill waybar; ${pkgs-unstable.swaynotificationcenter}/bin/swaync & waybar\""; always = true; }
- { command = "\"pkill glpaper; ${pkgs.glpaper}/bin/glpaper eDP-1 ${./sway/shader.glsl} -F -W 1920 -H 1080\""; always = true; }
+ { command = "\"pkill glpaper; ${pkgs-unstable.glpaper}/bin/glpaper eDP-1 ${./sway/shader.glsl} -F -W 1920 -H 1080\""; always = true; }
{ command = "light -N 1"; always = false; }
{ command = "\"pkill wob; rm -f $WOBSOCK && mkfifo $WOBSOCK && tail -f $WOBSOCK | wob --output='*'\""; always = true; }
];
@@ -210,7 +210,7 @@
jq
pulseaudio
pamixer
- glpaper
+ pkgs-unstable.glpaper
];
programs.zsh.profileExtra = ''
diff --git a/src/home.nix b/src/home.nix
index cad2f5d..34651be 100644
--- a/src/home.nix
+++ b/src/home.nix
@@ -43,7 +43,7 @@
# qemu
bind
file
- nur.repos.kira-bruneau.rofi-wayland
+ rofi-wayland
rofimoji
htop
hue-cli