allota changes idk
This commit is contained in:
parent
1929563b9a
commit
5ec09fee31
6
.gitignore
vendored
6
.gitignore
vendored
|
|
@ -1 +1,5 @@
|
|||
nixos/hardware-configuration.nix
|
||||
nixos/hardware-configuration.nix
|
||||
wg.pub
|
||||
wg.priv
|
||||
wg-phone.pub
|
||||
wg-phone.priv
|
||||
310
aw-category-export.json
Normal file
310
aw-category-export.json
Normal file
|
|
@ -0,0 +1,310 @@
|
|||
{
|
||||
"categories": [
|
||||
{
|
||||
"name": [
|
||||
"Productivity"
|
||||
],
|
||||
"rule": {
|
||||
"type": "none"
|
||||
},
|
||||
"data": {
|
||||
"color": "#FCDC00"
|
||||
},
|
||||
"id": 0
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Productivity",
|
||||
"Programming"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "GitHub|Copilot|Alacritty|VSCodium|Code|Insomnia"
|
||||
},
|
||||
"id": 1,
|
||||
"data": {
|
||||
"color": "#68BC00"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Productivity",
|
||||
"Image"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "Gimp|Inkscape"
|
||||
},
|
||||
"id": 2
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Productivity",
|
||||
"Audio"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "Audacity"
|
||||
},
|
||||
"id": 3
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Productivity",
|
||||
"3D"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "Blender"
|
||||
},
|
||||
"id": 4
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Entertaiment",
|
||||
"Games"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "Minecraft|RimWorld|Overwatch|steam_app_2357570|steam|Halo|Unrailed|tf_linux64|Warframe|Counter|Strike"
|
||||
},
|
||||
"data": {
|
||||
"color": "#009CE0"
|
||||
},
|
||||
"id": 5
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Entertaiment",
|
||||
"Video"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "YouTube|Plex|VLC|mpv"
|
||||
},
|
||||
"data": {
|
||||
"color": "#F33"
|
||||
},
|
||||
"id": 6
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Entertaiment",
|
||||
"Music"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "Spotify|Deezer|feishin",
|
||||
"ignore_case": true
|
||||
},
|
||||
"data": {
|
||||
"color": "#0062B1"
|
||||
},
|
||||
"id": 7
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Comms",
|
||||
"IM"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "Messenger|Telegram|Signal|WhatsApp|Rambox|Slack|Riot|Element|Discord|Nheko|Simplex"
|
||||
},
|
||||
"id": 8,
|
||||
"data": {
|
||||
"color": "#FA28FF"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Entertaiment"
|
||||
],
|
||||
"rule": {
|
||||
"type": "none"
|
||||
},
|
||||
"id": 10,
|
||||
"data": {
|
||||
"color": "#73D8FF"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Productivity",
|
||||
"Writing/reading"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "Logseq"
|
||||
},
|
||||
"id": 11,
|
||||
"data": {
|
||||
"color": "#16A5A5"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Comms",
|
||||
"VOIP"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "Mumble"
|
||||
},
|
||||
"id": 12,
|
||||
"data": {
|
||||
"color": "#AB149E"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Education"
|
||||
],
|
||||
"rule": {
|
||||
"type": "none"
|
||||
},
|
||||
"id": 13,
|
||||
"data": {
|
||||
"color": "#FCC400"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Education",
|
||||
"School"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "classroom\\.google\\.com"
|
||||
},
|
||||
"id": 14,
|
||||
"data": {
|
||||
"color": "#FCC400"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Education",
|
||||
"Self improvment"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "edx"
|
||||
},
|
||||
"id": 15,
|
||||
"data": {
|
||||
"color": "#FB9E00"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Productivity",
|
||||
"Programming",
|
||||
"Rust"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "rust|\\.rs"
|
||||
},
|
||||
"id": 16,
|
||||
"data": {
|
||||
"color": "#DEA584"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Productivity",
|
||||
"Programming",
|
||||
"Nix"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "nix"
|
||||
},
|
||||
"id": 17,
|
||||
"data": {
|
||||
"color": "#5E6EFF"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Productivity",
|
||||
"Programming",
|
||||
"Java"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "java"
|
||||
},
|
||||
"id": 18,
|
||||
"data": {
|
||||
"color": "#007396"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Productivity",
|
||||
"Programming",
|
||||
"Typescript"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "ts"
|
||||
},
|
||||
"id": 19,
|
||||
"data": {
|
||||
"color": "#007ACC"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Comms"
|
||||
],
|
||||
"rule": {
|
||||
"type": "none"
|
||||
},
|
||||
"id": 20
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Browsing"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "firefox"
|
||||
},
|
||||
"id": 21,
|
||||
"data": {
|
||||
"color": "#FF7139"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Productivity",
|
||||
"Programming",
|
||||
"Ai"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "Copilot"
|
||||
},
|
||||
"id": 22,
|
||||
"data": {
|
||||
"color": "#000000"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": [
|
||||
"Work"
|
||||
],
|
||||
"rule": {
|
||||
"type": "regex",
|
||||
"regex": "Proton|kdenlive|WordPress|Kdenlive|CapITris|DesktopEditors|Impress|libreoffice-impress"
|
||||
},
|
||||
"id": 23,
|
||||
"data": {
|
||||
"color": "#16A5A5"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -7,6 +7,8 @@
|
|||
mumble # voip
|
||||
element-desktop # fully featured matrix client
|
||||
#gomuks # tui matrix client
|
||||
|
||||
simplex-chat-desktop
|
||||
];
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
|
||||
environment.systemPackages = with pkgs; [
|
||||
#krita
|
||||
gimp
|
||||
figma-linux
|
||||
#gimp
|
||||
#figma-linux
|
||||
#kdenlive
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
{ pkgs, config, ... }: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
#cmus
|
||||
playerctl
|
||||
jamesdsp
|
||||
yt-dlp
|
||||
feishin
|
||||
#mpv-unwrapped
|
||||
qpwgraph
|
||||
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
libreoffice
|
||||
onlyoffice-bin
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,9 @@
|
|||
#inputs.romodoro.packages.x86_64-linux.default
|
||||
taskwarrior-tui
|
||||
inputs.dttyper.packages.x86_64-linux.default
|
||||
|
||||
# For tracking activity across the whole computer
|
||||
activitywatch
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
26
nix/configs/dunst.nix
Normal file
26
nix/configs/dunst.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ pkgs, ... }: {
|
||||
|
||||
home-manager.users.grape.services.dunst = {
|
||||
enable = true;
|
||||
settings = {
|
||||
global = {
|
||||
frame_color = "#1e66f5";
|
||||
separator_color = "frame";
|
||||
};
|
||||
urgency_low = {
|
||||
background = "#191830";
|
||||
foreground = "#FFFFFF";
|
||||
};
|
||||
urgency_normal = {
|
||||
background = "#191830";
|
||||
foreground = "#FFFFFF";
|
||||
};
|
||||
urgency_critical = {
|
||||
background = "#191830";
|
||||
foreground = "#FFFFFF";
|
||||
frame_color = "#fe640b";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -13,16 +13,19 @@
|
|||
userContent = builtins.readFile "/home/grape/dotfiles/nix/opt/firefox/userContent.css"; # browser styles
|
||||
|
||||
extensions =
|
||||
[
|
||||
pkgs.nur.repos.rycee.firefox-addons.ublock-origin
|
||||
pkgs.nur.repos.rycee.firefox-addons.clearurls # clear tracking urls
|
||||
pkgs.nur.repos.rycee.firefox-addons.stylus # cool styling for websites
|
||||
pkgs.nur.repos.rycee.firefox-addons.localcdn # locally stores frameworks such as vue, tailwind ect..
|
||||
pkgs.nur.repos.rycee.firefox-addons.libredirect # redirects to libre version of spyware sites
|
||||
pkgs.nur.repos.rycee.firefox-addons.tridactyl # vim like keybinds
|
||||
pkgs.nur.repos.rycee.firefox-addons.istilldontcareaboutcookies # dismisses cookie banners
|
||||
pkgs.nur.repos.rycee.firefox-addons.noscript # block js
|
||||
pkgs.nur.repos.rycee.firefox-addons.tabliss # sexy new tab
|
||||
with pkgs; [
|
||||
nur.repos.rycee.firefox-addons.ublock-origin
|
||||
nur.repos.rycee.firefox-addons.clearurls # clear tracking urls
|
||||
nur.repos.rycee.firefox-addons.stylus # cool styling for websites
|
||||
nur.repos.rycee.firefox-addons.localcdn # locally stores frameworks such as vue, tailwind ect..
|
||||
nur.repos.rycee.firefox-addons.libredirect # redirects to libre version of spyware sites
|
||||
nur.repos.rycee.firefox-addons.tridactyl # vim like keybinds
|
||||
nur.repos.rycee.firefox-addons.istilldontcareaboutcookies # dismisses cookie banners
|
||||
nur.repos.rycee.firefox-addons.noscript # block js
|
||||
nur.repos.rycee.firefox-addons.tabliss # sexy new tab
|
||||
nur.repos.rycee.firefox-addons.aw-watcher-web # activity watcher
|
||||
nur.repos.rycee.firefox-addons.stylus # styling
|
||||
nur.repos.rycee.firefox-addons.keepassxc-browser # password manager integration
|
||||
];
|
||||
search.force = true;
|
||||
search.order = [ "Searxng" "DuckDuckGo" ];
|
||||
|
|
@ -64,19 +67,27 @@
|
|||
{ name = "query"; value = "{searchTerms}"; }
|
||||
];
|
||||
}];
|
||||
|
||||
"Stylus styles" = {
|
||||
definedAliases = [ "@st" ];
|
||||
urls = [{
|
||||
template = " https://userstyles.world/search";
|
||||
params = [
|
||||
{
|
||||
name = "q";
|
||||
value = "{searchTerms}";
|
||||
}
|
||||
];
|
||||
}];
|
||||
};
|
||||
};
|
||||
"Nix Wiki" = {
|
||||
definedAliases = [ "@nw" ];
|
||||
urls = [{
|
||||
template = "https://wiki.nixos.org/w/index.php";
|
||||
params = [
|
||||
{ name = "search"; value = "{searchTerms}"; }
|
||||
];
|
||||
}];
|
||||
};
|
||||
"crates" = {
|
||||
definedAliases = [ "@cr" ];
|
||||
urls = [{
|
||||
template = "https://crates.io/search";
|
||||
params = [
|
||||
{
|
||||
name = "q";
|
||||
value = "{searchTerms}";
|
||||
}
|
||||
];
|
||||
}];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,9 +3,11 @@
|
|||
enable = true;
|
||||
allowedUDPPorts = [
|
||||
34197 #factorio
|
||||
4242
|
||||
];
|
||||
allowedTCPPorts = [
|
||||
25565 # mc
|
||||
4242
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,5 +13,6 @@
|
|||
# for scripts
|
||||
pkgs.xdotool
|
||||
pkgs.jq
|
||||
pkgs.pulseaudio
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,10 +19,19 @@ in
|
|||
command = "picom -b";
|
||||
}
|
||||
{
|
||||
command = "polybar default";
|
||||
command = "polybar -c ~/.config/polybar/test.ini default";
|
||||
}
|
||||
{
|
||||
command = "polybar bottom";
|
||||
command = "polybar -c ~/.config/polybar/test.ini bottom";
|
||||
}
|
||||
{
|
||||
command = "aw-server";
|
||||
}
|
||||
{
|
||||
command = "aw-watcher-afk";
|
||||
}
|
||||
{
|
||||
command = "aw-watcher-window";
|
||||
}
|
||||
];
|
||||
# defining alt as modifier
|
||||
|
|
@ -65,7 +74,7 @@ in
|
|||
|
||||
|
||||
# power off
|
||||
"mod4+Shift+Delete" = "exec shutdown now";
|
||||
"mod4+Shift+Delete" = "exec shutdown -h now";
|
||||
|
||||
# language settings
|
||||
"mod4+1" = "exec setxkbmap us";
|
||||
|
|
@ -86,6 +95,8 @@ in
|
|||
|
||||
# sticky window
|
||||
"Mod1+Shift+s" = "sticky toggle";
|
||||
# reset for ultrawide incase any game decides to fuck it up
|
||||
"mod4+u" = "exec xrandr --output DP-0 --mode 3440x1440 --rate 165";
|
||||
|
||||
|
||||
# Volume adjustment for current player
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ pkgs, ... }: {
|
||||
services.prometheus.exporters.node = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
port = 9001;
|
||||
openFirewall = true;
|
||||
listenAddress = "0.0.0.0";
|
||||
|
|
|
|||
|
|
@ -66,21 +66,22 @@
|
|||
clangd.enable = true; # C/C++
|
||||
csharp-ls.enable = true; # C#
|
||||
yamlls.enable = true; # YAML
|
||||
|
||||
lua-ls = {
|
||||
# Lua
|
||||
enable = true;
|
||||
settings.telemetry.enable = false;
|
||||
};
|
||||
|
||||
# Rust
|
||||
#Rust
|
||||
rust-analyzer = {
|
||||
enable = true;
|
||||
installRustc = false; # disabled so devshells work
|
||||
installCargo = false; # disabled so devsellsh work
|
||||
|
||||
settings.completion.callable.snippets = "add_parentheses";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
# Highlight word under cursor
|
||||
plugins.illuminate = {
|
||||
|
|
@ -102,7 +103,6 @@
|
|||
};
|
||||
|
||||
|
||||
|
||||
plugins.cmp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
@ -114,7 +114,6 @@
|
|||
maxViewEntries = 30;
|
||||
};
|
||||
|
||||
snippet = { expand = "luasnip"; };
|
||||
formatting = { fields = [ "kind" "abbr" "menu" ]; };
|
||||
sources = [
|
||||
{ name = "nvim_lsp"; }
|
||||
|
|
@ -129,10 +128,6 @@
|
|||
name = "path"; # file system paths
|
||||
keywordLength = 3;
|
||||
}
|
||||
{
|
||||
name = "luasnip"; # snippets
|
||||
keywordLength = 3;
|
||||
}
|
||||
];
|
||||
|
||||
window = {
|
||||
|
|
@ -193,6 +188,7 @@
|
|||
# inline error display
|
||||
plugins.trouble = {
|
||||
enable = true;
|
||||
settings = { };
|
||||
};
|
||||
|
||||
#plugins.nvimtree.enable = true;
|
||||
|
|
@ -215,10 +211,7 @@
|
|||
|
||||
|
||||
|
||||
# a completion engine using LSP
|
||||
|
||||
# languages
|
||||
plugins.rustaceanvim.enable = true;
|
||||
plugins.nix.enable = true;
|
||||
|
||||
keymaps = [
|
||||
|
|
@ -232,6 +225,10 @@
|
|||
}
|
||||
];
|
||||
|
||||
# THEME
|
||||
colorschemes.cyberdream.enable = true;
|
||||
colorscheme = "cyberdream";
|
||||
|
||||
opts = {
|
||||
number = true;
|
||||
relativenumber = true;
|
||||
|
|
@ -240,7 +237,6 @@
|
|||
|
||||
# TODO shades of purple colorscheme
|
||||
#extraPlugins = [ pkgs.vimPlugins.gruvbox ];
|
||||
#colorscheme = "gruvbox";
|
||||
# extraPlugins = [
|
||||
# pkgs.vimUtils.buildVimPlugin
|
||||
# {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ pkgs, ... }: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
ollama
|
||||
];
|
||||
services.ollama.enable = true;
|
||||
#environment.systemPackages = with pkgs; [
|
||||
# ollama
|
||||
#];
|
||||
services.ollama.enable = false;
|
||||
services.ollama.acceleration = "cuda";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@
|
|||
"90:class_g *= 'jamesdsp'"
|
||||
"90:class_g *= 'polybar'"
|
||||
"80:class_g *= 'codium'"
|
||||
"80:class_g *= 'code'"
|
||||
"80:class_g *= 'Code'"
|
||||
"80:class_g *= 'Rofi'"
|
||||
"80:class_g *= 'lutris'"
|
||||
"80:class_g *= 'Mumble'"
|
||||
|
|
|
|||
|
|
@ -1,24 +1,14 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
colors = {
|
||||
fg = "#FFFFFF";
|
||||
foreground = "#FFFFFF";
|
||||
bg = "#191830";
|
||||
background = "#191830";
|
||||
border = "#F72585";
|
||||
warn = "#f00";
|
||||
altfg = "#F72585";
|
||||
|
||||
invisible = "#00400080";
|
||||
script = "~/.config/scripts";
|
||||
|
||||
currentWorkspace = "#FAD000";
|
||||
seperatorColor = "#FAD000";
|
||||
};
|
||||
script = "~/dotifles/scripts";
|
||||
in
|
||||
{
|
||||
|
||||
imports = [
|
||||
./polybar/bottom.nix
|
||||
./polybar/top.nix
|
||||
];
|
||||
|
||||
home-manager.users.grape.services.polybar = {
|
||||
|
|
@ -26,183 +16,9 @@ in
|
|||
script = "${script}/polybar.sh";
|
||||
|
||||
config = {
|
||||
|
||||
|
||||
"module/date" = {
|
||||
type = "internal/date";
|
||||
font-1 = "Jetbrains Mono Nerd font";
|
||||
interval = 1;
|
||||
time = "%I:%M:%S";
|
||||
date = "%Y-%m-%d %A";
|
||||
format = "%{T2}%{F#191830}%{F-}%{T-}<label>%{T2}%{F#191830}%{F-}%{T-}";
|
||||
label-background = "${colors.bg}";
|
||||
label = "%time% %date%";
|
||||
label-foreground = "${colors.fg}";
|
||||
};
|
||||
|
||||
"module/fs-label-system" = {
|
||||
type = "custom/text";
|
||||
label = "SYS ";
|
||||
label-foreground = "${colors.seperatorColor}";
|
||||
};
|
||||
|
||||
"module/fs-label-data" = {
|
||||
type = "custom/text";
|
||||
label = "DAT ";
|
||||
label-foreground = "${ colors. seperatorColor}";
|
||||
};
|
||||
|
||||
"module/s" = {
|
||||
type = "custom/text";
|
||||
label = " ";
|
||||
};
|
||||
|
||||
"module/ewmh" = {
|
||||
type = "internal/xworkspaces";
|
||||
pin-workspaces = false;
|
||||
label-active-foreground = "${colors.currentWorkspace}";
|
||||
label-active-background = "${colors.background}";
|
||||
label-inactive-background = "${colors.background}";
|
||||
label-urgent-foreground = colors.warn;
|
||||
label-empty-background = "${colors.background}";
|
||||
label-occupied-background = "${colors.background}";
|
||||
format = "%{T2}%{F#191830}%{F-}%{T-}<label-state>%{T2}%{F#191830}%{F-}%{T-}";
|
||||
};
|
||||
|
||||
"module/cpu-temp" = {
|
||||
type = "internal/temperature";
|
||||
base-temperature = 20;
|
||||
warn-temperature = 85;
|
||||
label-warn-foreground = "${colors.warn}";
|
||||
thermal-zone = 0;
|
||||
zone-type = "x86_pkg_temp";
|
||||
label-background = "${colors.foreground}";
|
||||
label-foreground = "${colors.fg}";
|
||||
hwmon-path = "/sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input";
|
||||
format = "%{T2}%{F#${colors.background}}%{F-}%{T-}%{B${colors.bg}}%{F${colors.seperatorColor}}CPU %{F-}%{B-}<label>%{T2}%{F#191830}%{F-}%{T-}";
|
||||
format-warn = "%{F${colors.seperatorColor}}CPU%{F-} <label-warn> ";
|
||||
};
|
||||
|
||||
"module/cpu-usage" = {
|
||||
type = "internal/cpu";
|
||||
interval = "1.5";
|
||||
format = "<label>";
|
||||
label = "CPU %percentage%%";
|
||||
label-background = "${colors.foreground}";
|
||||
format-foreground = "${colors.fg}";
|
||||
};
|
||||
|
||||
"module/gpu-temp" = {
|
||||
type = "custom/script";
|
||||
interval = "1.5";
|
||||
exec = "nvidia-smi --query-gpu=temperature.gpu --format=csv,noheader,nounits";
|
||||
format = "%{B${colors.bg}}%{F${colors.seperatorColor}}GPU %{F-}%{B-}<label>°C";
|
||||
label-background = "${colors.foreground}";
|
||||
label-foreground = "${colors.foreground}";
|
||||
};
|
||||
|
||||
"module/gpu-usage" = {
|
||||
type = "custom/script";
|
||||
interval = "1.5";
|
||||
label-background = "${colors.background}";
|
||||
label-foreground = "${colors.foreground}";
|
||||
exec = "nvidia-smi --query-gpu=memory.used --format=csv,noheader,nounits";
|
||||
format = "<label> mb";
|
||||
};
|
||||
|
||||
"module/memory" = {
|
||||
type = "internal/memory";
|
||||
interval = 1;
|
||||
label-background = "${colors.background}";
|
||||
format = "%{T2}%{F#191830}%{F-}%{T-}%{B${colors.bg}}%{F${colors.seperatorColor}}RAM %{F-}%{B-}<label>%{T2}%{F#191830}%{F-}%{T-}";
|
||||
label = "%used%";
|
||||
label-warn = "%used%";
|
||||
warn-percentage = 60;
|
||||
label-warn-foreground = "${colors.warn}";
|
||||
};
|
||||
|
||||
"module/fs-system" = {
|
||||
type = "internal/fs";
|
||||
label-unmounted = "?";
|
||||
format-prefix-foreground = "${colors.fg}";
|
||||
warn-precentage = "80%";
|
||||
mount-0 = "/";
|
||||
interval = 30;
|
||||
label-mounted-background = "${colors.background}";
|
||||
format-mounted = "%{T2}%{F#191830}%{F-}%{T-}%{B${colors.bg}}%{F${colors.seperatorColor}}SYS %{F-}%{B-}<label-mounted>%{T2}%{F#191830}%{F-}%{T-}";
|
||||
label-mounted = "%free%(%total%)";
|
||||
# FIXME doesn't work
|
||||
label-warn = "%{F${colors.warn}} !%free%!%{F-}(%total%)";
|
||||
};
|
||||
|
||||
"module/fs-data" = {
|
||||
type = "internal/fs";
|
||||
label-unmounted = "?";
|
||||
format-prefix-foreground = "${colors.fg}";
|
||||
warn-precentage = "80%";
|
||||
label-mounted-background = "${colors.background}";
|
||||
mount-0 = "/media/terra";
|
||||
interval = 30;
|
||||
format-mounted = "%{T2}%{F#191830}%{F-}%{T-}%{B${colors.bg}}%{F${colors.seperatorColor}}DAT %{F-}%{B-}<label-mounted>%{T2}%{F#191830}%{F-}%{T-}";
|
||||
label-mounted = "%free%(%total%)";
|
||||
# FIXME doesn't work
|
||||
label-warn = "%{F${colors.warn}} !%free%!%{F-}(%total%)";
|
||||
};
|
||||
|
||||
|
||||
"module/battery" = {
|
||||
type = "internal/battery";
|
||||
full-at = 95;
|
||||
low-at = 20;
|
||||
battery = "BAT0";
|
||||
adapter = "AC0";
|
||||
label-background = colors.background;
|
||||
label-foreground = colors.foreground;
|
||||
format = "%{T2}%{F#191830}%{F-}%{T-}%{B${colors.bg}}%{F${colors.seperatorColor}}BAT %{F-}%{B-}<label-mounted>%{T2}%{F#191830}%{F-}%{T-}";
|
||||
poll-interval = 4;
|
||||
};
|
||||
|
||||
"module/keyboard" = {
|
||||
type = "internal/xkeyboard";
|
||||
label-layout-background = colors.background;
|
||||
label-layout-foreground = colors.foreground;
|
||||
format = "%{T2}%{F#191830}%{F-}%{T-}%{B${colors.background}}<label-layout> <label-indicator>%{B-}%{T2}%{F#191830}%{F-}%{T-}";
|
||||
};
|
||||
|
||||
"global/wm" = {
|
||||
override-redirect = false;
|
||||
};
|
||||
|
||||
"bar/default" = {
|
||||
font-0 = "Jetbrains Mono Nerd font:size=11;3";
|
||||
font-1 = "Jetbrains Mono Nerd font:size=22;5";
|
||||
bottom = false;
|
||||
|
||||
# Dimensions
|
||||
width = "100%";
|
||||
height = 34;
|
||||
radius = 15;
|
||||
|
||||
# Padding for modules
|
||||
padding-left = 2;
|
||||
padding-right = 2;
|
||||
|
||||
|
||||
# setting colors
|
||||
#background = "${colors.bg}";
|
||||
background = "#00191830";
|
||||
foreground = "${colors.fg}";
|
||||
|
||||
# border for bar
|
||||
border-size = "10px";
|
||||
border-color = "${colors.invisible}";
|
||||
|
||||
# Displayed modules
|
||||
modules-left = "date s keyboard";
|
||||
modules-center = "ewmh";
|
||||
modules-right = "battery-label battery s fs-data s fs-system s memory s start gpu-temp gpu-usage end s cpu-temp cpu-usage";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -73,18 +73,19 @@ in
|
|||
type = "internal/network";
|
||||
interface = "eno2";
|
||||
interval = ".5";
|
||||
format = "%{T2}%{F#191830}%{F-}%{T-}<label>%{T2}%{F#191830}%{F-}%{T-}";
|
||||
label-background = "#191830";
|
||||
format-connected = "%{T2}%{F#191830}%{F-}%{T-}<label-connected>%{T2}%{F#191830}%{F-}%{T-}";
|
||||
format-disconnected = "%{T2}%{F#191830}%{F-}%{T-}%{F${colors.warn}}eno%{F-}%{T2}%{F#191830}%{F-}%{T-}";
|
||||
format-disconnected = "%{T2}%{F#191830}%{F-}%{T-}<label-disconnected>%{T2}%{F#191830}%{F-}%{T-}";
|
||||
format-packetloss = "<animation-packetloss> <label-connected>";
|
||||
|
||||
label-background = "#191830";
|
||||
label-connected = "%{F${colors.seperatorColor}}%{F-} %downspeed% %{F${colors.seperatorColor}}%{F-} %upspeed%";
|
||||
label-disconnected = "%{F${colors.seperatorColor}}%{F-} %downspeed% %{F${colors.seperatorColor}}%{F-} %upspeed%";
|
||||
|
||||
|
||||
label-connected-background = "${colors.bg}";
|
||||
label-disconnected-background = "${colors.bg}";
|
||||
|
||||
};
|
||||
|
||||
"module/wireless-network" = {
|
||||
type = "internal/network";
|
||||
interface = "wlo1";
|
||||
|
|
@ -110,7 +111,7 @@ in
|
|||
height = "34";
|
||||
modules-center = "cava";
|
||||
modules-left = "audio-capsule a music-capsule";
|
||||
modules-right = " wireless-network a replay";
|
||||
modules-right = " wired-network a wireless-network a replay";
|
||||
padding-left = "5";
|
||||
padding-right = "5";
|
||||
radius = "20";
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@ in
|
|||
type = "internal/date";
|
||||
font-1 = "Jetbrains Mono Nerd font";
|
||||
interval = 1;
|
||||
format = "%{T2}%{F${colors.bg}}%{F-}%{T-}<label>%{T2}%{F${colors.bg}}%{F-}%{T-}";
|
||||
time = "%I:%M:%S";
|
||||
date = "%Y-%m-%d%";
|
||||
label = "%time% %date%";
|
||||
format = "%{T2}%{F${colors.bg}}%{F-}%{T-}<label>%{T2}%{F${colors.bg}}%{F-}%{T-}";
|
||||
label-foreground = "${colors.fg}";
|
||||
label-background = "${colors.fg}";
|
||||
};
|
||||
|
|
@ -50,27 +50,27 @@ in
|
|||
};
|
||||
|
||||
"module/cpu-temp" = {
|
||||
type = "internal/temperature";
|
||||
format = "%{F${colors.seperatorColor}}CPU %{F-}<label>";
|
||||
format-warn = "%{F${colors.seperatorColor}}CPU %{F-}<label-warn>";
|
||||
base-temperature = 20;
|
||||
warn-temperature = 85;
|
||||
label-warn-foreground = "${colors.warn}";
|
||||
label-foreground = "${colors.fg}";
|
||||
label-background = "${colors.bg}";
|
||||
thermal-zone = 0;
|
||||
zone-type = "x86_pkg_temp";
|
||||
base-temperature = "20";
|
||||
format = "%{T2}%{F#191830}%{F-}%{T-}%{B#191830}%{F#FAD000}CPU %{F-}<label>%{B-}";
|
||||
format-warn = "%{T2}%{F#191830}%{F-}%{T-}%{B#191830}%{F#FAD000}CPU %{F-}<label-warn>%{B-}";
|
||||
hwmon-path = "/sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input";
|
||||
label-background = "#191830";
|
||||
label-foreground = "#FFFFFF";
|
||||
label-warn-foreground = "#f00";
|
||||
label = "%temperature% ";
|
||||
thermal-zone = 0;
|
||||
type = "internal/temperature";
|
||||
warn-temperature = 85;
|
||||
zone-type = "x86_pkg_temp";
|
||||
};
|
||||
|
||||
"module/cpu-usage" = {
|
||||
type = "internal/cpu";
|
||||
interval = "1.5";
|
||||
format = "<label>";
|
||||
label-background = colors.bg;
|
||||
label-foreground = colors.fg;
|
||||
label = "CPU %percentage%%";
|
||||
format-foreground = "${colors.fg}";
|
||||
format = "%{T2}%{F#191830}%{F-}%{T-}%{B${colors.bg}}<label>";
|
||||
label-foreground = "${colors.fg}";
|
||||
label-background = "${colors.fg}";
|
||||
};
|
||||
|
||||
"module/gpu-temp" = {
|
||||
|
|
@ -132,7 +132,10 @@ in
|
|||
|
||||
"module/keyboard" = {
|
||||
type = "internal/xkeyboard";
|
||||
format = "<label-layout> <label-indicator>";
|
||||
format = "%{T2}%{F#191830}%{F-}%{T-}%{B#191830}<label-layout>%{B-}%{B#191830}%{F#FAD000} <label-indicator>%{T-}%{B-}%{T2}%{F#191830}%{F-}%{T-}";
|
||||
label-layout-background = "#191830";
|
||||
label-layout-foreground = "#FFFFFF";
|
||||
label-indicator-on-capslock = "CAPS";
|
||||
};
|
||||
|
||||
"global/wm" = {
|
||||
|
|
@ -140,34 +143,21 @@ in
|
|||
};
|
||||
|
||||
"bar/default" = {
|
||||
font-0 = "Jetbrains Mono Nerd font:size=11;3";
|
||||
font-1 = "Jetbrains Mono Nerd font:size=11;1";
|
||||
bottom = false;
|
||||
|
||||
# dimensons
|
||||
width = "100%";
|
||||
height = 40;
|
||||
radius = 15;
|
||||
|
||||
# Padding for modules
|
||||
padding-left = 5;
|
||||
padding-right = 5;
|
||||
|
||||
|
||||
# setting colors
|
||||
background = "${colors.bg}";
|
||||
foreground = "${colors.fg}";
|
||||
|
||||
# border for bar
|
||||
background = "#00191830";
|
||||
border-color = "#00400080";
|
||||
border-size = "10px";
|
||||
# border-color = ${colors.border}
|
||||
border-color = "${colors.invisible}";
|
||||
|
||||
# Displayed modules
|
||||
modules-left = "date s keyboard s ewmh";
|
||||
#modules-center = "cava";
|
||||
|
||||
modules-right = "battery-label battery s fs-label-data fs-data s fs-label-system fs-system s memory s gpu-label gpu-usage gpu-temp s cpu-temp cpu-usage";
|
||||
bottom = "false";
|
||||
font-0 = "Jetbrains Mono Nerd font:size=11;3";
|
||||
font-1 = "Jetbrains Mono Nerd font:size=22;5";
|
||||
foreground = "#FFFFFF";
|
||||
height = 34;
|
||||
modules-center = "ewmh";
|
||||
modules-left = "date s keyboard";
|
||||
modules-right = " fs-data s fs-system s memory s start gpu-temp gpu-usage end s cpu-temp cpu-usage";
|
||||
padding-left = 2;
|
||||
padding-right = 2;
|
||||
radius = 15;
|
||||
width = "100%";
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,43 +3,54 @@
|
|||
home-manager.users.grape = {
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgs.unstable.vscodium;
|
||||
package = pkgs.vscodium;
|
||||
#package = pkgs.vscode;
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
|
||||
# language suports
|
||||
rust-lang.rust-analyzer
|
||||
jnoortheen.nix-ide
|
||||
redhat.java
|
||||
redhat.vscode-yaml
|
||||
ms-azuretools.vscode-docker
|
||||
octref.vetur
|
||||
bungcip.better-toml
|
||||
mikestead.dotenv
|
||||
pkgs.unstable.vscode-extensions.rust-lang.rust-analyzer
|
||||
pkgs.vscode-extensions.jnoortheen.nix-ide
|
||||
pkgs.vscode-extensions.redhat.java
|
||||
pkgs.vscode-extensions.zxh404.vscode-proto3
|
||||
pkgs.vscode-extensions.redhat.vscode-yaml
|
||||
pkgs.vscode-extensions.ms-azuretools.vscode-docker
|
||||
pkgs.vscode-extensions.octref.vetur
|
||||
pkgs.vscode-extensions.bungcip.better-toml
|
||||
pkgs.vscode-extensions.mikestead.dotenv
|
||||
|
||||
# linters
|
||||
esbenp.prettier-vscode
|
||||
naumovs.color-highlight
|
||||
pkgs.vscode-extensions.esbenp.prettier-vscode
|
||||
pkgs.vscode-extensions.naumovs.color-highlight
|
||||
|
||||
# essentials, other
|
||||
streetsidesoftware.code-spell-checker
|
||||
vscodevim.vim
|
||||
oderwat.indent-rainbow
|
||||
usernamehw.errorlens
|
||||
christian-kohler.path-intellisense
|
||||
vscjava.vscode-spring-initializr
|
||||
gruntfuggly.todo-tree
|
||||
pkgs.vscode-extensions.streetsidesoftware.code-spell-checker
|
||||
pkgs.vscode-extensions.vscodevim.vim
|
||||
pkgs.vscode-extensions.oderwat.indent-rainbow
|
||||
pkgs.vscode-extensions.usernamehw.errorlens
|
||||
pkgs.vscode-extensions.christian-kohler.path-intellisense
|
||||
pkgs.vscode-extensions.vscjava.vscode-spring-initializr
|
||||
pkgs.vscode-extensions.gruntfuggly.todo-tree
|
||||
pkgs.vscode-extensions.eamodio.gitlens
|
||||
|
||||
#themes, icons
|
||||
vscode-icons-team.vscode-icons
|
||||
mechatroner.rainbow-csv
|
||||
|
||||
pkgs.vscode-extensions.vscode-icons-team.vscode-icons
|
||||
pkgs.vscode-extensions.mechatroner.rainbow-csv
|
||||
|
||||
# local ai
|
||||
pkgs.vscode-extensions.continue.continue
|
||||
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
||||
{
|
||||
name = "shades-of-purple";
|
||||
publisher = "ahmadawais";
|
||||
version = "7.3.2";
|
||||
sha256 = "10q5w9g7ghn2qvdc7h2b79x1vy8nzpnwz8dbg1h03074ikhvjx4v";
|
||||
|
||||
}
|
||||
{
|
||||
name = "aw-watcher-vscode";
|
||||
publisher = "activitywatch";
|
||||
version = "0.5.0";
|
||||
sha256 = "0nvw8pp6xaqs6w2zz3dr0vlrrpd6wcgh6jc5bp5ld92p0f34idrs";
|
||||
}
|
||||
];
|
||||
userSettings = {
|
||||
|
|
@ -55,11 +66,56 @@
|
|||
"[typescriptreact]" = {
|
||||
"editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
};
|
||||
# load build.rs from checks
|
||||
"rust-analyzer.cargo.loadOutDirsFromCheck" = true;
|
||||
"rust-analyzer.experimental.procAttrMacros" = false;
|
||||
"rust-analyzer.cargo.buildScripts.enable" = true;
|
||||
|
||||
|
||||
};
|
||||
languageSnippets = {
|
||||
|
||||
nix = {
|
||||
"Include RustSrc for vscode" = {
|
||||
body = [
|
||||
"LIBCLANG_PATH = \"\${pkgs.llvmPackages_17.libclang.lib}/lib\";"
|
||||
"RUST_SRC_PATH = \"\${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}\";"
|
||||
];
|
||||
description = "Include RUST_SRC_PATH and LIBCLANG_PATH for devshells";
|
||||
prefix = [
|
||||
"rust-src"
|
||||
];
|
||||
scope = "nix";
|
||||
};
|
||||
"Crane.dev workspace package into container" =
|
||||
{
|
||||
body = [
|
||||
"$1-container = pkgs.dockerTools.buildLayeredImage"
|
||||
"{"
|
||||
" name = \"$1\";"
|
||||
" tag = \"latest\";"
|
||||
" contents = with pkgs; ["
|
||||
" cacert"
|
||||
" openssl"
|
||||
" pkg-config"
|
||||
" libiconv"
|
||||
" ];"
|
||||
""
|
||||
" config = {"
|
||||
" WorkingDir = \"/app\";"
|
||||
" Volumes = {"
|
||||
" \"/app\" = { };"
|
||||
" };"
|
||||
" Entrypoint = [ \"\${$1}/bin/$2\" ];"
|
||||
" };"
|
||||
"}; "
|
||||
];
|
||||
prefix = [
|
||||
"nix container"
|
||||
];
|
||||
scope = "nix";
|
||||
};
|
||||
|
||||
pkginit = {
|
||||
body = [
|
||||
"{pkgs, ...}: {"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{ pkgs, ... }: {
|
||||
|
||||
|
||||
virtualisation.waydroid.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
waydroid
|
||||
weston
|
||||
];
|
||||
virtualisation.waydroid.enable = false;
|
||||
#environment.systemPackages = with pkgs; [
|
||||
# waydroid
|
||||
# weston
|
||||
# cage
|
||||
#];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@
|
|||
./configs/picom.nix
|
||||
./configs/polybar.nix
|
||||
./configs/btop.nix
|
||||
./configs/dunst.nix
|
||||
./configs/ollama.nix
|
||||
|
||||
./configs/vscode.nix
|
||||
|
|
@ -78,10 +79,9 @@
|
|||
|
||||
# other
|
||||
./configs/firewall.nix
|
||||
|
||||
|
||||
];
|
||||
|
||||
|
||||
# adding nur
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
|
||||
|
|
@ -96,10 +96,17 @@
|
|||
home.stateVersion = "24.05";
|
||||
};
|
||||
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"electron-27.3.11"
|
||||
];
|
||||
|
||||
# Bootloader.
|
||||