Compare commits

..

No commits in common. "3f733a569d61c16dc4fc010b94f90f6de710dbe3" and "53a901c95e2265e082a082f5836188ac8d15eab6" have entirely different histories.

4 changed files with 19 additions and 30 deletions

View file

@ -8,11 +8,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1707923576, "lastModified": 1707151070,
"narHash": "sha256-vch1hvgoB2TEl1+0J9h5uPkTrL4zNFUxE/razagkqQQ=", "narHash": "sha256-jDz+459Iqn895HWnxhIPW0alIlDG7Ar1ZM0ONJysWbg=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "arion", "repo": "arion",
"rev": "2b1fa9a8e9e40bb8e65a677c6fdd66dae4f4676e", "rev": "9e5caa2b4869c9094a39a7819511a88c35e35671",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -190,11 +190,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707919853, "lastModified": 1707683400,
"narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=", "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "043ba285c6dc20f36441d48525402bcb9743c498", "rev": "21b078306a2ab68748abf72650db313d646cf2ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -329,11 +329,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1707689078, "lastModified": 1706913249,
"narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=", "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8", "rev": "e92b6015881907e698782c77641aa49298330223",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -345,11 +345,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1707786466, "lastModified": 1707650010,
"narHash": "sha256-yLPfrmW87M2qt+8bAmwopJawa+MJLh3M9rUbXtpUc1o=", "narHash": "sha256-dOhphIA4MGrH4ElNCy/OlwmN24MsnEqFjRR6+RY7jZw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "01885a071465e223f8f68971f864b15829988504", "rev": "809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -55,10 +55,8 @@ in
xserver = { xserver = {
enable = true; enable = true;
xkb = {
layout = "us"; layout = "us";
variant = "altgr-intl"; xkbVariant = "altgr-intl";
};
libinput = { libinput = {
enable = true; enable = true;

View file

@ -39,7 +39,7 @@
separator-foreground = "\${colors.disabled}"; separator-foreground = "\${colors.disabled}";
font-0 = "FiraCode Nerd Font"; font-0 = "FiraCode Nerd Font";
modules-left = "xworkspaces xwindow"; modules-left = "xworkspaces xwindow";
modules-right = "memory cpu wlan bat0 bat1"; modules-right = "memory cpu wlan battery";
cursor-click = "pointer"; cursor-click = "pointer";
cursor-scroll = "ns-resize"; cursor-scroll = "ns-resize";
enable-ipc = true; enable-ipc = true;
@ -103,9 +103,12 @@
interface-type = "wireless"; interface-type = "wireless";
label-connected = "%{F#F0C674}%{F-} %local_ip%"; label-connected = "%{F#F0C674}%{F-} %local_ip%";
}; };
"battery-base" = {
"module/battery" = {
type = "internal/battery"; type = "internal/battery";
poll-interval = 1; poll-interval = 1;
battery = "BAT0";
adapter = "ADP1";
time-format = "%H%{F#7c6f64}:%{F#d5c4a1}%M"; time-format = "%H%{F#7c6f64}:%{F#d5c4a1}%M";
label-charging = "%{F#98971a}󰚥 %{F#ebdbb2}%percentage%%%{F#d5c4a1} %time%"; label-charging = "%{F#98971a}󰚥 %{F#ebdbb2}%percentage%%%{F#d5c4a1} %time%";
format-charging = "<ramp-capacity> <label-charging>"; format-charging = "<ramp-capacity> <label-charging>";
@ -128,16 +131,6 @@
"%{F#98971a}󰁹" "%{F#98971a}󰁹"
]; ];
}; };
"module/bat0" = {
"inherit" = "battery-base";
battery = "BAT0";
adapter = "ADP1";
};
"module/bat1" = {
"inherit" = "battery-base";
battery = "BAT1";
adapter = "ADP1";
};
"settings" = { "settings" = {
screenchange-reload = true; screenchange-reload = true;

View file

@ -14,8 +14,6 @@ in
services.flatpak.enable = true; services.flatpak.enable = true;
xdg.portal = { xdg.portal = {
enable = true; enable = true;
# TODO
config.common.default = "*";
extraPortals = [ extraPortals = [
pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gtk
]; ];