diff --git a/flake.lock b/flake.lock index d2414ef..18b52d9 100644 --- a/flake.lock +++ b/flake.lock @@ -82,6 +82,22 @@ "type": "github" } }, + "copilot-lua": { + "flake": false, + "locked": { + "lastModified": 1677479736, + "narHash": "sha256-n/SCrzzzL5WUHJk0sCXbgGusk/dQuy8DI9Pqdh+lVeQ=", + "owner": "zbirenbaum", + "repo": "copilot.lua", + "rev": "b41d4c9c7d4f5e0272bcf94061b88e244904c56f", + "type": "github" + }, + "original": { + "owner": "zbirenbaum", + "repo": "copilot.lua", + "type": "github" + } + }, "crane": { "inputs": { "flake-compat": [ @@ -813,6 +829,7 @@ "arkenfox-userjs": "arkenfox-userjs", "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver", "attic": "attic", + "copilot-lua": "copilot-lua", "emacs": "emacs", "flake-utils": "flake-utils_3", "forgit-git": "forgit-git", diff --git a/flake.nix b/flake.nix index 28c83f1..6a8b7d5 100644 --- a/flake.nix +++ b/flake.nix @@ -83,6 +83,11 @@ inputs.nixpkgs-stable.follows = "stable"; inputs.flake-utils.follows = "flake-utils"; }; + + copilot-lua = { + url = "github:zbirenbaum/copilot.lua"; + flake = false; + }; }; outputs = diff --git a/modules/config/theming/catppuccin-frappe.nix b/modules/config/theming/catppuccin-frappe.nix index b7d8169..8be760f 100644 --- a/modules/config/theming/catppuccin-frappe.nix +++ b/modules/config/theming/catppuccin-frappe.nix @@ -5,7 +5,7 @@ let cfg = config.my.theming; in { - config = mkIf (cfg.scheme == "catppuccin-frappe") + config = mkIf (cfg.enable && cfg.scheme == "catppuccin-frappe") (import ./catppuccin.nix { inherit config lib pkgs; diff --git a/modules/config/theming/catppuccin-latte.nix b/modules/config/theming/catppuccin-latte.nix index 6743ed9..3cf64d8 100644 --- a/modules/config/theming/catppuccin-latte.nix +++ b/modules/config/theming/catppuccin-latte.nix @@ -5,7 +5,7 @@ let cfg = config.my.theming; in { - config = mkIf (cfg.scheme == "catppuccin-latte") + config = mkIf (cfg.enable && cfg.scheme == "catppuccin-latte") (import ./catppuccin.nix { inherit config lib pkgs; diff --git a/modules/config/theming/catppuccin-macchiato.nix b/modules/config/theming/catppuccin-macchiato.nix index 70b4dd8..f4f02f6 100644 --- a/modules/config/theming/catppuccin-macchiato.nix +++ b/modules/config/theming/catppuccin-macchiato.nix @@ -5,7 +5,7 @@ let cfg = config.my.theming; in { - config = mkIf (cfg.scheme == "catppuccin-macchiato") + config = mkIf (cfg.enable && cfg.scheme == "catppuccin-macchiato") (import ./catppuccin.nix { inherit config lib pkgs; diff --git a/modules/config/theming/catppuccin-mocha.nix b/modules/config/theming/catppuccin-mocha.nix index ab35068..6b39aa6 100644 --- a/modules/config/theming/catppuccin-mocha.nix +++ b/modules/config/theming/catppuccin-mocha.nix @@ -5,7 +5,7 @@ let cfg = config.my.theming; in { - config = mkIf (cfg.scheme == "catppuccin-mocha") + config = mkIf (cfg.enable && cfg.scheme == "catppuccin-mocha") (import ./catppuccin.nix { inherit config lib pkgs; diff --git a/modules/config/theming/dracula.nix b/modules/config/theming/dracula.nix index 235e0c3..22ef8e6 100644 --- a/modules/config/theming/dracula.nix +++ b/modules/config/theming/dracula.nix @@ -17,7 +17,7 @@ let yellow = "#f1fa8c"; in { - config = mkIf (cfg.scheme == "dracula") { + config = mkIf (cfg.enable && cfg.scheme == "dracula") { home-manager.users.moritz = { programs = { kitty.extraConfig = diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index d70b17f..10de55c 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -75,11 +75,9 @@ with lib; { git.signing = true; gpg.enable = true; hub.enable = true; - kitty.enable = true; ledger.enable = true; logseq.enable = true; - python.enable = true; - rofi.enable = true; + python.versions."311".enable = true; ssh = { enable = true; includeSecrets = [ ../../secrets/ssh-home.age ]; diff --git a/modules/programs/bspwm/default.nix b/modules/programs/bspwm/default.nix index 78c64a6..ba50a96 100644 --- a/modules/programs/bspwm/default.nix +++ b/modules/programs/bspwm/default.nix @@ -37,7 +37,7 @@ in "feh".state = "floating"; "Vampire_Survivors".state = "fullscreen"; }; - settings = with config.scheme.withHashtag; { + settings = { border_width = 2; window_gap = 5; borderless_monocle = true; diff --git a/modules/programs/default.nix b/modules/programs/default.nix index a588494..9674641 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -18,10 +18,12 @@ ./gpg.nix ./helix.nix ./hub.nix + ./hyprland ./kakoune.nix ./kitty.nix ./ledger ./logseq.nix + ./miracast.nix ./python.nix ./rofi ./spotify.nix @@ -32,6 +34,5 @@ ./xmonad ./zathura.nix ./zsh.nix - ./hyprland ]; } diff --git a/modules/programs/hyprland/config.nix b/modules/programs/hyprland/config.nix index 732aa27..5bfba05 100644 --- a/modules/programs/hyprland/config.nix +++ b/modules/programs/hyprland/config.nix @@ -141,6 +141,8 @@ in # Fullscreen Applications # ${mkRules ["opaque" "noblur" "noborder" "noshadow" "forceinput"] ["fullscreen:1"]} + ${mkRules ["opaque" "noblur" "noshadow"] ["class:^jetbrains-pycharm$"]} + # See https://wiki.hyprland.org/Configuring/Keywords/ for more $mainMod = SUPER $windowMod = ALT diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix index 26b1538..62f4660 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -28,6 +28,13 @@ in }; config = mkIf cfg.enable { + my = { + programs = { + kitty.enable = true; + rofi.enable = true; + }; + services.dunst.enable = true; + }; # enable nix module programs.hyprland = { @@ -35,6 +42,7 @@ in package = null; # because we use the home-manager module }; + # enable home-manager module home-manager.users.moritz = { # import home-manager module @@ -146,11 +154,12 @@ in # add user packages for wayland and hyprland in particular users.users.moritz.packages = with pkgs; [ - pamixer # pulse audio cli - playerctl # control media playback brightnessctl # control brightness grimblast # screenshot tool for hyprland + pamixer # pulse audio cli + playerctl # control media playback slurp # region select for wayland (for screensharing) + wdisplays # manage monitors wl-clipboard # clipboard tool for wayland ]; @@ -169,7 +178,6 @@ in } // (optionalAttrs cfg.nvidiaSupport { LIBVA_DRIVER_NAME = "nvidia"; - XDG_SESSION_TYPE = "wayland"; GBM_BACKEND = "nvidia-drm"; __GLX_VENDOR_LIBRARY_NAME = "nvidia"; WLR_NO_HARDWARE_CURSORS = "1"; diff --git a/modules/programs/miracast.nix b/modules/programs/miracast.nix new file mode 100644 index 0000000..6181a88 --- /dev/null +++ b/modules/programs/miracast.nix @@ -0,0 +1,23 @@ +{ config +, lib +, pkgs +, ... +}: + +with lib; +let + cfg = config.my.programs.miracast; +in +{ + options.my.programs.miracast.enable = mkEnableOption "miracast"; + + config = mkIf cfg.enable { + networking.firewall = { + allowedTCPPorts = [ 7236 7250 ]; + allowedUDPPorts = [ 7236 5353 ]; + }; + users.users.moritz.packages = with pkgs; [ + gnome-network-displays + ]; + }; +} diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix index 3ec5a1c..697bd7b 100644 --- a/modules/programs/nvim/default.nix +++ b/modules/programs/nvim/default.nix @@ -8,26 +8,6 @@ with lib; let cfg = config.my.programs.vim; - - mkDate = longDate: (lib.concatStringsSep "-" [ - (builtins.substring 0 4 longDate) - (builtins.substring 4 2 longDate) - (builtins.substring 6 2 longDate) - ]); - - mkVersionInput = input: mkDate (input.lastModifiedDate or "19700101") + "_" + (input.shortRev or "dirty"); - - nvim-treesitter-textsubjects = pkgs.vimUtils.buildVimPluginFrom2Nix { - pname = "nvim-treesitter-textsubjects"; - version = mkVersionInput inputs.nvim-treesitter-textsubjects; - src = inputs.nvim-treesitter-textsubjects; - }; - - smartcolumn-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { - pname = "smartcolumn-nvim"; - version = mkVersionInput inputs.smartcolumn-nvim; - src = inputs.smartcolumn-nvim; - }; in { options.my.programs.vim = { diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua index de5e1cf..65153bf 100644 --- a/modules/programs/nvim/init.lua +++ b/modules/programs/nvim/init.lua @@ -329,7 +329,7 @@ local function lspconfig_setup(lsp, options) lspconfig[lsp].setup(final_options) end -local servers = { "nil_ls", "pylsp", "rust_analyzer" } +local servers = { "nil_ls", "pylsp", "rust_analyzer", "ruff_lsp" } for _, lsp in ipairs(servers) do lspconfig_setup(lsp, {}) end @@ -440,6 +440,10 @@ require("copilot").setup({ suggestion = { enabled = false }, panel = { enabled = false }, }) +vim.api.nvim_create_autocmd("VimEnter", { + desc = "Disable Copilot by default on startup", + command = "Copilot disable", +}) require("copilot_cmp").setup() local orgmode = require("orgmode") diff --git a/modules/programs/python.nix b/modules/programs/python.nix index 8dc452b..adecd55 100644 --- a/modules/programs/python.nix +++ b/modules/programs/python.nix @@ -8,40 +8,55 @@ with lib; let cfg = config.my.programs.python; - mkPython = packages: version: pkgs.${version}.withPackages (ps: map (flip getAttr ps) packages); + pythonVersions = map (version: "3${toString version}") (range 8 11); + enabledVersions = filterAttrs (name: value: value.enable) cfg.versions; - pythonVersions = [ - "python311" - "python310" - "python39" - "python38" - ]; + pythonPackages = version: attrNames pkgs."python${version}Packages"; - packageLists = map (version: attrNames pkgs."${version}Packages") cfg.versions; + commonPackages = + let + packageLists = map pythonPackages (attrNames enabledVersions); + in + foldl' intersectLists (head packageLists) (tail packageLists); - commonPackages = foldl' intersectLists (head packageLists) (tail packageLists); + versionOpts = version: { + enable = mkEnableOption (toString version); + pythonPackages = mkOption { + default = [ ]; + type = with types; listOf (enum (pythonPackages version)); + }; + }; in { options.my.programs.python = { - enable = mkEnableOption "python"; - versions = mkOption { - default = [ "python310" ]; - type = with types; nonEmptyListOf (enum pythonVersions); - example = [ "python39" ]; - }; - packages = mkOption { - default = [ - "flake8" - "isort" - "mypy" - "pytest" - ]; + versions = genAttrs pythonVersions versionOpts; + defaultPackages = mkOption { + default = [ ]; type = with types; listOf (enum commonPackages); }; + extraPackages = mkOption { + default = with pkgs; [ + poetry + ruff + python310Packages.python-lsp-server + ]; + type = with types; listOf package; + }; }; - config = mkIf cfg.enable { - users.users.moritz.packages = map (mkPython cfg.packages) cfg.versions - ++ [ pkgs.poetry pkgs.nodePackages.pyright ]; + config = { + users.users.moritz.packages = + ( + let + mkPython = version: + let + package = pkgs."python${version}"; + finalPythonPackages = cfg.versions.${version}.pythonPackages ++ cfg.defaultPackages; + getPythonPackages = ps: map (flip getAttr ps) finalPythonPackages; + in + package.withPackages getPythonPackages; + in + map mkPython (attrNames enabledVersions) + ) ++ cfg.extraPackages; }; } diff --git a/modules/virtualisation/podman.nix b/modules/virtualisation/podman.nix index f3fdf35..1698fe3 100644 --- a/modules/virtualisation/podman.nix +++ b/modules/virtualisation/podman.nix @@ -15,6 +15,7 @@ in virtualisation.podman = { enable = true; dockerCompat = true; + defaultNetwork.settings.dns_enabled = true; }; }; } diff --git a/overlays/default.nix b/overlays/default.nix index ae2256c..960d029 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,13 @@ -{ inputs }: final: prev: { +{ inputs }: final: prev: +let + mkDate = longDate: (prev.lib.concatStringsSep "-" [ + (builtins.substring 0 4 longDate) + (builtins.substring 4 2 longDate) + (builtins.substring 6 2 longDate) + ]); + mkVersionInput = input: "unstable" + mkDate (input.lastModifiedDate or "19700101") + "_" + (input.shortRev or "dirty"); +in +{ agenix = inputs.agenix.packages.${prev.system}.default; attic = inputs.attic.packages.${prev.system}.default; hyprpaper = inputs.hyprpaper.packages.${prev.system}.default; @@ -23,6 +32,25 @@ mesonFlags = old.mesonFlags or [ ] ++ [ "-Dexperimental=true" ]; }); + vimPlugins = prev.vimPlugins // { + nvim-treesitter-textsubjects = prev.vimUtils.buildVimPluginFrom2Nix { + pname = "nvim-treesitter-textsubjects"; + version = mkVersionInput inputs.nvim-treesitter-textsubjects; + src = inputs.nvim-treesitter-textsubjects; + }; + + smartcolumn-nvim = prev.vimUtils.buildVimPluginFrom2Nix { + pname = "smartcolumn-nvim"; + version = mkVersionInput inputs.smartcolumn-nvim; + src = inputs.smartcolumn-nvim; + }; + + copilot-lua = prev.vimPlugins.copilot-lua.overrideAttrs (old: { + version = mkVersionInput inputs.copilot-lua; + src = inputs.copilot-lua; + }); + }; + master = import inputs.master { inherit (prev) system; config.allowUnfree = true;