mirror of
https://gitlab.com/upRootNutrition/dotfiles.git
synced 2025-06-15 09:35:12 -05:00
Compare commits
2 commits
a128d9b7fa
...
cd01d3e40b
| Author | SHA1 | Date | |
|---|---|---|---|
|
cd01d3e40b | ||
|
|
c5fe1e3538 |
12 changed files with 111 additions and 159 deletions
|
|
@ -60,15 +60,14 @@ in
|
|||
usbImager
|
||||
virtManager
|
||||
# polychromatic
|
||||
dolphin
|
||||
espanso
|
||||
claudeCode
|
||||
jamesDsp
|
||||
zoom
|
||||
academic
|
||||
# hypr
|
||||
hypr
|
||||
# niri
|
||||
# wayland
|
||||
wayland
|
||||
theming
|
||||
;
|
||||
};
|
||||
|
|
|
|||
12
modules/home/gui/apps/tools/nautilus/default.nix
Normal file
12
modules/home/gui/apps/tools/nautilus/default.nix
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
{
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
home.packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
nautilus
|
||||
sushi
|
||||
;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,91 +0,0 @@
|
|||
let
|
||||
superBinds = builtins.map (x: "SUPER, " + x) [
|
||||
# Apps
|
||||
"B, exec, brave"
|
||||
"E, exec, ghostty -e nu -e y"
|
||||
"S, exec, steam"
|
||||
"N, exec, signal-desktop"
|
||||
"D, exec, discordcanary"
|
||||
"R, exec, flatpak run org.vinegarhq.Sober"
|
||||
"T, exec, ghostty"
|
||||
"P, exec, spotify"
|
||||
"M, exec, prismlauncher"
|
||||
"J, exec, jellyfinmediaplayer"
|
||||
"L, exec, lutris"
|
||||
# Workspaces
|
||||
"1, workspace, 1"
|
||||
"2, workspace, 2"
|
||||
"3, workspace, 3"
|
||||
"4, workspace, 4"
|
||||
"5, workspace, 5"
|
||||
# Windows
|
||||
"X, killactive"
|
||||
"bracketright, splitratio, 0.33"
|
||||
"bracketleft, splitratio, -0.33"
|
||||
"Tab, fullscreen, 0"
|
||||
"F, togglefloating"
|
||||
# Window Focus
|
||||
"left, movefocus, l"
|
||||
"up, movefocus, u"
|
||||
"down, movefocus, d"
|
||||
"right, movefocus, r"
|
||||
# Audio
|
||||
"PageUp, exec, playerctl next"
|
||||
"PageDown, exec, playerctl previous"
|
||||
"Home, exec, playerctl play-pause"
|
||||
"Space, exec, rm -r /home/$USER/.cache/tofi* ; tofi-drun"
|
||||
];
|
||||
|
||||
superShiftBinds = builtins.map (x: "SUPER SHIFT, " + x) [
|
||||
# Super+shift binds
|
||||
# Window Move
|
||||
"left, movewindow, l"
|
||||
"up, movewindow, u"
|
||||
"down, movewindow, d"
|
||||
"right, movewindow, r"
|
||||
# Quick Action
|
||||
"S, exec, flameshot gui"
|
||||
"period, exec, emote"
|
||||
"Backspace, layoutmsg, togglesplit"
|
||||
"P, pin, enable"
|
||||
# "Print, exec, grim -g \"$(slurp)\""
|
||||
# Utility
|
||||
"End, exec, shutdown now"
|
||||
"Insert, exec, systemctl reboot"
|
||||
"Home, exec, swaylock"
|
||||
"1, movetoworkspacesilent, 1"
|
||||
"2, movetoworkspacesilent, 2"
|
||||
"3, movetoworkspacesilent, 3"
|
||||
"4, movetoworkspacesilent, 4"
|
||||
"5, movetoworkspacesilent, 5"
|
||||
];
|
||||
superCtrlBinds = builtins.map (x: "SUPER CTRL, " + x) [
|
||||
# Super+shift binds
|
||||
];
|
||||
|
||||
altBinds = builtins.map (x: "ALT, " + x) [
|
||||
# Alt binds
|
||||
];
|
||||
|
||||
shiftBinds = builtins.map (x: "SHIFT, " + x) [
|
||||
# Shift binds
|
||||
];
|
||||
|
||||
ctrlBinds = builtins.map (x: "CTRL, " + x) [
|
||||
# Ctrl binds
|
||||
];
|
||||
|
||||
ctrlShiftBinds = builtins.map (x: "CTRL SHIFT, " + x) [
|
||||
# Ctrl+shift binds
|
||||
# "End, exec, shutdown now"
|
||||
];
|
||||
in
|
||||
superBinds
|
||||
++ superShiftBinds
|
||||
++ superCtrlBinds
|
||||
++ altBinds
|
||||
++ ctrlBinds
|
||||
++ ctrlShiftBinds
|
||||
++ shiftBinds
|
||||
# Docs
|
||||
# https://wiki.hyprland.org/Getting-Started/Master-Tutorial/
|
||||
|
|
@ -2,17 +2,16 @@ let
|
|||
superBinds = builtins.map (x: "SUPER, " + x) [
|
||||
# Apps
|
||||
"Z, exec, obsidian"
|
||||
"L, exec, slack"
|
||||
"H, exec, feishin"
|
||||
"G, exec, scrcpy"
|
||||
"K, exec, ghostty -e nu -e y"
|
||||
"L, exec, thunar"
|
||||
"S, exec, steam"
|
||||
"R, exec, ghostty -e zellij a dotfiles"
|
||||
"N, exec, signal-desktop"
|
||||
"T, exec, zeditor"
|
||||
"B, exec, floorp"
|
||||
"X, exec, freetube"
|
||||
"V, exec, discordcanary"
|
||||
"V, exec, vesktop"
|
||||
"M, exec, element-desktop"
|
||||
"D, exec, ghostty"
|
||||
"P, exec, bitwarden"
|
||||
|
|
@ -35,7 +34,7 @@ let
|
|||
"PageUp, exec, playerctl next"
|
||||
"PageDown, exec, playerctl previous"
|
||||
"Home, exec, playerctl play-pause"
|
||||
"Space, exec, rm -r /home/$USER/.cache/tofi* ; tofi-drun"
|
||||
"Space, exec, fuzzel"
|
||||
];
|
||||
|
||||
superShiftBinds = builtins.map (x: "SUPER SHIFT, " + x) [
|
||||
|
|
@ -1,17 +1,13 @@
|
|||
{
|
||||
flake,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
||||
inherit (flake.config.people) user1;
|
||||
user = config.home.username;
|
||||
|
||||
configPath = ./config;
|
||||
configImports = {
|
||||
animations = import (configPath + /animations.nix);
|
||||
bind = import (configPath + /bind.nix);
|
||||
bindm = import (configPath + /bindm.nix);
|
||||
binds = import (configPath + /binds.nix);
|
||||
# bindl = import (configPath + /bindl.nix);
|
||||
|
|
@ -24,15 +20,6 @@ let
|
|||
windowrulev2 = import (configPath + /windowrulev2.nix);
|
||||
xwayland = import (configPath + /xwayland.nix);
|
||||
monitor = import (configPath + /monitor.nix);
|
||||
bind =
|
||||
let
|
||||
bindConfig =
|
||||
if user == user1 then
|
||||
import (configPath + /bind-user1.nix)
|
||||
else
|
||||
import (configPath + /bind-user0.nix);
|
||||
in
|
||||
bindConfig;
|
||||
};
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
config,
|
||||
flake,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
|
@ -38,6 +39,11 @@ in
|
|||
workspace4 = "extra";
|
||||
in
|
||||
{
|
||||
# environment = {
|
||||
# QT_QPA_PLATFORM = "wayland";
|
||||
# DISPLAY = null;
|
||||
# };
|
||||
|
||||
prefer-no-csd = true;
|
||||
|
||||
cursor = {
|
||||
|
|
@ -50,7 +56,7 @@ in
|
|||
};
|
||||
|
||||
spawn-at-startup = [
|
||||
{ command = [ "swaylock" ]; }
|
||||
# { command = [ "xwayland-satellite" ]; }
|
||||
{ command = [ "wl-clipboard" ]; }
|
||||
{ command = [ "wpaperd" ]; }
|
||||
{ command = [ "gammastep" ]; }
|
||||
|
|
@ -144,9 +150,9 @@ in
|
|||
# "Super+Enter".action = niri.toggle-overview;
|
||||
|
||||
"Super+1".action = niri.focus-workspace workspace0;
|
||||
"Super+2".action = niri.focus-workspace workspace1;
|
||||
"Super+4".action = niri.focus-workspace workspace1;
|
||||
"Super+3".action = niri.focus-workspace workspace2;
|
||||
"Super+4".action = niri.focus-workspace workspace3;
|
||||
"Super+2".action = niri.focus-workspace workspace3;
|
||||
"Super+5".action = niri.focus-workspace workspace4;
|
||||
|
||||
"Super+c".action = niri.focus-column-or-monitor-left;
|
||||
|
|
@ -291,6 +297,7 @@ in
|
|||
open-on-workspace = workspace3;
|
||||
}
|
||||
{
|
||||
# opacity = 0.90;
|
||||
clip-to-geometry = true;
|
||||
focus-ring.enable = false;
|
||||
geometry-corner-radius =
|
||||
|
|
@ -307,16 +314,22 @@ in
|
|||
];
|
||||
|
||||
layout = {
|
||||
# always-center-single-column = true;
|
||||
default-column-width = {
|
||||
proportion = 0.5;
|
||||
};
|
||||
preset-column-widths = [
|
||||
{ proportion = 1. / 3.; }
|
||||
{ proportion = 1. / 2.; }
|
||||
{ proportion = 2. / 3.; }
|
||||
];
|
||||
border = {
|
||||
enable = true;
|
||||
width = 2;
|
||||
active.color = makeColour el.base0E;
|
||||
inactive.color = makeColour el.base02;
|
||||
};
|
||||
gaps = 10;
|
||||
gaps = 5;
|
||||
shadow = {
|
||||
enable = true;
|
||||
color = el.base11;
|
||||
|
|
@ -346,5 +359,9 @@ in
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
# home.packages = builtins.attrValues {
|
||||
# inherit (pkgs)
|
||||
# xwayland-satellite
|
||||
# ;
|
||||
# };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,13 +12,12 @@ in
|
|||
margin-left = 5;
|
||||
margin-right = 5;
|
||||
modules-left = [
|
||||
"custom/weather"
|
||||
# "niri/workspaces"
|
||||
"custom/launcher"
|
||||
"hyprland/workspaces"
|
||||
];
|
||||
|
||||
modules-center = [
|
||||
# "custom/launcher"
|
||||
"clock"
|
||||
"custom/weather"
|
||||
];
|
||||
|
||||
modules-right = [
|
||||
|
|
@ -30,7 +29,7 @@ in
|
|||
"pulseaudio"
|
||||
# "network"
|
||||
"battery"
|
||||
# "clock"
|
||||
"clock"
|
||||
];
|
||||
|
||||
clock = {
|
||||
|
|
@ -45,24 +44,33 @@ in
|
|||
format-alt = " {:%d/%m}";
|
||||
};
|
||||
|
||||
# "niri/workspaces" = {
|
||||
# active-only = false;
|
||||
# disable-scroll = true;
|
||||
# format = "{icon}";
|
||||
# on-click = "activate";
|
||||
# format-icons = {
|
||||
# # focused = "◉";
|
||||
# # active = "◉";
|
||||
# # empty = "◯";
|
||||
# # urgent = "";
|
||||
# # default = "◯";
|
||||
# # sort-by-number = true;
|
||||
# };
|
||||
# };
|
||||
"hyprland/workspaces" = {
|
||||
active-only = false;
|
||||
disable-scroll = true;
|
||||
format = "{icon}";
|
||||
on-click = "activate";
|
||||
format-icons = {
|
||||
"1" = "◉";
|
||||
"2" = "◉";
|
||||
"3" = "◉";
|
||||
"4" = "◉";
|
||||
"5" = "◉";
|
||||
urgent = "";
|
||||
default = "◉";
|
||||
sort-by-number = true;
|
||||
};
|
||||
persistent-workspaces = {
|
||||
"1" = [ ];
|
||||
"2" = [ ];
|
||||
"3" = [ ];
|
||||
"4" = [ ];
|
||||
"5" = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
memory = {
|
||||
format = " {}%";
|
||||
format-alt = " {used} GiB"; #
|
||||
format = " {}%";
|
||||
format-alt = " {used} GiB"; #
|
||||
interval = 2;
|
||||
};
|
||||
|
||||
|
|
@ -115,8 +123,7 @@ in
|
|||
};
|
||||
"custom/launcher" = {
|
||||
format = "";
|
||||
on-click = "rm -r /home/$USER/.cache/tofi* ; tofi-drun";
|
||||
# on-click-right = "pkill tofi || wallpaper-picker";
|
||||
on-click = "fuzzel";
|
||||
tooltip = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ in
|
|||
''
|
||||
|
||||
* {
|
||||
min-height: 30px;
|
||||
min-height: 34px;
|
||||
border-radius: 0;
|
||||
font-family: ${custom.font};
|
||||
font-weight: ${custom.font_weight};
|
||||
|
|
@ -58,20 +58,18 @@ in
|
|||
|
||||
#workspaces {
|
||||
font-size: 18px;
|
||||
padding-left: 15px;
|
||||
margin-bottom: 2px;
|
||||
padding-left: 5px;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
#workspaces button {
|
||||
color: #${custom.button_color};
|
||||
padding: 5px 0px 5px 0px;
|
||||
}
|
||||
#workspaces button.active {
|
||||
color: #${custom.text_color};
|
||||
padding: 0px 5px 0px 5px;
|
||||
opacity: ${custom.opacityBt};
|
||||
}
|
||||
#workspaces button.empty {
|
||||
color: #${custom.button_color};
|
||||
color: #${custom.background_3};
|
||||
}
|
||||
#workspaces button.focused {
|
||||
#workspaces button.active {
|
||||
color: #${custom.text_color};
|
||||
}
|
||||
|
||||
|
|
@ -100,7 +98,6 @@ in
|
|||
}
|
||||
|
||||
#clock {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
#battery {
|
||||
|
|
@ -121,6 +118,5 @@ in
|
|||
font-size: 14px;
|
||||
color: #${custom.text_color};
|
||||
font-weight: ${custom.font_weight};
|
||||
padding-left: 10px;
|
||||
}
|
||||
''
|
||||
|
|
|
|||
|
|
@ -10,13 +10,12 @@ in
|
|||
mullvad
|
||||
syncthing
|
||||
ollama
|
||||
plasma
|
||||
# plasma
|
||||
sddm
|
||||
# hypr
|
||||
hypr
|
||||
# niri
|
||||
# wayland
|
||||
wayland
|
||||
searx
|
||||
portals
|
||||
xserver
|
||||
flatpak
|
||||
wireGuard
|
||||
|
|
|
|||
|
|
@ -1,10 +1,26 @@
|
|||
{ pkgs, flake, ... }:
|
||||
let
|
||||
inherit (flake.config.aesthetics.themes) fonts;
|
||||
in
|
||||
{
|
||||
services = {
|
||||
displayManager = {
|
||||
sddm = {
|
||||
enable = true;
|
||||
wayland.enable = true;
|
||||
enableHidpi = true;
|
||||
theme = "catppuccin-mocha";
|
||||
};
|
||||
};
|
||||
};
|
||||
environment = {
|
||||
systemPackages = [
|
||||
(pkgs.catppuccin-sddm.override {
|
||||
flavor = "mocha";
|
||||
font = "${fonts.names.name0}";
|
||||
fontSize = "${toString fonts.sizes.desktop.size0}";
|
||||
loginBackground = true;
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,12 +5,23 @@
|
|||
xdg = {
|
||||
portal = {
|
||||
enable = true;
|
||||
config = {
|
||||
niri = {
|
||||
default = [
|
||||
"wlr"
|
||||
"gtk"
|
||||
"gnome"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
wlr.enable = true;
|
||||
config.common.default = "*";
|
||||
xdgOpenUsePortal = true;
|
||||
extraPortals = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
xdg-desktop-portal-gtk
|
||||
xdg-desktop-portal-gnome
|
||||
# xdg-desktop-portal-hyprland
|
||||
xdg-desktop-portal-wlr
|
||||
;
|
||||
|
|
|
|||
|
|
@ -67,11 +67,11 @@ in
|
|||
in
|
||||
{
|
||||
"/" = {
|
||||
device = "/dev/disk/by-uuid/1de87c26-c123-44c0-9c9b-6d2480bdeb7d";
|
||||
device = "/dev/disk/by-uuid/6328deb2-075a-471e-8396-459921a82832";
|
||||
fsType = "ext4";
|
||||
};
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-uuid/6A1F-3641";
|
||||
device = "/dev/disk/by-uuid/6152-9BBC";
|
||||
fsType = "vfat";
|
||||
options = mars.boot.options;
|
||||
};
|
||||
|
|
@ -83,7 +83,7 @@ in
|
|||
));
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/8b1d43a7-baf8-4d15-a1ad-dc0c9dda6970"; }
|
||||
{ device = "/dev/disk/by-uuid/c8839bac-980b-4b24-9c36-504965acc964"; }
|
||||
];
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue