diff --git a/flake.lock b/flake.lock index d33328d..167bba0 100644 --- a/flake.lock +++ b/flake.lock @@ -21,28 +21,27 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1765809053, - "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", "owner": "tomyun", "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1760703920, - "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", + "lastModified": 1752979451, + "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "d646af9b7d14bff08824538164af99d0c521b185", + "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", "type": "github" }, "original": { @@ -71,11 +70,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764724327, - "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", + "lastModified": 1756083905, + "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", + "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", "type": "github" }, "original": { @@ -86,11 +85,11 @@ }, "flake-compat": { "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -139,11 +138,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -160,11 +159,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -210,20 +209,18 @@ "gnome-shell": { "flake": false, "locked": { - "host": "gitlab.gnome.org", - "lastModified": 1764524476, - "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", + "lastModified": 1748186689, + "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", - "type": "gitlab" + "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", + "type": "github" }, "original": { - "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "gnome-49", + "ref": "48.2", "repo": "gnome-shell", - "type": "gitlab" + "type": "github" } }, "home-manager": { @@ -233,11 +230,11 @@ ] }, "locked": { - "lastModified": 1765980955, - "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=", + "lastModified": 1758810399, + "narHash": "sha256-bpWoE1tiFX5T1tr5EudkpW9Kk02XR+6olkoSkf3nHZU=", "owner": "nix-community", "repo": "home-manager", - "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173", + "rev": "39d26c16866260eee6d0487fe9c102ba1c1bf7b2", "type": "github" }, "original": { @@ -254,11 +251,11 @@ ] }, "locked": { - "lastModified": 1765682243, - "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", + "lastModified": 1752603129, + "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", "owner": "nix-community", "repo": "home-manager", - "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", + "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", "type": "github" }, "original": { @@ -284,11 +281,11 @@ }, "mnw": { "locked": { - "lastModified": 1758834834, - "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", + "lastModified": 1756659871, + "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", + "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16", "type": "github" }, "original": { @@ -297,24 +294,6 @@ "type": "github" } }, - "ndg": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1765720983, - "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=", - "owner": "feel-co", - "repo": "ndg", - "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936", - "type": "github" - }, - "original": { - "owner": "feel-co", - "repo": "ndg", - "type": "github" - } - }, "nix-alien": { "inputs": { "flake-compat": "flake-compat", @@ -322,11 +301,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1765855559, - "narHash": "sha256-AUT31hDJliW0fK9G7tfTEDD2me4rIXbBXPu1lf0mVHs=", + "lastModified": 1757920634, + "narHash": "sha256-MNxTc+dncIHFGKQRyAqI/Clttp3JICaSUKlMUQ6l9jc=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "0eb86c42d1e33e8dbcf771cb67446319517a0a57", + "rev": "f8a51ef800bc8b7420998415035f9c086eb64d5c", "type": "github" }, "original": { @@ -343,11 +322,11 @@ ] }, "locked": { - "lastModified": 1762660502, - "narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=", + "lastModified": 1757822619, + "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "15c5451c63f4c612874a43846bfe3fa828b03eee", + "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", "type": "github" }, "original": { @@ -378,11 +357,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -410,11 +389,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", - "owner": "nixos", + "lastModified": 1760773850, + "narHash": "sha256-skbm70mjURx9k0iGIN1aUm09b0n3QbFw2gCpG0A5mEI=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "df05dcceaf4d6a5f2caeda75da00de370d8c14e6", "type": "github" }, "original": { @@ -426,27 +405,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1756819007, + "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1", "type": "github" }, "original": { @@ -468,11 +431,11 @@ ] }, "locked": { - "lastModified": 1764773531, - "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", + "lastModified": 1756961635, + "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", "owner": "nix-community", "repo": "NUR", - "rev": "1d9616689e98beded059ad0384b9951e967a17fa", + "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", "type": "github" }, "original": { @@ -486,18 +449,17 @@ "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", "mnw": "mnw", - "ndg": "ndg", "nixpkgs": [ "nixpkgs" ], "systems": "systems_2" }, "locked": { - "lastModified": 1765894398, - "narHash": "sha256-vZmKngMAaZ38mUjWeXavagrCE5f4h4s9yIShf2q75I4=", + "lastModified": 1758271661, + "narHash": "sha256-ENqd2/33uP5vB44ClDjjAV+J78oF8q1er4QUZuT8Z7g=", "owner": "NotAShelf", "repo": "nvf", - "rev": "cd81bbb904571b538397d72a29e4c84b98480ee1", + "rev": "b7571df4d6e9ac08506a738ddceeec0b141751b0", "type": "github" }, "original": { @@ -527,11 +489,11 @@ ] }, "locked": { - "lastModified": 1765836173, - "narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=", + "lastModified": 1758425756, + "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", "owner": "Mic92", "repo": "sops-nix", - "rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63", + "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", "type": "github" }, "original": { @@ -570,7 +532,7 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_2", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nur": "nur", "systems": "systems_3", "tinted-foot": "tinted-foot", @@ -580,11 +542,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1765897595, - "narHash": "sha256-NgTRxiEC5y96zrhdBygnY+mSzk5FWMML39PcRGVJmxg=", + "lastModified": 1758757969, + "narHash": "sha256-2zC4aHoDsR12Jyd6WvSxmQbAKT4V93frnHHDjA8o3r8=", "owner": "danth", "repo": "stylix", - "rev": "e6829552d4bb659ebab00f08c61d8c62754763f3", + "rev": "484819a16fdc1c76cdd62d8e94018db44e5e1a8b", "type": "github" }, "original": { @@ -674,11 +636,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1763914658, - "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", + "lastModified": 1754779259, + "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", + "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", "type": "github" }, "original": { @@ -690,11 +652,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1764465359, - "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", + "lastModified": 1754788770, + "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", + "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", "type": "github" }, "original": { @@ -706,11 +668,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1764464512, - "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", + "lastModified": 1755613540, + "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", + "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", "type": "github" }, "original": { @@ -748,11 +710,11 @@ ] }, "locked": { - "lastModified": 1766032508, - "narHash": "sha256-7MHR94mOoa5/s4NBrpsXWaNNzrZyRC0OwRwEobp1wzI=", + "lastModified": 1760843785, + "narHash": "sha256-lp6xctqGBNKZ3pmRlALX1puVG7EKQa4xAq+2leThDKw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a7f58a9e3481804915d75a9c86527bca6d9dafb3", + "rev": "a36f9da8a234b59dd5fc4484e37dadae2aa75b80", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 299d280..24547ee 100644 --- a/flake.nix +++ b/flake.nix @@ -64,9 +64,6 @@ # work murk = utils.mkHost ./hosts/murk/configuration.nix; - # lenovo - muvo = utils.mkHost ./hosts/muvo/configuration.nix; - # installer muin = utils.mkHost ./hosts/muin/configuration.nix; }; diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index 869393c..8a430c3 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -25,7 +25,6 @@ in { opensnitch opensnitch-ui obsidian - opencode ]; # System diff --git a/hosts/muvo/configuration.nix b/hosts/muvo/configuration.nix deleted file mode 100644 index 5c20a37..0000000 --- a/hosts/muvo/configuration.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - system, - sources, - modulesPath, - ... -}: let - cfg = config.mods; -in { - # Hardware - imports = [ - ./hardware-configuration.nix - "${ - builtins.fetchTarball { - url = "https://github.com/nix-community/disko/archive/refs/tags/v1.12.0.tar.gz"; - sha256 = "0wbx518d2x54yn4xh98cgm65wvj0gpy6nia6ra7ns4j63hx14fkq"; - } - }/module.nix" - ./disk-config.nix - # (inputs.nixpkgs - # + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix") - ]; - - environment.systemPackages = with inputs.nix-alien.packages.${system}; [nix-alien]; - - # System - mods.user.name = "muon"; - networking.hostName = "muvo"; - networking.hostId = "a2309040"; - mods.home.file = ./home.nix; - - # Modules - mods.desktop.enable = true; - mods.boot.enable = true; - - mods.theme.enable = true; - mods.theme.scheme = "woodland"; - mods.theme.wallpaper = ./wallpaper.png; - - services.xserver.windowManager.i3.enable = true; - - mods.impermanence.enable = true; - - # Persist - environment.persistence."/persist" = { - directories = ["/etc/NetworkManager" "/var/lib/NetworkManager"]; - }; - - # Hardware preferences - environment.variables = { - WINIT_HIDPI_FACTOR = "1"; - WINIT_X11_SCALE_FACTOR = "1"; - }; - - ## Laptop - powerManagement.enable = true; - services.thermald.enable = true; - services.tlp.enable = true; - - ## Mouse - services.libinput.mouse.accelProfile = "flat"; - - # Version of first install - system.stateVersion = "23.05"; -} diff --git a/hosts/muvo/disk-config.nix b/hosts/muvo/disk-config.nix deleted file mode 100644 index 05a9f01..0000000 --- a/hosts/muvo/disk-config.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - disko.devices = { - disk = { - main = { - type = "disk"; - device = "/dev/sda"; - content = { - type = "gpt"; - partitions = { - ESP = { - size = "512M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "crypted"; - # disable settings.keyFile if you want to use interactive password entry - #passwordFile = "/tmp/secret.key"; # Interactive - # settings = { - # allowDiscards = true; - # keyFile = "/tmp/secret.key"; - # }; - # additionalKeyFiles = [ "/tmp/additionalSecret.key" ]; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = { - "/root" = { - mountpoint = "/"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/home" = { - mountpoint = "/home"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/nix" = { - mountpoint = "/nix"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/persist" = { - mountpoint = "/persist"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/log" = { - mountpoint = "/var/log"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/swap" = { - mountpoint = "/swap"; - swap.swapfile.size = "4G"; - }; - }; - }; - }; - }; - }; - }; - }; - }; - }; - - fileSystems."/persist".neededForBoot = true; - fileSystems."/var/log".neededForBoot = true; -} diff --git a/hosts/muvo/hardware-configuration.nix b/hosts/muvo/hardware-configuration.nix deleted file mode 100644 index e465f37..0000000 --- a/hosts/muvo/hardware-configuration.nix +++ /dev/null @@ -1,18 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/muvo/home.nix b/hosts/muvo/home.nix deleted file mode 100644 index 9ba0dcb..0000000 --- a/hosts/muvo/home.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - pkgs, - lib, - config, - osConfig, - inputs, - ... -}: let - cfg = osConfig.mods; -in { - imports = [inputs.impermanence.homeManagerModules.impermanence]; - - # Modules - mods.xdg.enable = true; - mods.i3.enable = true; - mods.battery.enable = true; - mods.terminal.zsh.enable = true; - mods.terminal.emulator.enable = true; - mods.terminal.development.enable = true; - mods.terminal.tools.enable = true; - mods.desktop.development.enable = true; - mods.desktop.productivity.enable = false; - - home.packages = with pkgs; [ - pulseaudio - pavucontrol - alsa-utils - ]; - - # Hardware preferences - ## Monitors - services.autorandr.enable = true; - programs.autorandr = { - enable = true; - hooks.postswitch = { - "notify-i3" = "${pkgs.i3}/bin/i3-msg restart"; - "set-wallpaper" = '' - ${lib.getExe pkgs.feh} --bg-fill --nofehbg ${./wallpaper.png} - ''; - }; - }; - - # Version of first install - home.stateVersion = "23.05"; -} diff --git a/hosts/muvo/wallpaper.png b/hosts/muvo/wallpaper.png deleted file mode 100644 index f016897..0000000 Binary files a/hosts/muvo/wallpaper.png and /dev/null differ diff --git a/modules/home/terminal/development.nix b/modules/home/terminal/development.nix index d822b98..9ec1fe8 100644 --- a/modules/home/terminal/development.nix +++ b/modules/home/terminal/development.nix @@ -12,9 +12,6 @@ in { options.mods.terminal.development.enable = lib.mkEnableOption "enables cli editor"; - options.mods.obsidian.enable = - lib.mkEnableOption "enables obsidian"; - imports = [inputs.nvf.homeManagerModules.default]; config = lib.mkIf config.mods.terminal.development.enable { @@ -260,7 +257,7 @@ in { }; notes = { - obsidian = lib.mkIf config.mods.obsidian.enable { + obsidian = { enable = true; setupOpts = { workspaces = [ diff --git a/modules/nixos/theme/default.nix b/modules/nixos/theme/default.nix index 4743778..6f4c4cc 100644 --- a/modules/nixos/theme/default.nix +++ b/modules/nixos/theme/default.nix @@ -1,10 +1,5 @@ -{ - pkgs, - lib, - config, - ... -}: let - cfg = config.mods.theme; +{ pkgs, lib, config, ... }: +let cfg = config.mods.theme; in { options.mods.theme = { enable = lib.mkEnableOption "enables stylix system theme"; @@ -37,7 +32,7 @@ in { name = "CommitMono Nerd Font"; }; emoji = { - package = pkgs.noto-fonts-color-emoji; + package = pkgs.noto-fonts-emoji; name = "OpenMoji Color"; }; serif = config.stylix.fonts.monospace;