diff --git a/flake.lock b/flake.lock index 4311a84..e91d882 100644 --- a/flake.lock +++ b/flake.lock @@ -825,11 +825,11 @@ }, "nur": { "locked": { - "lastModified": 1728769516, - "narHash": "sha256-pAN1uxvHwCVU6gNiNxI08BKM8+feS3rSLqbECkHp9LI=", + "lastModified": 1728792359, + "narHash": "sha256-aXIK4Tat912rwK01FLeOoE0rrbZD8Q+KJb/SgW1WHUc=", "owner": "nix-community", "repo": "NUR", - "rev": "2783ec9ab9ea630d8f7657bee76cef81e0c125e6", + "rev": "120a1adeb88d528d494bb0bad3572683716ff03d", "type": "github" }, "original": { diff --git a/glasshouse-desktop/home/default.nix b/glasshouse-desktop/home/default.nix index 63402df..d5ea85c 100644 --- a/glasshouse-desktop/home/default.nix +++ b/glasshouse-desktop/home/default.nix @@ -2,21 +2,21 @@ { imports = - [ (import ./btop.nix) ] - ++ [ (import ./bat.nix) ] - ++ [ (import ./firefox.nix) ] - ++ [ (import ./cava.nix) ] - ++ [ (import ./fuzzel.nix) ] - ++ [ (import ./gtk.nix) ] - ++ [ (import ./hyprland) ] - ++ [ (import ./kitty.nix) ] - ++ [ (import ./spicetify.nix) ] - ++ [ (import ./starship.nix) ] - ++ [ (import ./scripts) ] - ++ [ (import ./yazi.nix) ] - ++ [ (import ./swaync/swaync.nix)] - ++ [ (import ./userpkgs.nix) ] - ++ [ (import ./waybar) ] - ++ [ (import ./eza.nix) ] - ++ [ (import ./zshell.nix) ]; + [ (import ./btop.nix) ] + ++ [ (import ./bat.nix) ] + ++ [ (import ./firefox/firefox.nix) ] + ++ [ (import ./cava.nix) ] + ++ [ (import ./fuzzel.nix) ] + ++ [ (import ./gtk.nix) ] + ++ [ (import ./hyprland) ] + ++ [ (import ./kitty.nix) ] + ++ [ (import ./spicetify.nix) ] + ++ [ (import ./starship.nix) ] + ++ [ (import ./scripts) ] + ++ [ (import ./yazi.nix) ] + ++ [ (import ./swaync/swaync.nix) ] + ++ [ (import ./userpkgs.nix) ] + ++ [ (import ./waybar) ] + ++ [ (import ./eza.nix) ] + ++ [ (import ./zshell.nix) ]; } diff --git a/glasshouse-desktop/home/firefox.nix b/glasshouse-desktop/home/firefox.nix deleted file mode 100644 index 5e63ea7..0000000 --- a/glasshouse-desktop/home/firefox.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ nur, username, ... }: - -{ - programs.firefox = { - enable = true; - profiles.${username} = { - name = "${username}"; - isDefault = true; - bookmarks = [ - { name = "NixOS Options"; - url = "https://search.nixos.org/options"; - } - { name = "Home Manager Options"; - url = "https://home-manager-options.extranix.com/"; - } - { name = "Nixvim Docs"; - url = "https://nix-community.github.io/nixvim/"; - } - { name = "Rust Manual"; - url = "https://doc.rust-lang.org/book/ch01-03-hello-cargo.html"; - } - { name = "ChatGPT"; - url = "https://chatgpt.com/"; - } - { name = "DataAnnotation"; - url = "https://app.dataannotation.tech/users/sign_in"; - } - { name = "Nerd Fonts Cheatsheet"; - url = "https://www.nerdfonts.com/cheat-sheet"; - } - ]; - extensions = with nur.repos.rycee.firefox-addons; [ - darkreader - adnauseam - cookie-autodelete - disconnect - vimium - firenvim - privacy-badger - ]; - settings = { - "extensions.autoDisableScopes" = 0; - "browser.startup.homepage" = "https://nixos.org"; - }; - }; - }; -} diff --git a/glasshouse-desktop/home/firefox/firefox.nix b/glasshouse-desktop/home/firefox/firefox.nix new file mode 100644 index 0000000..ef2b86a --- /dev/null +++ b/glasshouse-desktop/home/firefox/firefox.nix @@ -0,0 +1,92 @@ +{ nur, username, self, ... }: + +{ + programs.firefox = { + enable = true; + policies = { + DisableTelemetry = true; + DisableFirefoxStudies = true; + EnableTrackingProtection = { + Value= true; + Locked = true; + Cryptomining = true; + Fingerprinting = true; + }; + DisablePocket = true; + DisableFirefoxAccounts = true; + DisableAccounts = true; + DisableFirefoxScreenshots = true; + OverrideFirstRunPage = ""; + OverridePostUpdatePage = ""; + DontCheckDefaultBrowser = true; + DisplayBookmarksToolbar = "always"; # alternatives: "always" or "newtab" + DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" + SearchBar = "unified"; # alternative: "separate" isDefault = true; + }; + profiles.${username} = { + name = "${username}"; + bookmarks = [ + { name = "NixOS Options"; + url = "https://search.nixos.org/options"; + } + { name = "Home Manager Options"; + url = "https://home-manager-options.extranix.com/"; + } + { name = "Nixvim Docs"; + url = "https://nix-community.github.io/nixvim/"; + } + { name = "Rust Manual"; + url = "https://doc.rust-lang.org/book/ch01-03-hello-cargo.html"; + } + { name = "ChatGPT"; + url = "https://chatgpt.com/"; + } + { name = "DataAnnotation"; + url = "https://app.dataannotation.tech/users/sign_in"; + } + { name = "Nerd Fonts Cheatsheet"; + url = "https://www.nerdfonts.com/cheat-sheet"; + } + ]; + extensions = with nur.repos.rycee.firefox-addons; [ + darkreader + adnauseam + cookie-autodelete + disconnect + firefox-color + vimium + firenvim + privacy-badger + new-tab-override + tampermonkey + ]; + extraConfig = '' + "browser.startup.homepage" = "${self}/glasshouse-desktop/home/firefox/homepage.html"; + "browser.active_color" = "#EE0000"; + "browser.active_color.dark" = "#FF6666"; + "browser.anchor_color" = "#0000EE"; + "browser.anchor_color.dark" = "#8C8CFF"; + "browser.display.background_color" = "#FFFFFF"; + "browser.display.background_color.dark" = "#1C1B22"; + "browser.display.document_color_use" = "1"; + "browser.display.foreground_color" = "#000000"; + "browser.display.foreground_color.dark" = "#FBFBFE"; + "browser.display.suppress_canvas_background_image_on_forced_colors" = "true"; + "browser.display.use_system_colors" = "false"; + "browser.newtabpage.activity-stream.newNewtabExperience.colors" = "#0090ED,#FF4F5F,#2AC3A2,#FF7139,#A172FF,#FFA437,#FF2A8A"; + "browser.theme.colorway-closet" = "true"; + "browser.theme.colorway-migration" = "true"; + "browser.theme.windows.accent-color-in-tabs.enabled" = "false"; + "browser.visited_color" = "#551A8B"; + "browser.visited_color.dark" = "#FFADFF"; + "browser.newtabpage.pinned" = [{ + title = "Homepage"; + url = "${self}/glasshouse-desktop/home/firefox/homepage.html"; + }]; + "devtools.defaultColorUnit" = "authored"; + "editor.background_color" = "#FFFFFF"; + "editor.use_custom_colors" = "false"; + ''; + }; + }; +} diff --git a/glasshouse-desktop/home/firefox/index.html b/glasshouse-desktop/home/firefox/index.html new file mode 100644 index 0000000..44ef0ed --- /dev/null +++ b/glasshouse-desktop/home/firefox/index.html @@ -0,0 +1,77 @@ + + + + + + My Homepage + + + +
+
+ GitHub + YouTube + ChatGPT + Data Annotation +
+ +
+ +
+
+ + + + diff --git a/glasshouse-desktop/home/scripts/compress.nix b/glasshouse-desktop/home/scripts/commands/compress.nix similarity index 100% rename from glasshouse-desktop/home/scripts/compress.nix rename to glasshouse-desktop/home/scripts/commands/compress.nix diff --git a/glasshouse-desktop/home/scripts/crs.nix b/glasshouse-desktop/home/scripts/commands/crs.nix similarity index 100% rename from glasshouse-desktop/home/scripts/crs.nix rename to glasshouse-desktop/home/scripts/commands/crs.nix diff --git a/glasshouse-desktop/home/scripts/extract.nix b/glasshouse-desktop/home/scripts/commands/extract.nix similarity index 100% rename from glasshouse-desktop/home/scripts/extract.nix rename to glasshouse-desktop/home/scripts/commands/extract.nix diff --git a/glasshouse-desktop/home/scripts/invoke.nix b/glasshouse-desktop/home/scripts/commands/invoke.nix similarity index 100% rename from glasshouse-desktop/home/scripts/invoke.nix rename to glasshouse-desktop/home/scripts/commands/invoke.nix diff --git a/glasshouse-desktop/home/scripts/keybinds.nix b/glasshouse-desktop/home/scripts/commands/keybinds.nix similarity index 100% rename from glasshouse-desktop/home/scripts/keybinds.nix rename to glasshouse-desktop/home/scripts/commands/keybinds.nix diff --git a/glasshouse-desktop/home/scripts/mcd.nix b/glasshouse-desktop/home/scripts/commands/mcd.nix similarity index 100% rename from glasshouse-desktop/home/scripts/mcd.nix rename to glasshouse-desktop/home/scripts/commands/mcd.nix diff --git a/glasshouse-desktop/home/scripts/runbg.nix b/glasshouse-desktop/home/scripts/commands/runbg.nix similarity index 100% rename from glasshouse-desktop/home/scripts/runbg.nix rename to glasshouse-desktop/home/scripts/commands/runbg.nix diff --git a/glasshouse-desktop/home/scripts/s_check.nix b/glasshouse-desktop/home/scripts/commands/s_check.nix similarity index 100% rename from glasshouse-desktop/home/scripts/s_check.nix rename to glasshouse-desktop/home/scripts/commands/s_check.nix diff --git a/glasshouse-desktop/home/scripts/splash.nix b/glasshouse-desktop/home/scripts/commands/splash.nix similarity index 100% rename from glasshouse-desktop/home/scripts/splash.nix rename to glasshouse-desktop/home/scripts/commands/splash.nix diff --git a/glasshouse-desktop/home/scripts/default.nix b/glasshouse-desktop/home/scripts/default.nix index 7713498..1d4ff99 100644 --- a/glasshouse-desktop/home/scripts/default.nix +++ b/glasshouse-desktop/home/scripts/default.nix @@ -1,56 +1,56 @@ { self, pkgs, ... }: let - compress = (import ./compress.nix { self = self; pkgs = pkgs;}); - crs = (import ./crs.nix { self = self; pkgs = pkgs;}); - extract = (import ./extract.nix { self = self; pkgs = pkgs;}); - garbage-collect = (import ./garbage-collect.nix { self = self; pkgs = pkgs;}); - homep = (import ./homep.nix { self = self; pkgs = pkgs;}); - homer = (import ./homer.nix { self = self; pkgs = pkgs;}); - invoke = (import ./invoke.nix { self = self; pkgs = pkgs;}); - lofi = (import ./lofi.nix { self = self; pkgs = pkgs;}); - mcd = (import ./mcd.nix { self = self; pkgs = pkgs;}); - music = (import ./music.nix { self = self; pkgs = pkgs;}); - nixcommit = (import ./nixcommit.nix { self = self; pkgs = pkgs;}); - nixp = (import ./nixp.nix { self = self; pkgs = pkgs;}); - nixr = (import ./nixr.nix { self = self; pkgs = pkgs;}); - nixswitch = (import ./nixswitch.nix { self = self; pkgs = pkgs;}); - nsp = (import ./nsp.nix { self = self; pkgs = pkgs;}); - runbg = (import ./runbg.nix { self = self; pkgs = pkgs;}); - scheck = (import ./s_check.nix { self = self; pkgs = pkgs;}); - shutdown-script = (import ./shutdown-script.nix { self = self; pkgs = pkgs;}); - splash = (import ./splash.nix { self = self; pkgs = pkgs;}); - switchmon = (import ./switchmon.nix { self = self; pkgs = pkgs;}); - toggle_blur = (import ./toggle_blur.nix { self = self; pkgs = pkgs;}); - toggle_float = (import ./toggle_float.nix { self = self; pkgs = pkgs;}); - toggle_oppacity = (import ./toggle_oppacity.nix { self = self; pkgs = pkgs;}); - toggle_waybar = (import ./toggle_waybar.nix { self = self; pkgs = pkgs;}); + compress = (import ./commands/compress.nix { self = self; pkgs = pkgs;}); + crs = (import ./commands/crs.nix { self = self; pkgs = pkgs;}); + extract = (import ./commands/extract.nix { self = self; pkgs = pkgs;}); + invoke = (import ./commands/invoke.nix { self = self; pkgs = pkgs;}); + splash = (import ./commands/splash.nix { self = self; pkgs = pkgs;}); + scheck = (import ./commands/s_check.nix { self = self; pkgs = pkgs;}); + runbg = (import ./commands/runbg.nix { self = self; pkgs = pkgs;}); + mcd = (import ./commands/mcd.nix { self = self; pkgs = pkgs;}); + garbage-collect = (import ./nix/garbage-collect.nix { self = self; pkgs = pkgs;}); + homep = (import ./nix/homep.nix { self = self; pkgs = pkgs;}); + homer = (import ./nix/homer.nix { self = self; pkgs = pkgs;}); + nsp = (import ./nix/nsp.nix { self = self; pkgs = pkgs;}); + nixswitch = (import ./nix/nixswitch.nix { self = self; pkgs = pkgs;}); + nixr = (import ./nix/nixr.nix { self = self; pkgs = pkgs;}); + nixp = (import ./nix/nixp.nix { self = self; pkgs = pkgs;}); + nixcommit = (import ./nix/nixcommit.nix { self = self; pkgs = pkgs;}); + lofi = (import ./wm-controls/lofi.nix { self = self; pkgs = pkgs;}); + music = (import ./wm-controls/music.nix { self = self; pkgs = pkgs;}); + shutdown-script = (import ./wm-controls/shutdown-script.nix { self = self; pkgs = pkgs;}); + switchmon = (import ./wm-controls/switchmon.nix { self = self; pkgs = pkgs;}); + toggle_blur = (import ./wm-controls/toggle_blur.nix { self = self; pkgs = pkgs;}); + toggle_float = (import ./wm-controls/toggle_float.nix { self = self; pkgs = pkgs;}); + toggle_oppacity = (import ./wm-controls/toggle_oppacity.nix { self = self; pkgs = pkgs;}); + toggle_waybar = (import ./wm-controls/toggle_waybar.nix { self = self; pkgs = pkgs;}); in { home.packages = [ - splash - nixswitch - garbage-collect - mcd + compress crs - nixcommit + extract + garbage-collect + homep + homer invoke - nsp + lofi + mcd + music + nixcommit nixp nixr - homep - scheck - homer + nixswitch + nsp runbg - music - lofi + scheck + shutdown-script + splash switchmon toggle_blur toggle_float toggle_oppacity toggle_waybar - compress - extract - shutdown-script ]; } diff --git a/glasshouse-desktop/home/scripts/garbage-collect.nix b/glasshouse-desktop/home/scripts/nix/garbage-collect.nix similarity index 100% rename from glasshouse-desktop/home/scripts/garbage-collect.nix rename to glasshouse-desktop/home/scripts/nix/garbage-collect.nix diff --git a/glasshouse-desktop/home/scripts/homep.nix b/glasshouse-desktop/home/scripts/nix/homep.nix similarity index 100% rename from glasshouse-desktop/home/scripts/homep.nix rename to glasshouse-desktop/home/scripts/nix/homep.nix diff --git a/glasshouse-desktop/home/scripts/homer.nix b/glasshouse-desktop/home/scripts/nix/homer.nix similarity index 100% rename from glasshouse-desktop/home/scripts/homer.nix rename to glasshouse-desktop/home/scripts/nix/homer.nix diff --git a/glasshouse-desktop/home/scripts/nixcommit.nix b/glasshouse-desktop/home/scripts/nix/nixcommit.nix similarity index 100% rename from glasshouse-desktop/home/scripts/nixcommit.nix rename to glasshouse-desktop/home/scripts/nix/nixcommit.nix diff --git a/glasshouse-desktop/home/scripts/nixp.nix b/glasshouse-desktop/home/scripts/nix/nixp.nix similarity index 100% rename from glasshouse-desktop/home/scripts/nixp.nix rename to glasshouse-desktop/home/scripts/nix/nixp.nix diff --git a/glasshouse-desktop/home/scripts/nixr.nix b/glasshouse-desktop/home/scripts/nix/nixr.nix similarity index 100% rename from glasshouse-desktop/home/scripts/nixr.nix rename to glasshouse-desktop/home/scripts/nix/nixr.nix diff --git a/glasshouse-desktop/home/scripts/nixswitch.nix b/glasshouse-desktop/home/scripts/nix/nixswitch.nix similarity index 100% rename from glasshouse-desktop/home/scripts/nixswitch.nix rename to glasshouse-desktop/home/scripts/nix/nixswitch.nix diff --git a/glasshouse-desktop/home/scripts/nsp.nix b/glasshouse-desktop/home/scripts/nix/nsp.nix similarity index 100% rename from glasshouse-desktop/home/scripts/nsp.nix rename to glasshouse-desktop/home/scripts/nix/nsp.nix diff --git a/glasshouse-desktop/home/scripts/lofi.nix b/glasshouse-desktop/home/scripts/wm-controls/lofi.nix similarity index 100% rename from glasshouse-desktop/home/scripts/lofi.nix rename to glasshouse-desktop/home/scripts/wm-controls/lofi.nix diff --git a/glasshouse-desktop/home/scripts/music.nix b/glasshouse-desktop/home/scripts/wm-controls/music.nix similarity index 100% rename from glasshouse-desktop/home/scripts/music.nix rename to glasshouse-desktop/home/scripts/wm-controls/music.nix diff --git a/glasshouse-desktop/home/scripts/power-menu.nix b/glasshouse-desktop/home/scripts/wm-controls/power-menu.nix similarity index 100% rename from glasshouse-desktop/home/scripts/power-menu.nix rename to glasshouse-desktop/home/scripts/wm-controls/power-menu.nix diff --git a/glasshouse-desktop/home/scripts/shutdown-script.nix b/glasshouse-desktop/home/scripts/wm-controls/shutdown-script.nix similarity index 100% rename from glasshouse-desktop/home/scripts/shutdown-script.nix rename to glasshouse-desktop/home/scripts/wm-controls/shutdown-script.nix diff --git a/glasshouse-desktop/home/scripts/switchmon.nix b/glasshouse-desktop/home/scripts/wm-controls/switchmon.nix similarity index 100% rename from glasshouse-desktop/home/scripts/switchmon.nix rename to glasshouse-desktop/home/scripts/wm-controls/switchmon.nix diff --git a/glasshouse-desktop/home/scripts/toggle_blur.nix b/glasshouse-desktop/home/scripts/wm-controls/toggle_blur.nix similarity index 100% rename from glasshouse-desktop/home/scripts/toggle_blur.nix rename to glasshouse-desktop/home/scripts/wm-controls/toggle_blur.nix diff --git a/glasshouse-desktop/home/scripts/toggle_float.nix b/glasshouse-desktop/home/scripts/wm-controls/toggle_float.nix similarity index 100% rename from glasshouse-desktop/home/scripts/toggle_float.nix rename to glasshouse-desktop/home/scripts/wm-controls/toggle_float.nix diff --git a/glasshouse-desktop/home/scripts/toggle_oppacity.nix b/glasshouse-desktop/home/scripts/wm-controls/toggle_oppacity.nix similarity index 100% rename from glasshouse-desktop/home/scripts/toggle_oppacity.nix rename to glasshouse-desktop/home/scripts/wm-controls/toggle_oppacity.nix diff --git a/glasshouse-desktop/home/scripts/toggle_waybar.nix b/glasshouse-desktop/home/scripts/wm-controls/toggle_waybar.nix similarity index 100% rename from glasshouse-desktop/home/scripts/toggle_waybar.nix rename to glasshouse-desktop/home/scripts/wm-controls/toggle_waybar.nix diff --git a/glasshouse-desktop/home/userpkgs.nix b/glasshouse-desktop/home/userpkgs.nix index 144963e..5fdaaf3 100644 --- a/glasshouse-desktop/home/userpkgs.nix +++ b/glasshouse-desktop/home/userpkgs.nix @@ -36,5 +36,6 @@ in ripgrep nvim toilet + python3 ]; } diff --git a/glasshouse-desktop/sys/packages.nix b/glasshouse-desktop/sys/packages.nix index aecbf92..1a7ec54 100644 --- a/glasshouse-desktop/sys/packages.nix +++ b/glasshouse-desktop/sys/packages.nix @@ -68,5 +68,6 @@ wl-clipboard xpad libnotify + file ]; } diff --git a/media/wallpapers/catppuccin/nixos-catppuccin.png b/media/wallpapers/catppuccin/nixos-catppuccin.png new file mode 100644 index 0000000..aa0e2ab Binary files /dev/null and b/media/wallpapers/catppuccin/nixos-catppuccin.png differ diff --git a/media/wallpapers/catppuccin/nixos_blue.png b/media/wallpapers/catppuccin/nixos_blue.png new file mode 100644 index 0000000..f95719b Binary files /dev/null and b/media/wallpapers/catppuccin/nixos_blue.png differ