feat: i3!

home/profiles/common/base16.nix

@@ -14,14 +14,14 @@ in {
     shell.enable = true;
     schemes = {
       light = {
-        schemeData = schemeSources.atelier.schemes.atelier-heath-light;
+        schemeData = schemeSources.tinted.schemes.catppuccin-latte;
         ansi.palette.background.alpha = "d000";
       };
       dark = {
-        schemeData = schemeSources.outrun.schemes.outrun-dark;
+        schemeData = schemeSources.tinted.schemes.catppuccin-mocha;
         ansi.palette.background.alpha = "ee00";
       };
     };
-    defaultSchemeName = "dark";
+    defaultSchemeName = "light";
   };
 }

home/profiles/common/catppuccin.nix

@@ -0,0 +1,7 @@
+_: {
+  catppuccin = {
+    enable = true;
+    flavor = "latte";
+    gtk.enable = true;
+  };
+}

home/profiles/common/modules.nix

@@ -0,0 +1,5 @@
+_: {
+    disabledModules = [
+      "services/window-managers/i3-sway/i3.nix"
+    ];
+}

home/profiles/graphical/firefox.nix

@@ -9,7 +9,7 @@
       main = {
         id = 0;
         isDefault = true;
-        extensions = with nur.repos.rycee.firefox-addons; [
+        extensions.packages = with nur.repos.rycee.firefox-addons; [
           sponsorblock
           link-cleaner
           canvasblocker

home/profiles/graphical/media.nix

@@ -5,9 +5,7 @@
   ...
 }: let
   inherit (lib.attrsets) mapAttrsToList;
-  ytdlp = inputs.nixpkgs-current.legacyPackages.x86_64-linux.yt-dlp;
 in {
-  # TODO: remove the libs
   programs.mpv = {
     enable = true;
     scripts = with pkgs.mpvScripts; [
@@ -23,7 +21,7 @@ in {
       script-opts =
         builtins.concatStringsSep ","
         (mapAttrsToList (k: v: "${k}=${builtins.toString v}") {
-          ytdl_hook-ytdl_path = "${ytdlp}/bin/yt-dlp";
+          ytdl_hook-ytdl_path = "${pkgs.yt-dlp}/bin/yt-dlp";
           osc-layout = "slimbox";
           osc-vidscale = "no";
           osc-deadzonesize = 0.75;
@@ -42,7 +40,7 @@ in {
     yt = "mpv --ytdl-format='bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best[height<=720]'"; # Laptop doesn't like above 720p :c
   };
   home.packages = with pkgs; [
-    ytdlp # Watch videos from multiple sources without having to use a browser for it
+    yt-dlp # Watch videos from multiple sources without having to use a browser for it
     ytcc # Subscriptions manager and RSS feed exporter for YouTube
   ];
 }

home/profiles/graphical/packages.nix

@@ -21,7 +21,7 @@
     dino # XMPP
     signal-desktop
     mumble
-
+    keymapp
     # Archivery
     unzip
     zip

home/profiles/graphical/syncplay.nix

@@ -0,0 +1,30 @@
+_: {
+  programs.syncplay = {
+    enable = true;
+    username = "kat";
+    defaultRoom = "lounge";
+    server = {
+      host = "syncplay.local.gensokyo.zone";
+    };
+    playerArgs = [
+      "--ytdl-format=bestvideo[height<=1080]+bestaudio/best[height<=1080]/bestvideo+bestaudio/best"
+    ];
+    # gui = false;
+    config = {
+      client_settings = {
+        onlyswitchtotrusteddomains = false;
+        autoplayrequiresamefiles = false;
+        readyatstart = true;
+        pauseonleave = false;
+        rewindondesync = false;
+        rewindthreshold = 6.0;
+        fastforwardthreshold = 6.0;
+        unpauseaction = "Always";
+      };
+      gui = {
+        #autosavejoinstolist = false;
+        showdurationnotification = false;
+      };
+    };
+  };
+}

home/profiles/graphical/wezterm.nix

@@ -26,7 +26,7 @@
       window_decorations = "TITLE | RESIZE",
       enable_wayland = true,
       warn_about_missing_glyphs = false,
-              font_size = 10.0,
+              font_size = 12.0,
               check_for_updates = false,
               enable_tab_bar = false
             }

home/profiles/neovim/default.nix

@@ -43,7 +43,7 @@ in {
       # EasyMotion Equivalent
       hop-nvim
       # org-mode for vim
-      #				neorg
+      neorg
       # base16
       config.base16.vim.plugin
       # Fonts

home/profiles/neovim/init.lua

@@ -9,30 +9,30 @@ local api = vim.api   -- Lua API
 -----------------------------------------------------------
 -- Base16
 -----------------------------------------------------------
-vim.g.base16colorspace = 256
-vim.g.base16background = "@defaultSchemeName@"
-g.base16_shell_path = "@base16ShellPath@"
-vim.cmd("colorscheme base16-@defaultSchemeSlug@")
-g.colors_name = "@defaultSchemeSlug@"
+--vim.g.base16colorspace = 256
+--vim.g.base16background = "@defaultSchemeName@"
+--g.base16_shell_path = "@base16ShellPath@"
+--vim.cmd("colorscheme base16-@defaultSchemeSlug@")
+--g.colors_name = "@defaultSchemeSlug@"
 
-local base16 = {
-	base00 = "@base00@",
-	base01 = "@base01@",
-	base02 = "@base02@",
-	base03 = "@base03@",
-	base04 = "@base04@",
-	base05 = "@base05@",
-	base06 = "@base06@",
-	base07 = "@base07@",
-	base08 = "@base08@",
-	base09 = "@base09@",
-	base0A = "@base0A@",
-	base0B = "@base0B@",
-	base0C = "@base0C@",
-	base0D = "@base0D@",
-	base0E = "@base0E@",
-	base0F = "@base0F@"
-}
+--local base16 = {
+--	base00 = "@base00@",
+--	base01 = "@base01@",
+--	base02 = "@base02@",
+--	base03 = "@base03@",
+--	base04 = "@base04@",
+--	base05 = "@base05@",
+--	base06 = "@base06@",
+--	base07 = "@base07@",
+--	base08 = "@base08@",
+--	base09 = "@base09@",
+--	base0A = "@base0A@",
+--	base0B = "@base0B@",
+--	base0C = "@base0C@",
+--	base0D = "@base0D@",
+--	base0E = "@base0E@",
+--	base0F = "@base0F@"
+--}
 
 api.nvim_create_autocmd("vimenter", {
 	command = "highlight Normal guibg=NONE ctermbg=NONE"
@@ -74,6 +74,8 @@ opt.laststatus = 3                            -- Set global statusline
 opt.cursorline = true                         -- Highlight cursor screenline
 opt.cmdheight = 1                             -- Command entry line height
 opt.hlsearch = true                           -- Highlight matches with last search pattern
+vim.g.mapleader = " "
+vim.g.maplocalleader = ","
 
 -----------------------------------------------------------
 -- Tabs, indent
@@ -184,23 +186,22 @@ api.nvim_create_autocmd('BufWritePre', {
 	command = 'lua vim.lsp.buf.formatting_sync()'
 })
 
---[[
 -- neorg
 require('neorg').setup {
 	-- Tell Neorg what modules to load
 	load = {
 		['core.defaults'] = {}, -- Load all the default modules
-		['core.norg.concealer'] = {}, -- Allows for use of icons
-		['core.norg.dirman'] = { -- Manage your directories with Neorg
+		['core.concealer'] = {}, -- Allows for use of icons
+		['core.dirman'] = { -- Manage your directories with Neorg
 			config = {
-				engine = 'nvim-cmp',
 				workspaces = {
-					home = '~/neorg'
-				}
+					notes = '~/Notes',
+				},
+				default_workspace = "notes",
 			}
 		}
 	},
-}]]--
+}
 
 -- telescope
 local telescope = require('telescope.builtin')
@@ -298,7 +299,7 @@ require('bufferline').setup {
 	}
 }
 
-local barColor = base16.base00;
+--local barColor = base16.base00;
 
 local highlightItems = {
 	BufferLineFill = "bg",
@@ -310,13 +311,13 @@ local highlightItems = {
 
 local commandString = ""
 
-for item, ground in pairs(highlightItems) do
-	commandString = "highlight " .. item .. " cterm" .. ground .. "=" .. barColor .. " | " .. commandString
-end
+--for item, ground in pairs(highlightItems) do
+--	commandString = "highlight " .. item .. " cterm" .. ground .. "=" .. barColor .. " | " .. commandString
+--end
 
-api.nvim_create_autocmd("ColorScheme", {
-	command = commandString;
-})
+--api.nvim_create_autocmd("ColorScheme", {
+--	command = commandString;
+--})
 
 -- hop
 local hop = require('hop')
@@ -338,3 +339,5 @@ end, {remap=true})
 vim.keymap.set("", "F", function()
 	hop.hint_char1({ direction = directions.BEFORE_CURSOR, current_line_only = true })
 end, {remap=true})
+
+vim.cmd("colorscheme catppuccin-latte")