fix waybar icons, add project, add fido token

This commit is contained in:
2024-07-06 12:43:59 +02:00
parent b3f80e0818
commit 9db05facea
6 changed files with 93 additions and 54 deletions

View File

@@ -39,9 +39,16 @@ in {
# nixos cross building qemu # nixos cross building qemu
boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
boot.supportedFilesystems = [ "ntfs" ]; boot.supportedFilesystems = [ "ntfs" ];
boot.plymouth.enable = true; boot.plymouth = {
boot.plymouth.theme = "breeze"; enable = true;
boot.kernelParams = ["quiet"]; theme = "spin";
themePackages = with pkgs; [
# By default we would install all themes
(adi1090x-plymouth-themes.override {
selected_themes = [ "spin" ];
})
];
};
environment.persistence."/nix/persist/system" = { environment.persistence."/nix/persist/system" = {
hideMounts = true; hideMounts = true;

View File

@@ -26,7 +26,14 @@
fsType = "f2fs"; fsType = "f2fs";
}; };
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/08897ecb-23ce-4352-a1fc-fa442b9e0f72"; boot.initrd = {
luks.devices."enc" = {
crypttabExtraOpts = [ "fido2-device=auto" ];
device = "/dev/disk/by-uuid/08897ecb-23ce-4352-a1fc-fa442b9e0f72";
};
systemd.enable = true;
};
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/1521-B173"; { device = "/dev/disk/by-uuid/1521-B173";

View File

@@ -17,16 +17,16 @@ set $up k
set $right l set $right l
# define names for workspaces # define names for workspaces
set $ws1 "1: " set $ws1 "1:  "
set $ws2 "2: " set $ws2 "2:  "
set $ws3 "3: " set $ws3 "3:  "
set $ws4 "4: " set $ws4 "4:  "
set $ws5 "5: " set $ws5 "5:  "
set $ws6 "6: " set $ws6 "6:  "
set $ws7 "7: " set $ws7 "7:  "
set $ws8 "8: " set $ws8 "8:  "
set $ws9 "9: " set $ws9 "9:  "
set $ws10 "10: " set $ws10 "10:  "
# assign workspaces to primary monitor # assign workspaces to primary monitor
workspace $ws1 output primary workspace $ws1 output primary

View File

@@ -69,20 +69,24 @@
"tooltip": false "tooltip": false
}, },
"clock#2": { "clock#2": {
"format": "{:%H:%M}", "format": "{:%H:%M}",
"tooltip": false "tooltip": false
}, },
"clock#3": { "clock#3": {
"format": "{:%d.%m}", "format": "{:%d.%m}",
"tooltip": false "tooltip": false
}, },
"pulseaudio": { "pulseaudio": {
"format": "{icon}{volume}%", "format": "{icon} {volume}%",
"format-muted": "", "format-bluetooth": "󰂰",
"format-muted": "󰝟",
"format-source-muted": " ",
"format-icons": { "format-icons": {
"phone": ["奄", "奔", "墳"], "headphone": " ",
"default": ["奄", "奔", "墳"] "hands-free": " ",
"headset": " ",
"default": ["", "", " "]
}, },
"scroll-step": 5, "scroll-step": 5,
"on-click": "pavucontrol", "on-click": "pavucontrol",
@@ -90,43 +94,62 @@
}, },
"network": { "network": {
// "interface": "wlp2*", // (Optional) To force the use of this interface // "interface": "wlp2*", // (Optional) To force the use of this interface
"format-wifi": "{essid} ({signalStrength}%) ", "format-wifi": "{essid} ({signalStrength}%)  ",
"format-ethernet": "{ipaddr}/{cidr} ", "format-ethernet": "{ipaddr}/{cidr} ",
"tooltip-format": "{ifname} via {gwaddr} ", "tooltip-format": "{ifname} via {gwaddr} ",
"format-linked": "{ifname} (No IP) ", "format-linked": "{ifname} (No IP) ",
"format-disconnected": "Disconnected ", "format-disconnected": "Disconnected ",
"format-alt": "{ifname}: {ipaddr}/{cidr}" "format-alt": "{ifname}: {ipaddr}/{cidr}"
}, },
"memory": { "memory": {
"interval": 5, "interval": 5,
"format": "{}%" "format": "{}%"
}, },
"cpu": { "cpu": {
"interval": 5, "interval": 5,
"format": "{usage:2}%" "format": "{usage:2}%"
}, },
"battery": { "battery": {
"states": { "states": {
"good": 95, "good": 95,
"warning": 30, "warning": 30,
"critical": 15 "critical": 15
}, },
"format": "{icon} {capacity}%", "format": "{icon} {capacity}%",
"format-icons": [ "format-icons": {
"", "charging": [
"", "󰢜",
"", "󰂆",
"", "󰂇",
"" "󰂈",
] "󰢝",
}, "󰂉",
"disk": { "󰢞",
"interval": 5, "󰂊",
"format": "{percentage_used:2}%", "󰂋",
"path": "/home/" "󰂅"
}, ],
"tray": { "default": [
"icon-size": 20 "󰁺",
} "󰁻",
"󰁼",
"󰁽",
"󰁾",
"󰁿",
"󰂀",
"󰂁",
"󰂂",
"󰁹"
]
},
},
"disk": {
"interval": 5,
"format": " {percentage_used:2}%",
"path": "/home/"
},
"tray": {
"icon-size": 20
}
} }

View File

@@ -1,3 +1,4 @@
/home/dominik/projects/cloonar/support-invoiced
/home/dominik/projects/cloonar/cloonar-nixos /home/dominik/projects/cloonar/cloonar-nixos
/home/dominik/projects/cloonar/cloonar-website /home/dominik/projects/cloonar/cloonar-website
/home/dominik/projects/cloonar/wohnservice-wien /home/dominik/projects/cloonar/wohnservice-wien

View File

@@ -329,6 +329,7 @@ in
home.activation.projects = lib.hm.dag.entryAfter ["writeBoundary"] '' home.activation.projects = lib.hm.dag.entryAfter ["writeBoundary"] ''
PATH="${pkgs.git}/bin:${pkgs.openssh}/bin:$PATH" PATH="${pkgs.git}/bin:${pkgs.openssh}/bin:$PATH"
set +eu set +eu
git clone gitea@git.cloonar.com:Cloonar/support-invoiced.git /nix/persist/user/dominik/projects/cloonar/support-invoiced 2>/dev/null
git clone gitea@git.cloonar.com:Cloonar/nixos.git /nix/persist/user/dominik/projects/cloonar/cloonar-nixos 2>/dev/null git clone gitea@git.cloonar.com:Cloonar/nixos.git /nix/persist/user/dominik/projects/cloonar/cloonar-nixos 2>/dev/null
git clone gitea@git.cloonar.com:Cloonar/website.git /nix/persist/user/dominik/projects/cloonar/cloonar-website 2>/dev/null git clone gitea@git.cloonar.com:Cloonar/website.git /nix/persist/user/dominik/projects/cloonar/cloonar-website 2>/dev/null
git clone gitea@git.cloonar.com:Cloonar/wohnservice-wien-typo3.git /nix/persist/user/dominik/projects/cloonar/wohnservice-wien 2>/dev/null git clone gitea@git.cloonar.com:Cloonar/wohnservice-wien-typo3.git /nix/persist/user/dominik/projects/cloonar/wohnservice-wien 2>/dev/null