This commit is contained in:
Leon Vatthauer 2024-04-06 07:44:39 +02:00
commit b494c3cbe3
Signed by: leonv
SSH key fingerprint: SHA256:G4+ddwoZmhLPRB1agvXzZMXIzkVJ36dUYZXf5NxT+u8
10 changed files with 185 additions and 71 deletions

View file

@ -5,19 +5,21 @@
(include "./widgets/resources/eww.yuck") (include "./widgets/resources/eww.yuck")
(defwindow top-bar (defwindow top-bar
:monitor 0 :monitor 0
:geometry (geometry :x "0%" :geometry (geometry :x "0%"
:y "10px" :y "10px"
:width "98.8%" :width "98.8%"
:height "30px" :height "30px"
:anchor "top center") :anchor "top center")
:stacking "fg" :stacking "fg"
:exclusive true :exclusive true
(centerbox (centerbox
:class "bar" :class "bar"
(left) (left)
(center) (center)
(right))) (right)
)
)
(defwidget left [] (defwidget left []
(box (box

View file

@ -4,22 +4,22 @@
(defvar GB 1024000000) (defvar GB 1024000000)
(defvar MB 1024000) (defvar MB 1024000)
; DATE + TIME ; DATE + TIME
(defpoll time :interval "5s" (defpoll time :interval "5s"
:initial "" :initial ""
`date +%H:%M`) `date +%H:%M`)
(defpoll date :interval "60s" (defpoll date :interval "60s"
:initial "" :initial ""
`date "+%A | %m-%d-%+4Y"`) `date "+%A | %m-%d-%+4Y"`)
(defwidget datetime [] (defwidget datetime []
(eventbox (eventbox
:tooltip date :tooltip date
(label (label
:class "text time" :class "text time"
:text time) :text time)
)) ))
; CPU ; CPU
@ -61,7 +61,7 @@
:tooltip hostname :tooltip hostname
(label (label
:text status-icon :text status-icon
:class "network_icon"))) :class "network_icon")))
; BLUETOOTH ; BLUETOOTH
(defwidget bluetooth [] (defwidget bluetooth []
@ -70,7 +70,7 @@
:onclick "blueman-manager &" :onclick "blueman-manager &"
(label (label
:text "" :text ""
:class "bluetooth_icon"))) :class "bluetooth_icon")))
; VOLUME ; VOLUME
@ -87,6 +87,6 @@
:spacing "3" :spacing "3"
(label (label
:class "volume_text" :class "volume_text"
:text "${volume_percent <= 33 ? "" : volume_percent <= 66 ? "" : ""} ${volume_percent}%") :text "${volume_percent <= 33 ? "" : volume_percent <= 66 ? "" : ""} ${volume_percent}%")
))) )))
; TODO add mic widget ; TODO add mic widget

View file

@ -2,7 +2,6 @@
{ {
programs.eww = { programs.eww = {
enable = true; enable = true;
package = pkgs.eww-wayland;
configDir = ./config; configDir = ./config;
}; };
} }

View file

@ -26,6 +26,24 @@
version = "0.0.3"; version = "0.0.3";
sha256 = "sha256-DITgLedaO0Ifrttu+ZXkiaVA7Ua5RXc4jXQHPYLqrcM="; sha256 = "sha256-DITgLedaO0Ifrttu+ZXkiaVA7Ua5RXc4jXQHPYLqrcM=";
} }
{
name = "simple-alignment";
publisher = "earshinov";
version = "1.0.1";
sha256 = "sha256-Lqg5wVGj6VulEJHVv7CS6aci7Ze2KEqXMu10vlrYYao=";
}
{
name = "todo-tree";
publisher = "Gruntfuggly";
version = "0.0.226";
sha256 = "sha256-Fj9cw+VJ2jkTGUclB1TLvURhzQsaryFQs/+f2RZOLHs=";
}
{
name = "lean4";
publisher = "leanprover";
version = "0.0.133";
sha256 = "sha256-tjBTOkh4UeEmOo/ZbadpeyW07QiPcUO4aI2NWdtTxrE=";
}
]; ];
userSettings = { userSettings = {
"agdaMode.connection.agdaLanguageServer" = false; "agdaMode.connection.agdaLanguageServer" = false;
@ -73,6 +91,20 @@
"editor.autoClosingOvertype" = "never"; "editor.autoClosingOvertype" = "never";
"editor.autoClosingBrackets" = "never"; "editor.autoClosingBrackets" = "never";
"editor.accessibilitySupport" = "off"; "editor.accessibilitySupport" = "off";
# for latex
"todo-tree.regex.regex" = "((//|#|<!--|;|/\\*|^|%|\\\\)\\s*($TAGS)\\{*|^\\s*- \\[ \\])";
"todo-tree.regex.regexCaseSensitive" = false;
"latex-workshop.linting.chktex.enabled" = true;
"editor.formatOnSave" = true;
"latex-workshop.linting.chktex.exec.args" = [
"-wall"
"-n21"
"-n22"
"-n30"
"-e16"
"-q"
];
}; };
keybindings = [ keybindings = [
{ {

View file

@ -160,7 +160,6 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1709531328,
"narHash": "sha256-wtqwOBg5i3qsU2zbucOHwoO8osbvfkqKFNtXksxmSII=", "narHash": "sha256-wtqwOBg5i3qsU2zbucOHwoO8osbvfkqKFNtXksxmSII=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
@ -180,7 +179,6 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709391291,
"narHash": "sha256-NJwAgXRKLVuO3YLkGxXIanLvTKN+cJsYwbLoWOa7ODk=", "narHash": "sha256-NJwAgXRKLVuO3YLkGxXIanLvTKN+cJsYwbLoWOa7ODk=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
@ -341,7 +339,6 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1709237383,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",

View file

@ -20,7 +20,7 @@
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "unstable"; home-manager.inputs.nixpkgs.follows = "unstable";
hyprland-contrib.url = "github:hyprwm/contrib"; hyprland-contrib.url = "github:hyprwm/contrib";
hyprland-contrib.inputs.nixpkgs.follows = "unstable"; hyprland-contrib.inputs.nixpkgs.follows = "unstable";

View file

@ -58,35 +58,44 @@
services.greetd = { services.greetd = {
enable = true; enable = true;
package = pkgs.greetd.gtkgreet;
settings = { settings = {
default_session = { default_session = {
command = "Hyprland --config /etc/greetd/hyprland.conf"; command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --cmd Hyprland";
user = "greeter"; user = "greeter";
}; };
}; };
}; };
environment.etc."greetd/environments".text = '' # services.greetd = {
Hyprland # enable = true;
''; # package = pkgs.greetd.gtkgreet;
environment.etc."greetd/hyprland.conf".text = '' # settings = {
monitor = DP-3,2560x1440@144,1920x0,1 # default_session = {
monitor = HDMI-A-5,1920x1080@75,0x0,1 # command = "Hyprland --config /etc/greetd/hyprland.conf";
misc { # user = "greeter";
disable_hyprland_logo = true # };
} # };
# };
# environment.etc."greetd/environments".text = ''
# Hyprland
# '';
# environment.etc."greetd/hyprland.conf".text = ''
# monitor = DP-3,2560x1440@144,1920x0,1
# monitor = HDMI-A-5,1920x1080@75,0x0,1
# misc {
# disable_hyprland_logo = true
# }
exec-once = gtkgreet -l -b /etc/greetd/wallpaper.jpg -s /etc/greetd/style.css; hyprctl dispatch exit # exec-once = tuigreet -l -b /etc/greetd/wallpaper.jpg -s /etc/greetd/style.css; hyprctl dispatch exit
''; # '';
environment.etc."greetd/wallpaper.jpg".source = ./hypr/wallpaper.jpg; # environment.etc."greetd/wallpaper.jpg".source = ./hypr/wallpaper.jpg;
environment.etc."greetd/style.css".text = '' # environment.etc."greetd/style.css".text = ''
window { # window {
background-position: center; # background-position: center;
background-repeat: no-repeat; # background-repeat: no-repeat;
background-size: cover; # background-size: cover;
background-color: black; # background-color: black;
} # }
''; # '';
# Configure console keymap # Configure console keymap
console.keyMap = "us"; console.keyMap = "us";
@ -94,7 +103,7 @@
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns = true; nssmdns4 = true;
openFirewall = true; openFirewall = true;
}; };
services.printing = { services.printing = {
@ -183,13 +192,13 @@
programs.zsh.enable = true; programs.zsh.enable = true;
users.defaultUserShell = pkgs.zsh; users.defaultUserShell = pkgs.zsh;
# Binary Cache for Haskell.nix # # Binary Cache for Haskell.nix
nix.settings.trusted-public-keys = [ # nix.settings.trusted-public-keys = [
"hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" # "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
]; # ];
nix.settings.substituters = [ nix.settings.substituters = [
"https://aseipp-nix-cache.global.ssl.fastly.net" "https://aseipp-nix-cache.global.ssl.fastly.net"
"https://cache.iog.io" # "https://cache.iog.io"
]; ];
# environment variables # environment variables

View file

@ -5,6 +5,11 @@
enable = true; enable = true;
xwayland.enable = true; xwayland.enable = true;
settings = { settings = {
workspace = [
"1, monitor:HDMI-A-3, default:true, persistent:true"
"2, monitor:DP-3 , default:true, persistent:true"
"special:scratchpad, on-created-empty:foot"
];
monitor = [ monitor = [
"DP-3 , 2560x1440@144, 1920x0, 1" "DP-3 , 2560x1440@144, 1920x0, 1"
"HDMI-A-5, 1920x1080@75 , 0x0 , 1" "HDMI-A-5, 1920x1080@75 , 0x0 , 1"
@ -58,7 +63,7 @@
bind = [ bind = [
# opening programs # opening programs
"$mod, Return, exec, foot" "$mod, Return, exec, foot"
"$mod, D, exec, rofi -show drun -show-icons" "$mod, D, exec, wofi"
"$mod, M, exit, " "$mod, M, exit, "
"$mod, Q, killactive, " "$mod, Q, killactive, "
@ -86,7 +91,7 @@
# fullscreen # fullscreen
"$mod, F11, fullscreen, 0" "$mod, F11, fullscreen, 0"
"$mod, m, fullscreen, 1" # maximize # "$mod, m, fullscreen, 1" # maximize
# floating # floating
"$mod, F, togglefloating, active" "$mod, F, togglefloating, active"
@ -94,7 +99,8 @@
# screenshot # screenshot
", Print, exec, grimblast copysave area $HOME\"/screenshots/\"$(date +'%F-%T.png');" ", Print, exec, grimblast copysave area $HOME\"/screenshots/\"$(date +'%F-%T.png');"
# scratchpad
"$mod, C, togglespecialworkspace, scratchpad"
]; ];
bindm = [ bindm = [
"$mod, mouse:272, movewindow" "$mod, mouse:272, movewindow"
@ -142,18 +148,88 @@
}; };
}; };
programs.rofi = { programs.wofi = {
enable = true; enable = true;
package = pkgs.rofi-wayland; settings = {
theme = ./catppuccin-macchiato.rasi; width = 600;
font = "monospace 14"; height = 365;
terminal = "foot"; location = "center";
extraConfig = { show = "drun";
modi = "drun,run,top"; prompt = "Search...";
filter_rate = 100;
allow_markup = true;
no_actions = true;
halign = "fill";
orientation = "vertical";
content_halign = "fill";
insensitive = true;
allow_images = true;
image_size = 40;
gtk_dark = true;
layer = "overlay";
}; };
plugins = [ style = ''
pkgs.rofi-top window {
]; margin: 0px;
border: 2px solid #b59dc3;
background-color: #282a36;
border-radius: 18px;
}
#input {
margin: 5px;
border: none;
color: #f8f8f2;
border-radius: 15px;
background-color: #44475a;
}
#inner-box {
margin: 5px;
border: none;
border-radius: 15px;
background-color: #282a36;
}
#outer-box {
margin: 5px;
border: none;
border-radius: 15px;
background-color: #282a36;
}
#scroll {
margin: 0px;
border-radius: 15px;
border: none;
}
#text {
border-radius: 15px;
margin: 5px;
border: none;
color: #f8f8f2;
}
#entry.activatable #text {
color: #282a36;
}
#entry > * {
color: #f8f8f2;
}
#entry:selected {
border-radius: 15px;
background-color: #44475a;
}
#entry:selected #text {
border-radius: 15px;
}
'';
}; };
services.mako = { services.mako = {

View file

@ -15,6 +15,7 @@
orchis-theme orchis-theme
# stuff # stuff
tidal-hifi
jq jq
vlc vlc
openvpn openvpn
@ -81,11 +82,12 @@
yubikey-manager yubikey-manager
# agda # agda
(agda.withPackages [ (agda.withPackages [
agdaPackages.standard-library agdaPackages.standard-library
agdaPackages.agda-categories agdaPackages.agda-categories
]) ])
lean4
]; ];
programs.home-manager.enable = true; programs.home-manager.enable = true;
@ -98,6 +100,8 @@
ll = "eza -l"; ll = "eza -l";
l = "eza -lah"; l = "eza -lah";
code = "codium"; code = "codium";
alg = "code ~/Git/algprog/tex";
nixos = "code ~/Git/nixos";
}; };
initExtra = '' initExtra = ''
function rebuild () { function rebuild () {

View file

@ -59,11 +59,6 @@
"plexmediaserver" "plexmediaserver"
]; ];
services.plex = {
enable = true;
openFirewall = true;
};
services.jellyfin.enable = true; services.jellyfin.enable = true;
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "23.11"; # Did you read the comment?