aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/variables.nix25
-rw-r--r--flake.lock102
-rw-r--r--home-manager/stvnliu/home.nix2
-rw-r--r--home-manager/stvnliu/hypr/hyprland/hyprbars.nix2
-rw-r--r--home-manager/stvnliu/nixvim/lsp.nix2
-rw-r--r--home-manager/stvnliu/nixvim/tagbar.nix3
-rw-r--r--home-manager/stvnliu/packages/discord.nix2
-rw-r--r--home-manager/stvnliu/packages/util-programs.nix1
-rw-r--r--home-manager/stvnliu/programs/git.nix11
-rw-r--r--home-manager/stvnliu/programs/git_config.nix13
-rw-r--r--home-manager/stvnliu/scripts/launch-url-firefox.script.nix8
-rw-r--r--home-manager/stvnliu/services/mpd.nix23
-rw-r--r--home-manager/stvnliu/services/waybar.nix124
-rw-r--r--home-manager/stvnliu/services/waybar_config.nix117
-rw-r--r--home-manager/stvnliu/services/waybar_style.nix4
-rw-r--r--home-manager/stvnliu/stylix.nix3
-rw-r--r--nixos/configuration.nix7
-rw-r--r--nixos/custom-hosts.nix2
18 files changed, 232 insertions, 219 deletions
diff --git a/common/variables.nix b/common/variables.nix
index 3b3ea73..7ad651d 100644
--- a/common/variables.nix
+++ b/common/variables.nix
@@ -1,7 +1,7 @@
{ config, pkgs, lib, ... }:
let
monitorMaxBrightness = "255";
- monitorMinBrightness = "32";
+ # monitorMinBrightness = "32";
stylixBG = config.lib.stylix.colors.base00;
stylixFG = config.lib.stylix.colors.base07;
stylixPrimaryBG = config.lib.stylix.colors.base12;
@@ -25,7 +25,10 @@ in
displayScale = mkOption { type = int; };
myAutostartCommands = mkOption { type = listOf str; };
myConfigLocation = mkOption { type = str; };
- desktopFontFullName = mkOption { type = str; };
+ desktopFont = {
+ shortName = mkOption { type = str; };
+ fullName = mkOption { type = str; };
+ };
};
# Default values for this configuration
@@ -37,13 +40,17 @@ in
myWallPaperPathString = "/home/${myUserName}/wallpaper.png";
myDisplayName = "Zhongheng Liu";
myEmail = "z.liu@outlook.com.gr";
- specialisation."powersave".configuration = {
- myAutostartCommands =
- [ "${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMinBrightness}" ];
- };
+ /* specialisation."powersave".configuration = {
+ myAutostartCommands =
+ [ "${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMinBrightness}" ];
+ };
+ */
myConfigLocation =
"/home/${myUserName}/Development/Nix/nixos-configuration";
- desktopFontFullName = "JetBrainsMono Nerd Font:style=Regular";
+ desktopFont = {
+ fullName = "${desktopFont.shortName}:style=Regular";
+ shortName = "JetBrains Mono Nerd Font";
+ };
myAutostartCommands = [
"${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMaxBrightness}"
"fcitx5"
@@ -55,8 +62,8 @@ in
defaultApplications = {
terminal = "${pkgs.foot}/bin/footclient";
fileManager = "${pkgs.nemo}/bin/nemo";
- appLauncher =
- "${pkgs.wmenu}/bin/wmenu-run -p \"Launch a program...\" -N ${stylixBG} -n ${stylixFG} -S ${stylixPrimaryBG}";
+ appLauncher = ''
+ ${pkgs.wmenu}/bin/wmenu-run -p "Launch a program..." -N ${stylixBG} -n ${stylixFG} -S ${stylixPrimaryBG}'';
};
usingMusicPlayerDaemon = true;
};
diff --git a/flake.lock b/flake.lock
index 70cae67..4c034d6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,11 +70,11 @@
"firefox-gnome-theme": {
"flake": false,
"locked": {
- "lastModified": 1739223196,
- "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=",
+ "lastModified": 1743774811,
+ "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
- "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21",
+ "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e",
"type": "github"
},
"original": {
@@ -124,11 +124,11 @@
]
},
"locked": {
- "lastModified": 1738453229,
- "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+ "lastModified": 1743550720,
+ "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+ "rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github"
},
"original": {
@@ -227,11 +227,11 @@
]
},
"locked": {
- "lastModified": 1737465171,
- "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
+ "lastModified": 1742649964,
+ "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
+ "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
"type": "github"
},
"original": {
@@ -286,11 +286,11 @@
]
},
"locked": {
- "lastModified": 1740494361,
- "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=",
+ "lastModified": 1744380363,
+ "narHash": "sha256-cXjAUuAfQDPSLSsckZuTioQ986iqSPTzx8D7dLAcC+Q=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17",
+ "rev": "e43c6bcb101ba3301522439c459288c4a248f624",
"type": "github"
},
"original": {
@@ -307,11 +307,11 @@
]
},
"locked": {
- "lastModified": 1740347597,
- "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=",
+ "lastModified": 1743869639,
+ "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449",
+ "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836",
"type": "github"
},
"original": {
@@ -408,11 +408,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1738828244,
- "narHash": "sha256-cmo544QvdacVTHPqmc6er4xnSSc63e6Z71BS0FxSklE=",
+ "lastModified": 1741036724,
+ "narHash": "sha256-nCsqa5dXW1Qja+smRkVpNkGAHfYkBFJ6U3bVilY5pDo=",
"owner": "h3rmt",
"repo": "hyprswitch",
- "rev": "bb06fb046aa1c204c2effa382573b8045cefd355",
+ "rev": "3feeccf2f1d3d6c0fb7c79b965ccf382118651d2",
"type": "github"
},
"original": {
@@ -507,11 +507,11 @@
},
"nixpkgs-master": {
"locked": {
- "lastModified": 1740570505,
- "narHash": "sha256-pGc2vjPl9dJ57syjonuhn500CWVTduKNEIBqUG4hnu0=",
+ "lastModified": 1744395621,
+ "narHash": "sha256-VTC1c/kL8aZWLLbKPYbq7B+mQ0sQxidhqey1ZfkADws=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "f7a293e8c3577dcaa7e91037f0ca8d8f7e5f46d6",
+ "rev": "2ffb6632c36e1716067d0db5465213a0407119a9",
"type": "github"
},
"original": {
@@ -523,11 +523,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1740463929,
- "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=",
+ "lastModified": 1744309437,
+ "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b",
+ "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7",
"type": "github"
},
"original": {
@@ -554,11 +554,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1740367490,
- "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
+ "lastModified": 1744232761,
+ "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+ "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14",
"type": "github"
},
"original": {
@@ -570,11 +570,11 @@
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1740367490,
- "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
+ "lastModified": 1743583204,
+ "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+ "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
"type": "github"
},
"original": {
@@ -593,11 +593,11 @@
"nuschtosSearch": "nuschtosSearch"
},
"locked": {
- "lastModified": 1740520037,
- "narHash": "sha256-TpZMYjOre+6GhKDVHFwoW2iBWqpNQppQTuqIAo+OBV8=",
+ "lastModified": 1744383153,
+ "narHash": "sha256-We4ePUixXnMOIqA9IRMWXGEW6efZRTGwTVCv5/yCvcU=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "6f8d8f7aee84f377f52c8bb58385015f9168a666",
+ "rev": "e537d4a6b4c1c81f8b71dfd916fdf970d0d5c987",
"type": "github"
},
"original": {
@@ -616,11 +616,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1740408283,
- "narHash": "sha256-2xECnhgF3MU9YjmvOkrRp8wRFo2OjjewgCtlfckhL5s=",
+ "lastModified": 1743884191,
+ "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "496a4a11162bdffb9a7b258942de138873f019f7",
+ "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c",
"type": "github"
},
"original": {
@@ -639,11 +639,11 @@
]
},
"locked": {
- "lastModified": 1738508923,
- "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
+ "lastModified": 1743683223,
+ "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=",
"owner": "NuschtOS",
"repo": "search",
- "rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
+ "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962",
"type": "github"
},
"original": {
@@ -694,11 +694,11 @@
"systems": "systems_3"
},
"locked": {
- "lastModified": 1740284169,
- "narHash": "sha256-Ne+3kEyOFD2sNfw3cnKk+Zi/tTk+WkmnsfE7PDLNEXU=",
+ "lastModified": 1744251450,
+ "narHash": "sha256-4zwkN8aC/B8G48p2R5ptqp4/l8M+SmLN/VddF39DeXM=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
- "rev": "fd31f20e2bd2bf3894d729590bf578c02c252239",
+ "rev": "e1326d6cd66f74595da4707ed7f1928e3d8cbbdd",
"type": "github"
},
"original": {
@@ -729,11 +729,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
- "lastModified": 1740520441,
- "narHash": "sha256-CWK3L7i7YqubbcrdS/5D/+Vo+IuClrNR+5B+ByhBlEo=",
+ "lastModified": 1744270948,
+ "narHash": "sha256-+1psY8uBaDdkqV/P3G40SzulPvUcb9VHisqQnDozC0U=",
"owner": "danth",
"repo": "stylix",
- "rev": "a98c363a58accad047a2580382d90433619a08e0",
+ "rev": "ce45f19e8acb43e5f02888d873d451e2f994546b",
"type": "github"
},
"original": {
@@ -839,11 +839,11 @@
"tinted-schemes": {
"flake": false,
"locked": {
- "lastModified": 1740351358,
- "narHash": "sha256-Hdk850xgAd3DL8KX0AbyU7tC834d3Lej1jOo3duWiOA=",
+ "lastModified": 1742851696,
+ "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=",
"owner": "tinted-theming",
"repo": "schemes",
- "rev": "a1bc2bd89e693e7e3f5764cfe8114e2ae150e184",
+ "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77",
"type": "github"
},
"original": {
@@ -855,11 +855,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
- "lastModified": 1740272597,
- "narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=",
+ "lastModified": 1743296873,
+ "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
- "rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0",
+ "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a",
"type": "github"
},
"original": {
diff --git a/home-manager/stvnliu/home.nix b/home-manager/stvnliu/home.nix
index 3462f1d..ae1589c 100644
--- a/home-manager/stvnliu/home.nix
+++ b/home-manager/stvnliu/home.nix
@@ -28,6 +28,7 @@
];
# Configure your nixpkgs instance
config = {
+ cudaSupport = true;
permittedInsecurePackages = [
"dotnet-core-combined"
"dotnet-sdk-6.0.428"
@@ -58,7 +59,6 @@
kdePackages.kdenlive
obsidian
heroic
- rustdesk
];
myAutostartCommands = [
#"${pkgs.clash-verge-rev}/bin/clash-verge"
diff --git a/home-manager/stvnliu/hypr/hyprland/hyprbars.nix b/home-manager/stvnliu/hypr/hyprland/hyprbars.nix
index 1279223..ef79e37 100644
--- a/home-manager/stvnliu/hypr/hyprland/hyprbars.nix
+++ b/home-manager/stvnliu/hypr/hyprland/hyprbars.nix
@@ -4,7 +4,7 @@
bar_color = "rgb(1e1e1e)";
"col.text" = "ffffff";
bar_text_size = 12;
- bar_text_font = config.desktopFontFullName;
+ bar_text_font = config.desktopFont.fullName;
bar_button_padding = 12;
bar_padding = 10;
bar_precedence_over_border = true;
diff --git a/home-manager/stvnliu/nixvim/lsp.nix b/home-manager/stvnliu/nixvim/lsp.nix
index 637fbf7..73124a1 100644
--- a/home-manager/stvnliu/nixvim/lsp.nix
+++ b/home-manager/stvnliu/nixvim/lsp.nix
@@ -11,7 +11,7 @@
#ruff.enable = true;
#ruff_lsp.enable = true;
- rust-analyzer = {
+ rust_analyzer = {
enable = true;
installCargo = false;
installRustc = false;
diff --git a/home-manager/stvnliu/nixvim/tagbar.nix b/home-manager/stvnliu/nixvim/tagbar.nix
index e011bf7..2c7c1b0 100644
--- a/home-manager/stvnliu/nixvim/tagbar.nix
+++ b/home-manager/stvnliu/nixvim/tagbar.nix
@@ -1,9 +1,10 @@
{ pkgs, ... }:
{
+
+ dependencies.ctags.package = pkgs.universal-ctags;
plugins.tagbar = {
enable = true;
- tagsPackage = pkgs.universal-ctags;
settings = {
autoclose = false;
autofocus = false;
diff --git a/home-manager/stvnliu/packages/discord.nix b/home-manager/stvnliu/packages/discord.nix
index 30e8bae..b0de476 100644
--- a/home-manager/stvnliu/packages/discord.nix
+++ b/home-manager/stvnliu/packages/discord.nix
@@ -1,7 +1,7 @@
{ pkgs
, ...
}: {
- home.packages = with pkgs; [ discord vesktop ];
+ home.packages = with pkgs; [ discord vesktop cinny-desktop ];
/*xdg.desktopEntries.discord = {
exec = "${pkgs.vesktop}/bin/vesktop";
terminal = false;
diff --git a/home-manager/stvnliu/packages/util-programs.nix b/home-manager/stvnliu/packages/util-programs.nix
index aeff855..59c3466 100644
--- a/home-manager/stvnliu/packages/util-programs.nix
+++ b/home-manager/stvnliu/packages/util-programs.nix
@@ -18,5 +18,6 @@
udiskie
sxiv
transmission_4-gtk
+ chromium
];
}
diff --git a/home-manager/stvnliu/programs/git.nix b/home-manager/stvnliu/programs/git.nix
index ebf934f..688902e 100644
--- a/home-manager/stvnliu/programs/git.nix
+++ b/home-manager/stvnliu/programs/git.nix
@@ -8,15 +8,6 @@
package = pkgs.gitFull;
userName = config.myDisplayName;
userEmail = config.myEmail;
- extraConfig = {
- core.autocrlf = "input";
- push.autoSetupRemote = true;
- commit.gpgsign = true;
- #gpg.format = "ssh";
- #gpg.ssh.allowedSignersFile = "/home/${config.myUserName}/.ssh/allowed_signers";
- #user.signingkey = "/home/${config.myUserName}/.ssh/id_ed25519.pub";
- user.signingkey = "DC8F48E7B4C40905";
- credential.helper = "libsecret";
- };
+ extraConfig = import ./git_config.nix;
};
}
diff --git a/home-manager/stvnliu/programs/git_config.nix b/home-manager/stvnliu/programs/git_config.nix
new file mode 100644
index 0000000..15011a0
--- /dev/null
+++ b/home-manager/stvnliu/programs/git_config.nix
@@ -0,0 +1,13 @@
+{
+ core.autocrlf = "input";
+ push = {
+ autoSetupRemote = true;
+ followTags = true;
+ };
+ commit.gpgsign = true;
+ #gpg.format = "ssh";
+ #gpg.ssh.allowedSignersFile = "/home/${config.myUserName}/.ssh/allowed_signers";
+ #user.signingkey = "/home/${config.myUserName}/.ssh/id_ed25519.pub";
+ user.signingkey = "DC8F48E7B4C40905";
+ credential.helper = "libsecret";
+}
diff --git a/home-manager/stvnliu/scripts/launch-url-firefox.script.nix b/home-manager/stvnliu/scripts/launch-url-firefox.script.nix
new file mode 100644
index 0000000..b46d2b1
--- /dev/null
+++ b/home-manager/stvnliu/scripts/launch-url-firefox.script.nix
@@ -0,0 +1,8 @@
+{ pkgs, }:
+let
+ # browserPath = lib.getExe config.programs.firefox.package;
+ # dmenuPath = lib.getExe pkgs.wmenu;
+in
+pkgs.writeShellScriptBin "urlmenu" ''
+ #!${pkgs.bash}/bin/bash
+''
diff --git a/home-manager/stvnliu/services/mpd.nix b/home-manager/stvnliu/services/mpd.nix
index 23e38e0..d8a1c4a 100644
--- a/home-manager/stvnliu/services/mpd.nix
+++ b/home-manager/stvnliu/services/mpd.nix
@@ -6,24 +6,11 @@ lib.mkIf config.usingMusicPlayerDaemon {
network.listenAddress = "any";
network.port = 6600;
extraConfig = ''
- audio_output {
- type "pipewire"
- name "my pipewire output"
- }
- audio_output {
- type "httpd"
- name "My HTTP Stream"
- encoder "vorbis" # optional, vorbis or lame
- port "8000"
- # bind_to_address "0.0.0.0" # optional, IPv4 or IPv6
- quality "5.0" # do not define if bitrate is defined
- # bitrate "128" # do not define if quality is defined
- format "44100:16:1"
- max_clients "5" # optional 0=no limit
- }
+ audio_output {
+ type "pipewire"
+ name "my pipewire output"
+ }
'';
};
- services.mpd-mpris = {
- enable = true;
- };
+ services.mpd-mpris = { enable = true; };
}
diff --git a/home-manager/stvnliu/services/waybar.nix b/home-manager/stvnliu/services/waybar.nix
index 9c6f655..ed489fa 100644
--- a/home-manager/stvnliu/services/waybar.nix
+++ b/home-manager/stvnliu/services/waybar.nix
@@ -2,127 +2,7 @@
programs.waybar = {
enable = true;
systemd = { enable = true; };
- style = ''
- * {
- font-family: JetBrainsMono Nerd Font;
- }
- '';
- settings = {
- mainBar = {
- layer = "top";
- position = "bottom";
- height = 30;
- output = [ "eDP-1" "eDP-2" "HDMI-A-1" ];
- modules-left = [ "hyprland/workspaces" "hyprland/submap" ];
- modules-center = [ "mpd" ];
- modules-right =
- [ "clock" "group/trays" "group/monitor" "wireplumber" "temperature" ];
- "battery" = {
- "bat" = "BAT1";
- "format" = "BAT {capacity}% @ {power}W";
- };
- "hyprland/workspaces" = {
- disable-scroll = true;
- all-outputs = true;
- };
- "tray" = {
- "icon-size" = 18;
- "spacing" = 10;
- };
- "custom/tray-label" = { "format" = "[TRAY]"; };
- "custom/monitor-label" = { "format" = "[HW]"; };
- "group/trays" = {
- "orientation" = "inherit";
- "modules" = [ "custom/tray-label" "tray" ];
- "drawer" = { "click-to-reveal" = true; };
- };
- "group/monitor" = {
- "orientation" = "inherit";
- "modules" = [ "custom/monitor-label" "battery" "cpu" "memory" ];
- "drawer" = { "click-to-reveal" = true; };
- };
- "mpd" = {
- "artist-len" = 10;
- "album-len" = 10;
- "title-len" = 20;
- "format" =
- "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ";
- "format-disconnected" = "Disconnected ";
- "format-stopped" =
- "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ";
- "interval" = 10;
- "consume-icons" = {
- "on" = " "; # Icon shows only when "consume" is on
- };
- "random-icons" = {
- "off" = ''
- <span color="#f53c3c"></span> ''; # Icon grayed out when "random" is off
- "on" = " ";
- };
- "repeat-icons" = { "on" = " "; };
- "single-icons" = { "on" = " 1 "; };
- "state-icons" = {
- "paused" = "";
- "playing" = "";
- };
- "tooltip-format" = "MPD (connected)";
- "tooltip-format-disconnected" = "MPD (disconnected)";
- };
- "wireplumber" = {
- "format" = "{volume}% {icon}";
- "format-muted" = "";
- "format-icons" = [ "" "" "" ];
- };
- "cpu" = {
- "format" = "CPU {icon}";
- "format-icons" = [
- "<span color='#69ff94'>▁</span>" # green
- "<span color='#2aa9ff'>▂</span>" # blue
- "<span color='#f8f8f2'>▃</span>" # white
- "<span color='#f8f8f2'>▄</span>" # white
- "<span color='#ffffa5'>▅</span>" # yellow
- "<span color='#ffffa5'>▆</span>" # yellow
- "<span color='#ff9977'>▇</span>" # orange
- "<span color='#dd532e'>█</span>" # red
- ];
- "memory" = { "format" = "MEM {percentage}%"; };
- };
- "clock" = {
- "format" = "{:%H:%M}  ";
- "format-alt" = "{:%A, %B %d, %Y (%R)}";
- "tooltip-format" = "<tt><small>{calendar}</small></tt>";
- "calendar" = {
- "mode" = "year";
- "mode-mon-col" = 3;
- "weeks-pos" = "right";
- "on-scroll" = 1;
- "format" = {
- "months" = "<span color='#ffead3'><b>{}</b></span>";
- "days" = "<span color='#ecc6d9'><b>{}</b></span>";
- "weeks" = "<span color='#99ffdd'><b>W{}</b></span>";
- "weekdays" = "<span color='#ffcc66'><b>{}</b></span>";
- "today" = "<span color='#ff6699'><b><u>{}</u></b></span>";
- };
- };
- /* "actions" = {
- "on-click-right" = "mode";
- "on-scroll-up" = "tz_up";
- "on-scroll-down" = "tz_down";
- "on-scroll-up" = "shift_up";
- "on-scroll-down" = "shift_down";
- };
- */
- };
- /* "custom/hello-from-waybar" = {
- format = "hello {}";
- max-length = 40;
- interval = "once";
- exec = pkgs.writeShellScript "hello-from-waybar" ''
- echo "from within waybar"
- '';
- };
- */
- };
- };
+ style = "${import ./waybar_style.nix { }}";
+ settings = import ./waybar_config.nix;
};
}
diff --git a/home-manager/stvnliu/services/waybar_config.nix b/home-manager/stvnliu/services/waybar_config.nix
new file mode 100644
index 0000000..382e096
--- /dev/null
+++ b/home-manager/stvnliu/services/waybar_config.nix
@@ -0,0 +1,117 @@
+{
+ mainBar = {
+ layer = "top";
+ position = "bottom";
+ height = 30;
+ output = [ "eDP-1" "eDP-2" "HDMI-A-1" ];
+ modules-left = [ "hyprland/workspaces" "hyprland/submap" ];
+ modules-center = [ "mpd" ];
+ modules-right =
+ [ "clock" "group/trays" "group/monitor" "wireplumber" "temperature" ];
+ "battery" = {
+ "bat" = "BAT1";
+ "format" = "BAT {capacity}% @ {power}W";
+ };
+ "hyprland/workspaces" = {
+ disable-scroll = true;
+ all-outputs = true;
+ };
+ "tray" = {
+ "icon-size" = 18;
+ "spacing" = 10;
+ };
+ "custom/tray-label" = { "format" = "[TRAY]"; };
+ "custom/monitor-label" = { "format" = "[HW]"; };
+ "group/trays" = {
+ "orientation" = "inherit";
+ "modules" = [ "custom/tray-label" "tray" ];
+ "drawer" = { "click-to-reveal" = true; };
+ };
+ "group/monitor" = {
+ "orientation" = "inherit";
+ "modules" = [ "custom/monitor-label" "battery" "cpu" "memory" ];
+ "drawer" = { "click-to-reveal" = true; };
+ };
+ "mpd" = {
+ "artist-len" = 10;
+ "album-len" = 10;
+ "title-len" = 20;
+ "format" =
+ "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ";
+ "format-disconnected" = "Disconnected ";
+ "format-stopped" =
+ "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ";
+ "interval" = 10;
+ "consume-icons" = {
+ "on" = " "; # Icon shows only when "consume" is on
+ };
+ "random-icons" = {
+ "off" = ''
+ <span color="#f53c3c"></span> ''; # Icon grayed out when "random" is off
+ "on" = " ";
+ };
+ "repeat-icons" = { "on" = " "; };
+ "single-icons" = { "on" = " 1 "; };
+ "state-icons" = {
+ "paused" = "";
+ "playing" = "";
+ };
+ "tooltip-format" = "MPD (connected)";
+ "tooltip-format-disconnected" = "MPD (disconnected)";
+ };
+ "wireplumber" = {
+ "format" = "{volume}% {icon}";
+ "format-muted" = "";
+ "format-icons" = [ "" "" "" ];
+ };
+ "cpu" = {
+ "format" = "CPU {icon}";
+ "format-icons" = [
+ "<span color='#69ff94'>▁</span>" # green
+ "<span color='#2aa9ff'>▂</span>" # blue
+ "<span color='#f8f8f2'>▃</span>" # white
+ "<span color='#f8f8f2'>▄</span>" # white
+ "<span color='#ffffa5'>▅</span>" # yellow
+ "<span color='#ffffa5'>▆</span>" # yellow
+ "<span color='#ff9977'>▇</span>" # orange
+ "<span color='#dd532e'>█</span>" # red
+ ];
+ "memory" = { "format" = "MEM {percentage}%"; };
+ };
+ "clock" = {
+ "format" = "{:%H:%M}  ";
+ "format-alt" = "{:%A, %B %d, %Y (%R)}";
+ "tooltip-format" = "<tt><small>{calendar}</small></tt>";
+ "calendar" = {
+ "mode" = "year";
+ "mode-mon-col" = 3;
+ "weeks-pos" = "right";
+ "on-scroll" = 1;
+ "format" = {
+ "months" = "<span color='#ffead3'><b>{}</b></span>";
+ "days" = "<span color='#ecc6d9'><b>{}</b></span>";
+ "weeks" = "<span color='#99ffdd'><b>W{}</b></span>";
+ "weekdays" = "<span color='#ffcc66'><b>{}</b></span>";
+ "today" = "<span color='#ff6699'><b><u>{}</u></b></span>";
+ };
+ };
+ /* "actions" = {
+ "on-click-right" = "mode";
+ "on-scroll-up" = "tz_up";
+ "on-scroll-down" = "tz_down";
+ "on-scroll-up" = "shift_up";
+ "on-scroll-down" = "shift_down";
+ };
+ */
+ };
+ /* "custom/hello-from-waybar" = {
+ format = "hello {}";
+ max-length = 40;
+ interval = "once";
+ exec = pkgs.writeShellScript "hello-from-waybar" ''
+ echo "from within waybar"
+ '';
+ };
+ */
+ };
+}
diff --git a/home-manager/stvnliu/services/waybar_style.nix b/home-manager/stvnliu/services/waybar_style.nix
new file mode 100644
index 0000000..2849206
--- /dev/null
+++ b/home-manager/stvnliu/services/waybar_style.nix
@@ -0,0 +1,4 @@
+{ ... }: ''
+ * {
+ font-family: JetBrainsMono Nerd Font;
+ }''
diff --git a/home-manager/stvnliu/stylix.nix b/home-manager/stvnliu/stylix.nix
index b7e675b..f26a962 100644
--- a/home-manager/stvnliu/stylix.nix
+++ b/home-manager/stvnliu/stylix.nix
@@ -17,7 +17,7 @@ in
package = pkgs.helvetica-neue-lt-std;
};
monospace = {
- name = config.desktopFontFullName;
+ name = config.desktopFont.fullName;
package = pkgs.nerd-fonts.jetbrains-mono;
};
sizes = {
@@ -25,7 +25,6 @@ in
applications = 14;
};
};
- cursor.size = 24;
opacity = {
applications = globalOpacity;
desktop = globalOpacity;
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index dee7d5b..ac87ce1 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -12,7 +12,7 @@
#./dwm
./spec.nix
./hardware-configuration.nix
- ./custom-hosts.nix
+ #./custom-hosts.nix
];
# Virtual cam settings: see https://wiki.nixos.org/wiki/OBS_Studio#Using_the_Virtual_Camera
environment.sessionVariables = {
@@ -23,6 +23,10 @@
NIXOS_OZONE_WL = "1";
# GTK_IM_MODULE = lib.mkForce "";
};
+ /*services.jellyfin = {
+ enable = true;
+ openFirewall = true;
+ };*/
services.keyd = {
enable = true;
keyboards = {
@@ -156,6 +160,7 @@
nixpkgs = {
overlays = [ ];
config = {
+ cudaSupport = true;
allowUnfree = true;
permittedInsecurePackages = [ "dotnet-core-combined" ];
};
diff --git a/nixos/custom-hosts.nix b/nixos/custom-hosts.nix
index 423229e..a0a18b4 100644
--- a/nixos/custom-hosts.nix
+++ b/nixos/custom-hosts.nix
@@ -15,6 +15,6 @@ in
{
networking.extraHosts = ''
# home IP mapping
- 100.91.33.34 ${rootDomainName} ${builtins.concatStringsSep " " (map (x: x + "." + rootDomainName) subdomains)}
+ 192.168.1.100 ${rootDomainName} ${builtins.concatStringsSep " " (map (x: x + "." + rootDomainName) subdomains)}
'';
}
generated by cgit (git 2.34.1) at 2025-05-22 16:28:01 +0000