I wish life was this easy

6 files changed, 28 insertions, 55 deletions

diff --git a/common/modules/window_managers/noctalia.nix b/common/modules/window_managers/noctalia.nix
index fabe3e4..5a37f68 100644
--- a/common/modules/window_managers/noctalia.nix
+++ b/common/modules/window_managers/noctalia.nix
@@ -14,10 +14,6 @@ let
   cfg = config.${moduleNameSpace}.windowManagers;
 in
 {
-  imports = lib.optionals homeManager [
-    inputs.noctalia.homeModules.default
-  ];
-
   config = lib.mkIf cfg.noctalia (
     lib.optionalAttrs homeManager {
       programs.noctalia = {
diff --git a/common/programs/vesktop.nix b/common/programs/vesktop.nix
index 5f7a1da..be35840 100644
--- a/common/programs/vesktop.nix
+++ b/common/programs/vesktop.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 {
   programs.vesktop = {
-    enable = true;
+    enable = false;
     vencord = {
       settings = {
         enabledThemes =
diff --git a/flake.lock b/flake.lock
index 5539258..ae036a8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,11 +12,11 @@
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1786985328,
-        "narHash": "sha256-4buflYowr+rZecPe+rLDrEX5ZFO9lx0iyp0Cjbzw8cw=",
+        "lastModified": 1787572613,
+        "narHash": "sha256-vqOl2vOB6oTLxzJD9OZwz2m5dRGYec6jKCYsBRIweCI=",
         "ref": "refs/heads/main",
-        "rev": "eb2ff1efdf31180c3dbeabb928dcf028ff8b33f9",
-        "revCount": 52,
+        "rev": "8b138abdba70537b4dd720391ca366807101fa89",
+        "revCount": 53,
         "type": "git",
         "url": "https://codeberg.org/beeb5k/beeVim"
       },
@@ -30,11 +30,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1785627969,
-        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
+        "lastModified": 1787559586,
+        "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
+        "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1",
         "type": "github"
       },
       "original": {
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786988494,
-        "narHash": "sha256-nZcYMi4nJxjqp8atEWkowCtRQplS6RuzqIxcPUqG0CA=",
+        "lastModified": 1787540599,
+        "narHash": "sha256-MHwk52ty3NsLhq9a1IbIfBJZlCUJIdiUYFo52JLK9hY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ec161155d76f7ec25404c0da2fa9f5f133f6ae4c",
+        "rev": "03f4cd46bc1dd4f3a96da778d2ce9f7ce39dd450",
         "type": "github"
       },
       "original": {
@@ -65,11 +65,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1786862985,
-        "narHash": "sha256-FBJRXmbGXiSUDvYEbfLYRkckayyZ6SK1UEqhCrIZ2Cs=",
+        "lastModified": 1787498568,
+        "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e5bdc4a41d4c072fe1e3787eaa0320a384741d44",
+        "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188",
         "type": "github"
       },
       "original": {
@@ -94,26 +94,6 @@
         "type": "github"
       }
     },
-    "noctalia": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1786984599,
-        "narHash": "sha256-I7E/WigdUVzJ5qZWkexYbHE/EWntxGPTh2N+VBUdpzo=",
-        "owner": "noctalia-dev",
-        "repo": "noctalia",
-        "rev": "87b203c682045d0f81a3d92d418bb37caf728a1c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "noctalia-dev",
-        "repo": "noctalia",
-        "type": "github"
-      }
-    },
     "plugins-base46": {
       "flake": false,
       "locked": {
@@ -165,11 +145,11 @@
     "plugins-neogit": {
       "flake": false,
       "locked": {
-        "lastModified": 1785165041,
-        "narHash": "sha256-oyGGEbBCGr9mYeaG7siHl/Zz2HOBEKEkhQuwmJ2eA3o=",
+        "lastModified": 1787410561,
+        "narHash": "sha256-s0yrtTweFrrUsxVjLjr+1uNHTlhcxGI7JUvOkrpt13g=",
         "owner": "NeogitOrg",
         "repo": "neogit",
-        "rev": "37e0f22a2345bad1bffe01b31970885882f46275",
+        "rev": "5adc81b26232954cd7a90f158aa7844c18fc3165",
         "type": "github"
       },
       "original": {
@@ -184,7 +164,6 @@
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "noctalia": "noctalia",
         "sops-nix": "sops-nix",
         "zen-browser": "zen-browser"
       }
@@ -217,11 +196,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782135443,
-        "narHash": "sha256-vAmbArdCyjqpVW+37aCy/PMBOLIqukUXLQuEKLwUhA4=",
+        "lastModified": 1787531025,
+        "narHash": "sha256-PbDBQ714Ua/FFpfWVNa8wLEgLeSxidQintFM8VF4p+w=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "6e7f66fa2cdf4d63162580b438f7fcf87c28a46f",
+        "rev": "f4e8db680592dbdd729d776e87c6278423d70a1d",
         "type": "github"
       },
       "original": {
@@ -237,11 +216,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786685380,
-        "narHash": "sha256-3ZuubfWk7CHPF/60w5BVrVkzdO7Oed1MgZ+ugLsgww8=",
+        "lastModified": 1787200418,
+        "narHash": "sha256-4d24Wa/CO8WsSEjKwzFwJXn+oxbI4Bm8xuMR77xJgYI=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "e1e4aa6433a352f07059aeb8483ae42deb61f9b2",
+        "rev": "20195bc99e82b02abe82bb81ac366ae81c67dc5a",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 6eb8831..fbf9bf9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,10 +22,6 @@
       # url = "git+file:/home/beeb5k/.config/beeVim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    noctalia = {
-      url = "github:noctalia-dev/noctalia";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/common.nix b/hosts/common.nix
index 0be25ce..f0b3797 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -181,7 +181,8 @@
 
   fonts.fontDir.enable = true;
   fonts.packages = with pkgs; [
-    nerd-fonts.iosevka
+    # nerd-fonts.iosevka
+    nerd-fonts.jetbrains-mono
     # inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.iosevka-input
     # nerd-fonts.symbols-only
     noto-fonts
@@ -189,6 +190,7 @@
   ];
 
   fonts.fontconfig.defaultFonts.monospace = [
+    "JetBrainsMono NF"
     "Iosevka Nerd Font"
     "IosevkaInput"
     "Symbols Nerd Font"
diff --git a/users/beeb5k/default.nix b/users/beeb5k/default.nix
index b9655ed..143492f 100644
--- a/users/beeb5k/default.nix
+++ b/users/beeb5k/default.nix
@@ -41,8 +41,8 @@
     terminal = {
       default = "alacritty";
       alacritty = true;
-      font.family = "monospace";
-      font.size = 12.0;
+      font.family = "monospace"; # change default font from ../../hosts/common.nix
+      font.size = 11.0;
     };
   };