joy/nix
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

update

Browse source
This commit is contained in:
joy 2024-07-02 22:10:44 +02:00
parent 2829c5cdae
commit f32827833d
8 changed files with 313 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
flake.lock
View file

@ -1,5 +1,23 @@
{ {
"nodes": { "nodes": {
"ags": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1718921313,
"narHash": "sha256-TFJah1RW5qnYW7kajjAFPAS5j/0q0R3vz9zPjrRA0Mc=",
"owner": "Aylur",
"repo": "ags",
"rev": "646d5ad073ff7f8b1d50cfbd40f5b8a250fcd59d",
"type": "github"
},
"original": {
"owner": "Aylur",
"repo": "ags",
"type": "github"
}
},
"base16-schemes": { "base16-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -57,15 +75,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1719915469, "lastModified": 1718714799,
"narHash": "sha256-dNQPEges+os5o3SpV3gkIJk2wNX+eIzv6D48S3WxBRo=", "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88d829e52cfbeee71d81704ce28f5b439f6dea16", "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -85,11 +104,27 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1719915469,
"narHash": "sha256-dNQPEges+os5o3SpV3gkIJk2wNX+eIzv6D48S3WxBRo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "88d829e52cfbeee71d81704ce28f5b439f6dea16",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"ags": "ags",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs_2"
} }
} }
}, },

1
flake.nix
View file

@ -4,6 +4,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs"; nixpkgs.url = "github:nixos/nixpkgs";
nix-colors.url = "github:misterio77/nix-colors"; nix-colors.url = "github:misterio77/nix-colors";
ags.url = "github:Aylur/ags";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";

8
home/ags/default.nix Normal file
View file

@ -0,0 +1,8 @@
{pkgs, ...}:
{
programs.ags {
enable = true;
};
}

2
home/default.nix
View file

@ -9,7 +9,9 @@
./zsh ./zsh
./gtk ./gtk
./git ./git
./ags
inputs.nix-colors.homeManagerModules.default inputs.nix-colors.homeManagerModules.default
inputs.ags.homeManagerModules.default
]; ];
home.username = "joy"; home.username = "joy";

23
home/hyprland/default.nix
View file

@ -1,5 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
rofi-wayland rofi-wayland
pavucontrol pavucontrol
@ -19,7 +21,6 @@
settings = { settings = {
"$mod" = "SUPER"; "$mod" = "SUPER";
dwindle = { dwindle = {
pseudotile = true; pseudotile = true;
preserve_split = true; preserve_split = true;
@ -68,21 +69,21 @@
"$mod+shift, Y, exec, systemctl suspend" "$mod+shift, Y, exec, systemctl suspend"
"$mod+shift, M, exit, hyprland" "$mod+shift, M, exit, hyprland"
# mocp # cmus
"$mod, P, exec, cmus-remote --pause" "$mod, P, exec, cmus-remote --pause"
"$mod, comma, exec, cmus-remote --prev" "$mod, comma, exec, cmus-remote --prev"
"$mod, period, exec, cmus-remote --next" "$mod, period, exec, cmus-remote --next"
"$mod, equal, exec, cmus-remote -v +5%" "$mod, equal, exec, cmus-remote -v +5%"
"$mod, minus, exec, cmus-remote -v -5%" "$mod, minus, exec, cmus-remote -v -5%"
# Move focus with mainMod + arrow keys # Move focus
"$mod, Return, fullscreen" "$mod, Return, fullscreen"
"$mod, left, movefocus, l" "$mod, left, movefocus, l"
"$mod, right, movefocus, r" "$mod, right, movefocus, r"
"$mod, up, movefocus, u" "$mod, up, movefocus, u"
"$mod, down, movefocus, d" "$mod, down, movefocus, d"
# Switch workspaces with mainMod + [0-9] # Switch workspaces
"$mod, 1, workspace, 1" "$mod, 1, workspace, 1"
"$mod, 2, workspace, 2" "$mod, 2, workspace, 2"
"$mod, 3, workspace, 3" "$mod, 3, workspace, 3"
@ -94,7 +95,7 @@
"$mod, 9, workspace, 9" "$mod, 9, workspace, 9"
"$mod, 0, workspace, 10" "$mod, 0, workspace, 10"
# Move active window to a workspace with mainMod + SHIFT + [0-9] # Move active window to a workspace
"$mod+Shift, 1, movetoworkspace, 1" "$mod+Shift, 1, movetoworkspace, 1"
"$mod+Shift, 2, movetoworkspace, 2" "$mod+Shift, 2, movetoworkspace, 2"
"$mod+Shift, 3, movetoworkspace, 3" "$mod+Shift, 3, movetoworkspace, 3"
@ -113,9 +114,11 @@
]; ];
general = { general = {
gaps_in = 1; gaps_in = 0;
gaps_out = 1; gaps_out = 0;
border_size = 2; border_size = 3;
"col.active_border" = "0xFFEBDBB2";
"col.inactive_border" = "0xFF363537";
allow_tearing = false; allow_tearing = false;
layout = "dwindle"; layout = "dwindle";
}; };
@ -136,6 +139,8 @@
}; };
}; };
};
};
} }

21
home/waybar/cmus.sh Executable file
View file

@ -0,0 +1,21 @@
#!/bin/bash
# Fetch the status of cmus
status=$(cmus-remote -Q)
if [[ $? -ne 0 ]]; then
echo "No song playing"
exit 1
fi
# Extract artist, album, and title information
artist=$(echo "$status" | grep 'tag artist' | cut -d ' ' -f 3-)
title=$(echo "$status" | grep 'tag title' | cut -d ' ' -f 3-)
# Display the song information
if [ -n "$artist" ] && [ -n "$title" ]; then
echo "$artist - $title"
else
echo "No song playing"
fi

91
home/waybar/default.nix
View file

@ -25,7 +25,6 @@
clock = { clock = {
actions = { actions = {
on-click-backward = "tz_down";
on-click-forward = "tz_up"; on-click-forward = "tz_up";
on-click-right = "mode"; on-click-right = "mode";
on-scroll-down = "shift_down"; on-scroll-down = "shift_down";
@ -68,7 +67,7 @@ window#waybar {
* Workspaces * Workspaces
* ----------------------------------------------------- */ * ----------------------------------------------------- */
#workspaces { #workspaces {
background: #fb4934; background: #458588;
margin: 5px 3px 5px 12px; margin: 5px 3px 5px 12px;
padding: 0px 1px; padding: 0px 1px;
border-radius: 15px; border-radius: 15px;
@ -83,14 +82,92 @@ window#waybar {
border-radius: 15px; border-radius: 15px;
border: 0px; border: 0px;
color: #15161e; color: #15161e;
background-color: #fb4934; background-color: #458588;
opacity: 0.5; opacity: 0.5;
transition: all 0.3s ease-in-out; transition: all 0.3s ease-in-out;
} }
#workspaces button.active { #workspaces button.active {
color: #15161e; color: #15161e;
background: #fb4934;
* {
border: none;
border-radius: 0px;
font-family: "Inconsolata";
font-size: 16px;
min-height: 0;
color: #ebdbb2;
}
window#waybar {
border-bottom-style: inset;
border-bottom: 4px solid #689d6a;
background: #1d2021;
}
#workspaces, #clock, #custom-music, #window {
font-weight: 800;
}
/* Workspace Buttons */
#workspaces button label{
color: #689d6a;
}
#workspaces button.focused label {
color: #1d2021;
}
#workspaces button.focused {
background: #689d6a;
}
#mode {
background-color: #cc241d;
color: white;
}
#clock, #battery, #cpu, #memory, #network, #pulseaudio, #tray, #mode, #idle_inhibitor {
padding: 0 5px;
margin: 0 10px;
}
#idle_inhibitor {
padding: 0 10px;
}
#idle_inhibitor.activated {
background-color: #689d6a;
color: #1d2021;
}
#custom-music {
color: #b8bb26;
margin: 0 15px;
padding: 0 20px;
border-bottom: 4px solid #b8bb26;
}
#clock {
margin: 0;
color: #fabd2f;
border-bottom: 4px solid #fabd2f;
}
#network.disconnected {
color: #cc241d;
border-bottom: 4px solid #cc241d;
}
#pulseaudio.muted {
padding: 0 20px;
color: #cc241d;
border-bottom: 4px solid #cc241d;
}
background: #458588;
border-radius: 15px; border-radius: 15px;
min-width: 40px; min-width: 40px;
transition: all 0.3s ease-in-out; transition: all 0.3s ease-in-out;
@ -99,7 +176,7 @@ window#waybar {
#workspaces button:hover { #workspaces button:hover {
color: #15161e; color: #15161e;
background: #fb4934; background: #458588;
border-radius: 15px; border-radius: 15px;
opacity: 1.0; opacity: 1.0;
} }
@ -146,7 +223,7 @@ tooltip label {
} }
#clock { #clock {
color: #15161e; color: #15161e;
background: #fabd2f; background: #458588;
border-radius: 15px; border-radius: 15px;
margin: 5px; margin: 5px;
padding: 2px 10px; padding: 2px 10px;
@ -194,7 +271,7 @@ tooltip label {
#pulseaudio { #pulseaudio {
color: #15161e; color: #15161e;
background: #83a598; background: #458588;
border-radius: 15px; border-radius: 15px;
margin: 5px; margin: 5px;
padding: 2px 10px; padding: 2px 10px;

39
home/waybar/nohup.out Normal file
View file

@ -0,0 +1,39 @@
[2024-07-02 21:51:16.844] [info] Using configuration file /home/joy/.config/waybar/config
[2024-07-02 21:51:16.845] [info] Unable to receive desktop appearance: GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such interface “org.freedesktop.portal.Settings” on object at path /org/freedesktop/portal/desktop
[2024-07-02 21:51:16.845] [info] Using CSS file /home/joy/.config/waybar/style.css
[2024-07-02 21:51:16.848] [info] Hyprland IPC starting
[2024-07-02 21:51:16.849] [info] Loading persistent workspaces from Hyprland workspace rules
sh: line 1: /home/joy/nix/home/waybar/cmus.sh: cannot execute: required file not found
[2024-07-02 21:51:16.855] [error] cmus stopped unexpectedly, is it endless?
[2024-07-02 21:51:16.867] [warning] Requested height: 14 is less than the minimum height: 27 required by the modules
[2024-07-02 21:51:16.867] [info] Bar configured (width: 2560, height: 27) for output: DP-1
[2024-07-02 21:51:52.625] [info] Reloading...
[2024-07-02 21:51:52.628] [info] Using configuration file /home/joy/.config/waybar/config
[2024-07-02 21:51:52.628] [info] Using CSS file /home/joy/.config/waybar/style.css
[2024-07-02 21:51:52.633] [info] Reloading...
[2024-07-02 21:51:52.635] [info] Loading persistent workspaces from Hyprland workspace rules
(waybar:29756): GLib-GIO-WARNING **: 21:51:52.644: Invalid id -1200428736 passed to g_bus_unwatch_name()
(waybar:29756): GLib-GIO-CRITICAL **: 21:51:52.644: g_dbus_interface_skeleton_unexport: assertion 'interface_->priv->connections != NULL' failed
[2024-07-02 21:51:52.645] [info] Using configuration file /home/joy/.config/waybar/config
[2024-07-02 21:51:52.645] [info] Using CSS file /home/joy/.config/waybar/style.css
[2024-07-02 21:51:52.648] [info] Loading persistent workspaces from Hyprland workspace rules
[2024-07-02 21:51:52.655] [warning] Requested height: 14 is less than the minimum height: 37 required by the modules
[2024-07-02 21:51:52.655] [info] Bar configured (width: 2560, height: 37) for output: DP-1
[2024-07-02 21:52:00.848] [info] Using configuration file /home/joy/.config/waybar/config
[2024-07-02 21:52:00.850] [info] Unable to receive desktop appearance: GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such interface “org.freedesktop.portal.Settings” on object at path /org/freedesktop/portal/desktop
[2024-07-02 21:52:00.850] [info] Using CSS file /home/joy/.config/waybar/style.css
[2024-07-02 21:52:00.853] [info] Hyprland IPC starting
[2024-07-02 21:52:00.854] [info] Loading persistent workspaces from Hyprland workspace rules
[2024-07-02 21:52:00.868] [warning] Requested height: 14 is less than the minimum height: 42 required by the modules
[2024-07-02 21:52:00.868] [info] Bar configured (width: 2560, height: 42) for output: DP-1
[2024-07-02 22:00:47.199] [info] Reloading...
[2024-07-02 22:00:47.203] [info] Using configuration file /home/joy/.config/waybar/config
[2024-07-02 22:00:47.204] [info] Using CSS file /home/joy/.config/waybar/style.css
[2024-07-02 22:00:47.212] [info] Reloading...
[2024-07-02 22:00:47.212] [error] style.css:45:0Expected semicolon
[2024-07-02 22:01:22.256] [info] Using configuration file /home/joy/.config/waybar/config
[2024-07-02 22:01:22.257] [info] Unable to receive desktop appearance: GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such interface “org.freedesktop.portal.Settings” on object at path /org/freedesktop/portal/desktop
[2024-07-02 22:01:22.257] [info] Using CSS file /home/joy/.config/waybar/style.css
[2024-07-02 22:01:22.257] [error] style.css:45:0Expected semicolon