summaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
Diffstat (limited to 'nixos')
-rwxr-xr-xnixos/bin/unblock-pipewire.sh (renamed from nixos/.unblock-pipewire.sh)0
-rw-r--r--nixos/config/hypr/hyprland.lua22
-rw-r--r--nixos/config/nvim/init.lua2
-rw-r--r--nixos/config/waybar/config.jsonc154
-rw-r--r--nixos/config/waybar/style.css120
-rw-r--r--nixos/configuration.nix7
-rw-r--r--nixos/home.nix43
7 files changed, 183 insertions, 165 deletions
diff --git a/nixos/.unblock-pipewire.sh b/nixos/bin/unblock-pipewire.sh
index c860072..c860072 100755
--- a/nixos/.unblock-pipewire.sh
+++ b/nixos/bin/unblock-pipewire.sh
diff --git a/nixos/config/hypr/hyprland.lua b/nixos/config/hypr/hyprland.lua
index 1b55bb7..1c27d75 100644
--- a/nixos/config/hypr/hyprland.lua
+++ b/nixos/config/hypr/hyprland.lua
@@ -24,8 +24,7 @@ local menu = "exec $(tofi-drun -c ~/.config/tofi.ini)"
hl.on("hyprland.start", function()
hl.exec_cmd("dunst")
hl.exec_cmd("waybar")
- hl.exec_cmd("~/.config/hypr/xdg-portal-hyprland")
- hl.exec_cmd("/usr/lib/hyprpolkitagent/hyprpolkitagent")
+ hl.exec_cmd("sh ~/.local/bin/unlock-pipewire.sh")
hl.exec_cmd("gsettings set org.gnome.desktop.interface gtk-theme \"Adwaita-dark\"")
hl.exec_cmd("gsettings set org.gnome.desktop.interface color-scheme \"prefer-dark\"")
end)
@@ -37,12 +36,12 @@ hl.env("XDG_SESSION_DESKTOP", "Hyprland")
hl.config({
general = {
- gaps_in = 0,
- gaps_out = 0,
- border_size = 0,
+ gaps_in = 7,
+ gaps_out = 7,
+ border_size = 2,
col = {
- active_border = { colors = { "rgba(33ccffee)", "rgba(00ff99ee)" }, angle = 45 },
- inactive_border = "rgba(595959aa)",
+ active_border = "rgba(122, 162, 247, 1)",
+ inactive_border = "rgba(26, 27, 38, 1)",
},
resize_on_border = false,
allow_tearing = false,
@@ -50,15 +49,15 @@ hl.config({
},
decoration = {
- rounding = 0,
- rounding_power = 0,
+ rounding = 5,
+ rounding_power = 20,
active_opacity = 1.0,
inactive_opacity = 1.0,
shadow = { enabled = false, },
blur = { enabled = false, },
},
- animations = { enabled = false, },
+ animations = { enabled = true, },
})
hl.config({ dwindle = { preserve_split = true, }, })
@@ -70,8 +69,7 @@ hl.config({
force_default_wallpaper = 0,
disable_hyprland_logo = true,
disable_splash_rendering = true,
- --background_color = "#000000"
- background_color = "#1a1b26"
+ background_color = "#000000"
},
})
diff --git a/nixos/config/nvim/init.lua b/nixos/config/nvim/init.lua
index 8e19474..ee48b3e 100644
--- a/nixos/config/nvim/init.lua
+++ b/nixos/config/nvim/init.lua
@@ -25,7 +25,7 @@ vim.o.swapfile = false
vim.o.cursorline = true
-- •⏎.·○◦
---vim.o.list = true
+vim.o.list = true
vim.o.listchars = "tab:🡪 ,trail:·,eol:⏎,space:·,multispace:·,lead:·,leadmultispace:·"
vim.o.completeopt = "fuzzy,menuone,noselect"
diff --git a/nixos/config/waybar/config.jsonc b/nixos/config/waybar/config.jsonc
index a60a949..7b8e46c 100644
--- a/nixos/config/waybar/config.jsonc
+++ b/nixos/config/waybar/config.jsonc
@@ -1,93 +1,67 @@
{
- //"margin-top": 15,
- //"margin-right": 15,
- //"margin-left": 15,
- "margin-top": 0,
- "margin-right": 0,
- "margin-left": 0,
- "layer": "top",
- "position": "top",
- "spacing": 3,
- // All modules : battery, pulseaudio, tray, hyprland/workspaces, clock, cpu, memory, network
- "modules-left": [
- "hyprland/workspaces",
- "hyprland/window"
- ],
- "modules-center": [
- "clock"
- ],
- "modules-right": [
- "tray",
+ "layer": "top",
+ "position": "top",
+ "height": 30,
+ "spacing": 8,
+
+ "modules-left": [
+ "hyprland/workspaces",
+ "hyprland/window"
+ ],
+
+ "modules-center": [
+ ],
+
+ "modules-right": [
+ "tray",
+ "network",
"battery",
- "pulseaudio",
- "temperature",
- "cpu",
- "memory",
- "network"
- ],
- "temperature": {
- "format": "TEMP: {temperatureC}°C",
- "hwmon-path": [
- "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon2/temp1_input"
- ],
- "critical-threshold": 65,
- "interval": 3
- },
- "hyprland/workspaces": {
- "format": "{id}",
- "show-special": true
- },
- "hyprland/window": {
- "format": "{initialTitle}",
- "tooltip": false,
- "icon": true
- },
- "network": {
- "format": "{ifname}",
- "format-disconnected": "NULL",
- "interval": 5,
- "tooltip": true,
- "tooltip-format": "{essid}"
- },
- "cpu": {
- "format": "CPU: {usage}%",
- "interval": 3,
- "states": {
- "warning": 40,
- "urgent": 60,
- "critical": 80
- }
- },
- "memory": {
- "format": "MEM: {percentage}%",
- "format-alt": "MEM: {used} GiB",
- "interval": 3,
- "states": {
- "warning": 40,
- "urgent": 60,
- "critical": 80
- },
- "tooltip": true,
- "tooltip-format": "{used}/{total} GiB"
- },
- "pulseaudio": {
- "format": "VOL: {volume}%",
- "format-bluetooth": "VOL: {volume}%",
- "format-muted": "MUTED",
- "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
- },
- "battery": {
- "format": "BAT: {capacity}%",
- "interval": 5,
- "states": {
- "warning": 60,
- "urgent": 35,
- "critical": 20
- }
- },
- "clock": {
- "format": "{:%H:%M:%S - %a %d %B %Y}",
- "tooltip": false,
- "interval": 1
- }
+ "cpu",
+ "memory",
+ "disk",
+ "clock"
+ ],
+
+ "hyprland/workspaces": {
+ "format": "{name}",
+ "persistent-workspaces": {
+ "*" : 9
+ }
+ },
+
+ "hyprland/window" : {
+ "max-length": 40,
+ "seperate-outputs": false
+ },
+ "tray": {
+ "spacing": 10
+ },
+ "clock": {
+ "format-alt": "{:%Y-%m-%d}"
+ },
+ "cpu": {
+ "format": "CPU: {usage}%",
+ "tooltip": false
+ },
+ "memory": {
+ "format": "RAM: {used}GiB"
+ },
+ "disk": {
+ "interval": 60,
+ "path": "/",
+ "format": "ROOT: {free}"
+ },
+ "battery": {
+ "states": {
+ "good": 95,
+ "warning": 30,
+ "critical": 15
+ },
+ "format": "BAT: {capacity}%",
+ "format-plugged": "BAT!: {capacity}%"
+ },
+ "network": {
+ "format": "ONLINE",
+ "format-disconnected": "OFFLINE"
+ }
}
diff --git a/nixos/config/waybar/style.css b/nixos/config/waybar/style.css
index 4e7b6e8..2bcc39c 100644
--- a/nixos/config/waybar/style.css
+++ b/nixos/config/waybar/style.css
@@ -1,94 +1,100 @@
+@define-color bg #1a1b26;
+@define-color fg #a9b1d6;
+@define-color blk #32344a;
+@define-color red #f7768e;
+@define-color grn #9ece6a;
+@define-color ylw #e0af68;
+@define-color blu #7aa2f7;
+@define-color mag #ad8ee6;
+@define-color cyn #0db9d7;
+@define-color brblk #444b6a;
+@define-color white #ffffff;
+
* {
- font-family: "monospace";
- font-weight: bold;
+ font-family: "0xProto Nerd Font", monospace;
+ font-size: 16px;
+ font-weight: bold;
}
-#waybar {
- background: #1a1b26;
- color: #fff;
+window#waybar {
+ background-color: @bg;
+ color: @fg;
}
#workspaces button {
- color: #fff;
- border-radius: 0;
+ padding: 0 6px;
+ color: @cyn;
+ background: transparent;
+ border-bottom: 3px solid @bg;
}
-
#workspaces button.active {
- background: #ad8ee6;
+ color: @cyn;
+ border-bottom: 3px solid @mag;
}
-
-#workspaces button.special {
- background: #7aa2f7;
+#workspaces button.empty {
+ color: @white;
+}
+#workspaces button.empty.active {
+ color: @cyn;
+ border-bottom: 3px solid @mag;
}
#workspaces button.urgent {
- background: #f7768e;
+ background-color: @red;
}
-#workspaces button:hover {
- box-shadow: none;
- text-shadow: none;
- background: #32344a;
- border: none;
- transition: none;
- color: #7aa2f7;
+button:hover {
+ background: inherit;
+ box-shadow: inset 0 -3px #ffffff;
}
+#clock,
+#custom-sep,
#battery,
#cpu,
#memory,
-#pulseaudio,
+#disk,
#network,
-#clock,
-#tray,
-#temperature,
-#workspaces button {
- padding: 7 7;
+#tray {
+ padding: 0 8px;
+ color: @white;
}
-#network {
- background: #449dab;
+#clock {
+ color: @cyn;
+ border-bottom: 4px solid @cyn;
}
-#pulseaudio {
- background: #ad8ee6;
+#battery {
+ color: @mag;
+ border-bottom: 4px solid @mag;
}
-#pulseaudio.bluetooth {
- background: #7aa2f7;
+#disk {
+ color: @ylw;
+ border-bottom: 4px solid @ylw;
}
-#battery,
-#cpu,
-#memory,
-#temperature {
- background: #9ece6a;
+#memory {
+ color: @mag;
+ border-bottom: 4px solid @mag;
}
-#battery.warning,
-#cpu.warning,
-#memory.warning {
- background: #e0af68;
+#cpu {
+ color: @grn;
+ border-bottom: 4px solid @grn;
}
-#battery.urgent,
-#cpu.urgent,
-#memory.urgent,
-#network.disabled {
- background: #ff9e64;
+#network {
+ color: @blu;
+ border-bottom: 4px solid @blu;
}
-#battery.critical,
-#cpu.critical,
-#pulseaudio.muted,
-#memory.critical,
-#network.disconnected,
-#temperature.critical {
- background: #f7768e
+#network.disconnected {
+ background-color: @red;
}
-#window {
- margin-left: 10px;
- background: #32344a;
- padding: 7;
+#tray {
+ background-color: #2980b9;
}
+
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 24d7549..fe54d08 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -61,6 +61,13 @@
alsa-firmware
];
+ fonts = {
+ enableDefaultPackages = true;
+ packages = with pkgs; [
+ nerd-fonts._0xproto
+ ];
+ };
+
services.openssh.enable = true;
networking.firewall.allowedTCPPorts = [ ];
diff --git a/nixos/home.nix b/nixos/home.nix
index cd31c1f..6a76346 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -37,16 +37,19 @@
'';
};
- home.file.".config/hypr".source = ./config/hypr;
- home.file.".config/waybar".source = ./config/waybar;
- home.file.".config/git".source = ./config/git;
- home.file.".config/nvim/init.lua".source = ./config/nvim/init.lua;
- home.file.".config/user-dirs.dirs".source = ./config/user-dirs.dirs;
+ home.file.".config/hypr/hyprland.lua".source = ./config/hypr/hyprland.lua;
+ home.file.".config/waybar".source = ./config/waybar;
+ home.file.".config/git".source = ./config/git;
+ home.file.".config/nvim/init.lua".source = ./config/nvim/init.lua;
+ home.file.".config/user-dirs.dirs".source = ./config/user-dirs.dirs;
+ home.file.".local/bin/unblock-pipewire.sh".source = ./bin/unblock-pipewire.sh;
home.packages = with pkgs; [
neovim
nil
+
hyprpicker
+ hyprpaper
dunst
grim
wl-clipboard
@@ -60,6 +63,8 @@
yt-dlp
pavucontrol
fzf
+ btop
+
(pkgs.writeShellApplication {
name = "ns";
runtimeInputs = with pkgs; [
@@ -73,6 +78,22 @@
programs.alacritty = {
enable = true;
theme = "tokyo_night";
+ settings = {
+ window = {
+ padding = {
+ x = 10;
+ y = 10;
+ };
+ opacity = 1;
+ };
+ font = {
+ normal = {
+ family = "0xProto Nerd Font";
+ style = "Regular";
+ };
+ size = 15;
+ };
+ };
};
programs.firefox = {
@@ -86,4 +107,16 @@
search.default = "ddg";
};
};
+
+ services.hyprpaper = {
+ enable = true;
+ settings = {
+ wallpaper = [
+ {
+ monitor = "auto";
+ path = "~/images/wallpaper.png";
+ }
+ ];
+ };
+ };
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-06-10 15:51:29 +0000