merge
This commit is contained in:
commit
b494c3cbe3
10 changed files with 185 additions and 71 deletions
|
@ -17,7 +17,9 @@
|
|||
:class "bar"
|
||||
(left)
|
||||
(center)
|
||||
(right)))
|
||||
(right)
|
||||
)
|
||||
)
|
||||
|
||||
(defwidget left []
|
||||
(box
|
||||
|
|
|
@ -9,10 +9,10 @@
|
|||
|
||||
(defpoll time :interval "5s"
|
||||
:initial ""
|
||||
`date +%H:%M`)
|
||||
`date +%H:%M`)
|
||||
(defpoll date :interval "60s"
|
||||
:initial ""
|
||||
`date "+%A | %m-%d-%+4Y"`)
|
||||
`date "+%A | %m-%d-%+4Y"`)
|
||||
|
||||
(defwidget datetime []
|
||||
(eventbox
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
{
|
||||
programs.eww = {
|
||||
enable = true;
|
||||
package = pkgs.eww-wayland;
|
||||
configDir = ./config;
|
||||
};
|
||||
}
|
|
@ -26,6 +26,24 @@
|
|||
version = "0.0.3";
|
||||
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 = {
|
||||
"agdaMode.connection.agdaLanguageServer" = false;
|
||||
|
@ -73,6 +91,20 @@
|
|||
"editor.autoClosingOvertype" = "never";
|
||||
"editor.autoClosingBrackets" = "never";
|
||||
"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 = [
|
||||
{
|
||||
|
|
|
@ -160,7 +160,6 @@
|
|||
"homebrew-core": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1709531328,
|
||||
"narHash": "sha256-wtqwOBg5i3qsU2zbucOHwoO8osbvfkqKFNtXksxmSII=",
|
||||
"owner": "homebrew",
|
||||
"repo": "homebrew-core",
|
||||
|
@ -180,7 +179,6 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709391291,
|
||||
"narHash": "sha256-NJwAgXRKLVuO3YLkGxXIanLvTKN+cJsYwbLoWOa7ODk=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "contrib",
|
||||
|
@ -341,7 +339,6 @@
|
|||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1709237383,
|
||||
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
|
|
|
@ -58,35 +58,44 @@
|
|||
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
package = pkgs.greetd.gtkgreet;
|
||||
settings = {
|
||||
default_session = {
|
||||
command = "Hyprland --config /etc/greetd/hyprland.conf";
|
||||
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --cmd Hyprland";
|
||||
user = "greeter";
|
||||
};
|
||||
};
|
||||
};
|
||||
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
|
||||
}
|
||||
# services.greetd = {
|
||||
# enable = true;
|
||||
# package = pkgs.greetd.gtkgreet;
|
||||
# settings = {
|
||||
# default_session = {
|
||||
# command = "Hyprland --config /etc/greetd/hyprland.conf";
|
||||
# user = "greeter";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# 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
|
||||
'';
|
||||
environment.etc."greetd/wallpaper.jpg".source = ./hypr/wallpaper.jpg;
|
||||
environment.etc."greetd/style.css".text = ''
|
||||
window {
|
||||
background-position: center;
|
||||
background-repeat: no-repeat;
|
||||
background-size: cover;
|
||||
background-color: black;
|
||||
}
|
||||
'';
|
||||
# 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/style.css".text = ''
|
||||
# window {
|
||||
# background-position: center;
|
||||
# background-repeat: no-repeat;
|
||||
# background-size: cover;
|
||||
# background-color: black;
|
||||
# }
|
||||
# '';
|
||||
|
||||
# Configure console keymap
|
||||
console.keyMap = "us";
|
||||
|
@ -94,7 +103,7 @@
|
|||
# Enable CUPS to print documents.
|
||||
services.avahi = {
|
||||
enable = true;
|
||||
nssmdns = true;
|
||||
nssmdns4 = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
services.printing = {
|
||||
|
@ -183,13 +192,13 @@
|
|||
programs.zsh.enable = true;
|
||||
users.defaultUserShell = pkgs.zsh;
|
||||
|
||||
# Binary Cache for Haskell.nix
|
||||
nix.settings.trusted-public-keys = [
|
||||
"hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
|
||||
];
|
||||
# # Binary Cache for Haskell.nix
|
||||
# nix.settings.trusted-public-keys = [
|
||||
# "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
|
||||
# ];
|
||||
nix.settings.substituters = [
|
||||
"https://aseipp-nix-cache.global.ssl.fastly.net"
|
||||
"https://cache.iog.io"
|
||||
# "https://cache.iog.io"
|
||||
];
|
||||
|
||||
# environment variables
|
||||
|
|
|
@ -5,6 +5,11 @@
|
|||
enable = true;
|
||||
xwayland.enable = true;
|
||||
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 = [
|
||||
"DP-3 , 2560x1440@144, 1920x0, 1"
|
||||
"HDMI-A-5, 1920x1080@75 , 0x0 , 1"
|
||||
|
@ -58,7 +63,7 @@
|
|||
bind = [
|
||||
# opening programs
|
||||
"$mod, Return, exec, foot"
|
||||
"$mod, D, exec, rofi -show drun -show-icons"
|
||||
"$mod, D, exec, wofi"
|
||||
"$mod, M, exit, "
|
||||
"$mod, Q, killactive, "
|
||||
|
||||
|
@ -86,7 +91,7 @@
|
|||
|
||||
# fullscreen
|
||||
"$mod, F11, fullscreen, 0"
|
||||
"$mod, m, fullscreen, 1" # maximize
|
||||
# "$mod, m, fullscreen, 1" # maximize
|
||||
|
||||
# floating
|
||||
"$mod, F, togglefloating, active"
|
||||
|
@ -94,7 +99,8 @@
|
|||
# screenshot
|
||||
", Print, exec, grimblast copysave area $HOME\"/screenshots/\"$(date +'%F-%T.png');"
|
||||
|
||||
|
||||
# scratchpad
|
||||
"$mod, C, togglespecialworkspace, scratchpad"
|
||||
];
|
||||
bindm = [
|
||||
"$mod, mouse:272, movewindow"
|
||||
|
@ -142,18 +148,88 @@
|
|||
};
|
||||
};
|
||||
|
||||
programs.rofi = {
|
||||
programs.wofi = {
|
||||
enable = true;
|
||||
package = pkgs.rofi-wayland;
|
||||
theme = ./catppuccin-macchiato.rasi;
|
||||
font = "monospace 14";
|
||||
terminal = "foot";
|
||||
extraConfig = {
|
||||
modi = "drun,run,top";
|
||||
settings = {
|
||||
width = 600;
|
||||
height = 365;
|
||||
location = "center";
|
||||
show = "drun";
|
||||
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 = [
|
||||
pkgs.rofi-top
|
||||
];
|
||||
style = ''
|
||||
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 = {
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
orchis-theme
|
||||
|
||||
# stuff
|
||||
tidal-hifi
|
||||
jq
|
||||
vlc
|
||||
openvpn
|
||||
|
@ -81,11 +82,12 @@
|
|||
yubikey-manager
|
||||
|
||||
# agda
|
||||
|
||||
(agda.withPackages [
|
||||
agdaPackages.standard-library
|
||||
agdaPackages.agda-categories
|
||||
])
|
||||
|
||||
lean4
|
||||
];
|
||||
|
||||
programs.home-manager.enable = true;
|
||||
|
@ -98,6 +100,8 @@
|
|||
ll = "eza -l";
|
||||
l = "eza -lah";
|
||||
code = "codium";
|
||||
alg = "code ~/Git/algprog/tex";
|
||||
nixos = "code ~/Git/nixos";
|
||||
};
|
||||
initExtra = ''
|
||||
function rebuild () {
|
||||
|
|
|
@ -59,11 +59,6 @@
|
|||
"plexmediaserver"
|
||||
];
|
||||
|
||||
services.plex = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
|
||||
services.jellyfin.enable = true;
|
||||
|
||||
system.stateVersion = "23.11"; # Did you read the comment?
|
||||
|
|
Loading…
Reference in a new issue