karitham.dev / dotfiles
a dotfile but it's really big
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

fix small issues around desktop module

karitham 4c1173f1 fbfddea4

+29 -19
+1 -1
modules/desktop/desktop.nix
··· 10 10 in 11 11 { 12 12 imports = [ inputs.niri.nixosModules.niri ]; 13 - config = lib.mkIf cfg.enable { 13 + config = lib.mkIf cfg.wm.enable { 14 14 environment = { 15 15 systemPackages = with pkgs; [ 16 16 wl-clipboard
+13 -7
modules/desktop/home.nix
··· 1 1 { 2 2 lib, 3 - osConfig ? { }, 3 + osConfig ? {}, 4 4 pkgs, 5 - config, 6 5 ... 7 - }: 8 - let 6 + }: let 9 7 inherit (lib) mkEnableOption mkOption types; 10 - in 11 - { 12 - config.dev = lib.intersectAttrs config.dev (osConfig.dev or { }); 8 + in { 9 + config.desktop = { 10 + inherit 11 + (osConfig.desktop or {}) 12 + enable 13 + wm 14 + terminal 15 + audio 16 + apps 17 + ; 18 + }; 13 19 options.desktop = { 14 20 enable = mkEnableOption "all desktop tools"; 15 21
-1
modules/desktop/nixos.nix
··· 30 30 desktop.terminal.enable = mkIf cfg.enable true; 31 31 desktop.audio.enable = mkIf cfg.enable true; 32 32 desktop.apps.enable = mkIf cfg.enable true; 33 - desktop.ipcam.enable = mkIf cfg.enable true; 34 33 desktop.yubikey.enable = mkIf cfg.enable true; 35 34 desktop.locale.enable = mkIf cfg.enable true; 36 35 };
+2 -2
modules/desktop/wm/dunst.nix
··· 1 - { config, lib, ... }: 1 + { config, ... }: 2 2 { 3 - services.dunst = lib.mkIf config.desktop.wm.enable { enable = true; }; 3 + services.dunst.enable = config.desktop.wm.enable; 4 4 }
+1 -1
modules/desktop/wm/xdg.nix
··· 23 23 "application/x-extension-xht" = browser; 24 24 "x-scheme-handler/about" = browser; 25 25 "x-scheme-handler/unknown" = browser; 26 - "x-scheme-handler/discord" = "legcord.desktop"; 26 + "x-scheme-handler/discord" = "vesktop.desktop"; 27 27 "text/markdown" = editor; 28 28 "text/plain" = editor; 29 29 };
+12 -7
modules/dev/home.nix
··· 1 1 { 2 - osConfig ? { }, 2 + osConfig ? {}, 3 3 lib, 4 - config, 5 4 ... 6 - }: 7 - let 5 + }: let 8 6 inherit (lib) mkEnableOption; 9 - in 10 - { 11 - config.dev = lib.intersectAttrs config.dev (osConfig.dev or { }); 7 + in { 8 + config.dev = { 9 + inherit 10 + (osConfig.dev or {}) 11 + shell 12 + editor 13 + vcs 14 + tools 15 + ; 16 + }; 12 17 options.dev = { 13 18 enable = mkEnableOption "all development tools"; 14 19