Compare commits

...

5 commits

Author SHA1 Message Date
GaspardCulis
e679417a08 fix(eww -> get-connectivity-info): Fixed wireless info parsing
When SSIDs contain spaces
2024-10-17 09:47:56 +02:00
GaspardCulis
63134d3675 fix(hypr): Fixed wayland.windowManager.hyprland not using hyprland input 2024-10-16 08:58:12 +02:00
GaspardCulis
f3d95b97b6 fix(hypr -> nix): Fixed Hyrland-wrapper HM link path 2024-10-16 08:14:44 +02:00
GaspardCulis
e73992b173 fix(bin->Hyprland + bash->exec): Fix hyrland lowercase alias removal 2024-10-16 08:12:58 +02:00
GaspardCulis
8d4ec36c98 chore(flake.lock): Update flake
Should fix firefox CVE-2024-9680
2024-10-15 22:40:08 +02:00
6 changed files with 111 additions and 53 deletions

View file

@ -40,8 +40,9 @@ print_network_infos() {
"$(echo "$route_line" | awk '{ print $3 }')" "$(echo "$route_line" | awk '{ print $3 }')"
if [ "$state" = wireless ]; then if [ "$state" = wireless ]; then
ssid=$(nmcli connection show --active | grep "$device" | cut -d \ -f1) wireless_info=$(nmcli --get-values active,ssid,signal dev wifi list --rescan no | grep "^yes")
signal=$(nmcli dev wifi list --rescan no | awk '/\*/{if (NR!=1) {print $8}}') ssid=$(echo "$wireless_info" | cut -d : -f2)
signal=$(echo "$wireless_info" | cut -d : -f3)
printf ',"wifi":{"signal":"%s","ssid":"%s"}' \ printf ',"wifi":{"signal":"%s","ssid":"%s"}' \
"$(wifi_strength "$signal")" \ "$(wifi_strength "$signal")" \
"$ssid" "$ssid"

View file

@ -9,6 +9,6 @@ export XDG_CONFIG_HOME="${HOME}/.config"
# Execution # Execution
exec ssh-agent \ exec ssh-agent \
dbus-launch --exit-with-session \ dbus-launch --exit-with-session \
hyprland \ Hyprland \
"$@" "$@"

View file

@ -11,8 +11,8 @@
executable = true; executable = true;
}; };
# Hyprland launch wrapper # Hyprland launch wrapper
".local/bin/Hyprland" = { ".local/bin/Hyprland-wrapper" = {
source = ../../bin/Hyprland; source = ../../bin/Hyprland-wrapper;
executable = true; executable = true;
}; };
# UWU launcher script # UWU launcher script
@ -70,6 +70,7 @@
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
extraConfig = builtins.readFile ./hyprland.conf; extraConfig = builtins.readFile ./hyprland.conf;
plugins = [inputs.hy3.packages.${pkgs.system}.hy3]; plugins = [inputs.hy3.packages.${pkgs.system}.hy3];
}; };

View file

@ -29,11 +29,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1721135360, "lastModified": 1728852607,
"narHash": "sha256-ZhSA0e45UxiOAjEVqkym/aULh0Dt+KHJLNda7bjx9UI=", "narHash": "sha256-PhJdr8b4nZVHts5KMEsf7vCDXVpFIFCa7VlCt+oYpL4=",
"owner": "anyrun-org", "owner": "anyrun-org",
"repo": "anyrun", "repo": "anyrun",
"rev": "c6101a31a80b51e32e96f6a77616b609770172e0", "rev": "6e0385f6945d701545edc5bccfc5f544e1e12663",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -66,11 +66,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725199881, "lastModified": 1727261104,
"narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=", "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b", "rev": "b82fdaff917582a9d568969e15e61b398c71e990",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -86,11 +86,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728334376, "lastModified": 1729010169,
"narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", "narHash": "sha256-AjgIlXcreagCs6ltT8mzI1UYEiYgfhlwe4Tl3taxQSU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", "rev": "9ab6ae4e632016caac1c7e82e15b12b8c672ed76",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -127,11 +127,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717285511, "lastModified": 1727826117,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -147,11 +147,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728337164, "lastModified": 1728903686,
"narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -165,11 +165,11 @@
"hyprland": "hyprland" "hyprland": "hyprland"
}, },
"locked": { "locked": {
"lastModified": 1727932681, "lastModified": 1728520267,
"narHash": "sha256-zCFWQb6COHRSXlRj7Jln2cKEUxg8PjHoa1Unuu0XHzM=", "narHash": "sha256-6TVaB+nWVanqZWqievg+m7tVNrSpQ9CQcwXJQeyU/Q0=",
"owner": "outfoxxed", "owner": "outfoxxed",
"repo": "hy3", "repo": "hy3",
"rev": "4bc32709c7b8f831e39ec2a7921030c08dbdf500", "rev": "4e92705d7a0ff23296aa1a62c05734ccc6de7bec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -197,11 +197,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722623071, "lastModified": 1727532803,
"narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", "narHash": "sha256-ZaZ7h7PY8mQc4vtGmVqWLAq9CAO02gHMyNR5yY8zDmM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "912d56025f03d41b1ad29510c423757b4379eb1c", "rev": "b98726e431d4d3ed58bd58bee1047cdb81cec69f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -214,6 +214,7 @@
"inputs": { "inputs": {
"aquamarine": "aquamarine", "aquamarine": "aquamarine",
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
@ -222,23 +223,48 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1725814101, "lastModified": 1728142617,
"narHash": "sha256-+wE97utoDfhQP6AMdZHUmBeL8grbce/Jv2i5M+6AbaE=", "narHash": "sha256-ramJ6G9bKYuZshtYRc0olhtN89bP9i4BDhhTU0E0cLc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "0f594732b063a90d44df8c5d402d658f27471dfe", "rev": "0ec6072a290051a03ab66cfb9bc616b2f5540e64",
"revCount": 5196, "revCount": 5298,
"submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
}, },
"original": { "original": {
"rev": "0f594732b063a90d44df8c5d402d658f27471dfe", "rev": "0ec6072a290051a03ab66cfb9bc616b2f5540e64",
"submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
} }
}, },
"hyprland-protocols": { "hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hy3",
"hyprland",
"nixpkgs"
],
"systems": [
"hy3",
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1727451107,
"narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprland-protocols_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hy3", "hy3",
@ -286,11 +312,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725188252, "lastModified": 1725997860,
"narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=", "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "c12ab785ce1982f82594aff03b3104c598186ddd", "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -313,11 +339,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724966483, "lastModified": 1727300645,
"narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -340,11 +366,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721324119, "lastModified": 1726874836,
"narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -355,11 +381,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1725103162, "lastModified": 1727348695,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -371,11 +397,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1728241625, "lastModified": 1728888510,
"narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -432,12 +458,22 @@
}, },
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols_2",
"hyprlang": [ "hyprlang": [
"hy3", "hy3",
"hyprland", "hyprland",
"hyprlang" "hyprlang"
], ],
"hyprutils": [
"hy3",
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hy3",
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [ "nixpkgs": [
"hy3", "hy3",
"hyprland", "hyprland",
@ -450,11 +486,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725203932, "lastModified": 1727524473,
"narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=", "narHash": "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251", "rev": "7e500e679ede40e79cf2d89b5f5fa3e34923bd26",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -2,7 +2,7 @@
# Start DE if on tty1 # Start DE if on tty1
if [ "$(tty)" = /dev/tty1 ]; then if [ "$(tty)" = /dev/tty1 ]; then
exec Hyprland exec Hyprland-wrapper
fi fi
# Start DE if on tty1 # Start DE if on tty1

20
themes/pomme.nix Normal file
View file

@ -0,0 +1,20 @@
{pkgs, ...}: {
home.packages = [pkgs.dconf];
dconf.settings = {
"org/gnome/desktop/interface" = {
color-scheme = "prefer-light";
};
};
gtk = {
enable = true;
theme = {
package = pkgs.qogir-theme;
name = "qogir-dark";
};
iconTheme = {
package = pkgs.qogir-icon-theme;
name = "Qogir";
};
};
}