diff --git a/README.md b/README.md index 65ebec2..e1f925b 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ This is my dotfiles repo. It's a work in progress, and I'm still learning how to - Notifications: dunst - Launcher: wofi - DM: Tuigreet +- Secrets: sops-nix # Themes & Colors diff --git a/home/home.nix b/home/home.nix index 989aa8c..8cb72e1 100644 --- a/home/home.nix +++ b/home/home.nix @@ -3,6 +3,7 @@ imports = [ ./hyprland ./nvim + ./homepage ./waybar ./kitty ./dunst @@ -33,6 +34,7 @@ obsidian btop xfce.thunar + bitwarden # Dev go diff --git a/home/homepage/default.nix b/home/homepage/default.nix index 0db3279..8e19992 100644 --- a/home/homepage/default.nix +++ b/home/homepage/default.nix @@ -1,3 +1,295 @@ -{ +{ config, ... }: +let + bookmarks = '' + Bookmarks: [ + {text: "MyNixOs", url: "https://mynixos.com", icon: "󱄅"}, + {text: "Github", url: "https://github.com", icon: ""}, + {text: "Proton", url: "https://mail.proton.me/u/0/inbox", icon: ""}, + {text: "Cloudflare One", url: "https://one.dash.cloudflare.com/", icon: ""}, + {text: "Chat GPT", url: "https://chat.openai.com/", icon: "󰭹"}, + {text: "Nixvim", url: "https://nix-community.github.io/nixvim/", icon: "󰭹"}, + {text: "Hyprland Wiki", url: "https://wiki.hyprland.org/", icon: "󰖬"}, + {text: "Nerdfont", url: "https://www.nerdfonts.com/cheat-sheet", icon: ""}, + ], + Home: [ + {text: "Casa", url: "http://192.168.2.16:8081/#/", icon: "󰋜"}, + {text: "Plex", url: "http://192.168.2.16:32400", icon: "󰚺"}, + {text: "Nextcloud", url: "http://192.168.2.16:10081", icon: ""}, + ], + Work: [ + {text: "Outlook", url: "https://outlook.office.com/mail/", icon: "󰴢"}, + {text: "Office", url: "https://www.office.com/?auth=2", icon: "󰏆"}, + {text: "Teams", url: "https://teams.microsoft.com/_", icon: "󰊻"}, + ], + ''; +in { + xdg.configFile."startpage/index.html".text = '' + + + + + + + Homepage + + + + +
+
+

+

+
+
+

+
+ +
+ + + + + ''; } diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 951257c..05874b2 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -33,7 +33,7 @@ "$powermenu" = "${pkgs.wlogout}/bin/wlogout"; exec-once = - [ "${pkgs.hypridle}/bin/hypridle" "${pkgs.hyprpaper}/bin/hyprpaper" ]; + [ "${pkgs.hypridle}/bin/hypridle" "${pkgs.hyprpaper}/bin/hyprpaper" "${pkgs.bitwarden}/bin/bitwarden" ]; monitor = [ "eDP-2,highres,0x0,1" diff --git a/home/nvim/lsp.nix b/home/nvim/lsp.nix index ba62a7c..3a9f8ca 100644 --- a/home/nvim/lsp.nix +++ b/home/nvim/lsp.nix @@ -9,6 +9,7 @@ gopls.enable = true; nixd.enable = true; tailwindcss.enable = true; + html.enable = true; }; keymaps.lspBuf = { "gd" = "definition"; diff --git a/home/nvim/none-ls.nix b/home/nvim/none-ls.nix index 2976768..b4eaac5 100644 --- a/home/nvim/none-ls.nix +++ b/home/nvim/none-ls.nix @@ -11,6 +11,7 @@ goimports.enable = true; nixfmt.enable = true; markdownlint.enable = true; + tidy.enable = true; }; }; }; diff --git a/home/nvim/treesitter.nix b/home/nvim/treesitter.nix index 633e7bf..eeb2e23 100644 --- a/home/nvim/treesitter.nix +++ b/home/nvim/treesitter.nix @@ -6,6 +6,5 @@ indent = true; }; treesitter-context.enable = true; - rainbow-delimiters.enable = true; }; } diff --git a/home/qutebrowser/default.nix b/home/qutebrowser/default.nix index a59fd11..b518c8a 100644 --- a/home/qutebrowser/default.nix +++ b/home/qutebrowser/default.nix @@ -1,4 +1,7 @@ -{ config, ... }: { +{ config, ... }: +let + +in { imports = [ ./duckduckgo-colorscheme.nix ]; @@ -10,16 +13,33 @@ "d" = "https://duckduckgo.com/?q={}&ia=web"; "g" = "https://google.com/search?q={}"; "y" = "https://youtube.com/results?search_query={}"; + "ya" = "https://yandex.com/search/?text={}"; "n" = "https://mynixos.com/search?q={}"; "nixo" = "https://search.nixos.org/options?channel=unstable&query={}"; "nixp" = "https://search.nixos.org/packages?channel=unstable&query={}"; }; - settings = { + quickmarks = { + mynixos = "https://mynixos.com"; + github = "https://github.com"; + outlook = "https://outlook.office.com/mail/"; + office = "https://www.office.com/?auth=2"; + teams = "https://teams.microsoft.com/_"; + casa = "http://192.168.2.16:8081/#/"; + proton = "https://mail.proton.me/u/0/inbox"; + cloudflare-one = "https://one.dash.cloudflare.com/"; + chatgpt = "https://chat.openai.com/"; + nixvim = "https://nix-community.github.io/nixvim/"; + hyprland = "https://wiki.hyprland.org/"; + nerdfont = "https://www.nerdfonts.com/cheat-sheet"; + }; + settings = { url = { - default_page = "https://duckduckgo.com"; - start_pages = [ "https://duckduckgo.com" ]; + default_page = + "${config.home.homeDirectory}/.config/startpage/index.html"; + start_pages = + [ "${config.home.homeDirectory}/.config/startpage/index.html" ]; }; colors = { @@ -91,7 +111,7 @@ }; }; - fonts = { default_family = "#${config.theme.font}"; }; + fonts = { default_family = "${config.theme.font}"; }; completion = { height = "30%"; @@ -117,28 +137,6 @@ remove_finished = 0; }; - fileselect = { - handler = "external"; - multiple_files.command = [ - "alacritty" - "--embed" - "$(xdotool getactivewindow)" - "-e" - "lf" - "-selection-path" - "{}" - ]; - single_file.command = [ - "alacritty" - "--embed" - "$(xdotool getactivewindow)" - "-e" - "lf" - "-selection-path" - "{}" - ]; - }; - hints = { border = "none"; radius = 1; @@ -149,11 +147,6 @@ smooth = true; }; - statusbar = { - show = "never"; - widgets = [ ]; - }; - tabs = { show = "multiple"; last_close = "close"; @@ -197,32 +190,6 @@ "" = "tab-focus 8"; "" = "tab-focus 9"; "" = "tab-focus 10"; - - "gtb" = "open https://github.com/noib3"; - "ttb" = "open -t https://github.com/noib3"; - - "gma" = "open https://mail.protonmail.com/inbox"; - "tma" = "open -t https://mail.protonmail.com/inbox"; - - "gkp" = "open https://keep.google.com"; - "tkp" = "open -t https://keep.google.com"; - - "grhm" = - "open https://github.com/nix-community/home-manager/find/master"; - "trhm" = - "open -t https://github.com/nix-community/home-manager/find/master"; - - "gnv" = "open https://github.com/neovim/neovim/tree/master/src/nvim"; - "tnv" = "open -t https://github.com/neovim/neovim/tree/master/src/nvim"; - - "gbg" = "open https://rarbgunblocked.org/torrents.php"; - "tbg" = "open -t https://rarbgunblocked.org/torrents.php"; - - "g12ft" = "open https://12ft.io/"; - "t12ft" = "open -t https://12ft.io/"; - - "gtra" = "open http://localhost:9091/transmission/web/"; - "ttra" = "open -t http://localhost:9091/transmission/web/"; }; command = { diff --git a/home/qutebrowser/duckduckgo-colorscheme.nix b/home/qutebrowser/duckduckgo-colorscheme.nix index d054e5a..b955337 100644 --- a/home/qutebrowser/duckduckgo-colorscheme.nix +++ b/home/qutebrowser/duckduckgo-colorscheme.nix @@ -24,7 +24,7 @@ }); }; - alert('The GitHub Dark theme will be applied.'); + alert('The Nixy theme will be applied.'); // Call set cookies, passing in formated cookie data setCookies(cookieToJSON(cookie));