From bd2465d356f7c25eec81397cdef106bb900dcd36 Mon Sep 17 00:00:00 2001 From: kenji Date: Mon, 7 Jul 2025 18:20:12 -0500 Subject: [PATCH] test --- config.nix | 8 ++++-- flake.lock | 39 +++++++++++++++++++++++++++- flake.nix | 7 +++++ hosts/hakase/configuration.nix | 1 + modules/default/desktop.nix | 3 +++ modules/home/desktop.nix | 5 +++- packages/firefox/home.nix | 46 +++++++++++++++++---------------- packages/hyprland/home.nix | 4 +-- packages/quickshell/default.nix | 0 packages/quickshell/home.nix | 13 +++++++++- 10 files changed, 97 insertions(+), 29 deletions(-) create mode 100644 packages/quickshell/default.nix diff --git a/config.nix b/config.nix index 9b1cddc..1ab418e 100644 --- a/config.nix +++ b/config.nix @@ -7,7 +7,7 @@ general = { Terminal = { font = "JetBrainsMono Nerd Font"; - size = "12"; + size = "18"; shell = "fish"; # or zsh aliases = { }; @@ -32,7 +32,11 @@ ]; }; Hyprland = { - monitors = []; + monitors = [ + "DP-1, highres@165,0x1080,auto" + "DP-2, highres@highrr, 0x0,auto" + "HDMI-A-1, preferred, 20000x20000,1" + ]; }; Git = { user = ""; diff --git a/flake.lock b/flake.lock index 8c922be..9ca2c37 100644 --- a/flake.lock +++ b/flake.lock @@ -137,7 +137,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -276,6 +276,27 @@ "type": "github" } }, + "matugen": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1745334376, + "narHash": "sha256-GZAesQW51EwCEB9w5caxgi87LiAMhVfP6GqZmet9VZc=", + "owner": "InioX", + "repo": "Matugen", + "rev": "4619cca93513470dc2a1833d9a138297cbccaf2e", + "type": "github" + }, + "original": { + "owner": "InioX", + "repo": "Matugen", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -458,6 +479,7 @@ "darwin": "darwin", "flake-utils": "flake-utils", "home-manager": "home-manager", + "matugen": "matugen", "nixovim": "nixovim", "nixpkgs": "nixpkgs_3", "nur": "nur" @@ -497,6 +519,21 @@ } }, "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index 6038fc8..6ed3e07 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,13 @@ url = "git+https://git.sakamoto.dev/kenji/nixovim.git"; inputs.nixpkgs.follows = "nixpkgs"; }; + + matugen = { + url = "github:/InioX/Matugen"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + }; outputs = { diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix index b129db6..ea93733 100644 --- a/hosts/hakase/configuration.nix +++ b/hosts/hakase/configuration.nix @@ -13,6 +13,7 @@ environment.systemPackages = with pkgs; [ pavucontrol + wl-clipboard ]; users = { diff --git a/modules/default/desktop.nix b/modules/default/desktop.nix index 2c63c08..6be9853 100644 --- a/modules/default/desktop.nix +++ b/modules/default/desktop.nix @@ -1,2 +1,5 @@ { + imports = [ + ../../packages/steam/home.nix + ]; } diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index c8dbe7d..1a325b1 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -7,8 +7,11 @@ ../../packages/hyprland/home.nix ../../packages/hyprlock/home.nix ../../packages/hypridle/home.nix + ../../packages/rofi/home.nix + ../../packages/quickshell/home.nix - ../../packages/steam/home.nix ../../packages/mangohud/home.nix + + ../../packages/matugen/home.nix ]; } diff --git a/packages/firefox/home.nix b/packages/firefox/home.nix index 38a9596..16366a5 100644 --- a/packages/firefox/home.nix +++ b/packages/firefox/home.nix @@ -7,13 +7,31 @@ profiles = { hakase = { isDefault = true; - search.default = "DuckDuckGo"; + search.default = "ddg"; settings = { - "browser.startup.homepage" = "https://nixos.org"; + "browser.contentblocking.category" = "strict"; + "extensions.pocket.enabled" = false; + "extensions.screenshots.disabled" = true; + "browser.topsites.contile.enabled" = false; + "browser.formfill.enable" = false; + "browser.search.suggest.enabled" = false; + "browser.search.suggest.enabled.private" = false; + "browser.urlbar.suggest.searches" = false; + "browser.urlbar.showSearchSuggestionsFirst" = false; + "browser.newtabpage.activity-stream.feeds.section.topstories" = false; + "browser.newtabpage.activity-stream.feeds.snippets" = false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; + "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false; + "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false; + "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false; + "browser.newtabpage.activity-stream.showSponsored" = false; + "browser.newtabpage.activity-stream.system.showSponsored" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "browser.startup.homepage" = "https://dash.sakamoto.dev"; "browser.newtabpage.pinned" = [ { - title = "NixOS"; - url = "https://nixos.org"; + title = "Dashboard"; + url = "https://dash.sakamoto.dev"; } ]; }; @@ -21,27 +39,11 @@ force = true; settings = [ { - name = "wikipedia"; - tags = ["wiki"]; - keyword = "wiki"; - url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go"; - } - { - name = "kernel.org"; - url = "https://www.kernel.org"; - } - { - name = "Nix sites"; toolbar = true; bookmarks = [ { - name = "homepage"; - url = "https://nixos.org/"; - } - { - name = "wiki"; - tags = ["wiki" "nix"]; - url = "https://wiki.nixos.org/"; + name = "Home-manager"; + url = "https://mynixos.com/home-manager/options/programs"; } ]; } diff --git a/packages/hyprland/home.nix b/packages/hyprland/home.nix index ddcd927..6610b13 100644 --- a/packages/hyprland/home.nix +++ b/packages/hyprland/home.nix @@ -8,14 +8,14 @@ "$term" = "kitty --single-instance"; "$browser" = "firefox"; - monitor = myConfig.linux.hyprconf.Monitor; + monitor = myConfig.nixos.Hyprland.monitors; exec-once = [ "[workspace 20 silent] kitty --single-insance --hold fastfetch" "[workspace 20 silent] firefox" "[workspace 1] kitty --single-instance --hold fastfetch" "pkill gjs & ags run" - "matugen image /home/${myConfig.general.Username}/.config/nixos/assets/wallpapers/ultrawide-nixos-default.png" + "matugen image /home/${myConfig.essentials.Username}/.config/nixos/assets/wallpapers/ultrawide-nixos-default.png" "hyprctl setcursor Bibata-Original-Classic 24" "solaar -w hide" ]; diff --git a/packages/quickshell/default.nix b/packages/quickshell/default.nix new file mode 100644 index 0000000..e69de29 diff --git a/packages/quickshell/home.nix b/packages/quickshell/home.nix index 2c63c08..a678dad 100644 --- a/packages/quickshell/home.nix +++ b/packages/quickshell/home.nix @@ -1,2 +1,13 @@ -{ +{pkgs, ...}: let + caelestia-shell = pkgs.fetchFromGitea { + domain = "git.sakamoto.dev"; # Or your self-hosted instance, e.g., "codeberg.org" + owner = "kenji"; + repo = "caelestia-dots"; + rev = "main"; # Or a specific commit hash or tag like "v1.0" + hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; # !!! REPLACE THIS HASH !!! + }; +in { + home.file.".config/quickshell" = { + source = caelestia-shell; + }; }