diff --git a/home/programs/console/default.nix b/home/modules/console/default.nix similarity index 92% rename from home/programs/console/default.nix rename to home/modules/console/default.nix index ddd5de3..41ce7ac 100644 --- a/home/programs/console/default.nix +++ b/home/modules/console/default.nix @@ -2,7 +2,6 @@ imports = [ ./editor # Still need to implement nvim ./fileManager - # ./language ./multiplexer # Still need to implement tmux and screen ./prompt # only Starship is currently implemented ./shell diff --git a/home/programs/console/editor/default.nix b/home/modules/console/editor/default.nix similarity index 93% rename from home/programs/console/editor/default.nix rename to home/modules/console/editor/default.nix index c0b5212..0f37368 100644 --- a/home/programs/console/editor/default.nix +++ b/home/modules/console/editor/default.nix @@ -6,7 +6,7 @@ # ./nvim ]; - options.programs.console.editor = { + options.homeModules.console.editor = { helix = { enable = lib.mkEnableOption "Enable helix text editor"; default = lib.mkOption { diff --git a/home/programs/console/editor/helix/default.nix b/home/modules/console/editor/helix/default.nix similarity index 97% rename from home/programs/console/editor/helix/default.nix rename to home/modules/console/editor/helix/default.nix index f864a65..ef9b247 100644 --- a/home/programs/console/editor/helix/default.nix +++ b/home/modules/console/editor/helix/default.nix @@ -1,6 +1,6 @@ { inputs, config, pkgs, lib, ... }: let - cfg = config.programs.console.editor.helix; + cfg = config.homeModules.console.editor.helix; inherit (config) colorscheme; in { diff --git a/home/modules/console/editor/helix/languages.nix b/home/modules/console/editor/helix/languages.nix new file mode 100644 index 0000000..23efb87 --- /dev/null +++ b/home/modules/console/editor/helix/languages.nix @@ -0,0 +1,108 @@ +{ pkgs, lib, config, ... }: + +let + cfg = config.homeModules.console.editor.helix; +in + +{ + config = lib.mkIf cfg.enable { + programs.helix.languages = { + language = let + deno = lang: { + command = "${pkgs.deno}/bin/deno"; + args = ["fmt" "-" "--ext" lang]; + }; + + prettier = lang: { + command = "${pkgs.nodePackages.prettier}/bin/prettier"; + args = ["--parser" lang]; + }; + prettierLangs = map (e: { + name = e; + formatter = prettier e; + }); + langs = ["css" "scss" "html"]; + in + [ + { + name = "bash"; + auto-format = true; + formatter = { + command = "${pkgs.shfmt}/bin/shfmt"; + args = ["-i" "2"]; + }; + } + { + name = "clojure"; + injection-regex = "(clojure|clj|edn|boot|yuck)"; + file-types = ["clj" "cljs" "cljc" "clje" "cljr" "cljx" "edn" "boot" "yuck"]; + } + { + name = "javascript"; + auto-format = true; + language-servers = ["deno-lsp"]; + } + { + name = "json"; + formatter = deno "json"; + } + { + name = "markdown"; + auto-format = true; + formatter = deno "md"; + } + ] + ++ prettierLangs langs; + + language-server = { + bash-language-server = { + command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server"; + args = ["start"]; + }; + + clangd = { + command = "${pkgs.clang-tools}/bin/clangd"; + clangd.fallbackFlags = ["-std=c++2b"]; + }; + + deno-lsp = { + command = "${pkgs.deno}/bin/deno"; + args = ["lsp"]; + environment.NO_COLOR = "1"; + config.deno = { + enable = true; + lint = true; + unstable = true; + suggest = { + completeFunctionCalls = false; + imports = {hosts."https://deno.land" = true;}; + }; + inlayHints = { + enumMemberValues.enabled = true; + functionLikeReturnTypes.enabled = true; + parameterNames.enabled = "all"; + parameterTypes.enabled = true; + propertyDeclarationTypes.enabled = true; + variableTypes.enabled = true; + }; + }; + }; + + nil = { + command = lib.getExe pkgs.nil; + config.nil.formatting.command = ["${lib.getExe pkgs.alejandra}" "-q"]; + }; + + vscode-css-language-server = { + command = "${pkgs.nodePackages.vscode-css-languageserver-bin}/bin/css-languageserver"; + args = ["--stdio"]; + config = { + provideFormatter = true; + css.validate.enable = true; + scss.validate.enable = true; + }; + }; + }; + }; + }; +} diff --git a/home/programs/console/editor/helix/theme.nix b/home/modules/console/editor/helix/theme.nix similarity index 100% rename from home/programs/console/editor/helix/theme.nix rename to home/modules/console/editor/helix/theme.nix diff --git a/home/programs/console/editor/nvim/default.nix b/home/modules/console/editor/nvim/default.nix similarity index 100% rename from home/programs/console/editor/nvim/default.nix rename to home/modules/console/editor/nvim/default.nix diff --git a/home/programs/console/fileManager/default.nix b/home/modules/console/fileManager/default.nix similarity index 92% rename from home/programs/console/fileManager/default.nix rename to home/modules/console/fileManager/default.nix index 98b2e22..b3ad9cd 100644 --- a/home/programs/console/fileManager/default.nix +++ b/home/modules/console/fileManager/default.nix @@ -7,7 +7,7 @@ # ./ranger ]; - options.programs.console.fileManager = { + options.homeModules.console.fileManager = { lf = { enable = lib.mkEnableOption "Enable lf file manager"; default = lib.mkOption { diff --git a/home/programs/console/fileManager/lf/default.nix b/home/modules/console/fileManager/lf/default.nix similarity index 96% rename from home/programs/console/fileManager/lf/default.nix rename to home/modules/console/fileManager/lf/default.nix index b5093f7..fdad615 100644 --- a/home/programs/console/fileManager/lf/default.nix +++ b/home/modules/console/fileManager/lf/default.nix @@ -4,7 +4,7 @@ # - ripdrag support # - color parity with eza let - cfg = config.programs.console.fileManager.lf; + cfg = config.homeModules.console.fileManager.lf; in { diff --git a/home/programs/console/multiplexer/default.nix b/home/modules/console/multiplexer/default.nix similarity index 79% rename from home/programs/console/multiplexer/default.nix rename to home/modules/console/multiplexer/default.nix index ee991e1..ce72b5f 100644 --- a/home/programs/console/multiplexer/default.nix +++ b/home/modules/console/multiplexer/default.nix @@ -6,7 +6,7 @@ #./tmux ]; - options.programs.console.multiplexer = { + options.homeModules.console.multiplexer = { zellij = { enable = lib.mkEnableOption "Enable zellij multiplexer"; }; diff --git a/home/programs/console/multiplexer/zellij/default.nix b/home/modules/console/multiplexer/zellij/default.nix similarity index 93% rename from home/programs/console/multiplexer/zellij/default.nix rename to home/modules/console/multiplexer/zellij/default.nix index 8fe62ff..a02b827 100644 --- a/home/programs/console/multiplexer/zellij/default.nix +++ b/home/modules/console/multiplexer/zellij/default.nix @@ -2,7 +2,7 @@ let inherit (config) colorscheme; inherit (colorscheme) colors; - cfg = config.programs.console.multiplexer.zellij; + cfg = config.homeModules.console.multiplexer.zellij; in { diff --git a/home/programs/console/prompt/default.nix b/home/modules/console/prompt/default.nix similarity index 77% rename from home/programs/console/prompt/default.nix rename to home/modules/console/prompt/default.nix index 83f7d89..8b1eed5 100644 --- a/home/programs/console/prompt/default.nix +++ b/home/modules/console/prompt/default.nix @@ -4,7 +4,7 @@ ./starship ]; - options.programs.console.prompt = { + options.homeModules.console.prompt = { starship = { enable = lib.mkEnableOption "Enable starship prompt"; }; diff --git a/home/programs/console/prompt/starship/default.nix b/home/modules/console/prompt/starship/default.nix similarity index 98% rename from home/programs/console/prompt/starship/default.nix rename to home/modules/console/prompt/starship/default.nix index 8830185..e64c3f7 100644 --- a/home/programs/console/prompt/starship/default.nix +++ b/home/modules/console/prompt/starship/default.nix @@ -1,7 +1,7 @@ { config, lib, ... }: let - cfg = config.programs.console.prompt.starship; + cfg = config.homeModules.console.prompt.starship; in { diff --git a/home/programs/console/shell/bash/default.nix b/home/modules/console/shell/bash/default.nix similarity index 68% rename from home/programs/console/shell/bash/default.nix rename to home/modules/console/shell/bash/default.nix index 37bd6d4..cdc635f 100644 --- a/home/programs/console/shell/bash/default.nix +++ b/home/modules/console/shell/bash/default.nix @@ -1,6 +1,6 @@ { config, lib, ... }: let - cfg = config.programs.console.shell.bash; + cfg = config.homeModules.console.shell.bash; in { config = lib.mkIf cfg.enable { diff --git a/home/programs/console/shell/default.nix b/home/modules/console/shell/default.nix similarity index 88% rename from home/programs/console/shell/default.nix rename to home/modules/console/shell/default.nix index a327eeb..41066fa 100644 --- a/home/programs/console/shell/default.nix +++ b/home/modules/console/shell/default.nix @@ -5,7 +5,7 @@ ./bash ]; - options.programs.console.shell = { + options.homeModules.console.shell = { fish = { enable = lib.mkEnableOption "Enable fish configuration"; }; diff --git a/home/programs/console/shell/fish/default.nix b/home/modules/console/shell/fish/default.nix similarity index 99% rename from home/programs/console/shell/fish/default.nix rename to home/modules/console/shell/fish/default.nix index 4b9bcbc..c65881b 100644 --- a/home/programs/console/shell/fish/default.nix +++ b/home/modules/console/shell/fish/default.nix @@ -1,6 +1,6 @@ { pkgs, lib, config, ... }: let - cfg = config.programs.console.shell.fish; + cfg = config.homeModules.console.shell.fish; inherit (lib) mkIf; hasPackage = pname: lib.any (p: p ? pname && p.pname == pname) config.home.packages; hasEza = hasPackage "eza"; diff --git a/home/programs/console/utility/default.nix b/home/modules/console/utility/default.nix similarity index 88% rename from home/programs/console/utility/default.nix rename to home/modules/console/utility/default.nix index 958123b..29ce931 100644 --- a/home/programs/console/utility/default.nix +++ b/home/modules/console/utility/default.nix @@ -6,7 +6,7 @@ ./tools ]; - options.programs.console.utility = { + options.homeModules.console.utility = { nixIndex = { enable = lib.mkEnableOption "Enable nixIndex configuration"; }; diff --git a/home/programs/console/utility/git/default.nix b/home/modules/console/utility/git/default.nix similarity index 90% rename from home/programs/console/utility/git/default.nix rename to home/modules/console/utility/git/default.nix index 4d15154..50e5f47 100644 --- a/home/programs/console/utility/git/default.nix +++ b/home/modules/console/utility/git/default.nix @@ -1,6 +1,6 @@ { pkgs, config, lib, ... }: let - cfg = config.programs.console.utility.git; + cfg = config.homeModules.console.utility.git; in { config = { diff --git a/home/programs/console/utility/nixIndex/default.nix b/home/modules/console/utility/nixIndex/default.nix similarity index 95% rename from home/programs/console/utility/nixIndex/default.nix rename to home/modules/console/utility/nixIndex/default.nix index e0b1e5a..d757c9e 100644 --- a/home/programs/console/utility/nixIndex/default.nix +++ b/home/modules/console/utility/nixIndex/default.nix @@ -1,6 +1,6 @@ { pkgs, config, lib, ... }: let - cfg = config.programs.console.utility.nixIndex; + cfg = config.homeModules.console.utility.nixIndex; update-script = pkgs.writeShellApplication { name = "fetch-nix-index-database"; runtimeInputs = with pkgs; [ wget coreutils ]; diff --git a/home/programs/console/utility/tools/default.nix b/home/modules/console/utility/tools/default.nix similarity index 96% rename from home/programs/console/utility/tools/default.nix rename to home/modules/console/utility/tools/default.nix index 9d493c5..7f13fa3 100644 --- a/home/programs/console/utility/tools/default.nix +++ b/home/modules/console/utility/tools/default.nix @@ -1,6 +1,6 @@ { pkgs, lib, config, ... }: let - cfg = config.programs.console.utility.tools; + cfg = config.homeModules.console.utility.tools; in { config = lib.mkIf cfg.enable { diff --git a/home/programs/default.nix b/home/modules/default.nix similarity index 100% rename from home/programs/default.nix rename to home/modules/default.nix diff --git a/home/programs/desktop/browser/brave/default.nix b/home/modules/desktop/browser/brave/default.nix similarity index 100% rename from home/programs/desktop/browser/brave/default.nix rename to home/modules/desktop/browser/brave/default.nix diff --git a/home/programs/desktop/browser/chrome/default.nix b/home/modules/desktop/browser/chrome/default.nix similarity index 100% rename from home/programs/desktop/browser/chrome/default.nix rename to home/modules/desktop/browser/chrome/default.nix diff --git a/home/programs/desktop/browser/default.nix b/home/modules/desktop/browser/default.nix similarity index 90% rename from home/programs/desktop/browser/default.nix rename to home/modules/desktop/browser/default.nix index d4374bd..73f79ff 100644 --- a/home/programs/desktop/browser/default.nix +++ b/home/modules/desktop/browser/default.nix @@ -7,7 +7,7 @@ #./brave -- still needs tio be implemented ]; - options.programs.desktop.browser = { + options.homeModules.desktop.browser = { firefox = { enable = lib.mkEnableOption "Enable firefox browser"; default = lib.mkOption { diff --git a/home/programs/desktop/browser/firefox/default.nix b/home/modules/desktop/browser/firefox/default.nix similarity index 99% rename from home/programs/desktop/browser/firefox/default.nix rename to home/modules/desktop/browser/firefox/default.nix index 1510b91..727cdf5 100644 --- a/home/programs/desktop/browser/firefox/default.nix +++ b/home/modules/desktop/browser/firefox/default.nix @@ -2,7 +2,7 @@ let addons = inputs.firefox-addons.packages.${pkgs.system}; - cfg = config.programs.desktop.browser.firefox; + cfg = config.homeModules.desktop.browser.firefox; in { diff --git a/home/programs/desktop/communication/default.nix b/home/modules/desktop/communication/default.nix similarity index 74% rename from home/programs/desktop/communication/default.nix rename to home/modules/desktop/communication/default.nix index 6ed5be7..a2fe60c 100644 --- a/home/programs/desktop/communication/default.nix +++ b/home/modules/desktop/communication/default.nix @@ -5,7 +5,7 @@ ./discord ]; - options.programs.desktop.communication = { + options.homeModules.desktop.communication = { discord = { enable = lib.mkEnableOption "Enable discord module"; }; diff --git a/home/programs/desktop/communication/discord/default.nix b/home/modules/desktop/communication/discord/default.nix similarity index 98% rename from home/programs/desktop/communication/discord/default.nix rename to home/modules/desktop/communication/discord/default.nix index 349f9bd..e909f2b 100644 --- a/home/programs/desktop/communication/discord/default.nix +++ b/home/modules/desktop/communication/discord/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let - cfg = config.programs.desktop.communication.discord; + cfg = config.homeModules.desktop.communication.discord; inherit (config.colorscheme) colors; in diff --git a/home/programs/desktop/creative/blender.nix b/home/modules/desktop/creative/blender.nix similarity index 100% rename from home/programs/desktop/creative/blender.nix rename to home/modules/desktop/creative/blender.nix diff --git a/home/programs/desktop/creative/gimp.nix b/home/modules/desktop/creative/gimp.nix similarity index 100% rename from home/programs/desktop/creative/gimp.nix rename to home/modules/desktop/creative/gimp.nix diff --git a/home/programs/desktop/creative/inkscape.nix b/home/modules/desktop/creative/inkscape.nix similarity index 100% rename from home/programs/desktop/creative/inkscape.nix rename to home/modules/desktop/creative/inkscape.nix diff --git a/home/programs/desktop/default.nix b/home/modules/desktop/default.nix similarity index 84% rename from home/programs/desktop/default.nix rename to home/modules/desktop/default.nix index f205c37..52c1c0c 100644 --- a/home/programs/desktop/default.nix +++ b/home/modules/desktop/default.nix @@ -4,12 +4,10 @@ ./browser # done -- firefox still need: chrome, brave #./creative -- still needs to be implemented ./communication # only discord implemented - #./desktopEnvironment -- still needs to be implemented ./media # done -- spotify gui still needs to be implemented ./terminal # done -- wezterm still needs to be implemented #./wallpaper -- still needs to be implemented #./utility -- still needs to be implemented - #./vm -- still needs to be implemented ./wayland # -- almost done, need to implement eww #./productivity -- still needs to be implemented # ./gaming diff --git a/home/programs/desktop/gaming/default.nix b/home/modules/desktop/gaming/default.nix similarity index 100% rename from home/programs/desktop/gaming/default.nix rename to home/modules/desktop/gaming/default.nix diff --git a/home/programs/desktop/media/default.nix b/home/modules/desktop/media/default.nix similarity index 100% rename from home/programs/desktop/media/default.nix rename to home/modules/desktop/media/default.nix diff --git a/home/programs/desktop/media/image/default.nix b/home/modules/desktop/media/image/default.nix similarity index 74% rename from home/programs/desktop/media/image/default.nix rename to home/modules/desktop/media/image/default.nix index e4a511a..167517d 100644 --- a/home/programs/desktop/media/image/default.nix +++ b/home/modules/desktop/media/image/default.nix @@ -4,7 +4,7 @@ ./imv ]; - options.programs.desktop.media.image = { + options.homeModules.desktop.media.image = { imv = { enable = lib.mkEnableOption "Enable imv image viewer"; }; diff --git a/home/programs/desktop/media/image/imv/default.nix b/home/modules/desktop/media/image/imv/default.nix similarity index 73% rename from home/programs/desktop/media/image/imv/default.nix rename to home/modules/desktop/media/image/imv/default.nix index 4d5d002..67d455c 100644 --- a/home/programs/desktop/media/image/imv/default.nix +++ b/home/modules/desktop/media/image/imv/default.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - cfg = config.programs.desktop.media.image.imv; + cfg = config.homeModules.desktop.media.image.imv; in { config = lib.mkIf cfg.enable { diff --git a/home/programs/desktop/media/music/default.nix b/home/modules/desktop/media/music/default.nix similarity index 84% rename from home/programs/desktop/media/music/default.nix rename to home/modules/desktop/media/music/default.nix index 1054265..b318f68 100644 --- a/home/programs/desktop/media/music/default.nix +++ b/home/modules/desktop/media/music/default.nix @@ -5,7 +5,7 @@ ./tui ]; - options.programs.desktop.media.music = { + options.homeModules.desktop.media.music = { tui = { enable = lib.mkEnableOption "Enable tui music"; }; diff --git a/home/programs/desktop/media/music/tui/default.nix b/home/modules/desktop/media/music/tui/default.nix similarity index 78% rename from home/programs/desktop/media/music/tui/default.nix rename to home/modules/desktop/media/music/tui/default.nix index 419c51b..317b1b7 100644 --- a/home/programs/desktop/media/music/tui/default.nix +++ b/home/modules/desktop/media/music/tui/default.nix @@ -1,7 +1,7 @@ { pkgs, config, lib, ... }: let - cfg = config.programs.desktop.media.music.tui; + cfg = config.homeModules.desktop.media.music.tui; in { diff --git a/home/programs/desktop/media/video/default.nix b/home/modules/desktop/media/video/default.nix similarity index 88% rename from home/programs/desktop/media/video/default.nix rename to home/modules/desktop/media/video/default.nix index 2906016..8e6d3b6 100644 --- a/home/programs/desktop/media/video/default.nix +++ b/home/modules/desktop/media/video/default.nix @@ -6,7 +6,7 @@ ./mpv ]; - options.programs.desktop.media.video = { + options.homeModules.desktop.media.video = { mpv = { enable = lib.mkEnableOption "Enable mpv video player"; }; diff --git a/home/programs/desktop/media/video/jellyfin/default.nix b/home/modules/desktop/media/video/jellyfin/default.nix similarity index 70% rename from home/programs/desktop/media/video/jellyfin/default.nix rename to home/modules/desktop/media/video/jellyfin/default.nix index 4d76440..80dffa5 100644 --- a/home/programs/desktop/media/video/jellyfin/default.nix +++ b/home/modules/desktop/media/video/jellyfin/default.nix @@ -1,6 +1,6 @@ { pkgs, lib, config, ... }: let - cfg = config.programs.desktop.media.video.jellyfin; + cfg = config.homeModules.desktop.media.video.jellyfin; in { config = lib.mkIf cfg.enable { diff --git a/home/programs/desktop/media/video/mpv/default.nix b/home/modules/desktop/media/video/mpv/default.nix similarity index 69% rename from home/programs/desktop/media/video/mpv/default.nix rename to home/modules/desktop/media/video/mpv/default.nix index 7963d0c..945364c 100644 --- a/home/programs/desktop/media/video/mpv/default.nix +++ b/home/modules/desktop/media/video/mpv/default.nix @@ -1,7 +1,7 @@ { lib, config, ... }: let - cfg = config.programs.desktop.media.video.mpv; + cfg = config.homeModules.desktop.media.video.mpv; in { config = { diff --git a/home/programs/desktop/media/video/youtube/default.nix b/home/modules/desktop/media/video/youtube/default.nix similarity index 75% rename from home/programs/desktop/media/video/youtube/default.nix rename to home/modules/desktop/media/video/youtube/default.nix index 80eaf96..27e4ae2 100644 --- a/home/programs/desktop/media/video/youtube/default.nix +++ b/home/modules/desktop/media/video/youtube/default.nix @@ -1,6 +1,6 @@ { lib, config, pkgs, ...}: let - cfg = config.programs.desktop.media.video.youtube; + cfg = config.homeModules.desktop.media.video.youtube; in { config = lib.mkIf cfg.enable { diff --git a/home/programs/desktop/productivity/libreoffice.nix b/home/modules/desktop/productivity/libreoffice.nix similarity index 100% rename from home/programs/desktop/productivity/libreoffice.nix rename to home/modules/desktop/productivity/libreoffice.nix diff --git a/home/programs/desktop/productivity/obsidian.nix b/home/modules/desktop/productivity/obsidian.nix similarity index 100% rename from home/programs/desktop/productivity/obsidian.nix rename to home/modules/desktop/productivity/obsidian.nix diff --git a/home/programs/desktop/terminal/default.nix b/home/modules/desktop/terminal/default.nix similarity index 90% rename from home/programs/desktop/terminal/default.nix rename to home/modules/desktop/terminal/default.nix index 7c28205..0eea826 100644 --- a/home/programs/desktop/terminal/default.nix +++ b/home/modules/desktop/terminal/default.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - cfg = config.programs.desktop.terminal; + cfg = config.homeModules.desktop.terminal; in { @@ -9,7 +9,7 @@ ./kitty ]; - options.programs.desktop.terminal = { + options.homeModules.desktop.terminal = { foot = { enable = lib.mkEnableOption "Enable foot terminal"; default = lib.mkOption { diff --git a/home/programs/desktop/terminal/foot/default.nix b/home/modules/desktop/terminal/foot/default.nix similarity index 92% rename from home/programs/desktop/terminal/foot/default.nix rename to home/modules/desktop/terminal/foot/default.nix index 2904051..0d3d952 100644 --- a/home/programs/desktop/terminal/foot/default.nix +++ b/home/modules/desktop/terminal/foot/default.nix @@ -2,17 +2,16 @@ let inherit (config.colorscheme) colors; + cfg = config.homeModules.desktop.terminal.foot; in { - config = { - - home.sessionVariables = lib.mkIf config.programs.desktop.terminal.foot.default { + config = lib.mkIf cfg.enable { + home.sessionVariables = lib.mkIf cfg.default { TERMINAL = "foot"; TERM = "foot"; }; - - programs.foot = lib.mkIf config.programs.desktop.terminal.foot.enable { + programs.foot = { enable = true; server.enable = true; settings = { diff --git a/home/programs/desktop/terminal/kitty/default.nix b/home/modules/desktop/terminal/kitty/default.nix similarity index 94% rename from home/programs/desktop/terminal/kitty/default.nix rename to home/modules/desktop/terminal/kitty/default.nix index da2b72e..006b54a 100644 --- a/home/programs/desktop/terminal/kitty/default.nix +++ b/home/modules/desktop/terminal/kitty/default.nix @@ -2,17 +2,16 @@ let inherit (config.colorscheme) colors; - cfg = config.programs.desktop.terminal.kitty; + cfg = config.homeModules.desktop.terminal.kitty; in { - config = { + config = lib.mkIf cfg.enable { home.sessionVariables = lib.mkIf cfg.default { TERMINAL = "kitty -1"; TERM = "kitty -1"; }; - - programs.kitty = lib.mkIf cfg.enable { + programs.kitty = { enable = true; font = { name = config.fontProfiles.monospace.family; diff --git a/home/programs/desktop/themeSettings/cursor.nix b/home/modules/desktop/themeSettings/cursor.nix similarity index 83% rename from home/programs/desktop/themeSettings/cursor.nix rename to home/modules/desktop/themeSettings/cursor.nix index f419342..a246c76 100644 --- a/home/programs/desktop/themeSettings/cursor.nix +++ b/home/modules/desktop/themeSettings/cursor.nix @@ -1,6 +1,6 @@ { pkgs, lib, config, ... }: let - cfg = config.programs.desktop.themeSettings; + cfg = config.homeModules.desktop.themeSettings; in { diff --git a/home/programs/desktop/themeSettings/default.nix b/home/modules/desktop/themeSettings/default.nix similarity index 81% rename from home/programs/desktop/themeSettings/default.nix rename to home/modules/desktop/themeSettings/default.nix index 5575eef..75ab7ed 100644 --- a/home/programs/desktop/themeSettings/default.nix +++ b/home/modules/desktop/themeSettings/default.nix @@ -8,7 +8,7 @@ ]; # settings to be expanded on in the future - options.programs.desktop.themeSettings = { + options.homeModules.desktop.themeSettings = { enable = lib.mkEnableOption "Enable theme settings"; }; } diff --git a/home/programs/desktop/themeSettings/fonts.nix b/home/modules/desktop/themeSettings/fonts.nix similarity index 90% rename from home/programs/desktop/themeSettings/fonts.nix rename to home/modules/desktop/themeSettings/fonts.nix index a209bd2..4f5de4b 100644 --- a/home/programs/desktop/themeSettings/fonts.nix +++ b/home/modules/desktop/themeSettings/fonts.nix @@ -1,6 +1,6 @@ { pkgs, config, lib, ... }: let - cfg = config.programs.desktop.themeSettings; + cfg = config.homeModules.desktop.themeSettings; in { config = lib. mkIf cfg.enable { diff --git a/home/programs/desktop/themeSettings/gtk.nix b/home/modules/desktop/themeSettings/gtk.nix similarity index 94% rename from home/programs/desktop/themeSettings/gtk.nix rename to home/modules/desktop/themeSettings/gtk.nix index 88bf5b8..6cbcd73 100644 --- a/home/programs/desktop/themeSettings/gtk.nix +++ b/home/modules/desktop/themeSettings/gtk.nix @@ -2,7 +2,7 @@ let inherit (inputs.nix-colors.lib-contrib { inherit pkgs; }) gtkThemeFromScheme; - cfg = config.programs.desktop.themeSettings; + cfg = config.homeModules.desktop.themeSettings; in { config = lib.mkIf cfg.enable (rec { diff --git a/home/programs/desktop/themeSettings/qt.nix b/home/modules/desktop/themeSettings/qt.nix similarity index 73% rename from home/programs/desktop/themeSettings/qt.nix rename to home/modules/desktop/themeSettings/qt.nix index d8f5e70..59e7a44 100644 --- a/home/programs/desktop/themeSettings/qt.nix +++ b/home/modules/desktop/themeSettings/qt.nix @@ -1,6 +1,6 @@ { config, lib, ... }: let - cfg = config.programs.desktop.themeSettings; + cfg = config.homeModules.desktop.themeSettings; in { config = lib.mkIf cfg.enable { diff --git a/home/modules/desktop/utility/gammastep.nix b/home/modules/desktop/utility/gammastep.nix new file mode 100644 index 0000000..7cfc966 --- /dev/null +++ b/home/modules/desktop/utility/gammastep.nix @@ -0,0 +1,21 @@ +{ lib, config, ... }: + +let + cfg = config.homeModules.desktop.utility.gammastep; +in + +{ + config = lib.mkIf cfg.enable { + services.gammastep = lib.mkif config.programs.desktop.windowManager.hyprland.enable { + enable = true; + provider = "geoclue2"; + temperature = { + day = 6000; + night = 4600; + }; + settings = { + general.adjustment-method = "wayland"; + }; + }; + }; +} diff --git a/home/programs/desktop/utility/gtk-lock.nix b/home/modules/desktop/utility/gtk-lock.nix similarity index 100% rename from home/programs/desktop/utility/gtk-lock.nix rename to home/modules/desktop/utility/gtk-lock.nix diff --git a/home/programs/desktop/vm/default.nix b/home/modules/desktop/wayland/bar/ags/default.nix similarity index 100% rename from home/programs/desktop/vm/default.nix rename to home/modules/desktop/wayland/bar/ags/default.nix diff --git a/home/programs/desktop/wayland/bar/default.nix b/home/modules/desktop/wayland/bar/default.nix similarity index 82% rename from home/programs/desktop/wayland/bar/default.nix rename to home/modules/desktop/wayland/bar/default.nix index 7976880..8772c77 100644 --- a/home/programs/desktop/wayland/bar/default.nix +++ b/home/modules/desktop/wayland/bar/default.nix @@ -6,7 +6,7 @@ #./waybar -- needs to be implemented ]; - options.programs.desktop.wayland.bar = { + options.homeModules.desktop.wayland.bar = { eww = { enable = lib.mkEnableOption "Enable Eww bar"; }; diff --git a/home/programs/desktop/wayland/bar/ags/default.nix b/home/modules/desktop/wayland/bar/eww/default.nix similarity index 100% rename from home/programs/desktop/wayland/bar/ags/default.nix rename to home/modules/desktop/wayland/bar/eww/default.nix diff --git a/home/programs/desktop/wayland/bar/eww/default.nix b/home/modules/desktop/wayland/bar/waybar/default.nix similarity index 100% rename from home/programs/desktop/wayland/bar/eww/default.nix rename to home/modules/desktop/wayland/bar/waybar/default.nix diff --git a/home/programs/desktop/wayland/default.nix b/home/modules/desktop/wayland/default.nix similarity index 84% rename from home/programs/desktop/wayland/default.nix rename to home/modules/desktop/wayland/default.nix index 607543b..dd06093 100644 --- a/home/programs/desktop/wayland/default.nix +++ b/home/modules/desktop/wayland/default.nix @@ -9,7 +9,7 @@ # ./launcher ]; - options.programs.desktop.wayland = { + options.homeModules.desktop.wayland = { base = { enable = lib.mkEnableOption "Enable wayland specific utilities"; }; diff --git a/home/programs/desktop/wayland/bar/waybar/default.nix b/home/modules/desktop/wayland/launcher/default.nix similarity index 100% rename from home/programs/desktop/wayland/bar/waybar/default.nix rename to home/modules/desktop/wayland/launcher/default.nix diff --git a/home/programs/desktop/wayland/lockscreen/default.nix b/home/modules/desktop/wayland/lockscreen/default.nix similarity index 78% rename from home/programs/desktop/wayland/lockscreen/default.nix rename to home/modules/desktop/wayland/lockscreen/default.nix index 51053a4..d181690 100644 --- a/home/programs/desktop/wayland/lockscreen/default.nix +++ b/home/modules/desktop/wayland/lockscreen/default.nix @@ -6,7 +6,7 @@ ./swaylock ]; - options.programs.desktop.wayland.lockscreen = { + options.homeModules.desktop.wayland.lockscreen = { swaylock = { enable = lib.mkEnableOption "Enable Swaylock screen"; }; diff --git a/home/programs/desktop/wayland/lockscreen/swaylock/default.nix b/home/modules/desktop/wayland/lockscreen/swaylock/default.nix similarity index 89% rename from home/programs/desktop/wayland/lockscreen/swaylock/default.nix rename to home/modules/desktop/wayland/lockscreen/swaylock/default.nix index 5d434e3..0dc134e 100644 --- a/home/programs/desktop/wayland/lockscreen/swaylock/default.nix +++ b/home/modules/desktop/wayland/lockscreen/swaylock/default.nix @@ -2,11 +2,11 @@ let inherit (config.colorscheme) colors; - cfg = config.programs.desktop.wayland.lockscreen.swaylock; + cfg = config.homeModules.desktop.wayland.lockscreen.swaylock; in { - config = { - programs.swaylock = lib.mkIf cfg.enable { + config = lib.mkIf cfg.enable { + programs.swaylock = { enable = true; settings = { font = config.fontProfiles.monospace.family; diff --git a/home/programs/desktop/wayland/notification/default.nix b/home/modules/desktop/wayland/notification/default.nix similarity index 77% rename from home/programs/desktop/wayland/notification/default.nix rename to home/modules/desktop/wayland/notification/default.nix index 755c2e4..acb0445 100644 --- a/home/programs/desktop/wayland/notification/default.nix +++ b/home/modules/desktop/wayland/notification/default.nix @@ -6,7 +6,7 @@ #./dunst -- still needs to be implemented ]; - options.programs.desktop.wayland.notification = { + options.homeModules.desktop.wayland.notification = { mako = { enable = lib.mkEnableOption "Enable mako notification daemon"; }; diff --git a/home/programs/desktop/wayland/notification/mako/default.nix b/home/modules/desktop/wayland/notification/mako/default.nix similarity index 88% rename from home/programs/desktop/wayland/notification/mako/default.nix rename to home/modules/desktop/wayland/notification/mako/default.nix index d6c2cf8..27b5862 100644 --- a/home/programs/desktop/wayland/notification/mako/default.nix +++ b/home/modules/desktop/wayland/notification/mako/default.nix @@ -1,10 +1,10 @@ { config, lib, ... }: let inherit (config.colorscheme) colors kind; - cfg = config.programs.desktop.wayland.notification.mako; + cfg = config.homeModules.desktop.wayland.notification.mako; in { - config = { - services.mako = lib.mkIf cfg.enable { + config = lib.mkIf cfg.enable { + services.mako = { enable = true; iconPath = if kind == "dark" then diff --git a/home/programs/desktop/wayland/utility/default.nix b/home/modules/desktop/wayland/utility/default.nix similarity index 68% rename from home/programs/desktop/wayland/utility/default.nix rename to home/modules/desktop/wayland/utility/default.nix index ad97c4b..6da50d8 100644 --- a/home/programs/desktop/wayland/utility/default.nix +++ b/home/modules/desktop/wayland/utility/default.nix @@ -1,7 +1,7 @@ { lib, config, pkgs, ... }: let - cfg = config.programs.desktop.wayland.base; + cfg = config.homeModules.desktop.wayland.base; in { @@ -35,16 +35,16 @@ in }; }; - services.gammastep = { - enable = true; - provider = "geoclue2"; - temperature = { - day = 6000; - night = 4600; - }; - settings = { - general.adjustment-method = "wayland"; - }; - }; + # services.gammastep = { + # enable = true; + # provider = "geoclue2"; + # temperature = { + # day = 6000; + # night = 4600; + # }; + # settings = { + # general.adjustment-method = "wayland"; + # }; + # }; }; } diff --git a/home/programs/desktop/wayland/windowManager/default.nix b/home/modules/desktop/wayland/windowManager/default.nix similarity index 72% rename from home/programs/desktop/wayland/windowManager/default.nix rename to home/modules/desktop/wayland/windowManager/default.nix index 1794ede..761bbb4 100644 --- a/home/programs/desktop/wayland/windowManager/default.nix +++ b/home/modules/desktop/wayland/windowManager/default.nix @@ -5,7 +5,7 @@ ./hyprland ]; - options.programs.desktop.wayland.windowManager = { + options.homeModules.desktop.wayland.windowManager = { hyprland = { enable = lib.mkEnableOption "Enable Hyprland window-manager"; }; diff --git a/home/programs/desktop/wayland/windowManager/hyprland/appearance.nix b/home/modules/desktop/wayland/windowManager/hyprland/appearance.nix similarity index 92% rename from home/programs/desktop/wayland/windowManager/hyprland/appearance.nix rename to home/modules/desktop/wayland/windowManager/hyprland/appearance.nix index 00763fd..dc9bec3 100644 --- a/home/programs/desktop/wayland/windowManager/hyprland/appearance.nix +++ b/home/modules/desktop/wayland/windowManager/hyprland/appearance.nix @@ -1,10 +1,10 @@ { config, lib, ... }: let - cfg = config.programs.desktop.wayland.windowManager.hyprland; + cfg = config.homeModules.desktop.wayland.windowManager.hyprland; in { - config = { - wayland.windowManager.hyprland = lib.mkIf cfg.enable { + config = lib.mkIf cfg.enable { + wayland.windowManager.hyprland = { settings = { general = { gaps_in = 10; diff --git a/home/programs/desktop/wayland/windowManager/hyprland/binds.nix b/home/modules/desktop/wayland/windowManager/hyprland/binds.nix similarity index 96% rename from home/programs/desktop/wayland/windowManager/hyprland/binds.nix rename to home/modules/desktop/wayland/windowManager/hyprland/binds.nix index 564d967..bd3be4d 100644 --- a/home/programs/desktop/wayland/windowManager/hyprland/binds.nix +++ b/home/modules/desktop/wayland/windowManager/hyprland/binds.nix @@ -1,8 +1,7 @@ { lib, config, pkgs, ... }: let - cfg = config.programs.desktop.wayland.windowManager.hyprland; - light = "${pkgs.light}/bin/light"; + cfg = config.homeModules.desktop.wayland.windowManager.hyprland; notifysend = "${pkgs.libnotify}/bin/notify-send"; #pamixer = "${pkgs.pamixer}/bin/pamixer"; @@ -10,15 +9,15 @@ #!/bin/sh if [ "$1" == "up" ]; then - ${light} -A 10 + brillo -q -u 30000 -A 5 elif [ "$1" == "down" ]; then - ${light} -U 10 + brillo -q -u 30000 -U 5 else echo "Invalid argument" exit 1 fi - BRIGHTNESS=$(${light} -G | awk -F'.' '{print$1}') + BRIGHTNESS=$(brillo -G | awk -F'.' '{print$1}') ${notifysend} --app-name="system-notify" -h string:x-canonical-private-synchronous:sys-notify "󰃠 $BRIGHTNESS%" ''; diff --git a/home/programs/desktop/wayland/windowManager/hyprland/default.nix b/home/modules/desktop/wayland/windowManager/hyprland/default.nix similarity index 94% rename from home/programs/desktop/wayland/windowManager/hyprland/default.nix rename to home/modules/desktop/wayland/windowManager/hyprland/default.nix index aefd72a..d720ce5 100644 --- a/home/programs/desktop/wayland/windowManager/hyprland/default.nix +++ b/home/modules/desktop/wayland/windowManager/hyprland/default.nix @@ -1,6 +1,6 @@ { lib, config, pkgs, ... }: let - cfg = config.programs.desktop.wayland.windowManager.hyprland; + cfg = config.homeModules.desktop.wayland.windowManager.hyprland; in { imports = [ @@ -19,6 +19,8 @@ in home.packages = with pkgs; [ inputs.hyprwm-contrib.grimblast hyprpicker + light + hyprshade ]; wayland.windowManager.hyprland = { diff --git a/home/programs/desktop/wayland/windowManager/hyprland/env.nix.bak b/home/modules/desktop/wayland/windowManager/hyprland/env.nix.bak similarity index 93% rename from home/programs/desktop/wayland/windowManager/hyprland/env.nix.bak rename to home/modules/desktop/wayland/windowManager/hyprland/env.nix.bak index 45d662e..685e3a4 100644 --- a/home/programs/desktop/wayland/windowManager/hyprland/env.nix.bak +++ b/home/modules/desktop/wayland/windowManager/hyprland/env.nix.bak @@ -1,7 +1,7 @@ { config, lib, ... }: { - home = lib.mkIf config.programs.desktop.wayland.windowManager.hyprland.enable { + home = lib.mkIf config.homeModules.desktop.wayland.windowManager.hyprland.enable { sessionVariables = { # GTK_IM_MODULE = "fcitx5"; # QT_IM_MODULE = "fcitx5"; diff --git a/home/programs/desktop/wayland/windowManager/hyprland/exec.nix b/home/modules/desktop/wayland/windowManager/hyprland/exec.nix similarity index 81% rename from home/programs/desktop/wayland/windowManager/hyprland/exec.nix rename to home/modules/desktop/wayland/windowManager/hyprland/exec.nix index 1079a80..567331d 100644 --- a/home/programs/desktop/wayland/windowManager/hyprland/exec.nix +++ b/home/modules/desktop/wayland/windowManager/hyprland/exec.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: let - cfg = config.programs.desktop.wayland.windowManager.hyprland; + cfg = config.homeModules.desktop.wayland.windowManager.hyprland; in { config = { @@ -13,6 +13,7 @@ in "${pkgs._1password-gui}/bin/1password --silent" "${pkgs.live-buds-cli}/bin/earbuds -d" "eww daemon && eww open bar" + "systemctl --user start clight" ]; }; }; diff --git a/home/programs/desktop/wayland/windowManager/hyprland/rules.nix b/home/modules/desktop/wayland/windowManager/hyprland/rules.nix similarity index 88% rename from home/programs/desktop/wayland/windowManager/hyprland/rules.nix rename to home/modules/desktop/wayland/windowManager/hyprland/rules.nix index 4e2fffe..b186085 100644 --- a/home/programs/desktop/wayland/windowManager/hyprland/rules.nix +++ b/home/modules/desktop/wayland/windowManager/hyprland/rules.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - cfg = config.programs.desktop.wayland.windowManager.hyprland; + cfg = config.homeModules.desktop.wayland.windowManager.hyprland; in { config = { diff --git a/home/profile/base/default.nix b/home/profile/base/default.nix index caa9d67..b31db77 100644 --- a/home/profile/base/default.nix +++ b/home/profile/base/default.nix @@ -7,7 +7,7 @@ in { imports = [ inputs.nix-colors.homeManagerModule - ../../programs + ../../modules ] ++ (builtins.attrValues outputs.homeManagerModules); config = lib.mkIf cfg.enable { @@ -44,7 +44,7 @@ in xdg.portal.enable = true; - programs = { + homeModules = { console = { editor.helix = { enable = true; diff --git a/home/profile/hyprland/default.nix b/home/profile/hyprland/default.nix index 802a6e7..64e0654 100644 --- a/home/profile/hyprland/default.nix +++ b/home/profile/hyprland/default.nix @@ -5,11 +5,11 @@ in { imports = [ - ../../programs + ../../modules ]; config = lib.mkIf cfg.enable { - programs.desktop = { + homeModules.desktop = { wayland = { base.enable = true; windowManager.hyprland.enable = true; diff --git a/home/programs/console/editor/helix/languages.nix b/home/programs/console/editor/helix/languages.nix deleted file mode 100644 index bd7bb5a..0000000 --- a/home/programs/console/editor/helix/languages.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ pkgs, lib, ... }: -{ - programs.helix.languages = { - language = let - deno = lang: { - command = "${pkgs.deno}/bin/deno"; - args = ["fmt" "-" "--ext" lang]; - }; - - prettier = lang: { - command = "${pkgs.nodePackages.prettier}/bin/prettier"; - args = ["--parser" lang]; - }; - prettierLangs = map (e: { - name = e; - formatter = prettier e; - }); - langs = ["css" "scss" "html"]; - in - [ - { - name = "bash"; - auto-format = true; - formatter = { - command = "${pkgs.shfmt}/bin/shfmt"; - args = ["-i" "2"]; - }; - } - { - name = "clojure"; - injection-regex = "(clojure|clj|edn|boot|yuck)"; - file-types = ["clj" "cljs" "cljc" "clje" "cljr" "cljx" "edn" "boot" "yuck"]; - } - { - name = "javascript"; - auto-format = true; - language-servers = ["deno-lsp"]; - } - { - name = "json"; - formatter = deno "json"; - } - { - name = "markdown"; - auto-format = true; - formatter = deno "md"; - } - ] - ++ prettierLangs langs; - - language-server = { - bash-language-server = { - command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server"; - args = ["start"]; - }; - - clangd = { - command = "${pkgs.clang-tools}/bin/clangd"; - clangd.fallbackFlags = ["-std=c++2b"]; - }; - - deno-lsp = { - command = "${pkgs.deno}/bin/deno"; - args = ["lsp"]; - environment.NO_COLOR = "1"; - config.deno = { - enable = true; - lint = true; - unstable = true; - suggest = { - completeFunctionCalls = false; - imports = {hosts."https://deno.land" = true;}; - }; - inlayHints = { - enumMemberValues.enabled = true; - functionLikeReturnTypes.enabled = true; - parameterNames.enabled = "all"; - parameterTypes.enabled = true; - propertyDeclarationTypes.enabled = true; - variableTypes.enabled = true; - }; - }; - }; - - nil = { - command = lib.getExe pkgs.nil; - config.nil.formatting.command = ["${lib.getExe pkgs.alejandra}" "-q"]; - }; - - vscode-css-language-server = { - command = "${pkgs.nodePackages.vscode-css-languageserver-bin}/bin/css-languageserver"; - args = ["--stdio"]; - config = { - provideFormatter = true; - css.validate.enable = true; - scss.validate.enable = true; - }; - }; - }; - }; -} diff --git a/home/programs/console/language/c.nix b/home/programs/console/language/c.nix deleted file mode 100644 index e69de29..0000000 diff --git a/home/programs/console/language/python.nix b/home/programs/console/language/python.nix deleted file mode 100644 index e69de29..0000000 diff --git a/home/programs/console/language/rust.nix b/home/programs/console/language/rust.nix deleted file mode 100644 index e69de29..0000000 diff --git a/home/programs/desktop/communication/discord/theme.css b/home/programs/desktop/communication/discord/theme.css deleted file mode 100644 index 0d71186..0000000 --- a/home/programs/desktop/communication/discord/theme.css +++ /dev/null @@ -1,102 +0,0 @@ -:root { - --nix-bg1: #32302f; /*base00*/ - --nix-bg2: #3c3836; /*base01*/ - --nix-bg3: #504945; /*base02*/ - - --nix-fg1: #d5c4a1; /*base05*/ - --nix-fg2: #fbf1c7; /*base07*/ - --nix-fg3: #665c54; /*base03*/ - --nix-link: #83a598; /*base0D*/ - - --nix-accent: #fb4934; /*base08*/ - --nix-hi: #b8bb26; /*base0B*/ - - /* server collapse */ - --sb-collapsed-width: 12px; - --sb-transition-duration: 0.15s; -} - -.theme-dark { - --background-primary: var(--nix-bg1); - --background-secondary: var(--nix-bg2); - --background-secondary-alt: var(--nix-bg3); - --header-primary: var(--nix-fg1); - --header-secondary: var(--nix-hi); - --text-normal: var(--nix-fg1); - --text-muted: var(--nix-fg1); - --text-link: var(--nix-link); - --background-accent: var(--nix-accent); /*base08*/ - --background-tertiary: var(--nix-bg2); /*base01*/ - --background-floating: var(--nix-bg1); /*base00*/ - --background-mentioned: var(--nix-hi); - --background-mentioned: var(--nix-hi); - --interactive-normal: var(--nix-fg1); /*base05*/ - --interactive-hover: var(--nix-hi); /*base0B*/ - --interactive-active: var(--nix-fg2); - --interactive-muted: var(--nix-fg3); /*base03*/ - --channels-default: var(--nix-fg1); - --background-mobile: var(--nix-bg1); - --background-mobile-secondary: var(--nix-bg2); - --background-modifier-selected: var(--nix-bg1); - --scrollbar-thin-thun: var(--nix-hi); - --scrollbar-auto-thumb: var(--nix-fg1); - --scrollbar-auto-track: var(--nix-bg2); - --channeltextarea-background: var(--nix-bg2); - --background-modifier-hover: var(--nix-bg1); - --activity-card-background: var(--nix-bg2); - --text-warning: var(--nix-accent); -} - -.link__95dc0 /* text channel*/ { - border-radius: 0px; - margin-left: var(--csu-init-margin); - font-family: JetBrains Mono Nerd Font; - transition: - margin-left var(--csu-anim-duration) var(--csu-anim-transition), - background-color var(--csu-anim-duration); -} - -.containerDefault__3187b .wrapper__7bcde:before /* text channel */ { - content: ""; - display: inline-block; - background: var(--nix-hi); - height: 100%; - position: absolute; - left: 0; -} - -/* server collapse */ -.guilds__2b93a /* servers */ { - overflow: hidden !important; - width: var(--sb-collapsed-width, 75px); - transition: width var(--sb-transition-duration); -} -.guilds__2b93a:hover /* expand server bar on hover */ { - width: 72px; - overflow: visible !important; - animation: server-bar-overflow 0s linear 0ms forwards; -} -.guilds__2b93a ~ .base__3e6af /* friends list, chat */ { - position: absolute; - left: var(--sb-collapsed-left, var(--sb-collapsed-width)); - top: var(--sb-collapsed-top, 0px); - bottom: var(--sb-collapsed-bottom, 0px); - right: var(--sb-collapsed-right, 0px); - transition-property: var(--sb-transition-property, left); - transition-duration: var(--sb-transition-duration); -} -.guilds__2b93a:hover ~ .base__3e6af /* friends list, chat */ { - position: absolute; - left: var(--sb-left, 60px); - top: var(--sb-top, 0px); - bottom: var(--sb-bottom, 0px); - right: var(--sb-right, 0px); -} -@keyframes server-bar-overflow { - from { - overflow: hidden; - } - to { - overflow: visible; - } -} diff --git a/home/programs/desktop/desktopEnvironment/default.nix b/home/programs/desktop/desktopEnvironment/default.nix deleted file mode 100644 index 1e1b1c4..0000000 --- a/home/programs/desktop/desktopEnvironment/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, ... } -{ - import = [ - ./window-manager - #./gnome -- still needs to be implemented - #./kde -- still needs to implemented - ./appearance - ]; - - options.programs.desktop.desktopEnvironment = { - hyprland = { - enable = lib.mkEnableOption "Enable Hyprland window-manager"; - }; - }; -} diff --git a/home/programs/desktop/utility/gammastep.nix b/home/programs/desktop/utility/gammastep.nix deleted file mode 100644 index ae61585..0000000 --- a/home/programs/desktop/utility/gammastep.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, config, ... }: -{ - services.gammastep = lib.mkif config.programs.desktop.windowManager.hyprland.enable { - enable = true; - provider = "geoclue2"; - temperature = { - day = 6000; - night = 4600; - }; - settings = { - general.adjustment-method = "wayland"; - }; - }; -} diff --git a/home/programs/desktop/utility/mako.nix b/home/programs/desktop/utility/mako.nix deleted file mode 100644 index e69de29..0000000 diff --git a/home/programs/desktop/utility/xdg.nix b/home/programs/desktop/utility/xdg.nix deleted file mode 100644 index e69de29..0000000 diff --git a/home/programs/desktop/wayland/launcher/default.nix b/home/programs/desktop/wayland/launcher/default.nix deleted file mode 100644 index e69de29..0000000 diff --git a/system/hosts/ookst480s/default.nix b/system/hosts/ookst480s/default.nix index 33d28c7..51b4f45 100644 --- a/system/hosts/ookst480s/default.nix +++ b/system/hosts/ookst480s/default.nix @@ -5,7 +5,6 @@ inputs.hardware.nixosModules.lenovo-thinkpad-t480s ./hardware-configuration.nix ../../profiles - # ../../modules ]; activeProfiles = ["base" "laptop"]; diff --git a/system/modules/hardware/backlight.nix b/system/modules/hardware/backlight.nix index 8e4753e..7afed96 100644 --- a/system/modules/hardware/backlight.nix +++ b/system/modules/hardware/backlight.nix @@ -9,13 +9,18 @@ in hardware.brillo.enable = true; services.clight = { enable = true; + temperature = { + night = 1000; + day = 6000; + }; settings = { verbose = true; backlight.disabled = true; dpms.timeouts = [900 300]; dimmer.timeouts = [870 270]; - gamma.long_transition = true; screen.disabled = true; + sunrise = "9:00"; + sunset = "20:00"; }; }; }; diff --git a/system/profiles/base/default.nix b/system/profiles/base/default.nix index 6cd6c37..73db64c 100644 --- a/system/profiles/base/default.nix +++ b/system/profiles/base/default.nix @@ -46,9 +46,19 @@ in hardware = { enableAllFirmware = true; - opengl.enable = true; + opengl = { + enable = true; + extraPackages = with pkgs; [ + libva + vaapiVdpau + libvdpau-va-gl + ]; + extraPackages32 = with pkgs.pkgsi686Linux; [ + vaapiVdpau + libvdpau-va-gl + ]; + }; }; - system.stateVersion = lib.mkDefault "23.11"; }; } diff --git a/system/profiles/laptop/default.nix b/system/profiles/laptop/default.nix index 05b2e2a..a292846 100644 --- a/system/profiles/laptop/default.nix +++ b/system/profiles/laptop/default.nix @@ -12,7 +12,7 @@ in hardware = { bluetooth.enable = true; power.enable = true; - # backlight.enable = true; + backlight.enable = true; }; }; };