This commit is contained in:
2025-07-14 01:30:39 +02:00
parent 0fb6806dd1
commit 16b83b8420
11 changed files with 290 additions and 62 deletions

24
flake.lock generated
View File

@@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1749223974, "lastModified": 1751880463,
"narHash": "sha256-/GAQYRW1duU81KG//2wI9ax8EkHVG/e1UOD97NdwLOY=", "narHash": "sha256-aSQllMKqsTYAUp4yhpspZn0Hj5yIj7Mh4UD5iyk5iMM=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "3a42cd79c647360ee8742659e42aeec0947dd3b4", "rev": "9474347c69e93e392f194dda7a57c641ba4b998e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -25,11 +25,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749154018, "lastModified": 1751810233,
"narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -41,11 +41,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1749794982, "lastModified": 1750776420,
"narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -57,11 +57,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1749727998, "lastModified": 1751741127,
"narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "rev": "29e290002bfff26af1db6f64d070698019460302",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
home/lukas/blueman.nix Normal file
View File

@@ -0,0 +1,3 @@
{
services.blueman.enable = true;
}

View File

@@ -9,6 +9,8 @@
bat.enable = true; # <- installs Catppuccin-Mocha.tmTheme bat.enable = true; # <- installs Catppuccin-Mocha.tmTheme
delta.enable = true; # <- colours delta with your mauve accent delta.enable = true; # <- colours delta with your mauve accent
waybar.enable = false;
rofi.enable = false;
}; };
gtk = { gtk = {

View File

@@ -11,6 +11,7 @@
./tmux.nix ./tmux.nix
./xgd.nix ./xgd.nix
./hyprland.nix ./hyprland.nix
./waybar.nix
./rofi.nix ./rofi.nix
./libreoffice.nix ./libreoffice.nix
]; ];

View File

@@ -1,4 +1,3 @@
{ config, lib, pkgs, ... }:
let let
userPubKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII1DsMfyMUK0snbTeVWMmdzLP9NIvPoQ4tjqyREUMHwZ mail@lukas.contact"; userPubKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII1DsMfyMUK0snbTeVWMmdzLP9NIvPoQ4tjqyREUMHwZ mail@lukas.contact";
in { in {
@@ -15,6 +14,7 @@ in {
user.signingkey = "~/.ssh/id_ed25519.pub"; user.signingkey = "~/.ssh/id_ed25519.pub";
pull.rebase = false; pull.rebase = false;
init.defaultBranch = "master"; init.defaultBranch = "master";
core.sshCommand = "ssh -4";
}; };
}; };
} }

View File

@@ -11,6 +11,14 @@
"nm-applet" "nm-applet"
"blueman-applet" "blueman-applet"
"swww-daemon" "swww-daemon"
"swayidle -w \
timeout 300 'hyprlock' \
timeout 360 'hyprctl dispatch dpms off' \
resume 'hyprctl dispatch dpms on' \
before-sleep 'hyprlock'
"
"swww img $HOME/Bilder/Wallpapers/mountain.jpg"
]; ];
env = [ env = [
@@ -47,14 +55,13 @@
"$mod, e, exec, emacs" "$mod, e, exec, emacs"
# Rofi launcher # Rofi launcher
"$mod, SPACE, exec, rofi -show drun -theme ~/.config/rofi/theme.rasi" "$mod, SPACE, exec, rofi -show drun"
# Toggle fullscreen # Toggle fullscreen
"$mod, M, fullscreen, 2" "$mod, M, fullscreen, 2"
# cycle windows # cycle windows
"$mod, N, cyclenext" "$mod, N, cyclenext"
# cycle workspaces # cycle workspaces
"$mod, Tab, workspace, r+1" "$mod, Tab, workspace, r+1"
"$mod Shift, Tab, workspace, r-1" "$mod Shift, Tab, workspace, r-1"
@@ -124,4 +131,6 @@
}; };
}; };
}; };
services.udiskie.enable = true;
} }

View File

@@ -29,9 +29,18 @@
pkgs.nil pkgs.nil
pkgs.zotero
(pkgs.aspellWithDicts (pkgs.aspellWithDicts
(dicts: with dicts; [ de en en-computers ])) (dicts: with dicts; [ de en en-computers ]))
# stuff for the waybar
pkgs.nerd-fonts.jetbrains-mono
pkgs.brightnessctl
pkgs.bluez
pkgs.bluetui
pkgs.jq
pkgs.lm_sensors
]; ];
} }

View File

@@ -1,3 +1,5 @@
{config, ...}:
let let
fullTheme = '' fullTheme = ''
* { * {
@@ -109,7 +111,11 @@ let
} }
''; '';
in { in {
programs.rofi.enable = true;
home.file.".config/rofi/theme.rasi".text = fullTheme; home.file.".config/rofi/theme.rasi".text = fullTheme;
programs.rofi = {
enable = true;
theme = "${config.xdg.configHome}/rofi/theme.rasi";
};
} }

View File

@@ -1,44 +1,240 @@
{ pkgs, ... }: let
fullStyle = ''
* {
min-height: 0;
min-width: 0;
font-family: FiraCode;
font-size: 16px;
font-weight: 600;
}
window#waybar {
transition-property: background-color;
transition-duration: 0.5s;
/* background-color: #1e1e2e; */
/* background-color: #181825; */
background-color: #11111b;
/* background-color: rgba(24, 24, 37, 0.6); */
}
#workspaces button {
padding: 0.3rem 0.6rem;
margin: 0.4rem 0.25rem;
border-radius: 6px;
/* background-color: #181825; */
background-color: #1e1e2e;
color: #cdd6f4;
}
#workspaces button:hover {
color: #1e1e2e;
background-color: #cdd6f4;
}
#workspaces button.active {
background-color: #1e1e2e;
color: #89b4fa;
}
#workspaces button.urgent {
background-color: #1e1e2e;
color: #f38ba8;
}
#clock,
#pulseaudio,
#custom-logo,
#custom-power,
#custom-spotify,
#custom-notification,
#cpu,
#tray,
#memory,
#window,
#mpris {
padding: 0.3rem 0.6rem;
margin: 0.4rem 0.25rem;
border-radius: 6px;
/* background-color: #181825; */
background-color: #1e1e2e;
}
#mpris.playing {
color: #a6e3a1;
}
#mpris.paused {
color: #9399b2;
}
#custom-sep {
padding: 0px;
color: #585b70;
}
window#waybar.empty #window {
background-color: transparent;
}
#cpu {
color: #94e2d5;
}
#memory {
color: #cba6f7;
}
#clock {
color: #74c7ec;
}
#clock.simpleclock {
color: #89b4fa;
}
#window {
color: #cdd6f4;
}
#pulseaudio {
color: #b4befe;
}
#pulseaudio.muted {
color: #a6adc8;
}
#custom-logo {
color: #89b4fa;
}
#custom-power {
color: #f38ba8;
}
tooltip {
background-color: #181825;
border: 2px solid #89b4fa;
}
'';
fullConfig = ''
{ {
home.packages = with pkgs; [ "layer": "top",
waybar networkmanagerapplet "position": "top",
]; "height": 32,
programs.waybar = { "spacing": 0,
catppuccin.enable = true; "modules-left": [
enable = true; "hyprland/workspaces",
systemd.enable = true; # auto-restart on crashes ],
settings = { "modules-right": [
mainBar = { "pulseaudio",
layer = "top"; "backlight",
position = "top"; "bluetooth",
height = 32; "network",
modules-left = [ "hyprland/workspaces" ]; "battery",
modules-center = [ "clock" ]; "clock",
modules-right = [ "tray",
"network" "custom/reboot",
"pulseaudio" "custom/power"
"battery" ],
"tray" "hyprland/workspaces": {
]; "disable-scroll": false,
"all-outputs": true,
# `network` module shows SSID + signal; no need for nm-applet text "format": "{icon}",
"network" = { "on-click": "activate",
format-wifi = "{ssid} {signalStrength}%"; "persistent-workspaces": {
format-disconnected = ""; "*":[1,2,3,4]
}; },
}; "format-icons": {
}; "1": "󰞷",
}; "2": "󰖟",
"3": "",
# Start nm-applet once; Waybar's SNI tray picks it up. "4": "",
systemd.user.services."nm-applet" = { "default": ""
Unit.Description = "NetworkManager Applet"; }
Service = { },
ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet --indicator"; "custom/reboot": {
Restart = "on-failure"; "format": "<span color='#FFD700'> </span>",
}; "on-click": "systemctl reboot",
Install.WantedBy = [ "graphical-session.target" ]; "tooltip": true,
}; },
"custom/power": {
"format": "<span color='#FF4040'> </span>",
"on-click": "systemctl poweroff",
"tooltip": true,
},
"network": {
"format-wifi": "<span color='#00FFFF'> 󰤨 </span>{essid} ",
"format-ethernet": "<span color='#7FFF00'> </span>Wired ",
"tooltip-format": "<span color='#FF1493'> 󰅧 </span>{bandwidthUpBytes} <span color='#00BFFF'> 󰅢 </span>{bandwidthDownBytes}",
"format-linked": "<span color='#FFA500'> 󱘖 </span>{ifname} (No IP) ",
"format-disconnected": "<span color='#FF4040'> </span>Disconnected ",
"format-alt": "<span color='#00FFFF'> 󰤨 </span>{signalStrength}% ",
"interval": 1
},
"battery": {
"states": {
"warning": 30,
"critical": 15
},
"format": "<span color='#28CD41'> {icon} </span>{capacity}% ",
"format-charging": " 󱐋{capacity}%",
"interval": 1,
"format-icons": ["󰂎", "󰁼", "󰁿", "󰂁", "󰁹"],
"tooltip": true
},
"pulseaudio": {
"format": "<span color='#00FF7F'>{icon}</span>{volume}% ",
"format-muted": "<span color='#FF4040'> 󰖁 </span>0% ",
"format-icons": {
"headphone": "<span color='#BF00FF'> </span>",
"hands-free": "<span color='#BF00FF'> </span>",
"headset": "<span color='#BF00FF'> </span>",
"phone": "<span color='#00FFFF'> </span>",
"portable": "<span color='#00FFFF'> </span>",
"car": "<span color='#FFA500'> </span>",
"default": [
"<span color='#808080'> </span>",
"<span color='#FFFF66'> </span>",
"<span color='#00FF7F'> </span>"
]
},
"on-click-right": "pavucontrol -t 3",
"on-click": "pactl -- set-sink-mute 0 toggle",
},
"clock": {
"interval": 1,
"timezone": "Europe/Berlin",
"format": "<span color='#BF00FF'> </span>{:%H:%M} ",
},
"tray": {
"icon-size": 17,
"spacing": 6
},
"backlight": {
"device": "intel_backlight",
"format": "<span color='#FFD700'>{icon}</span>{percent}% ",
"tooltip": true,
"format-icons": [
"<span color='#696969'> 󰃞 </span>",
"<span color='#A9A9A9'> 󰃝 </span>",
"<span color='#FFFF66'> 󰃟 </span>",
"<span color='#FFD700'> 󰃠 </span>"
]
},
"bluetooth": {
"format": "<span color='#00BFFF'> </span>{status} ",
"format-connected": "<span color='#00BFFF'> </span>{device_alias} ",
"format-connected-battery": "<span color='#00BFFF'> </span>{device_alias}{device_battery_percentage}% ",
"tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
"tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
"tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
"tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%"
}
}
'';
in {
home.file.".config/waybar/style.css".text = fullStyle;
home.file.".config/waybar/config.jsonc".text = fullConfig;
} }

View File

@@ -11,9 +11,7 @@
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
}; };
hardware = { hardware.graphics.enable = true;
opengl.enable = true;
};
environment.systemPackages = [ environment.systemPackages = [
(pkgs.waybar.overrideAttrs (oldAttrs: { (pkgs.waybar.overrideAttrs (oldAttrs: {
@@ -25,6 +23,8 @@
pkgs.rofi-wayland pkgs.rofi-wayland
pkgs.hyprlock pkgs.hyprlock
pkgs.hyprshot pkgs.hyprshot
pkgs.swayidle
pkgs.udiskie
pkgs.brightnessctl # adjust backlight via keybindings pkgs.brightnessctl # adjust backlight via keybindings
pkgs.scrot # simple screenshot pkgs.scrot # simple screenshot
@@ -37,6 +37,9 @@
xdg.portal.enable = true; xdg.portal.enable = true;
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
services.udisks2.enable = true;
services.greetd = { services.greetd = {
enable = true; enable = true;
settings = { settings = {

View File

@@ -1,4 +1,3 @@
{ config, pkgs, ... }:
{ {
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
} }