leonv/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge (removed flake.lock for sync)

Browse source
This commit is contained in:
Leon Vatthauer 2024-08-13 21:14:20 +02:00
commit 9129445865
Signed by: leonv
SSH key fingerprint: SHA256:G4+ddwoZmhLPRB1agvXzZMXIzkVJ36dUYZXf5NxT+u8
21 changed files with 22 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
absol/configuration.nix
View file

@ -124,8 +124,6 @@
services.blueman.enable = true; services.blueman.enable = true;
# Enable sound with pipewire. # Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;

2
absol/eww/config/widgets/resources/eww.yuck
View file

@ -86,7 +86,7 @@
; VOLUME ; VOLUME
(defpoll volume_percent :interval "0.1s" :initial "40" "amixer sget Master | grep 'Left:' | awk -F'[][]' '{ print $2 }' | tr -d '%'") (defpoll volume_percent :interval "0.1s" :initial "40" "wpctl get-volume @DEFAULT_AUDIO_SINK@ | awk -F. '{print $2}'")
(defwidget volume [] (defwidget volume []
(eventbox (eventbox

3
absol/eww/config/widgets/window-title/get-window-title.sh
View file

@ -1,3 +0,0 @@
#!/usr/bin/env bash
hyprctl activewindow -j | jq --raw-output .title
socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | stdbuf -o0 awk -F '>>|,' '/^activewindow>>/{print $3}'

2
absol/eww/config/widgets/workspaces/get-active-workspace.sh
View file

@ -2,5 +2,5 @@
hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id' hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id'
socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - |
stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}' stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}'

2
absol/eww/config/widgets/workspaces/get-workspaces.sh
View file

@ -6,6 +6,6 @@ spaces (){
} }
spaces spaces
socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | while read -r line; do socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | while read -r line; do
spaces spaces
done done

7
common/eww/config/widgets/window-title/eww.yuck
View file

@ -1,7 +0,0 @@
(deflisten window :initial "" "sh ./widgets/window-title/get-window-title.sh")
(defwidget windowtitle []
(box :class "title"
(label :text {window == "null" ? "" : window} :class "title"
)
)
)

3
common/eww/config/widgets/window-title/get-window-title.sh
View file

@ -1,3 +0,0 @@
#!/usr/bin/env bash
hyprctl activewindow -j | jq --raw-output .title
socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | stdbuf -o0 awk -F '>>|,' '/^activewindow>>/{print $3}'

69
flake.lock
View file

@ -1,69 +0,0 @@
{
"nodes": {
"home-manager": {
"inputs": {
"nixpkgs": [
"unstable"
]
},
"locked": {
"lastModified": 1720327769,
"narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6b7ce96f34b324e4e104abc30d06955d216bac71",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"hyprland-contrib": {
"inputs": {
"nixpkgs": [
"unstable"
]
},
"locked": {
"lastModified": 1718476555,
"narHash": "sha256-fuWpgh8KasByIJWE+xVd37Al0LV5YAn6s871T50qVY0=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "29a8374f4b9206d5c4af84aceb7fb5dff441ea60",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "contrib",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"hyprland-contrib": "hyprland-contrib",
"unstable": "unstable"
}
},
"unstable": {
"locked": {
"lastModified": 1720031269,
"narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

2
gunther/configuration.nix
View file

@ -102,8 +102,6 @@
services.blueman.enable = true; services.blueman.enable = true;
# Enable sound with pipewire. # Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;

10
common/eww/config/eww.scss → gunther/eww/config/eww.scss
View file

@ -27,16 +27,11 @@ $base: #24273a;
$mantle: #1e2030; $mantle: #1e2030;
$crust: #181926; $crust: #181926;
*{ * {
all: unset; all: unset;
font-family: "monospace"; font-family: "monospace";
} }
// .bar {
// background-color: $base;
// border-radius: 16px;
// }
.container { .container {
background-color: $base; background-color: $base;
border-radius: 16px; border-radius: 16px;
@ -71,16 +66,19 @@ tooltip label {
color: $green; color: $green;
margin: 0px 10px 0px 10px; margin: 0px 10px 0px 10px;
} }
.bluetooth_icon { .bluetooth_icon {
font-size: 18px; font-size: 18px;
color: $blue; color: $blue;
margin: 0px 10px 0px 10px; margin: 0px 10px 0px 10px;
} }
.cpu_text { .cpu_text {
font-size: 18px; font-size: 18px;
color: $maroon; color: $maroon;
margin: 0px 10px 0px 10px; margin: 0px 10px 0px 10px;
} }
.mem_text { .mem_text {
font-size: 18px; font-size: 18px;
color: $yellow; color: $yellow;

0
common/eww/config/eww.yuck → gunther/eww/config/eww.yuck
View file

4
common/eww/config/widgets/resources/eww.yuck → gunther/eww/config/widgets/resources/eww.yuck
View file

@ -74,13 +74,13 @@
; VOLUME ; VOLUME
(defpoll volume_percent :interval "0.1s" :initial "40" "amixer sget Master | grep 'Left:' | awk -F'[][]' '{ print $2 }' | tr -d '%'") (defpoll volume_percent :interval "0.1s" :initial "40" "wpctl get-volume @DEFAULT_AUDIO_SINK@ | awk -F. '{print $2}'")
(defwidget volume [] (defwidget volume []
(eventbox (eventbox
:active true :active true
:onclick "/usr/bin/env pavucontrol &" :onclick "/usr/bin/env pavucontrol &"
:onscroll "if [ {} = 'up' ]; then wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%+; else wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%-; fi" ; wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%- :onscroll "if [ {} = 'up' ]; then wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%+; else wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%-; fi"
(box (box
:space-evenly false :space-evenly false
:orientation "h" :orientation "h"

0
common/eww/config/widgets/resources/network.sh → gunther/eww/config/widgets/resources/network.sh
View file

2
absol/eww/config/widgets/window-title/eww.yuck → gunther/eww/config/widgets/window-title/eww.yuck
View file

@ -1,6 +1,6 @@
(deflisten window :initial "" "sh ./widgets/window-title/get-window-title.sh") (deflisten window :initial "" "sh ./widgets/window-title/get-window-title.sh")
(defwidget windowtitle [] (defwidget windowtitle []
(box :class "title" (box :class "title" :visible {window == "null" ? false : true}
(label :text {window == "null" ? "" : window} :class "title" (label :text {window == "null" ? "" : window} :class "title"
) )
) )

3
gunther/eww/config/widgets/window-title/get-window-title.sh Normal file
View file

@ -0,0 +1,3 @@
#!/bin/sh
hyprctl activewindow -j | jq --raw-output .title
socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | stdbuf -o0 awk -F '>>|,' '/^activewindow>>/{print $3}'

0
common/eww/config/widgets/workspaces/change-active-workspace.sh → gunther/eww/config/widgets/workspaces/change-active-workspace.sh
View file

0
common/eww/config/widgets/workspaces/eww.yuck → gunther/eww/config/widgets/workspaces/eww.yuck
View file

2
common/eww/config/widgets/workspaces/get-active-workspace.sh → gunther/eww/config/widgets/workspaces/get-active-workspace.sh
View file

@ -2,5 +2,5 @@
hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id' hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id'
socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - |
stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}' stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}'

2
common/eww/config/widgets/workspaces/get-workspaces.sh → gunther/eww/config/widgets/workspaces/get-workspaces.sh
View file

@ -6,6 +6,6 @@ spaces (){
} }
spaces spaces
socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | while read -r line; do socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | while read -r line; do
spaces spaces
done done

0
common/eww/default.nix → gunther/eww/default.nix
View file

9
gunther/leonv.nix
View file

@ -3,7 +3,7 @@
imports = [ imports = [
./../common ./../common
./hypr/hyprland.nix ./hypr/hyprland.nix
./../common/eww ./eww
]; ];
/* The home.stateVersion option does not have a default and must be set */ /* The home.stateVersion option does not have a default and must be set */
home.stateVersion = "24.05"; home.stateVersion = "24.05";
@ -22,6 +22,10 @@
nextcloud-client nextcloud-client
ausweisapp ausweisapp
godot_4
dotnet-runtime
blender
aseprite
# smt solver for liquid haskell # smt solver for liquid haskell
z3 z3
@ -80,8 +84,9 @@
inputs.hyprland-contrib.packages.${pkgs.system}.grimblast inputs.hyprland-contrib.packages.${pkgs.system}.grimblast
bluez bluez
htop htop
gnome.file-roller file-roller
zip zip
unzip
# yubikey # yubikey
yubico-pam yubico-pam