Deleted hyprpaper and replaced it with awww. Also deleted self declared niri systemd services, as they arent needed with running commands at startup
This commit is contained in:
60
flake.lock
generated
60
flake.lock
generated
@ -45,6 +45,28 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"awww": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": "flake-compat_2",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"rust-overlay": "rust-overlay_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1779666993,
|
||||||
|
"narHash": "sha256-W0yA7Y37oj5BBzl4ojO8dtv9MuOvdrIZDxtRjs7kpdg=",
|
||||||
|
"ref": "refs/heads/main",
|
||||||
|
"rev": "9b7f47f7f394dce0a17a7b161e0d2fe391ce72b3",
|
||||||
|
"revCount": 1366,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://codeberg.org/LGFae/awww"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://codeberg.org/LGFae/awww"
|
||||||
|
}
|
||||||
|
},
|
||||||
"base16": {
|
"base16": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"fromYaml": "fromYaml"
|
"fromYaml": "fromYaml"
|
||||||
@ -187,6 +209,22 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-compat_2": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1761588595,
|
||||||
|
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-parts": {
|
"flake-parts": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": [
|
"nixpkgs-lib": [
|
||||||
@ -618,6 +656,7 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"aagl": "aagl",
|
"aagl": "aagl",
|
||||||
"alejandra": "alejandra",
|
"alejandra": "alejandra",
|
||||||
|
"awww": "awww",
|
||||||
"cookiez-assets": "cookiez-assets",
|
"cookiez-assets": "cookiez-assets",
|
||||||
"grub2-themes": "grub2-themes",
|
"grub2-themes": "grub2-themes",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
@ -671,6 +710,27 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"rust-overlay_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"awww",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1764038373,
|
||||||
|
"narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=",
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"stylix": {
|
"stylix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"base16": "base16",
|
"base16": "base16",
|
||||||
|
|||||||
@ -42,6 +42,11 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
awww = {
|
||||||
|
url = "git+https://codeberg.org/LGFae/awww";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
nixvim = {
|
nixvim = {
|
||||||
url = "github:nix-community/nixvim";
|
url = "github:nix-community/nixvim";
|
||||||
#Do not use follows here as it will throw warnings with nixvim's built-in source
|
#Do not use follows here as it will throw warnings with nixvim's built-in source
|
||||||
@ -81,6 +86,7 @@
|
|||||||
grub2-themes,
|
grub2-themes,
|
||||||
nix-flatpak,
|
nix-flatpak,
|
||||||
nix-index-database,
|
nix-index-database,
|
||||||
|
awww,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
username = "cookiez";
|
username = "cookiez";
|
||||||
@ -105,6 +111,7 @@
|
|||||||
inherit project;
|
inherit project;
|
||||||
inherit alejandra;
|
inherit alejandra;
|
||||||
inherit cookiez-assets;
|
inherit cookiez-assets;
|
||||||
|
awwwPkg = awww.packages.${system}.awww;
|
||||||
pam-fprint-grosshack-pkg = pam-fprint-grosshack.packages.${system}.default;
|
pam-fprint-grosshack-pkg = pam-fprint-grosshack.packages.${system}.default;
|
||||||
host = hostname;
|
host = hostname;
|
||||||
};
|
};
|
||||||
|
|||||||
@ -14,6 +14,7 @@
|
|||||||
version,
|
version,
|
||||||
system,
|
system,
|
||||||
pam-fprint-grosshack-pkg,
|
pam-fprint-grosshack-pkg,
|
||||||
|
awwwPkg,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
#Assign Swap to the PC
|
#Assign Swap to the PC
|
||||||
@ -110,7 +111,7 @@
|
|||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
users.${username} = ./home.nix;
|
users.${username} = ./home.nix;
|
||||||
backupFileExtension = "backup"; # Automatically backs up conflicting files during activation
|
backupFileExtension = "backup"; # Automatically backs up conflicting files during activation
|
||||||
extraSpecialArgs = {inherit inputs username project version system host;};
|
extraSpecialArgs = {inherit inputs username project version system host awwwPkg;};
|
||||||
sharedModules = [inputs.plasma-manager.homeModules.plasma-manager];
|
sharedModules = [inputs.plasma-manager.homeModules.plasma-manager];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
inputs,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [
|
|
||||||
];
|
|
||||||
|
|
||||||
home-manager.sharedModules = [
|
|
||||||
./home.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
hyprpaper
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
inputs,
|
|
||||||
username,
|
|
||||||
project,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [
|
|
||||||
];
|
|
||||||
|
|
||||||
services = {
|
|
||||||
hyprpaper = {
|
|
||||||
enable = false;
|
|
||||||
|
|
||||||
settings = {
|
|
||||||
wallpaper = [
|
|
||||||
{
|
|
||||||
monitor = "eDP-1";
|
|
||||||
path = "${inputs.cookiez-assets}/wallpapers/pixel-desert.png";
|
|
||||||
fit_mode = "cover"; # optional, defaults to cover
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
|
inputs,
|
||||||
pkgs,
|
pkgs,
|
||||||
username,
|
username,
|
||||||
project,
|
project,
|
||||||
@ -7,31 +8,8 @@
|
|||||||
}: {
|
}: {
|
||||||
#To show logs of services run:
|
#To show logs of services run:
|
||||||
#journalctl --user-unit={service-name} --user
|
#journalctl --user-unit={service-name} --user
|
||||||
systemd.user.services.niri-waybar = {
|
|
||||||
description = "Waybar status bar for Niri";
|
|
||||||
|
|
||||||
# "wantedBy" replaces the [Install] section
|
# The Niri Session Cleanup Service
|
||||||
wantedBy = ["graphical-session.target"];
|
|
||||||
|
|
||||||
# "partOf" and "after" replace the [Unit] section dependencies
|
|
||||||
partOf = ["graphical-session.target"];
|
|
||||||
after = ["graphical-session.target"];
|
|
||||||
|
|
||||||
# [Unit] configuration goes here
|
|
||||||
unitConfig = {
|
|
||||||
# This checks the environment variable to ensure we are in Niri
|
|
||||||
ConditionEnvironment = "XDG_CURRENT_DESKTOP=niri";
|
|
||||||
};
|
|
||||||
|
|
||||||
# [Service] configuration goes here
|
|
||||||
serviceConfig = {
|
|
||||||
ExecStart = "${pkgs.waybar}/bin/waybar";
|
|
||||||
Restart = "on-failure";
|
|
||||||
RestartSec = "1s";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# 2. The Niri Session Cleanup Service
|
|
||||||
# This service starts when the graphical session starts, and when it stops,
|
# This service starts when the graphical session starts, and when it stops,
|
||||||
# it forcibly stops the graphical-session.target to ensure a clean state for the next login.
|
# it forcibly stops the graphical-session.target to ensure a clean state for the next login.
|
||||||
systemd.user.services.niri-session-manager = {
|
systemd.user.services.niri-session-manager = {
|
||||||
|
|||||||
@ -2,12 +2,12 @@
|
|||||||
config,
|
config,
|
||||||
inputs,
|
inputs,
|
||||||
pkgs,
|
pkgs,
|
||||||
|
system,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
./autostart.nix
|
./autostart.nix
|
||||||
../modules/hyprlock
|
../modules/hyprlock
|
||||||
../modules/hyprpaper
|
|
||||||
../modules/stylix
|
../modules/stylix
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -20,6 +20,7 @@
|
|||||||
fuzzel
|
fuzzel
|
||||||
waybar
|
waybar
|
||||||
xwayland-satellite
|
xwayland-satellite
|
||||||
|
inputs.awww.packages.${system}.awww
|
||||||
];
|
];
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
inputs,
|
||||||
|
awwwPkg,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
@ -38,6 +39,10 @@
|
|||||||
}
|
}
|
||||||
numlock
|
numlock
|
||||||
}
|
}
|
||||||
|
mouse {
|
||||||
|
accel-profile "flat"
|
||||||
|
accel-speed -0.4
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
prefer-no-csd
|
prefer-no-csd
|
||||||
@ -83,11 +88,14 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// spawn-at-startup "waybar"
|
spawn-at-startup "${pkgs.waybar}/bin/waybar"
|
||||||
spawn-at-startup "hyprpaper"
|
|
||||||
spawn-at-startup "${pkgs.mako}/bin/mako"
|
spawn-at-startup "${pkgs.mako}/bin/mako"
|
||||||
|
//spawn-sh-at-startup "${awwwPkg}/bin/awww-daemon --no-cache & sleep 1; ${awwwPkg}/bin/awww img ${inputs.cookiez-assets}/wallpapers/pixel-desert.png"
|
||||||
|
spawn-sh-at-startup "${awwwPkg}/bin/awww-daemon --no-cache"
|
||||||
|
spawn-sh-at-startup "until ${awwwPkg}/bin/awww query >/dev/null 2>&1; do :; done; ${awwwPkg}/bin/awww img --transition-type none ${inputs.cookiez-assets}/wallpapers/pixel-desert.png"
|
||||||
|
|
||||||
// spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell"
|
spawn-sh-at-startup "${awwwPkg}/bin/awww-daemon --no-cache --namespace backdrop"
|
||||||
|
spawn-sh-at-startup "until ${awwwPkg}/bin/awww query -n backdrop >/dev/null 2>&1; do :; done; ${awwwPkg}/bin/awww img -n backdrop --transition-type none ${inputs.cookiez-assets}/wallpapers/pixel-desert.png"
|
||||||
|
|
||||||
hotkey-overlay {
|
hotkey-overlay {
|
||||||
// Uncomment this line to disable the "Important Hotkeys" pop-up at startup.
|
// Uncomment this line to disable the "Important Hotkeys" pop-up at startup.
|
||||||
@ -102,6 +110,11 @@
|
|||||||
draw-border-with-background false
|
draw-border-with-background false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
layer-rule {
|
||||||
|
match namespace="^awww-daemonbackdrop$"
|
||||||
|
place-within-backdrop true
|
||||||
|
}
|
||||||
|
|
||||||
output "eDP-1" {
|
output "eDP-1" {
|
||||||
mode "2880x1920@120.000"
|
mode "2880x1920@120.000"
|
||||||
scale 2
|
scale 2
|
||||||
|
|||||||
Reference in New Issue
Block a user