diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock index db03436..20c0065 100644 --- a/dot_config/flake/flake.lock +++ b/dot_config/flake/flake.lock @@ -172,11 +172,11 @@ ] }, "locked": { - "lastModified": 1757809953, - "narHash": "sha256-29mlXbfAJhz9cWVrPP4STvVPDVZFCfCOmaIN5lFJa+Y=", + "lastModified": 1758119172, + "narHash": "sha256-LnVuGLf0PJHqqIHroxEzwXS57mjAdHSrXi0iODKbbiU=", "owner": "nix-community", "repo": "home-manager", - "rev": "17a10049486f6698fca32097d8f52c0c895542b0", + "rev": "9f408dc51c8e8216a94379e6356bdadbe8b4fef9", "type": "github" }, "original": { @@ -195,11 +195,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1757870947, - "narHash": "sha256-0N8w6SB6a68kWioFmlr+KfwfG44KVjPjJIBSQKNdNhE=", + "lastModified": 1758139056, + "narHash": "sha256-qS4VkDso0nc+UpGR+pWLMBrC14Dvbk1Q4ZC74Qx6r7M=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8e9b1a571399104e42d8fa5de6c28c63bff0c16a", + "rev": "2a84fdae04beddac03cbcaea8cfc05386dfb3bdc", "type": "github" }, "original": { @@ -228,11 +228,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1757832020, - "narHash": "sha256-SCdus7r4IS8l3jzF8mcMFMlDvACTdmDCcsPnGUEqll0=", + "lastModified": 1758135863, + "narHash": "sha256-r6u4eGvMECO7p1YRIcVFhhR/REwolaaVeafAhUIuLc0=", "owner": "YaLTeR", "repo": "niri", - "rev": "e6a8ad38479eb179dc7301755316f993e3e872ea", + "rev": "4808ba2b2055a09008be17d3e9eeae2d592b7b18", "type": "github" }, "original": { @@ -310,11 +310,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1757810152, - "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", + "lastModified": 1758070117, + "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a094440e02a699be5c57453a092a8baf569bdad", + "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d", "type": "github" }, "original": { @@ -388,11 +388,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1757810152, - "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", + "lastModified": 1758070117, + "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a094440e02a699be5c57453a092a8baf569bdad", + "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1757903079, - "narHash": "sha256-e4zqVdi0u4VmpmZ75vwDiYVWWyvqatRT0hCzsyR6DT0=", + "lastModified": 1758138010, + "narHash": "sha256-jZqB8XwznSnA7OshUR72OuYAmG0RLhPFQ8kjUzZpy8U=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "53d0c3943d58618538b0fd13d5484c5088fa12d7", + "rev": "85d7dc2506bfdc68d6fec8ce2ae6394ea79eabc7", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1756981260, - "narHash": "sha256-GhuD9QVimjynHI0OOyZsqJsnlXr2orowh9H+HYz4YMs=", + "lastModified": 1758006913, + "narHash": "sha256-lU00BAdiKAhm96M6o0AzBdZY6+bBSfB2a0zm4xJYl/U=", "owner": "outfoxxed", "repo": "quickshell", - "rev": "6eb12551baf924f8fdecdd04113863a754259c34", + "rev": "49646e4407fce5925920b178872ddd9f8e495218", "type": "github" }, "original": { diff --git a/dot_config/flake/home/helide/default.nix b/dot_config/flake/home/helide/default.nix index 1b2d460..d10b4cb 100644 --- a/dot_config/flake/home/helide/default.nix +++ b/dot_config/flake/home/helide/default.nix @@ -3,7 +3,7 @@ text = '' [manager] ratio = [0, 4, 0] - + [[input.prepend_keymap]] on = "" run = "close" @@ -57,6 +57,7 @@ xdg.configFile."helide/zellij_layout" = { text = '' + theme "ansi" layout { default_tab_template { pane size=1 borderless=true { @@ -84,7 +85,7 @@ ''; }; - home.shellAliases ={ + home.shellAliases = { helide = "zellij -l ~/.config/helide/zellij_layout"; }; } diff --git a/dot_config/flake/home/niri.nix b/dot_config/flake/home/niri.nix index 16df044..81b269c 100644 --- a/dot_config/flake/home/niri.nix +++ b/dot_config/flake/home/niri.nix @@ -14,27 +14,24 @@ in { noctalia inputs.quickshell.packages.${system}.default - xdg-desktop-portal-gtk - xdg-desktop-portal-gnome gnome-keyring mods.xwayland-satellite wlsunset ]; - xdg.portal = { - enable = true; - extraPortals = [pkgs.xdg-desktop-portal-gnome pkgs.xdg-desktop-portal-gtk]; - # wlr.enable = true; - config = { - niri = { - default = ["gnome" "gtk"]; - "org.freedesktop.impl.portal.Access" = ["gtk"]; - "org.freedesktop.impl.portal.Notification" = ["gtk"]; - "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"]; - }; - }; - }; + # xdg.portal = { + # enable = true; + # extraPortals = [pkgs.xdg-desktop-portal-gnome pkgs.xdg-desktop-portal-gtk]; + # config = { + # niri = { + # default = ["gnome" "gtk"]; + # "org.freedesktop.impl.portal.Access" = ["gtk"]; + # "org.freedesktop.impl.portal.Notification" = ["gtk"]; + # "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"]; + # }; + # }; + # }; home.shellAliases = { restart-shell = "${noctalia} kill && niri msg action spawn -- \"${noctalia}\""; @@ -43,6 +40,7 @@ in { programs.niri.settings = { cursor = { size = 12; + theme = "Adwaita"; }; # This config is in the KDL format: https://kdl.dev @@ -294,7 +292,7 @@ in { # // This line starts waybar, a commonly used bar for Wayland compositors. spawn-at-startup = [ - {argv = ["${noctalia}"];} + {argv = ["noctalia-shell"];} ]; # Uncomment this line to ask the clients to omit their client-side decorations if possible. diff --git a/dot_config/flake/machines/wash/configuration.nix b/dot_config/flake/machines/wash/configuration.nix index ff17462..0d65a10 100644 --- a/dot_config/flake/machines/wash/configuration.nix +++ b/dot_config/flake/machines/wash/configuration.nix @@ -125,7 +125,7 @@ pre-commit - unstable.vivaldi + unstable.jujutsu ]; fonts.packages = with pkgs; [ @@ -135,11 +135,6 @@ programs.nix-ld.enable = true; - services.desktopManager.cosmic.enable = true; - - # Install firefox. - programs.firefox.enable = true; - programs.fish.enable = true; programs.steam.enable = true; diff --git a/dot_config/flake/machines/wash/home.nix b/dot_config/flake/machines/wash/home.nix index 723c373..0766d49 100644 --- a/dot_config/flake/machines/wash/home.nix +++ b/dot_config/flake/machines/wash/home.nix @@ -20,14 +20,6 @@ in { ../../home/helide ]; - programs.firefox = { - profiles.tyler = { - userChrome = builtins.readFile (ff_gnome_theme + "/userChrome.css"); - userContent = builtins.readFile (ff_gnome_theme + "/userContent.css"); - extraConfig = builtins.readFile (ff_gnome_theme + "/configuration/user.js"); - }; - }; - home = { username = "tyler"; homeDirectory = "/home/tyler"; @@ -37,5 +29,21 @@ in { ]; stateVersion = "23.11"; + + file.".mozilla/firefox/default/chrome/firefox-gnome-theme" = { + source = ff_gnome_theme; + recursive = true; + }; + }; + + programs.firefox = { + enable = true; + profiles.default = { + name = "default"; + userChrome = '' + @import "firefox-gnome-theme/userChrome.css"; + @import "firefox-gnome-theme/theme/colors/dark.css"; + ''; + }; }; }