From 5ec09fee31a612e41c3d7433e6fa3701db57f589 Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Thu, 5 Dec 2024 07:02:26 +0100 Subject: [PATCH] allota changes idk --- .gitignore | 6 +- .stignore | 1 + aw-category-export.json | 310 +++++++++ nix/apps/communication.nix | 2 + nix/apps/graphics.nix | 5 +- nix/apps/music.nix | 4 +- nix/apps/office.nix | 1 + nix/apps/prod.nix | 3 + nix/configs/dunst.nix | 26 + nix/configs/firefox.nix | 57 +- nix/configs/firewall.nix | 2 + nix/configs/gpu-screen-recorder.nix | 1 + nix/configs/i3.nix | 17 +- nix/configs/node_exporter.nix | 2 +- nix/configs/nvim.nix | 22 +- nix/configs/ollama.nix | 8 +- nix/configs/picom.nix | 2 + nix/configs/polybar.nix | 190 +----- nix/configs/polybar/bottom.nix | 11 +- nix/configs/polybar/modules/sysinfo.nix | 0 nix/configs/polybar/top.nix | 76 +-- nix/configs/vscode.nix | 98 ++- nix/configs/waydroid.nix | 11 +- nix/configuration.nix | 11 +- nix/desktop.nix | 7 +- nix/dev.nix | 1 + nix/flake.lock | 111 +-- nix/gaming.nix | 50 +- nix/system/drivers/shitvidia-patch.nix | 5 +- nix/system/shell.nix | 1 + nix/system/sound.nix | 2 - scripts/music.sh | 2 +- userstyles/feishin.css | 123 ++++ userstyles/forgejo.css | 574 ++++++++++++++++ userstyles/github.css | 852 ++++++++++++++++++++++++ userstyles/searxng.css | 218 ++++++ 36 files changed, 2418 insertions(+), 394 deletions(-) create mode 100644 .stignore create mode 100644 aw-category-export.json create mode 100644 nix/configs/dunst.nix delete mode 100644 nix/configs/polybar/modules/sysinfo.nix create mode 100644 userstyles/feishin.css create mode 100644 userstyles/forgejo.css create mode 100644 userstyles/github.css create mode 100644 userstyles/searxng.css diff --git a/.gitignore b/.gitignore index 236eff2..cfce899 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ -nixos/hardware-configuration.nix \ No newline at end of file +nixos/hardware-configuration.nix +wg.pub +wg.priv +wg-phone.pub +wg-phone.priv \ No newline at end of file diff --git a/.stignore b/.stignore new file mode 100644 index 0000000..6b8710a --- /dev/null +++ b/.stignore @@ -0,0 +1 @@ +.git diff --git a/aw-category-export.json b/aw-category-export.json new file mode 100644 index 0000000..3bf85ce --- /dev/null +++ b/aw-category-export.json @@ -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" + } + } + ] +} \ No newline at end of file diff --git a/nix/apps/communication.nix b/nix/apps/communication.nix index 607778c..7533cd3 100755 --- a/nix/apps/communication.nix +++ b/nix/apps/communication.nix @@ -7,6 +7,8 @@ mumble # voip element-desktop # fully featured matrix client #gomuks # tui matrix client + + simplex-chat-desktop ]; diff --git a/nix/apps/graphics.nix b/nix/apps/graphics.nix index ad9c992..329e0c7 100644 --- a/nix/apps/graphics.nix +++ b/nix/apps/graphics.nix @@ -2,7 +2,8 @@ environment.systemPackages = with pkgs; [ #krita - gimp - figma-linux + #gimp + #figma-linux + #kdenlive ]; } diff --git a/nix/apps/music.nix b/nix/apps/music.nix index 00b3cc5..1679b35 100755 --- a/nix/apps/music.nix +++ b/nix/apps/music.nix @@ -1,10 +1,12 @@ { pkgs, config, ... }: { environment.systemPackages = with pkgs; [ - #cmus playerctl jamesdsp yt-dlp feishin + #mpv-unwrapped + qpwgraph + ]; } diff --git a/nix/apps/office.nix b/nix/apps/office.nix index d155c80..15064e7 100755 --- a/nix/apps/office.nix +++ b/nix/apps/office.nix @@ -2,6 +2,7 @@ { environment.systemPackages = with pkgs; [ libreoffice + onlyoffice-bin ]; } diff --git a/nix/apps/prod.nix b/nix/apps/prod.nix index a63e274..7f48d05 100755 --- a/nix/apps/prod.nix +++ b/nix/apps/prod.nix @@ -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 ]; } diff --git a/nix/configs/dunst.nix b/nix/configs/dunst.nix new file mode 100644 index 0000000..e569bf7 --- /dev/null +++ b/nix/configs/dunst.nix @@ -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"; + }; + }; + }; + +} diff --git a/nix/configs/firefox.nix b/nix/configs/firefox.nix index e3ddc48..1488a20 100644 --- a/nix/configs/firefox.nix +++ b/nix/configs/firefox.nix @@ -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}"; + } + ]; + }]; }; }; }; diff --git a/nix/configs/firewall.nix b/nix/configs/firewall.nix index 97d0941..a4b0ed9 100644 --- a/nix/configs/firewall.nix +++ b/nix/configs/firewall.nix @@ -3,9 +3,11 @@ enable = true; allowedUDPPorts = [ 34197 #factorio + 4242 ]; allowedTCPPorts = [ 25565 # mc + 4242 ]; }; } diff --git a/nix/configs/gpu-screen-recorder.nix b/nix/configs/gpu-screen-recorder.nix index fbbf38c..5955a09 100644 --- a/nix/configs/gpu-screen-recorder.nix +++ b/nix/configs/gpu-screen-recorder.nix @@ -13,5 +13,6 @@ # for scripts pkgs.xdotool pkgs.jq + pkgs.pulseaudio ]; } diff --git a/nix/configs/i3.nix b/nix/configs/i3.nix index dbd2a87..d587775 100755 --- a/nix/configs/i3.nix +++ b/nix/configs/i3.nix @@ -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 diff --git a/nix/configs/node_exporter.nix b/nix/configs/node_exporter.nix index 967f8a5..8d2dd04 100644 --- a/nix/configs/node_exporter.nix +++ b/nix/configs/node_exporter.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { services.prometheus.exporters.node = { - enable = true; + enable = false; port = 9001; openFirewall = true; listenAddress = "0.0.0.0"; diff --git a/nix/configs/nvim.nix b/nix/configs/nvim.nix index 403b0af..33f5ff7 100644 --- a/nix/configs/nvim.nix +++ b/nix/configs/nvim.nix @@ -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 # { diff --git a/nix/configs/ollama.nix b/nix/configs/ollama.nix index 5a0637a..56b81ce 100644 --- a/nix/configs/ollama.nix +++ b/nix/configs/ollama.nix @@ -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"; } diff --git a/nix/configs/picom.nix b/nix/configs/picom.nix index 31f7d24..d50dcd6 100755 --- a/nix/configs/picom.nix +++ b/nix/configs/picom.nix @@ -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'" diff --git a/nix/configs/polybar.nix b/nix/configs/polybar.nix index b47991a..4539e0a 100644 --- a/nix/configs/polybar.nix +++ b/nix/configs/polybar.nix @@ -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-}