update
This commit is contained in:
alyx
parent
43f8bc5995
commit
fb4ad07620
38 changed files with 128 additions and 2800 deletions
|
|
@ -1,7 +1,7 @@
|
|||
{config, pkgs, lib, inputs, vars, ...}:{
|
||||
imports = [
|
||||
#aux files to make finding specific things easier
|
||||
./theming.nix
|
||||
# ./theming.nix
|
||||
./nixvim
|
||||
./niri.nix
|
||||
./packages.nix #general user packages not managed by home-manager but i want to install via hm anyways
|
||||
|
|
@ -11,16 +11,15 @@
|
|||
homeDirectory = "/home/${username}"; #change this if you use a non-standard home dir
|
||||
stateVersion = "23.11";
|
||||
shell.enableBashIntegration = true;
|
||||
sessionVariables = { PASSWORD_STORE_DIR = "$HOME/sync/general/pass"; ELECTRON_OZONE_PLATFORM_HINT = "auto";};
|
||||
file = {
|
||||
".config/waybar/config".source = (if vars.user == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/terminal" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/modern");
|
||||
".config/waybar/style.css".source = (if vars.user == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/terminal.css" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/modern.css");
|
||||
".config/waybar/config".source = config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/terminal";
|
||||
".config/waybar/style.css".source = config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/terminal.css";
|
||||
};
|
||||
};
|
||||
programs.home-manager.enable = (!vars.isNixOS); #value is set in flake.nix
|
||||
programs.home-manager.enable = true;
|
||||
programs.foot = {
|
||||
enable = true;
|
||||
settings.main.font = (if vars.user == "alyx" then "monospace:size=20" else "monospace:size=10");
|
||||
settings.main.font = "monospace:size=20";
|
||||
settings.colors.alpha = "0.9";
|
||||
};
|
||||
|
||||
|
|
@ -30,11 +29,7 @@
|
|||
tags_separator = ";";
|
||||
};
|
||||
};
|
||||
programs.password-store = {
|
||||
enable = true;
|
||||
package = pkgs.pass.withExtensions (exts: [exts.pass-otp exts.pass-import]);
|
||||
settings = { PASSWORD_STORE_DIR = "$HOME/sync/general/pass"; };
|
||||
};
|
||||
|
||||
services.mpd = {
|
||||
enable = true;
|
||||
musicDirectory = "/home/${vars.user}/Music";
|
||||
|
|
@ -51,42 +46,18 @@
|
|||
|
||||
services.mpd-discord-rpc.enable = true;
|
||||
|
||||
services.syncthing.enable = (vars.useSyncthing);
|
||||
|
||||
#xdg.configFile."openxr/1/active_runtime.json".source = if vars.user == "alyx" then "${pkgs.monado}/share/openxr/1/openxr_monado.json" else null;
|
||||
|
||||
xdg.configFile."openvr/openvrpaths.vrpath".text = ''
|
||||
{
|
||||
"config" :
|
||||
[
|
||||
"${config.xdg.dataHome}/Steam/config"
|
||||
],
|
||||
"external_drivers" : null,
|
||||
"jsonid" : "vrpathreg",
|
||||
"log" :
|
||||
[
|
||||
"${config.xdg.dataHome}/Steam/logs"
|
||||
],
|
||||
"runtime" :
|
||||
[
|
||||
"${pkgs.opencomposite}/lib/opencomposite"
|
||||
],
|
||||
"version" : 1
|
||||
}
|
||||
'';
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
};
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = vars.user;
|
||||
userEmail = (if vars.user == "alyx" then "cydiralis@proton.me" else "beanigit@protonmail.com");
|
||||
extraConfig = {
|
||||
commit.gpgsign = true;
|
||||
gpg.format = "ssh";
|
||||
user.signingkey = "~/.ssh/id_ed25519.pub";
|
||||
init.defaultBranch = "main";
|
||||
settings = {
|
||||
user.name = vars.user;
|
||||
user.email = "cydiralis@proton.me";
|
||||
commit.gpgsign = true;
|
||||
gpg.format = "ssh";
|
||||
user.signingKey = "~/.ssh/id_ed25519.pub";
|
||||
init.defaultBranch = "main";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -106,16 +77,10 @@ xdg.configFile."openvr/openvrpaths.vrpath".text = ''
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.kanshi = {
|
||||
enable = true;
|
||||
settings = [
|
||||
{
|
||||
profile.name = "maya-desktop";
|
||||
profile.outputs = [
|
||||
{ criteria = "Dell Inc. DELL P2411H MGMHG1681VAU"; position = "0,1050"; }
|
||||
{ criteria = "Samsung Electric Company SyncMaster HMDQ202016"; position = "0,0"; }
|
||||
];
|
||||
}
|
||||
{
|
||||
profile.name = "alyx-desktop";
|
||||
profile.outputs = [
|
||||
|
|
@ -134,11 +99,11 @@ xdg.configFile."openvr/openvrpaths.vrpath".text = ''
|
|||
|
||||
programs.obs-studio = {
|
||||
enable = true;
|
||||
plugins = with pkgs.obs-studio-plugins; [
|
||||
wlrobs
|
||||
obs-backgroundremoval
|
||||
obs-pipewire-audio-capture
|
||||
];
|
||||
# plugins = with pkgs.obs-studio-plugins; [
|
||||
# wlrobs
|
||||
# obs-backgroundremoval
|
||||
# obs-pipewire-audio-capture
|
||||
# ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,43 +1,25 @@
|
|||
{pkgs, vars, ...}:{
|
||||
home.packages = with pkgs; [
|
||||
abaddon
|
||||
blender
|
||||
brightnessctl
|
||||
bs-manager
|
||||
clonehero
|
||||
comma
|
||||
cinny-desktop
|
||||
discordo
|
||||
dissent
|
||||
emacs
|
||||
fastfetch
|
||||
librewolf
|
||||
fzf
|
||||
gomuks
|
||||
gimp
|
||||
grayjay
|
||||
gzdoom
|
||||
hyfetch
|
||||
inkscape
|
||||
kanshi
|
||||
kdePackages.ark
|
||||
legcord
|
||||
libgpod
|
||||
libimobiledevice
|
||||
libnotify
|
||||
libreoffice
|
||||
mpc
|
||||
nemo
|
||||
nextcloud-client
|
||||
openrct2
|
||||
openscad
|
||||
openutau
|
||||
pamixer
|
||||
pavucontrol
|
||||
playerctl
|
||||
prismlauncher
|
||||
prusa-slicer
|
||||
ripcord
|
||||
swaybg
|
||||
swaynotificationcenter
|
||||
tetrio-desktop
|
||||
|
|
@ -50,7 +32,6 @@
|
|||
wlr-randr
|
||||
wttrbar
|
||||
wlx-overlay-s
|
||||
xfce.ristretto
|
||||
xfce.tumbler
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
{
|
||||
services.syncthing = {
|
||||
overrideDevices = true;
|
||||
overrideFolders = true;
|
||||
settings = {
|
||||
devices = {
|
||||
"hypermac" = { id = "XVY5YLM-QETCA4H-KT4XBEH-IR4U47O-CJCJ5YM-DPVWQQX-VHEK4MS-GJCMIQ2"; };
|
||||
"adventurer" = { id = "LLKP3BJ-5RBN5KR-63NXUCW-JC4FMAX-QOXTJBK-65OHI7V-OKZQPTD-5FJIIAB"; };
|
||||
"callisto" = { id = "NPXGWEK-JP4C2NM-QZZPBYI-ISAXIZK-ORCNVGO-C4GFRHJ-SWWFQGC-F5JAMQC"; };
|
||||
"traveler" = { id = "JVNNE3V-IMVW2YL-JKEWUJZ-N5PU4NE-3YQDEU7-77ZHIP3-ADW3LAA-NODOVA3"; };
|
||||
};
|
||||
folders = {
|
||||
"General" = {
|
||||
path = "/home/maya/sync/general";
|
||||
devices = [ "callisto" "hypermac" "adventurer" "traveler" ];
|
||||
};
|
||||
"Music" = {
|
||||
path = "/home/maya/Music";
|
||||
devices = [ "callisto" "hypermac" "adventurer" "traveler" ];
|
||||
};
|
||||
"College" = {
|
||||
path = "/home/maya/sync/college";
|
||||
devices = [ "callisto" "hypermac" "adventurer" "traveler" ];
|
||||
versioning = {
|
||||
type = "staggered";
|
||||
params = {
|
||||
cleanInterval = "3600";
|
||||
maxAge = "15768000";
|
||||
};
|
||||
};
|
||||
};
|
||||
"PrusaSlicer" = {
|
||||
path = "/home/maya/.config/PrusaSlicer";
|
||||
devices = [ "callisto" "hypermac" "adventurer" "traveler" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs, ...}:{
|
||||
{pkgs, lib, ...}:{
|
||||
home.pointerCursor = {
|
||||
gtk.enable = true;
|
||||
x11.enable = true;
|
||||
|
|
@ -8,12 +8,10 @@
|
|||
};
|
||||
catppuccin = {
|
||||
enable = true;
|
||||
gtk.enable = false;
|
||||
kvantum.enable = true;
|
||||
waybar.enable = false;
|
||||
};
|
||||
gtk = {
|
||||
#catppuccin.enable = false;
|
||||
enable = true;
|
||||
theme = {
|
||||
name = "catppuccin-mocha-mauve-standard";
|
||||
|
|
@ -23,8 +21,6 @@
|
|||
variant = "mocha";
|
||||
};
|
||||
};
|
||||
iconTheme.package = pkgs.adwaita-icon-theme;
|
||||
iconTheme.name = "Adwaita";
|
||||
};
|
||||
qt = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,146 +0,0 @@
|
|||
[
|
||||
{
|
||||
"layer": "top",
|
||||
"margin-top": 10,
|
||||
"margin-left": 12,
|
||||
"margin-right": 12,
|
||||
"height": 35,
|
||||
"spacing": 5,
|
||||
"position": "top",
|
||||
"modules-center": ["group/mpdg"],
|
||||
"modules-left": ["group/dtray", "battery", "battery#bat1", "battery#bat2"],
|
||||
"modules-right": ["clock", "group/audio", "disk", "memory", "cpu"],
|
||||
"memory": {
|
||||
"format": " {avail} + {swapAvail} GiB",
|
||||
},
|
||||
|
||||
"cava": {
|
||||
"method": "pipewire",
|
||||
"format-icons" : ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" ],
|
||||
"bar_delimiter": 0,
|
||||
"bars": 12,
|
||||
"stereo": false,
|
||||
"hide_on_silence": true,
|
||||
"input_delay": 1,
|
||||
"autosens": 0,
|
||||
"noise_reduction": 0.5,
|
||||
"sensitivity": 13,
|
||||
},
|
||||
|
||||
"disk": {
|
||||
"format": " {free} {path}",
|
||||
},
|
||||
|
||||
"cpu": {
|
||||
"format": " {usage}% {max_frequency}GHz",
|
||||
"states": { "highcpu": 85 },
|
||||
},
|
||||
|
||||
"group/dtray": {
|
||||
"orientation": "inherit",
|
||||
"drawer": {
|
||||
"transition-duration": 500,
|
||||
"transition-left-to-right": true
|
||||
},
|
||||
"modules": ["custom/arrow", "tray"]
|
||||
},
|
||||
|
||||
"group/audio": {
|
||||
"orientation": "inherit",
|
||||
"modules": ["wireplumber", ],
|
||||
"on-click": "pavucontrol",
|
||||
},
|
||||
|
||||
"group/mpdg": {
|
||||
"orientation": "inherit",
|
||||
"drawer": {
|
||||
"transition-duration": 500,
|
||||
"children-class": "mpdcontrol",
|
||||
"transition-left-to-right": true
|
||||
},
|
||||
"modules": ["mpd", "custom/playpause", "custom/prev", "custom/next"]
|
||||
},
|
||||
|
||||
"custom/playpause": {
|
||||
"format": "",
|
||||
"on-click": "mpc toggle"
|
||||
},
|
||||
|
||||
"custom/prev": {
|
||||
"format": "",
|
||||
"on-click": "mpc prev"
|
||||
},
|
||||
|
||||
"custom/next": {
|
||||
"format": "",
|
||||
"on-click": "mpc next"
|
||||
},
|
||||
|
||||
"custom/arrow": {
|
||||
"format": " ",
|
||||
"tooltip": false,
|
||||
"on-click": "swaync-client -t",
|
||||
},
|
||||
|
||||
"tray": {
|
||||
"spacing": 5
|
||||
},
|
||||
|
||||
"clock": {
|
||||
"format": "{:%I:%M %p}",
|
||||
},
|
||||
|
||||
"wireplumber": {
|
||||
"on-click": "pavucontrol",
|
||||
"format": " {volume}%",
|
||||
"format-muted": " {volume}%",
|
||||
},
|
||||
|
||||
"mpd": {
|
||||
"on-click": "mpc toggle",
|
||||
"format-disconnected": "MPD seems to be down",
|
||||
"format-stopped": "Nothing playing!",
|
||||
"format": "{title} - {album} - {artist}",
|
||||
"format-paused": "{title} - {album} - {artist}",
|
||||
},
|
||||
|
||||
"battery": {
|
||||
"bat": "BAT0",
|
||||
"interval": 5,
|
||||
"format-icons": [" ", " ", " ", " ", " "],
|
||||
"states": {
|
||||
"warning": 30,
|
||||
"critical": 15,
|
||||
"dead": 5
|
||||
},
|
||||
"format": "{icon} {capacity}%",
|
||||
"tooltip-format": "BAT0, {power}W"
|
||||
},
|
||||
|
||||
"battery#bat1": {
|
||||
"bat": "BAT1",
|
||||
"interval": 5,
|
||||
"format-icons": [" ", " ", " ", " ", " "],
|
||||
"states": {
|
||||
"warning": 30,
|
||||
"critical": 15,
|
||||
"dead": 5
|
||||
},
|
||||
"format": "{icon} {capacity}%",
|
||||
"tooltip-format": "BAT1, {power}W"
|
||||
},
|
||||
|
||||
"battery#bat2": {
|
||||
"bat": "BAT2",
|
||||
"interval": 5,
|
||||
"format-icons": [" ", " ", " ", " ", " "],
|
||||
"states": {
|
||||
"warning": 30,
|
||||
"critical": 15,
|
||||
"dead": 5
|
||||
},
|
||||
"format": "{icon} {capacity}%",
|
||||
"tooltip-format": "BAT2, {power}W"
|
||||
},
|
||||
}
|
||||
]
|
||||
|
|
@ -1,114 +0,0 @@
|
|||
@define-color rosewater #f5e0dc;
|
||||
@define-color flamingo #f2cdcd;
|
||||
@define-color pink #f5c2e7;
|
||||
@define-color mauve #cba6f7;
|
||||
@define-color red #f38ba8;
|
||||
@define-color maroon #eba0ac;
|
||||
@define-color peach #fab387;
|
||||
@define-color yellow #f9e2af;
|
||||
@define-color green #a6e3a1;
|
||||
@define-color teal #94e2d5;
|
||||
@define-color sky #89dceb;
|
||||
@define-color sapphire #74c7ec;
|
||||
@define-color blue #89b4fa;
|
||||
@define-color lavender #b4befe;
|
||||
@define-color text #cdd6f4;
|
||||
@define-color subtext1 #bac2de;
|
||||
@define-color subtext0 #a6adc8;
|
||||
@define-color overlay2 #9399b2;
|
||||
@define-color overlay1 #7f849c;
|
||||
@define-color overlay0 #6c7086;
|
||||
@define-color surface2 #585b70;
|
||||
@define-color surface1 #45475a;
|
||||
@define-color surface0 #313244;
|
||||
@define-color base #1e1e2e;
|
||||
@define-color mantle #181825;
|
||||
@define-color crust #11111b;
|
||||
/* forgive me, above is the contents of catppuccin mocha's waybar css file */
|
||||
* {
|
||||
font-family: Iosevka NF;
|
||||
}
|
||||
window#waybar {
|
||||
background-color: rgba(49, 50, 68, 0.999);
|
||||
/* padding: 0px 5px;
|
||||
margin: 5px 10px 5px; */
|
||||
border-radius: 10px;
|
||||
}
|
||||
#clock,
|
||||
#audio,
|
||||
#mpd,
|
||||
#battery,
|
||||
#cpu,
|
||||
#disk,
|
||||
#memory {
|
||||
padding: 5px;
|
||||
border-radius: 10px;
|
||||
border: 0.2em solid #cba6f7;
|
||||
background: @surface2;
|
||||
min-height: 0;
|
||||
margin: 0.2em;
|
||||
}
|
||||
#battery.warning {
|
||||
border: 0.2em solid @yellow;
|
||||
}
|
||||
#battery.critical {
|
||||
border: 0.2em solid @red;
|
||||
}
|
||||
#battery.dead {
|
||||
background: @surface0;
|
||||
color: @surface2;
|
||||
border: 0.2em solid @overlay1;
|
||||
}
|
||||
#dtray {
|
||||
margin: 0px 10px 0px;
|
||||
padding: 0px 10px 0px;
|
||||
}
|
||||
#wireplumber.muted {
|
||||
border: 0;
|
||||
color: #888888;
|
||||
}
|
||||
#mpd.stopped {
|
||||
background-color: @surface0;
|
||||
border: 0
|
||||
}
|
||||
#mpd.playing {
|
||||
background: @mauve;
|
||||
}
|
||||
.mpdcontrol {
|
||||
background-color: @surface0;
|
||||
/* border-radius: 10px; */
|
||||
font-size: 1.2em;
|
||||
}
|
||||
|
||||
#custom-playpause {
|
||||
background-color: #e5a6f7;
|
||||
padding-right: 10px;
|
||||
padding-left: 5px;
|
||||
}
|
||||
#custom-prev {
|
||||
background-color: #F7A6E8;
|
||||
padding-right: 7px;
|
||||
padding-left: 6px;
|
||||
}
|
||||
#custom-next {
|
||||
background-color: #FAA5B7;
|
||||
padding-right: 8px;
|
||||
padding-left: 6px;
|
||||
border-top-right-radius: 10px;
|
||||
border-bottom-right-radius: 10px;
|
||||
}
|
||||
#mpdg:hover {
|
||||
border-bottom-left-radius: 10px;
|
||||
border-top-left-radius: 10px;
|
||||
background: #e5a6f7;
|
||||
}
|
||||
#battery.charging {
|
||||
background: @mauve;
|
||||
}
|
||||
#cava {
|
||||
margin-left: 0.2em;
|
||||
color: @mauve;
|
||||
}
|
||||
#cpu.highcpu {
|
||||
background: @mauve;
|
||||
}
|
||||
BIN
home/wooz
BIN
home/wooz
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue