Add deno and remove forgejo origin from jj because it causes issues when the origin doesn't exist yet

Unfortunately no beautyline, as I think beautyline only has a raster image and plasma only seems to like vector images (maybe? who knows)

.gitignore

@@ -0,0 +1 @@
+./secrets.nix

flake.lock

@@ -25,11 +25,11 @@
       },
       "locked": {
         "dir": "/pkgs/firefox-addons",
-        "lastModified": 1732479769,
+        "lastModified": 1733087703,
-        "narHash": "sha256-barZy95JsQt4G9EDZ7RNrjgTneelXXfSzRLJJvokjsI=",
+        "narHash": "sha256-WKdLy5t8SH9HBtajC8BZb+V4n0FaP71aUUYLuku46Rk=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "80bf66046d8b8624c5991a0c8e512b211acce2b2",
+        "rev": "d4cbff4dda07726005224b33cf2cc5dc4a2c4211",
         "type": "gitlab"
       },
       "original": {
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732497628,
+        "lastModified": 1732670254,
-        "narHash": "sha256-r6vHlGeHoG51e9c77V5wadv6tnBD8bQnzTspH0Hn/3A=",
+        "narHash": "sha256-5z4pN4FnhZ/LedFrMmEhzCqFORd2cj227Jm1I2Lj4Zg=",
         "owner": "nix-community",
         "repo": "flake-firefox-nightly",
-        "rev": "60ff5970ff90ef231cf8ecc140ea269fb5df2a11",
+        "rev": "c7eb601bd2d36aa4b9b6cdddc5793a36d77c0f06",
         "type": "github"
       },
       "original": {
@@ -152,11 +152,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732482255,
+        "lastModified": 1733085484,
-        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
+        "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
+        "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732014248,
+        "lastModified": 1732837521,
-        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
+        "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
+        "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
         "type": "github"
       },
       "original": {
@@ -239,11 +239,11 @@
     },
     "nixpkgs-24-11": {
       "locked": {
-        "lastModified": 1732350895,
+        "lastModified": 1732981179,
-        "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=",
+        "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3",
+        "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
         "type": "github"
       },
       "original": {
@@ -278,11 +278,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732465698,
+        "lastModified": 1733005589,
-        "narHash": "sha256-xiue+Kj2Jm8PwyZQcHl4CaYmMIgo5oi37hVHqiw2Unk=",
+        "narHash": "sha256-NAym0oWYwKgFuAif6Z7HacU6Su/SJNTW4wEYC5urSYU=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "16d65cd02b5de665d1bcfec1616c02c71a1014a6",
+        "rev": "88ca377ff58b5c30a2879745829842554d4b21d5",
         "type": "github"
       },
       "original": {
@@ -363,11 +363,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732499683,
+        "lastModified": 1733104664,
-        "narHash": "sha256-Hw95rpgNiyAL4v9pJF2756PMud6O0p/1XQixs5f/Shk=",
+        "narHash": "sha256-UhlyYYO84s36aSj0/xZdclY6CgwJSWPYtTHTOBuHodM=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "b376bfa567fd25f9f22b6f51ffaa4f84d0b7c72f",
+        "rev": "e3a9b717e8327886d4ab6115f6989f4d1ef44e51",
         "type": "github"
       },
       "original": {

flake.nix

@@ -48,6 +48,7 @@
     outputs = inputs@{ nixpkgs, home-manager, plasma-manager, ... }: let
         system = "x86_64-linux";
         pkgs = nixpkgs.legacyPackages.${system};
+        secrets = import ./secrets.nix;
     in {
         nixosConfigurations.ty-nixos = nixpkgs.lib.nixosSystem {
             inherit system;
@@ -61,7 +62,7 @@
             ];
 
             specialArgs = {
-                inherit inputs system;
+                inherit inputs system secrets;
             };
         };
 
@@ -77,7 +78,7 @@
             ];
 
             extraSpecialArgs = {
-                inherit inputs system;
+                inherit inputs system secrets;
             };
         };
     };

home-manager/default.nix

@@ -1,12 +1,12 @@
-{ inputs, system, ... }:
+{ inputs, system, secrets, ... }:
 {
     home-manager.useGlobalPkgs = true;
     home-manager.useUserPackages = true;
     home-manager.sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
     home-manager.extraSpecialArgs = {
-        inherit inputs;
+        inherit inputs system secrets;
-        inherit system;
     };
+    home-manager.backupFileExtension = "backup";
 
     home-manager.users.ty = {
         imports = [

home-manager/home.nix

@@ -16,5 +16,6 @@
         ./modules/vscode.nix
         ./modules/desktop.nix
         ./modules/gtk.nix
+        ./modules/beets.nix
     ];
 }

home-manager/modules/accounts/email.nix

@@ -1,10 +1,10 @@
 { ... }:
 {
     accounts.email.accounts = {
-        PurelyMail = {
+        PurelyMail = rec {
             realName = "Tyler Beckman";
             address = "ty@myriation.xyz";
-            userName = "ty@myriation.xyz";
+            userName = address;
             primary = true;
 
             folders = {
@@ -40,5 +40,43 @@
 
             thunderbird.enable = true;
         };
+
+        Gmail = rec {
+            realName = "Tyler Beckman";
+            address = "tbeckman530@gmail.com";
+            userName = address;
+            flavor = "gmail.com";
+
+            folders = {
+                inbox = "Inbox";
+                drafts = "Drafts";
+                sent = "Sent";
+                trash = "Trash";
+            };
+
+            gpg = {
+                encryptByDefault = false;
+                signByDefault = false;
+                key = "A6299C20250223DCDEBA5E2C933B9437A97A56B8";
+            };
+
+            smtp.tls.useStartTls = false;
+
+            thunderbird.enable = true;
+        };
+
+        School = rec {
+            realName = "Tyler Beckman";
+            address = "tyler_beckman@mines.edu";
+            userName = address;
+            flavor = "outlook.office365.com";
+            
+            folders = {
+                inbox = "Inbox";
+                drafts = "Drafts";
+                sent = "Sent Items";
+                trash = "Trash";
+            };
+        };
     };
 }

home-manager/modules/beets.nix

@@ -0,0 +1,23 @@
+{ lib, secrets, ... }:
+{
+    programs.beets = {
+        enable = true;
+
+        settings = {
+            directory = "~/Music";
+            library = "~/Music/library.db";
+            plugins = "fetchart lyrics lastgenre";
+
+            lyrics = {
+                synced = "yes";
+                auto = "yes";
+                force = "yes";
+                sources = with secrets.programs.beets; lib.mkMerge [
+                    (lib.mkIf (google_api_key != null) "lrclib google genius tekstowo")
+                    (lib.mkIf (google_api_key == null) "lrclib genius tekstowo")
+                ];
+                google_API_key = with secrets.programs.beets; lib.mkIf (google_api_key != null) google_api_key;
+            };
+        };
+    };
+}

home-manager/modules/firefox.nix

@@ -35,6 +35,7 @@
                     "findbar.highlightAll" = true; # Highlight all search results in Ctrl+F
 
                     # Toolbar customization
+                    "browser.download.autohideButton" = false;
                     "browser.uiCustomization.state" = ''
                         {
                             "placements": {
@@ -55,10 +56,10 @@
                                     "stop-reload-button",
                                     "urlbar-container",
                                     "save-to-pocket-button",
-                                    "downloads-button",
                                     "fxa-toolbar-menu-button",
-                                    "reset-pbm-toolbar-button",
+                                    "downloads-button",
                                     "unified-extensions-button",
+                                    "reset-pbm-toolbar-button",
                                     "addon_darkreader_org-browser-action",
                                     "_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action",
                                     "ublock0_raymondhill_net-browser-action",
@@ -105,7 +106,7 @@
                                 "unified-extensions-area"
                             ],
                             "currentVersion": 20,
-                            "newElementCount": 5
+                            "newElementCount": 9
                         }
                     '';
                 };

home-manager/modules/gtk.nix

@@ -1,8 +1,11 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
     gtk = {
         enable = true;
 
+        # The other file gets overwritten, so change the path
+        gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+
         theme = {
             name = "Breeze-Dark";
             package = pkgs.kdePackages.breeze-gtk;

home-manager/modules/packages.nix

@@ -3,7 +3,7 @@
     home.packages = (with pkgs; [   
         # Documents
         logseq
-        inputs.nixpkgs-24-11.legacyPackages.${system}.libreoffice-qt6-fresh # Lock to 24.11 as the build is failing as of 11/24/24 on unstable
+        libreoffice-qt6-fresh
 
         # Video
         jellyfin-media-player
@@ -22,6 +22,7 @@
 
         # Programming
         nixd # NixD LSP for .nix files
+        deno
 
         # :3
         fastfetch

home-manager/modules/plasma.nix

@@ -37,7 +37,7 @@
                         name = "org.kde.plasma.kickoff";
                         config = {
                             General = {
-                                icon = "nixos";
+                                icon = "nix-snowflake";
                             };
                         };
                     }
@@ -47,11 +47,20 @@
                         config = {
                             General = {
                                 launchers = [
-                                    "applications:systemsettings.desktop"  # KDE System Settings
+                                    # System apps
-                                    "applications:org.kde.dolphin.desktop" # KDE File Manager
+                                    "applications:systemsettings.desktop"  # System Settings
+                                    "applications:org.kde.dolphin.desktop" # File Manager
+                                    "applications:org.kde.konsole.desktop" # Terminal emulator
+                                    # Communication
+                                    "applications:vesktop.desktop"         # Vesktop (discord)
+                                    "applications:element-desktop.desktop" # Element Desktop
+                                    "applications:thunderbird.desktop"     # Thunderbird
+                                    # Internet
                                     "applications:firefox-nightly.desktop" # Firefox
-                                    "applications:org.kde.konsole.desktop" # KDE Terminal App
+                                    # Other
+                                    "applications:logseq.desktop"          # LogSeq notes
                                     "applications:codium.desktop"          # VSCodium
+                                    "applications:steam.desktop"           # Steam
                                 ];
                             };
                         };

home-manager/modules/vcs/jj.nix

@@ -28,7 +28,7 @@
             };
 
             revset-aliases = {
-                "immutable_heads()" = "builtin_immutable_heads() | main@forgejo";
+                "immutable_heads()" = "builtin_immutable_heads()";
             };
         };
     };

home-manager/modules/vscode.nix

@@ -16,6 +16,7 @@
             jnoortheen.nix-ide                    # Nix
             tamasfe.even-better-toml              # TOML
             yzhang.markdown-all-in-one            # Markdown
+            denoland.vscode-deno                  # Deno JS/TS
             # Theming
             pkief.material-icon-theme             # Material icons
             # Utilities

hosts/laptop/modules/bluetooth.nix

@@ -1,6 +1,14 @@
 { ... }:
 {
     # Enable bluetooth
-    hardware.bluetooth.enable = true;
+    hardware.bluetooth = {
-    hardware.bluetooth.powerOnBoot = true;
+        enable = true;
+        powerOnBoot = true;
+
+        settings = {
+            General = {
+                Enable = "Source,Sink,Media,Socket";
+            };
+        };
+    };
 }

hosts/laptop/modules/environment.nix

@@ -1,11 +1,12 @@
 { ... }:
 {
     # Enable wayland support
-    environment.sessionVariables ={
+    environment.sessionVariables = {
-        NIXOS_OZONE_WL = "1";
+        # Wayland electron has no hardware acceleration support, so disable it for now
+        # NIXOS_OZONE_WL = "1";
         STEAM_FORCE_DESKTOPUI_SCALING = "2";
     };
 
     # Enable zsh-autocomplete compatibility
     environment.pathsToLink = [ "/share/zsh" ];
-}
+}

hosts/laptop/modules/fonts.nix

@@ -10,10 +10,10 @@
             fira-code-symbols
             jetbrains-mono
             # Nerd fonts
-            (nerdfonts.override {
+        ] ++ (with pkgs.nerd-fonts; [
-                fonts = [ "FiraCode" "JetBrainsMono" ];
+            fira-code
-            })
+            jetbrains-mono
-        ];
+        ]);
         # Disable any fonts not defined above
         enableDefaultPackages = false;
     };

secrets.example.nix

@@ -0,0 +1,8 @@
+{
+    programs = {
+        beets = {
+            # The API key to use for google custom search lyrics backend
+            google_api_key = null;
+        };
+    };
+}

secrets.nix

@@ -0,0 +1,8 @@
+{
+    programs = {
+        beets = {
+            # The API key to use for google custom search lyrics backend
+            google_api_key = "AIzaSyAWg0jEt2wPXNo2Q6dx2yvihT1FqkG26I4";
+        };
+    };
+}