From 30f81b2b795cc0840470a6fcf19e52045d99522d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20D=C3=B6nszelmann?= Date: Fri, 23 Jan 2026 13:27:58 +0100 Subject: [PATCH] make home configs work --- ; | 33 + config.nix | 124 ++ .../machine-config.nix | 14 +- defaults/machine-or-home-config.nix | 9 + {programs => defaults}/xdg.nix | 0 flake.nix | 112 +- hosts/fili/configuration.nix | 9 +- hosts/fili/services/forgejo.nix | 2 +- hosts/kili/configuration.nix | 12 +- hosts/kili/hardware-configuration.nix | 44 +- hosts/kili/kanata.nix | 13 + hosts/ragdoll/configuration.nix | 13 +- hosts/ragdoll/hardware-configuration.nix | 16 - modules/home-info.nix | 16 - modules/machine-type.nix | 25 - modules/program.nix | 9 +- modules/users.nix | 98 +- programs/default.nix | 11 +- programs/firefox/default.nix | 311 ++-- programs/fish/default.nix | 463 +++--- programs/git/default.nix | 65 +- programs/jj/default.nix | 365 ++--- programs/kanata/default.nix | 57 +- programs/kitty/default.nix | 121 +- programs/niri/default.nix | 1261 +++++++++-------- programs/nvim/default.nix | 285 ++-- programs/tmux/default.nix | 347 ++--- programs/zed/default.nix | 324 ++--- users/default.nix | 5 +- 29 files changed, 2131 insertions(+), 2033 deletions(-) create mode 100644 ; create mode 100644 config.nix rename default-machine-config.nix => defaults/machine-config.nix (91%) create mode 100644 defaults/machine-or-home-config.nix rename {programs => defaults}/xdg.nix (100%) create mode 100644 hosts/kili/kanata.nix delete mode 100644 hosts/ragdoll/hardware-configuration.nix delete mode 100644 modules/home-info.nix delete mode 100644 modules/machine-type.nix diff --git a/; b/; new file mode 100644 index 0000000..dad5d18 --- /dev/null +++ b/; @@ -0,0 +1,33 @@ +{ + lib, + options, + machine, + ... +}: +with lib; +{ + options = { + custom.program = mkOption { + type = types.attrsOf ( + types.submodule ( + { config, ... }: + { + options = { + name = mkOption { + type = types.string; + }; + home-config = mkOption { + type = types.deferredModule; + }; + system-config = mkOption { + type = types.deferredModule; + default = _: { }; + }; + }; + config = if builtins.isNull machine.home-only then config.system-config else config.home-config; + } + ) + ); + }; + }; +} diff --git a/config.nix b/config.nix new file mode 100644 index 0000000..22f414e --- /dev/null +++ b/config.nix @@ -0,0 +1,124 @@ +inputs@{ + nixpkgs, + deploy-rs, + self, + pkgsForSystem, + ... +}: + +rec { + configs = + configs: builtins.foldl' (acc: val: nixpkgs.lib.recursiveUpdate (config val) acc) { } configs; + config = + { + hostname, + capabilities, + type, + home-only ? null, + extra-modules ? [ ], + system ? "x86_64-linux", + deploy-hostname ? hostname, + deploy-options ? { + user = if builtins.isNull home-only then "root" else home-only; + sshUser = if builtins.isNull home-only then "jana" else home-only; + }, + home-manager ? builtins.isNull home-only, + stateVersion ? "26.05", + }: + with nixpkgs.lib; + let + inherit (nixpkgs) lib; + matches-capabilities = + # all requirements are contained in the machine capabilities + requirements: lib.all (req: builtins.elem req capabilities) requirements; + program = + { + requirements ? [ ], + home-config, + system-config ? { }, + }: + # if (matches-capabilities requirements) then + if (true) then + { + inherit home-config system-config; + } + else + { + # home-config = _: { }; + }; + specialArgsForHomeSystem = + { + system, + type, + capabilities, + }: + home-only: { + pkgs = pkgsForSystem system; + flakes = inputs; + inherit inputs; + inherit (inputs.secrets.packages.${system}) secrets; + machine = { + inherit + type + capabilities + stateVersion + home-only + program + ; + }; + }; + specialArgsForSystem = system: specialArgsForHomeSystem system null; + + specialArgs = specialArgsForSystem { + inherit system type capabilities; + }; + modules = + extra-modules + ++ [ ./hosts/${hostname}/configuration.nix ] + ++ ( + if builtins.isNull home-only then + [ ./defaults/machine-config.nix ] + else + [ ./defaults/machine-or-home-config.nix ] + ) + ++ ( + if home-manager then + [ + inputs.home-manager.nixosModules.default + { + home-manager.extraSpecialArgs = specialArgs; + } + ] + else + [ ] + ); + in + { + deploy.nodes.${hostname} = { + hostname = deploy-hostname; + fastConnection = true; + profiles.system = { + path = + if (builtins.isNull home-only) then + deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.${hostname} + else + deploy-rs.lib.x86_64-linux.activate.home-manager self.nixosConfigurations.${hostname}; + } + // deploy-options; + }; + + nixosConfigurations.${hostname} = + if builtins.isNull home-only then + (nixosSystem { + inherit system modules specialArgs; + }) + else + inputs.home-manager.lib.homeManagerConfiguration { + extraSpecialArgs = specialArgsForHomeSystem { + inherit system type capabilities; + } home-only; + inherit modules; + pkgs = pkgsForSystem system; + }; + }; +} diff --git a/default-machine-config.nix b/defaults/machine-config.nix similarity index 91% rename from default-machine-config.nix rename to defaults/machine-config.nix index be13758..5ff6d5f 100644 --- a/default-machine-config.nix +++ b/defaults/machine-config.nix @@ -1,23 +1,21 @@ { lib, pkgs, - inputs, flakes, + machine, ... }: { imports = [ - (inputs.self + /modules/machine-type.nix) - (inputs.self + /modules/program.nix) - (inputs.self + /programs) - (inputs.self + /users) + ./machine-or-home-config.nix + ./xdg.nix ]; - xdg.mime.enable = lib.mkForce false; - - system.stateVersion = "26.05"; + system.stateVersion = machine.stateVersion; services.resolved.enable = false; + xdg.mime.enable = lib.mkForce false; + # Enable SSH services.openssh = { enable = true; diff --git a/defaults/machine-or-home-config.nix b/defaults/machine-or-home-config.nix new file mode 100644 index 0000000..ccda0c0 --- /dev/null +++ b/defaults/machine-or-home-config.nix @@ -0,0 +1,9 @@ +{ inputs, ... }: +{ + imports = [ + (../modules/program.nix) + (../programs) + (../users) + ]; + +} diff --git a/programs/xdg.nix b/defaults/xdg.nix similarity index 100% rename from programs/xdg.nix rename to defaults/xdg.nix diff --git a/flake.nix b/flake.nix index e45c282..3f9ad6c 100644 --- a/flake.nix +++ b/flake.nix @@ -72,12 +72,10 @@ }; outputs = { - self, nixpkgs, flake-utils, sops-nix, vpn-confinement, - home-manager, deploy-rs, ... }@inputs: @@ -94,87 +92,40 @@ }) ]; }; - - specialArgsForSystem = system: { - pkgs = pkgsForSystem system; - flakes = inputs; - inherit inputs; - inherit (inputs.secrets.packages.${system}) secrets; - }; + configs = import ./config.nix (inputs // { inherit pkgsForSystem; }); in - { - nixosConfigurations.fili = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; - modules = [ - inputs.home-manager.nixosModules.default - { home-manager.extraSpecialArgs = specialArgs; } - - ./hosts/fili/configuration.nix - ./users - ./default-machine-config.nix - + (configs.configs [ + { + hostname = "fili"; + capabilities = [ "cli" ]; + type = "server"; + extra-modules = [ sops-nix.nixosModules.sops vpn-confinement.nixosModules.default ]; - specialArgs = specialArgsForSystem system; - }; - nixosConfigurations.kili = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; - modules = [ - inputs.home-manager.nixosModules.default - { home-manager.extraSpecialArgs = specialArgs; } - - ./hosts/kili/configuration.nix - ./users + } + { + hostname = "kili"; + deploy-hostname = "localhost"; + capabilities = [ + "cli" + "graphical" + "work" + "fun" ]; - specialArgs = specialArgsForSystem system; - }; - nixosConfigurations.ragdoll = home-manager.lib.homeManagerConfiguration ( - let - system = "x86_64-linux"; - in - { - modules = [ - inputs.home-manager.nixosModules.default - { home-manager.extraSpecialArgs = specialArgsForSystem system; } - - ./hosts/ragdoll/configuration.nix - ./default-machine-config.nix - ]; - pkgs = pkgsForSystem system; - } - ); - - deploy.nodes.fili = { - hostname = "fili"; - fastConnection = true; - profiles.system = { - user = "root"; - path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.fili; - sshUser = "jana"; - }; - }; - - deploy.nodes.kili = { - hostname = "localhost"; - fastConnection = true; - profiles.system = { - user = "root"; - path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.kili; - sshUser = "jana"; - }; - }; - - deploy.nodes.ragdoll = { + type = "pc"; + } + { hostname = "ragdoll"; - fastConnection = true; - profiles.system = { - user = "jana"; - path = deploy-rs.lib.x86_64-linux.activate.home-manager self.nixosConfigurations.ragdoll; - sshUser = "jana"; - }; - }; - } + deploy-hostname = "ragdoll"; + home-only = "jana"; + capabilities = [ + "cli" + "work" + ]; + type = "pc"; + } + ]) // flake-utils.lib.eachDefaultSystem ( system: let @@ -184,14 +135,17 @@ devShells.default = pkgs.mkShell { buildInputs = with pkgs; [ lix + (pkgs.writeShellScriptBin "apply-local" '' + apply $(hostname) + '') (pkgs.writeShellScriptBin "apply" '' set -e if [ $# -eq 0 ] then - deploy + deploy -s elif [ $# -eq 1 ] then - deploy ".#$@" + deploy -s ".#$@" else echo "too many parameters" exit 1 diff --git a/hosts/fili/configuration.nix b/hosts/fili/configuration.nix index 81eab81..12fcf36 100644 --- a/hosts/fili/configuration.nix +++ b/hosts/fili/configuration.nix @@ -6,13 +6,6 @@ _: { ./services ]; - custom.machine = { - type = "server"; - capabilities = [ - "cli" - ]; - }; - networking.nameservers = [ "1.1.1.1" "9.9.9.9" @@ -50,4 +43,6 @@ _: { "media" "nginx" ]; + + users.groups.media = { }; } diff --git a/hosts/fili/services/forgejo.nix b/hosts/fili/services/forgejo.nix index 4efb2c2..7bb631d 100644 --- a/hosts/fili/services/forgejo.nix +++ b/hosts/fili/services/forgejo.nix @@ -150,7 +150,7 @@ wget # used in deployments - flakes.colmena.defaultPackage."x86_64-linux" + # flakes.deploy.defaultPackage."x86_64-linux" lix openssh ]; diff --git a/hosts/kili/configuration.nix b/hosts/kili/configuration.nix index cd5b820..0387ab2 100644 --- a/hosts/kili/configuration.nix +++ b/hosts/kili/configuration.nix @@ -6,19 +6,9 @@ { imports = [ ./hardware-configuration.nix - ../../default-machine-config.nix + ./kanata.nix ]; - custom.machine = { - type = "pc"; - capabilities = [ - "cli" - "graphical" - "work" - "fun" - ]; - }; - boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/hosts/kili/hardware-configuration.nix b/hosts/kili/hardware-configuration.nix index a64dd08..70fc4f9 100644 --- a/hosts/kili/hardware-configuration.nix +++ b/hosts/kili/hardware-configuration.nix @@ -1,28 +1,44 @@ # 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, ... }: +{ + config, + lib, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "thunderbolt" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + "rtsx_pci_sdmmc" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/4919727e-d114-4d57-b206-522b5df5fccc"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/4919727e-d114-4d57-b206-522b5df5fccc"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/26CD-373C"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/26CD-373C"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; swapDevices = [ ]; diff --git a/hosts/kili/kanata.nix b/hosts/kili/kanata.nix new file mode 100644 index 0000000..504185b --- /dev/null +++ b/hosts/kili/kanata.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + # TODO: make kanata system pkgs only + users.groups.uinput = { }; + users.extraUsers.jana.extraGroups = [ + "uinput" + "input" + ]; + environment.systemPackages = [ pkgs.kanata-with-cmd ]; + services.udev.extraRules = '' + KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput" + ''; +} diff --git a/hosts/ragdoll/configuration.nix b/hosts/ragdoll/configuration.nix index fb18624..1c551fe 100644 --- a/hosts/ragdoll/configuration.nix +++ b/hosts/ragdoll/configuration.nix @@ -1,18 +1,7 @@ { - pkgs, ... }: { - imports = [ - ./hardware-configuration.nix - ../../default-machine-config.nix - ]; + imports = [ ]; - custom.machine = { - type = "pc"; - capabilities = [ - "cli" - ]; - homeOnly = "jana"; - }; } diff --git a/hosts/ragdoll/hardware-configuration.nix b/hosts/ragdoll/hardware-configuration.nix deleted file mode 100644 index 7245e61..0000000 --- a/hosts/ragdoll/hardware-configuration.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - config, - lib, - pkgs, - modulesPath, - ... -}: -{ - - fileSystems."/" = { - device = "/dev/disk/by-uuid/4919727e-d114-4d57-b206-522b5df5fccc"; - fsType = "ext4"; - }; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} diff --git a/modules/home-info.nix b/modules/home-info.nix deleted file mode 100644 index 251ab1e..0000000 --- a/modules/home-info.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - lib, - ... -}: -with lib; -{ - options = { - custom.home-info = mkOption { - type = types.submodule { - options = { - - }; - }; - }; - }; -} diff --git a/modules/machine-type.nix b/modules/machine-type.nix deleted file mode 100644 index 75d4542..0000000 --- a/modules/machine-type.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - ... -}: -with lib; -{ - options = { - custom.machine = mkOption { - type = types.submodule { - options = { - type = mkOption { - type = types.enum [ - "server" - "pc" - ]; - }; - capabilities = mkOption { - type = types.listOf (types.enum (import ./capabilities.nix)); - default = [ "cli" ]; - }; - }; - }; - }; - }; -} diff --git a/modules/program.nix b/modules/program.nix index a791eb1..dad5d18 100644 --- a/modules/program.nix +++ b/modules/program.nix @@ -1,6 +1,7 @@ { lib, options, + machine, ... }: with lib; @@ -15,19 +16,15 @@ with lib; name = mkOption { type = types.string; }; - requirements = mkOption { - type = types.listOf (types.enum (import ./capabilities.nix)); - default = [ "cli" ]; - }; home-config = mkOption { type = types.deferredModule; }; system-config = mkOption { - # type = types.attrs; type = types.deferredModule; - default = { }; + default = _: { }; }; }; + config = if builtins.isNull machine.home-only then config.system-config else config.home-config; } ) ); diff --git a/modules/users.nix b/modules/users.nix index 6dcb25a..aea828d 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -1,30 +1,31 @@ -{ +args@{ lib, pkgs, config, + machine, ... }: with lib; let cfg = config.custom.users; - machine = config.custom.machine; + inherit (machine) home-only; + inherit (machine) stateVersion; + valid-on-machine = on: # TODO: iterate over possibilities - if machine.type == "server" then - on.server - else if machine.type == "pc" then - on.pc - else - false; - matches-capabilities = - # all requirements are contained in the machine capabilities - requirements: lib.all (req: builtins.elem req machine.capabilities) requirements; + ( + if machine.type == "server" then + on.server + else if machine.type == "pc" then + on.pc + else + false + ); + users = lib.filterAttrs (_: value: valid-on-machine value.on) cfg; home-users = lib.filterAttrs (_: value: value.apply-home-configs) users; - stateVersion = config.system.stateVersion; programs = lib.attrsets.attrValues config.custom.program; - valid-programs = builtins.filter (program: matches-capabilities program.requirements) programs; in { options = @@ -75,32 +76,47 @@ in }; }; - config = lib.mkMerge ([ - { - users.extraUsers = lib.mapAttrs (name: value: { - isNormalUser = true; - extraGroups = value.groups; - openssh.authorizedKeys.keys = value.keys; - shell = value.shell; - description = name; - }) users; - home-manager.users = lib.mapAttrs ( - name: value: - (_: { - imports = ( - [ - ./home-info.nix - ] - ++ (map (program: program.home-config) valid-programs) - ); - - home = { - inherit stateVersion; - username = name; - homeDirectory = "/home/${name}"; - }; - }) - ) home-users; - } - ]); + config = lib.mkMerge [ + ( + if (!builtins.isNull home-only) then + lib.mkMerge ([ + { + home = { + inherit stateVersion; + username = toString home-only; + homeDirectory = "/home/${toString home-only}"; + }; + } + ] + # ++ map (program: program.home-config) programs + ) + else + (lib.mkMerge ([ + { + users.extraUsers = lib.mapAttrs (name: value: { + isNormalUser = true; + extraGroups = value.groups; + openssh.authorizedKeys.keys = value.keys; + inherit (value) shell; + description = name; + }) users; + home-manager.users = lib.mapAttrs ( + name: value: + (_: { + imports = ( + [ + ] + ++ (map (program: program.home-config) programs) + ); + home = { + inherit stateVersion; + username = name; + homeDirectory = "/home/${name}"; + }; + }) + ) home-users; + } + ])) + ) + ]; } diff --git a/programs/default.nix b/programs/default.nix index 2d14e5e..4c94d65 100644 --- a/programs/default.nix +++ b/programs/default.nix @@ -1,4 +1,4 @@ -{ ... }@inputs: +{ machine, ... }@inputs: { imports = [ ./nvim @@ -11,10 +11,9 @@ ./niri ./zed ./firefox - ./xdg.nix ]; - custom.program.graphcial-packages = { + custom.program.graphcial-packages = machine.program { requirements = [ "graphical" ]; home-config = { pkgs, ... }: @@ -34,7 +33,7 @@ }; }; - custom.program.discord = { + custom.program.discord = machine.program { requirements = [ "graphical" ]; home-config = { @@ -150,7 +149,7 @@ }; }; - custom.program.fun-packages = { + custom.program.fun-packages = machine.program { requirements = [ "fun" ]; home-config = { pkgs, ... }: @@ -162,7 +161,7 @@ }; }; - custom.program.cli-packages = { + custom.program.cli-packages = machine.program { requirements = [ "cli" ]; home-config = { config, pkgs, ... }: diff --git a/programs/firefox/default.nix b/programs/firefox/default.nix index e08a14a..d59a55e 100644 --- a/programs/firefox/default.nix +++ b/programs/firefox/default.nix @@ -1,165 +1,168 @@ -_: { - custom.program.firefox.requirements = [ "graphical" ]; - custom.program.firefox.home-config = - { - config, - flakes, - pkgs, - ... - }: - let - ff-pkgs = flakes.firefox-addons.packages.${pkgs.system}; - lock-false = { - Value = false; - Status = "locked"; - }; - # lock-true = { - # Value = true; - # Status = "locked"; - # }; - in - { - programs.firefox = { - enable = true; - package = pkgs.wrapFirefox pkgs.firefox-unwrapped { - extraPolicies = { - DisableFormHistory = true; - OfferToSaveLogins = false; - PasswordManagerEnabled = false; - AppAutoUpdate = false; - DisableFirefoxStudies = true; - DisablePocket = true; - DisableTelemetry = true; - UserMessaging = { - WhatsNew = true; - ExtensionRecommendations = false; - FeatureRecommendations = false; - UrlbarInterventions = false; - SkipOnboarding = true; - MoreFromMozilla = false; - Locked = true; - }; - FirefoxHome = { - Search = true; - TopSites = false; - SponsoredTopSites = false; - Highlights = false; - Pocket = false; - SponsoredPocket = false; - Snippets = false; - Locked = false; - }; - FirefoxSuggest = { - WebSuggestions = false; - SponsoredSuggestions = false; - ImproveSuggest = false; - Locked = true; - }; - # TODO: https://github.com/TheRealGramdalf/nixos/blob/83f4339b121175f47940314bf5811080ac42c316/users/games/firefox/privacy.nix - }; - +{ machine, ... }: +{ + custom.program.firefox = machine.program { + requirements = [ "graphical" ]; + home-config = + { + config, + flakes, + pkgs, + ... + }: + let + ff-pkgs = flakes.firefox-addons.packages.${pkgs.system}; + lock-false = { + Value = false; + Status = "locked"; }; + # lock-true = { + # Value = true; + # Status = "locked"; + # }; + in + { + programs.firefox = { + enable = true; + package = pkgs.wrapFirefox pkgs.firefox-unwrapped { + extraPolicies = { + DisableFormHistory = true; + OfferToSaveLogins = false; + PasswordManagerEnabled = false; + AppAutoUpdate = false; + DisableFirefoxStudies = true; + DisablePocket = true; + DisableTelemetry = true; + UserMessaging = { + WhatsNew = true; + ExtensionRecommendations = false; + FeatureRecommendations = false; + UrlbarInterventions = false; + SkipOnboarding = true; + MoreFromMozilla = false; + Locked = true; + }; + FirefoxHome = { + Search = true; + TopSites = false; + SponsoredTopSites = false; + Highlights = false; + Pocket = false; + SponsoredPocket = false; + Snippets = false; + Locked = false; + }; + FirefoxSuggest = { + WebSuggestions = false; + SponsoredSuggestions = false; + ImproveSuggest = false; + Locked = true; + }; + # TODO: https://github.com/TheRealGramdalf/nixos/blob/83f4339b121175f47940314bf5811080ac42c316/users/games/firefox/privacy.nix + }; - profiles.default = { - id = 0; - name = "profile_0"; - isDefault = true; - settings = { - # specify profile-specific preferences here; check about:config for options - "browser.newtabpage.activity-stream.feeds.section.highlights" = false; - "browser.startup.page" = 3; # Restore previous tabs - "extensions.autoDisableScopes" = 0; - "extensions.pocket.enabled" = lock-false; - "browser.tabs.closeWindowWithLastTab" = lock-false; - "sidebar.position_start" = false; # sidebar on the right - "toolkit.legacyUserProfileCustomizations.stylesheets" = true; - "browser.toolbars.bookmarks.visibility" = "always"; }; - userChrome = builtins.readFile ./userChrome.css; - userContent = builtins.readFile ./userChrome.css; + profiles.default = { + id = 0; + name = "profile_0"; + isDefault = true; + settings = { + # specify profile-specific preferences here; check about:config for options + "browser.newtabpage.activity-stream.feeds.section.highlights" = false; + "browser.startup.page" = 3; # Restore previous tabs + "extensions.autoDisableScopes" = 0; + "extensions.pocket.enabled" = lock-false; + "browser.tabs.closeWindowWithLastTab" = lock-false; + "sidebar.position_start" = false; # sidebar on the right + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + "browser.toolbars.bookmarks.visibility" = "always"; + }; - extensions.packages = with ff-pkgs; [ - bitwarden - ublock-origin - sidebery - sponsorblock - # vimium - ]; + userChrome = builtins.readFile ./userChrome.css; + userContent = builtins.readFile ./userChrome.css; - bookmarks = { - force = true; - settings = [ - { - keyword = "!w"; - url = "https://www.wikipedia.org/w/index.php?title=Special:Search&search=%s"; - } - { - keyword = "!m"; - url = "https://www.google.com/maps?q=%s"; - } - { - keyword = "!git"; - url = "https://github.com/search?q=%s&type=code"; - } - { - keyword = "!std"; - url = "https://std.rs%s"; - } - { - keyword = "!rust"; - url = "https://docs.rs/releases/search?query=%s"; - } - { - keyword = "!np"; - url = "https://search.nixos.org/packages?query=%s"; - } - { - keyword = "!hmo"; - url = "https://home-manager-options.extranix.com/?query=%s"; - } - { - keyword = "!no"; - url = "https://search.nixos.org/options?query=%s"; - } - - # { - # name = "bank"; - # toolbar = true; - # url = "https://web.bunq.com/user"; - # } + extensions.packages = with ff-pkgs; [ + bitwarden + ublock-origin + sidebery + sponsorblock + # vimium ]; - }; - # extensions.settings = { - # "${ff-pkgs.sidebery.addonId}".settings = { - # sidebar = { - # # panels = with builtins; with lib; listToAttrs (map ffContainerToSideberryPanel (attrsToList containers)); - # # nav = [ "Personal" "Programming"]; - # }; - # # https://github.com/Dash-L/nixconfig/blob/c30f6d1486a3fe2b3793ab0cb13a88edefe83b7a/home/firefox.nix#L82 - # settings = { - # pinnedTabsPosition = "top"; - # hideEmptyPanels = false; - # activateAfterClosing = "prev"; - # activateAfterClosingStayInPanel = true; - # newTabCtxReopen = true; - # }; - # }; - # }; + bookmarks = { + force = true; + settings = [ + { + keyword = "!w"; + url = "https://www.wikipedia.org/w/index.php?title=Special:Search&search=%s"; + } + { + keyword = "!m"; + url = "https://www.google.com/maps?q=%s"; + } + { + keyword = "!git"; + url = "https://github.com/search?q=%s&type=code"; + } + { + keyword = "!std"; + url = "https://std.rs%s"; + } + { + keyword = "!rust"; + url = "https://docs.rs/releases/search?query=%s"; + } + { + keyword = "!np"; + url = "https://search.nixos.org/packages?query=%s"; + } + { + keyword = "!hmo"; + url = "https://home-manager-options.extranix.com/?query=%s"; + } + { + keyword = "!no"; + url = "https://search.nixos.org/options?query=%s"; + } + + # { + # name = "bank"; + # toolbar = true; + # url = "https://web.bunq.com/user"; + # } + ]; + }; + + # extensions.settings = { + # "${ff-pkgs.sidebery.addonId}".settings = { + # sidebar = { + # # panels = with builtins; with lib; listToAttrs (map ffContainerToSideberryPanel (attrsToList containers)); + # # nav = [ "Personal" "Programming"]; + # }; + # # https://github.com/Dash-L/nixconfig/blob/c30f6d1486a3fe2b3793ab0cb13a88edefe83b7a/home/firefox.nix#L82 + # settings = { + # pinnedTabsPosition = "top"; + # hideEmptyPanels = false; + # activateAfterClosing = "prev"; + # activateAfterClosingStayInPanel = true; + # newTabCtxReopen = true; + # }; + # }; + # }; + }; + }; + + xdg.mimeApps = { + defaultApplications."x-scheme-handler/http" = [ + "firefox.desktop" + ]; + defaultApplications."x-scheme-handler/https" = [ + "firefox.desktop" + ]; + defaultApplications."text/html" = [ "firefox.desktop" ]; + defaultApplications."x-scheme-handler/about" = [ "firefox.desktop" ]; + defaultApplications."x-scheme-handler/unknown" = [ "firefox.desktop" ]; }; }; - - xdg.mimeApps = { - defaultApplications."x-scheme-handler/http" = [ - "firefox.desktop" - ]; - defaultApplications."x-scheme-handler/https" = [ - "firefox.desktop" - ]; - defaultApplications."text/html" = [ "firefox.desktop" ]; - defaultApplications."x-scheme-handler/about" = [ "firefox.desktop" ]; - defaultApplications."x-scheme-handler/unknown" = [ "firefox.desktop" ]; - }; - }; + }; } diff --git a/programs/fish/default.nix b/programs/fish/default.nix index 1e10839..b7acb77 100644 --- a/programs/fish/default.nix +++ b/programs/fish/default.nix @@ -1,254 +1,257 @@ -_: { - custom.program.fish.requirements = [ "cli" ]; - custom.program.fish.home-config = - { - config, - pkgs, - lib, - ... - }: - with builtins; - with lib.attrsets; - let - scripts = (import ./scripts.nix) pkgs; - aliases = with scripts; { - "cp-mov" = cp-media "mov" "movies"; - "cp-ser" = cp-media "ser" "shows"; - "cp-ani" = cp-media "ani" "anime"; - "dumpasm" = "${pkgs.custom.dumpasm}/bin/dumpasm"; - "p" = builtins.trace calc calc; - "s" = "systemctl"; - "j" = "journalctl"; - "ju" = "journalctl -u"; - "jfu" = "journalctl -fu"; - "ls" = "${pkgs.eza}/bin/eza --git"; - "ll" = "${pkgs.eza}/bin/eza --git"; - "lt" = "${pkgs.eza}/bin/eza --long --tree -L 3"; - "open" = "${pkgs.xdg-utils}/bin/xdg-open"; - "cb" = "${pkgs.wl-clipboard-rs}/bin/wl-copy"; - "cat" = "${pkgs.bat}/bin/bat"; +{ machine, ... }: +{ + custom.program.fish = machine.program { + requirements = [ "cli" ]; + home-config = + { + config, + pkgs, + lib, + ... + }: + with builtins; + with lib.attrsets; + let + scripts = (import ./scripts.nix) pkgs; + aliases = with scripts; { + "cp-mov" = cp-media "mov" "movies"; + "cp-ser" = cp-media "ser" "shows"; + "cp-ani" = cp-media "ani" "anime"; + "dumpasm" = "${pkgs.custom.dumpasm}/bin/dumpasm"; + "p" = builtins.trace calc calc; + "s" = "systemctl"; + "j" = "journalctl"; + "ju" = "journalctl -u"; + "jfu" = "journalctl -fu"; + "ls" = "${pkgs.eza}/bin/eza --git"; + "ll" = "${pkgs.eza}/bin/eza --git"; + "lt" = "${pkgs.eza}/bin/eza --long --tree -L 3"; + "open" = "${pkgs.xdg-utils}/bin/xdg-open"; + "cb" = "${pkgs.wl-clipboard-rs}/bin/wl-copy"; + "cat" = "${pkgs.bat}/bin/bat"; - # "pull" = "${pkgs.git}/bin/git pull"; - # "push" = "${pkgs.git}/bin/git push"; - # "commit" = "${pkgs.git}/bin/git commit"; - # "add" = "${pkgs.git}/bin/git add"; - # "patch" = "${pkgs.git}/bin/git add -p"; - # "amend" = "${pkgs.git}/bin/git commit --amend"; - # "log" = "${pkgs.git}/bin/git log --all --graph --decorate"; - # "st" = "${pkgs.git}/bin/git status"; - # "checkout" = "${pkgs.git}/bin/git checkout"; - # "rebase" = "${pkgs.git}/bin/git rebase"; - # "stash" = "${pkgs.git}/bin/git stash"; + # "pull" = "${pkgs.git}/bin/git pull"; + # "push" = "${pkgs.git}/bin/git push"; + # "commit" = "${pkgs.git}/bin/git commit"; + # "add" = "${pkgs.git}/bin/git add"; + # "patch" = "${pkgs.git}/bin/git add -p"; + # "amend" = "${pkgs.git}/bin/git commit --amend"; + # "log" = "${pkgs.git}/bin/git log --all --graph --decorate"; + # "st" = "${pkgs.git}/bin/git status"; + # "checkout" = "${pkgs.git}/bin/git checkout"; + # "rebase" = "${pkgs.git}/bin/git rebase"; + # "stash" = "${pkgs.git}/bin/git stash"; - "edit" = "jj edit"; - "old" = "jj edit @-"; - "new" = "jj edit @+"; - "rebase" = "jj rebase"; - "pull" = "jj git fetch; jj catchup"; - "msg" = "jj describe -m"; - "branch" = "jj bookmark set"; - "stat" = "jj status"; - "push" = "jj git push"; + "edit" = "jj edit"; + "old" = "jj edit @-"; + "new" = "jj edit @+"; + "rebase" = "jj rebase"; + "pull" = "jj git fetch; jj catchup"; + "msg" = "jj describe -m"; + "branch" = "jj bookmark set"; + "stat" = "jj status"; + "push" = "jj git push"; - "tidy" = "x test tidy --bless"; - "ui" = "x test tests/ui/"; + "tidy" = "x test tidy --bless"; + "ui" = "x test tests/ui/"; - "f" = "nautilus --no-desktop . &"; - }; - # extracting any compressed format - extract = '' - function extract -a file -d "decompress a file" - if not test -f $file - echo "'$file' is not a valid file" - return 1 - end - switch $file - # tar can automatically figure out how to decompress - case '*.{tar,tar.{bz2,zst,gz,xz},tbz2,tgz'; ${pkgs.gnutar}/bin/tar xf $file; end - case '*.bz2'; bunzip2 $file; end - case '*.rar'; unrar e $file; end - case '*.gz'; gunzip $file; end - case '*.zip'; ${pkgs.unzip}/bin/unzip $file; end - case '*.Z'; uncompress $file; end - case '*.7z'; 7z x $file; end - case '*'; - echo "'$file' cannot be extracted" + "f" = "nautilus --no-desktop . &"; + }; + # extracting any compressed format + extract = '' + function extract -a file -d "decompress a file" + if not test -f $file + echo "'$file' is not a valid file" return 1 + end + switch $file + # tar can automatically figure out how to decompress + case '*.{tar,tar.{bz2,zst,gz,xz},tbz2,tgz'; ${pkgs.gnutar}/bin/tar xf $file; end + case '*.bz2'; bunzip2 $file; end + case '*.rar'; unrar e $file; end + case '*.gz'; gunzip $file; end + case '*.zip'; ${pkgs.unzip}/bin/unzip $file; end + case '*.Z'; uncompress $file; end + case '*.7z'; 7z x $file; end + case '*'; + echo "'$file' cannot be extracted" + return 1 + end end - end - ''; - in - { - programs = { - atuin = { - enable = true; - enableFishIntegration = true; + ''; + in + { + programs = { + atuin = { + enable = true; + enableFishIntegration = true; - settings = { - filter_mode_shell_up_key_binding = "workspace"; - exit_mode = "return-original"; - inline_height = 20; - workspaces = true; + settings = { + filter_mode_shell_up_key_binding = "workspace"; + exit_mode = "return-original"; + inline_height = 20; + workspaces = true; + }; }; - }; - zoxide = { - enable = true; - enableFishIntegration = true; - }; + zoxide = { + enable = true; + enableFishIntegration = true; + }; - direnv = { - enable = true; - # enableFishIntegration = lib.mkDefault true; - }; + direnv = { + enable = true; + # enableFishIntegration = lib.mkDefault true; + }; - fzf = { - enable = true; - enableFishIntegration = true; - }; + fzf = { + enable = true; + enableFishIntegration = true; + }; - fish = { - enable = true; - shellAliases = aliases; - plugins = with pkgs.fishPlugins; [ - { - name = "bang-bang"; - src = pkgs.fetchFromGitHub { - owner = "oh-my-fish"; - repo = "plugin-bang-bang"; - rev = "ec991b80ba7d4dda7a962167b036efc5c2d79419"; - hash = "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0="; + fish = { + enable = true; + shellAliases = aliases; + plugins = with pkgs.fishPlugins; [ + { + name = "bang-bang"; + src = pkgs.fetchFromGitHub { + owner = "oh-my-fish"; + repo = "plugin-bang-bang"; + rev = "ec991b80ba7d4dda7a962167b036efc5c2d79419"; + hash = "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0="; + }; + } + { + name = "tide"; + inherit (tide) src; + } + { + name = "sponge"; + inherit (sponge) src; + } + { + name = "autopair"; + inherit (autopair) src; + } + ]; + + functions = { + fish_jj_prompt = { + body = '' + if not ${config.programs.jujutsu.package}/bin/jj root --quiet &>/dev/null + return 1 + end + + ${config.programs.jujutsu.package}/bin/jj log --ignore-working-copy --no-graph --color always -r @ -T ' + separate( + " ", + bookmarks.join(", "), + change_id.shortest(), + commit_id.shortest(), + if(conflict, "conflict"), + if(empty, "empty"), + if(divergent, "divergent"), + if(hidden, "hidden"), + ) + ' + ''; }; - } - { - name = "tide"; - inherit (tide) src; - } - { - name = "sponge"; - inherit (sponge) src; - } - { - name = "autopair"; - inherit (autopair) src; - } - ]; - functions = { - fish_jj_prompt = { - body = '' - if not ${config.programs.jujutsu.package}/bin/jj root --quiet &>/dev/null - return 1 - end + _tide_item_jj = { + body = '' + set -l _tide_item_jj_color $_tide_location_color + echo -ns $_tide_item_jj_color" ("(fish_jj_prompt)$_tide_item_jj_color")" + ''; + }; - ${config.programs.jujutsu.package}/bin/jj log --ignore-working-copy --no-graph --color always -r @ -T ' - separate( - " ", - bookmarks.join(", "), - change_id.shortest(), - commit_id.shortest(), - if(conflict, "conflict"), - if(empty, "empty"), - if(divergent, "divergent"), - if(hidden, "hidden"), - ) - ' - ''; + _tide_item_git = { + body = '' + if not test -d .jj + fish_git_prompt '%s' + end + ''; + }; }; - _tide_item_jj = { - body = '' - set -l _tide_item_jj_color $_tide_location_color - echo -ns $_tide_item_jj_color" ("(fish_jj_prompt)$_tide_item_jj_color")" - ''; - }; + interactiveShellInit = '' + fish_vi_key_bindings - _tide_item_git = { - body = '' - if not test -d .jj - fish_git_prompt '%s' - end - ''; - }; + bind \e\[3\;5~ kill-word + bind \cH backward-kill-word + bind \cV beginning-of-line + bind \f end-of-line + + bind -M insert \e\[3\;5~ kill-word + bind -M insert \cH backward-kill-word + bind -M insert \cV beginning-of-line + bind -M insert \f end-of-line + + bind \cl 'clear; commandline -f repaint' + bind -M insert \cl 'clear; commandline -f repaint' + + set -g sponge_successful_exit_codes 0 + set -g sponge_allow_previously_successful false + set -g sponge_delay 10 + + ${config.programs.jujutsu.package}/bin/jj util completion fish | source + + # if set -q tide_left_prompt_items; and not contains "jj" $tide_left_prompt_items + # set -l tide_item_jj_idx (contains -i "pwd" $tide_left_prompt_items) + # if test $tide_item_jj_idx + # set tide_left_prompt_items \ + # $tide_left_prompt_items[1..$tide_item_jj_idx] \ + # jj \ + # $tide_left_prompt_items[(math $tide_item_jj_idx + 1)..-1] + # end + # end + + function t + cd "$(${pkgs.custom.t}/bin/t-rs $argv | tail -n 1)" + end + + function temp + t $argv + end + + function rs + cd "$(${pkgs.custom.t}/bin/t-rs $argv | tail -n 1)" + cargo init . --bin --name $(basename "$PWD") + vim src/main.rs + end + + fish_add_path "$HOME/.cargo/bin" + fish_add_path "$HOME/.local/bin" + fish_add_path "$HOME/Documents/scripts" + fish_add_path "$HOME/.nix-profile/bin" + + function fish_greeting + ${pkgs.blahaj}/bin/blahaj -s + end + ''; }; + }; - interactiveShellInit = '' - fish_vi_key_bindings - - bind \e\[3\;5~ kill-word - bind \cH backward-kill-word - bind \cV beginning-of-line - bind \f end-of-line - - bind -M insert \e\[3\;5~ kill-word - bind -M insert \cH backward-kill-word - bind -M insert \cV beginning-of-line - bind -M insert \f end-of-line - - bind \cl 'clear; commandline -f repaint' - bind -M insert \cl 'clear; commandline -f repaint' - - set -g sponge_successful_exit_codes 0 - set -g sponge_allow_previously_successful false - set -g sponge_delay 10 - - ${config.programs.jujutsu.package}/bin/jj util completion fish | source - - # if set -q tide_left_prompt_items; and not contains "jj" $tide_left_prompt_items - # set -l tide_item_jj_idx (contains -i "pwd" $tide_left_prompt_items) - # if test $tide_item_jj_idx - # set tide_left_prompt_items \ - # $tide_left_prompt_items[1..$tide_item_jj_idx] \ - # jj \ - # $tide_left_prompt_items[(math $tide_item_jj_idx + 1)..-1] - # end - # end - - function t - cd "$(${pkgs.custom.t}/bin/t-rs $argv | tail -n 1)" - end - - function temp - t $argv - end - - function rs - cd "$(${pkgs.custom.t}/bin/t-rs $argv | tail -n 1)" - cargo init . --bin --name $(basename "$PWD") - vim src/main.rs - end - - fish_add_path "$HOME/.cargo/bin" - fish_add_path "$HOME/.local/bin" - fish_add_path "$HOME/Documents/scripts" - fish_add_path "$HOME/.nix-profile/bin" - - function fish_greeting - ${pkgs.blahaj}/bin/blahaj -s - end + home.activation = { + setupTide = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + setupTide() { + ${pkgs.fish}/bin/fish -c ${lib.escapeShellArg "tide configure ${ + lib.cli.toGNUCommandLineShell { } { + auto = true; + style = "Lean"; + prompt_colors = "True color"; + show_time = "No"; + lean_prompt_height = "Two lines"; + prompt_connection = "Disconnected"; + prompt_spacing = "Compact"; + icons = "Few icons"; + transient = "Yes"; + } + }"} >/dev/null 2>&1 + } + setupTide ''; }; }; - - home.activation = { - setupTide = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - setupTide() { - ${pkgs.fish}/bin/fish -c ${lib.escapeShellArg "tide configure ${ - lib.cli.toGNUCommandLineShell { } { - auto = true; - style = "Lean"; - prompt_colors = "True color"; - show_time = "No"; - lean_prompt_height = "Two lines"; - prompt_connection = "Disconnected"; - prompt_spacing = "Compact"; - icons = "Few icons"; - transient = "Yes"; - } - }"} >/dev/null 2>&1 - } - setupTide - ''; - }; - }; + }; } diff --git a/programs/git/default.nix b/programs/git/default.nix index e364ce9..3de79e5 100644 --- a/programs/git/default.nix +++ b/programs/git/default.nix @@ -1,39 +1,42 @@ -_: { - custom.program.git.requirements = [ "cli" ]; - custom.program.git.home-config = _: { - programs.git = { - enable = true; - signing.key = "/home/jana/.ssh/id_ed25519.pub"; - signing.signByDefault = true; +{ machine, ... }: +{ + custom.program.git = machine.program { + requirements = [ "cli" ]; + home-config = _: { + programs.git = { + enable = true; + signing.key = "/home/jana/.ssh/id_ed25519.pub"; + signing.signByDefault = true; - settings = { - user.email = "jana@donsz.nl"; - user.name = "Jana Dönszelmann"; + settings = { + user.email = "jana@donsz.nl"; + user.name = "Jana Dönszelmann"; - push.autoSetupRemote = true; - pull.rebase = true; - init.defaultBranch = "main"; - gpg.format = "ssh"; - diff.colorMoved = "default"; - rerere.enabled = true; + push.autoSetupRemote = true; + pull.rebase = true; + init.defaultBranch = "main"; + gpg.format = "ssh"; + diff.colorMoved = "default"; + rerere.enabled = true; - alias.conflicts = "diff --check"; - }; - - }; - - programs.delta = { - enable = true; - options = { - navigate = true; - light = false; - side-by-side = true; - features = "decorations interactive"; - interactive = { - keep-plus-minus-markers = false; + alias.conflicts = "diff --check"; }; + + }; + + programs.delta = { + enable = true; + options = { + navigate = true; + light = false; + side-by-side = true; + features = "decorations interactive"; + interactive = { + keep-plus-minus-markers = false; + }; + }; + enableGitIntegration = true; }; - enableGitIntegration = true; }; }; } diff --git a/programs/jj/default.nix b/programs/jj/default.nix index 91b624a..0a3aa54 100644 --- a/programs/jj/default.nix +++ b/programs/jj/default.nix @@ -1,193 +1,196 @@ -_: { - custom.program.jujutsu.requirements = [ "cli" ]; - custom.program.jujutsu.home-config = - { config, pkgs, ... }: - { - programs.jujutsu = { - enable = true; - # package = pkgs.custom.jujutsu; +{ machine, ... }: +{ + custom.program.jujutsu = machine.program { + requirements = [ "cli" ]; + home-config = + { config, pkgs, ... }: + { + programs.jujutsu = { + enable = true; + # package = pkgs.custom.jujutsu; - settings = { - user = { - email = config.programs.git.settings.user.email; - name = config.programs.git.settings.user.name; - }; - - ui = { - paginate = "never"; - # pager = "${pkgs.delta}/bin/delta"; - # for delta - # diff-formatter = ":git"; - diff-formatter = [ - "${pkgs.difftastic}/bin/difft" - "--color=always" - "$left" - "$right" - ]; - - default-command = [ - "log" - "--reversed" - "--no-pager" - ]; - merge-editor = [ - "${pkgs.meld}/bin/meld" - "$left" - "$base" - "$right" - "-o" - "$output" - "--auto-merge" - ]; - # diff-editor = "${pkgs.meld}/bin/meld"; - }; - - fsmonitor.backend = "watchman"; - fsmonitor.watchman.register-snapshot-trigger = true; - - revsets.log = "@ | ancestors(trunk()..(visible_heads() & mine()), 2) | trunk()"; - # revsets.log = "trunk()..@ | @..trunk() | trunk() | @:: | fork_point(trunk() | @)"; - # revsets.log = "trunk() | ancestors(trunk()..heads(((trunk()..visible_heads()) & my() | @)::), 2)"; - - revset-aliases = { - "my()" = "user(\"${config.programs.jujutsu.settings.user.email}\")"; - "user(x)" = "author(x) | committer(x)"; - current = "bookmarks() & my() & ~immutable()"; - "closest_bookmark(to)" = "heads(::to & bookmarks())"; - }; - - template-aliases = { - "format_timestamp(timestamp)" = "timestamp.ago()"; - log_oneline = '' - if(root, - format_root_commit(self), - label(if(current_working_copy, "working_copy"), - concat( - separate(" ", - format_short_change_id_with_change_offset(self), - if(empty, label("empty", "(empty)")), - if(description, - description.first_line(), - label(if(empty, "empty"), description_placeholder), - ), - bookmarks, - tags, - working_copies, - if(conflict, label("conflict", "conflict")), - if(config("ui.show-cryptographic-signatures").as_boolean(), - format_short_cryptographic_signature(signature)), - ) ++ "\n", - ), - ) - ) - ''; - # if(.contained_in('first_parent(@)'), label("git_head", "HEAD")), - status_summary = "'\n' ++ self.diff().summary() ++ '\n'"; - log_oneline_with_status_summary = "log_oneline ++ if(self.current_working_copy() && self.diff().files().len() > 0, status_summary)"; - }; - - aliases = - let - util = script: [ - "util" - "exec" - "--" - "bash" - "-c" - script - ]; - in - { - tug = [ - "bookmark" - "move" - "--from" - "heads(@- & bookmarks())" - "--to" - "coalesce(@ & ~empty(), @-)" - ]; - fuck = [ - "bookmark" - "move" - "--from" - "heads(@ & bookmarks())" - "--to" - "@-" - "--allow-backwards" - ]; - catchup = [ - "rebase" - "-b" - "bookmarks() & mine() & ~immutable()" - "-d" - "trunk()" - "--skip-emptied" - ]; - pull = util '' - jj git fetch - jj catchup - ''; - ch = [ - "show" - "--stat" - ]; - move = [ - "rebase" - "-r" - ]; - push = [ - "git" - "push" - ]; - ll = [ - "log" - "-T" - "builtin_log_compact" - ]; - mdiff = [ - "diff" - "--from" - "trunk()" - ]; + settings = { + user = { + email = config.programs.git.settings.user.email; + name = config.programs.git.settings.user.name; }; - templates = { - log_node = '' - label("node", - coalesce( - if(!self, label("elided", "~")), - if(current_working_copy, label("working_copy", "@")), - if(conflict, label("conflict", "×")), - if(immutable, label("immutable", "*")), - label("normal", "·") + ui = { + paginate = "never"; + # pager = "${pkgs.delta}/bin/delta"; + # for delta + # diff-formatter = ":git"; + diff-formatter = [ + "${pkgs.difftastic}/bin/difft" + "--color=always" + "$left" + "$right" + ]; + + default-command = [ + "log" + "--reversed" + "--no-pager" + ]; + merge-editor = [ + "${pkgs.meld}/bin/meld" + "$left" + "$base" + "$right" + "-o" + "$output" + "--auto-merge" + ]; + # diff-editor = "${pkgs.meld}/bin/meld"; + }; + + fsmonitor.backend = "watchman"; + fsmonitor.watchman.register-snapshot-trigger = true; + + revsets.log = "@ | ancestors(trunk()..(visible_heads() & mine()), 2) | trunk()"; + # revsets.log = "trunk()..@ | @..trunk() | trunk() | @:: | fork_point(trunk() | @)"; + # revsets.log = "trunk() | ancestors(trunk()..heads(((trunk()..visible_heads()) & my() | @)::), 2)"; + + revset-aliases = { + "my()" = "user(\"${config.programs.jujutsu.settings.user.email}\")"; + "user(x)" = "author(x) | committer(x)"; + current = "bookmarks() & my() & ~immutable()"; + "closest_bookmark(to)" = "heads(::to & bookmarks())"; + }; + + template-aliases = { + "format_timestamp(timestamp)" = "timestamp.ago()"; + log_oneline = '' + if(root, + format_root_commit(self), + label(if(current_working_copy, "working_copy"), + concat( + separate(" ", + format_short_change_id_with_change_offset(self), + if(empty, label("empty", "(empty)")), + if(description, + description.first_line(), + label(if(empty, "empty"), description_placeholder), + ), + bookmarks, + tags, + working_copies, + if(conflict, label("conflict", "conflict")), + if(config("ui.show-cryptographic-signatures").as_boolean(), + format_short_cryptographic_signature(signature)), + ) ++ "\n", + ), + ) ) - ) - ''; - log = "log_oneline_with_status_summary"; - git_push_bookmark = ''"jdonszelmann/" ++ change_id.short()''; - }; + ''; + # if(.contained_in('first_parent(@)'), label("git_head", "HEAD")), + status_summary = "'\n' ++ self.diff().summary() ++ '\n'"; + log_oneline_with_status_summary = "log_oneline ++ if(self.current_working_copy() && self.diff().files().len() > 0, status_summary)"; + }; - signing = { - # sign-all = true; - behavior = "own"; - backend = "ssh"; - key = "~/.ssh/id_ed25519.pub"; - }; + aliases = + let + util = script: [ + "util" + "exec" + "--" + "bash" + "-c" + script + ]; + in + { + tug = [ + "bookmark" + "move" + "--from" + "heads(@- & bookmarks())" + "--to" + "coalesce(@ & ~empty(), @-)" + ]; + fuck = [ + "bookmark" + "move" + "--from" + "heads(@ & bookmarks())" + "--to" + "@-" + "--allow-backwards" + ]; + catchup = [ + "rebase" + "-b" + "bookmarks() & mine() & ~immutable()" + "-d" + "trunk()" + "--skip-emptied" + ]; + pull = util '' + jj git fetch + jj catchup + ''; + ch = [ + "show" + "--stat" + ]; + move = [ + "rebase" + "-r" + ]; + push = [ + "git" + "push" + ]; + ll = [ + "log" + "-T" + "builtin_log_compact" + ]; + mdiff = [ + "diff" + "--from" + "trunk()" + ]; + }; - # remotes.origin.auto-track-bookmarks = true; - # remotes.upstream.auto-track-bookmarks = true; + templates = { + log_node = '' + label("node", + coalesce( + if(!self, label("elided", "~")), + if(current_working_copy, label("working_copy", "@")), + if(conflict, label("conflict", "×")), + if(immutable, label("immutable", "*")), + label("normal", "·") + ) + ) + ''; + log = "log_oneline_with_status_summary"; + git_push_bookmark = ''"jdonszelmann/" ++ change_id.short()''; + }; - git = { - private-commits = "description(glob:'wip:*') | description(glob:'trial:*')"; - write-change-id-header = true; + signing = { + # sign-all = true; + behavior = "own"; + backend = "ssh"; + key = "~/.ssh/id_ed25519.pub"; + }; - fetch = [ - "upstream" - "origin" - ]; - push = "origin"; + # remotes.origin.auto-track-bookmarks = true; + # remotes.upstream.auto-track-bookmarks = true; + + git = { + private-commits = "description(glob:'wip:*') | description(glob:'trial:*')"; + write-change-id-header = true; + + fetch = [ + "upstream" + "origin" + ]; + push = "origin"; + }; }; }; }; - }; + }; } diff --git a/programs/kanata/default.nix b/programs/kanata/default.nix index 984d120..0794676 100644 --- a/programs/kanata/default.nix +++ b/programs/kanata/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ machine, pkgs, ... }: let kanata-config = '' (defcfg @@ -86,32 +86,34 @@ let ''; in { - custom.program.kanata.requirements = [ "graphical" ]; - custom.program.kanata.home-config = - { pkgs, config, ... }: - { - systemd.user.services.kanata = { - Unit = { - Description = "kanata"; + custom.program.kanata = machine.program { + requirements = [ "graphical" ]; + home-config = + { pkgs, ... }: + { + systemd.user.services.kanata = { + Unit = { + Description = "kanata"; + }; + + Service = { + Restart = "always"; + RestartSec = "3"; + ExecStart = "${pkgs.kanata-with-cmd}/bin/kanata --cfg ${pkgs.writeText "kanata.kbd" kanata-config}"; + Nice = "-20"; + }; + + Install = { + WantedBy = [ "default.target" ]; + }; }; - Service = { - Restart = "always"; - RestartSec = "3"; - ExecStart = "${pkgs.kanata-with-cmd}/bin/kanata --cfg ${pkgs.writeText "kanata.kbd" kanata-config}"; - Nice = "-20"; - }; - - Install = { - WantedBy = [ "default.target" ]; + home.file.kanata = { + target = ".config/kanata/kanata.kbd"; + text = kanata-config; }; }; - - home.file.kanata = { - target = ".config/kanata/kanata.kbd"; - text = kanata-config; - }; - }; + }; # custom.program.kanata.system-config = # { pkgs, ... }: @@ -123,15 +125,6 @@ in # reboot or sudo udevadm control --reload-rules && sudo udevadm trigger # sudo modprobe uinput - users.groups.uinput = { }; - users.extraUsers.jana.extraGroups = [ - "uinput" - "input" - ]; - environment.systemPackages = [ pkgs.kanata-with-cmd ]; - services.udev.extraRules = '' - KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput" - ''; # }; } diff --git a/programs/kitty/default.nix b/programs/kitty/default.nix index 05b44c7..78651ba 100644 --- a/programs/kitty/default.nix +++ b/programs/kitty/default.nix @@ -1,63 +1,66 @@ -_: { - custom.program.kitty.requirements = [ "graphical" ]; - custom.program.kitty.home-config = - { pkgs, flakes, ... }: - { - home.packages = pkgs.custom.maple-fonts-pack; +{ machine, ... }: +{ + custom.program.kitty = machine.program { + requirements = [ "graphical" ]; + home-config = + { pkgs, flakes, ... }: + { + home.packages = pkgs.custom.maple-fonts-pack; - programs.kitty = { - enable = true; - font = { - name = "Maple Mono NF"; - size = 11.0; - package = pkgs.jetbrains-mono; + programs.kitty = { + enable = true; + font = { + name = "Maple Mono NF"; + size = 11.0; + package = pkgs.jetbrains-mono; + }; + + settings = { + scrollback_lines = 20000; + allow_hyperlinks = true; + + repaint_delay = 10; + input_delay = 3; + + enable_audio_bell = false; + update_check_interval = 0; + + initial_window_width = "95c"; + initial_window_height = "30c"; + remember_window_size = "no"; + + draw_minimal_borders = false; + hide_window_decorations = true; + + shell = "${pkgs.tmux}/bin/tmux"; + clipboard_control = "write-clipboard write-primary read-clipboard read-primary"; + + foreground = "#fcfcfc"; + background = "#232627"; + linux_display_server = "auto"; + }; + + keybindings = { + "ctrl+f" = + "launch --location=hsplit --allow-remote-control kitty +kitten ${flakes.kitty-search}/search.py @active-kitty-window-id"; + "ctrl+alt+r" = "load_config_file"; + "ctrl+shift+r" = "no_op"; + "super+`" = "no_op"; + "ctrl+EQUAL" = "change_font_size all +2.0"; + "ctrl+minus" = "change_font_size all -2.0"; + "ctrl+0" = "change_font_size all 0"; + # "ctrl+/" = "send_text all "; + "super+~" = "no_op"; + + # required for vim!! + # terminals map ctrl+i to tab. I want them to do different things in vim. + "ctrl+i" = "send_text all \\x01"; + }; + + extraConfig = '' + mouse_map left click ungrabbed no-op + ''; }; - - settings = { - scrollback_lines = 20000; - allow_hyperlinks = true; - - repaint_delay = 10; - input_delay = 3; - - enable_audio_bell = false; - update_check_interval = 0; - - initial_window_width = "95c"; - initial_window_height = "30c"; - remember_window_size = "no"; - - draw_minimal_borders = false; - hide_window_decorations = true; - - shell = "${pkgs.tmux}/bin/tmux"; - clipboard_control = "write-clipboard write-primary read-clipboard read-primary"; - - foreground = "#fcfcfc"; - background = "#232627"; - linux_display_server = "auto"; - }; - - keybindings = { - "ctrl+f" = - "launch --location=hsplit --allow-remote-control kitty +kitten ${flakes.kitty-search}/search.py @active-kitty-window-id"; - "ctrl+alt+r" = "load_config_file"; - "ctrl+shift+r" = "no_op"; - "super+`" = "no_op"; - "ctrl+EQUAL" = "change_font_size all +2.0"; - "ctrl+minus" = "change_font_size all -2.0"; - "ctrl+0" = "change_font_size all 0"; - # "ctrl+/" = "send_text all "; - "super+~" = "no_op"; - - # required for vim!! - # terminals map ctrl+i to tab. I want them to do different things in vim. - "ctrl+i" = "send_text all \\x01"; - }; - - extraConfig = '' - mouse_map left click ungrabbed no-op - ''; }; - }; + }; } diff --git a/programs/niri/default.nix b/programs/niri/default.nix index 04ae0f6..d36528e 100644 --- a/programs/niri/default.nix +++ b/programs/niri/default.nix @@ -1,663 +1,666 @@ -_: { - custom.program.niri.requirements = [ "graphical" ]; - custom.program.niri.home-config = - { - config, - pkgs, - flakes, - lib, - ... - }: - let - noctalia = - cmd: - [ - "${pkgs.lib.getExe' flakes.noctalia.packages.${pkgs.system}.default "noctalia-shell"}" - "ipc" - "call" - ] - ++ (pkgs.lib.splitString " " cmd); +{ machine, ... }: +{ + custom.program.niri = machine.program { + requirements = [ "graphical" ]; + home-config = + { + config, + pkgs, + flakes, + lib, + ... + }: + let + noctalia = + cmd: + [ + "${pkgs.lib.getExe' flakes.noctalia.packages.${pkgs.system}.default "noctalia-shell"}" + "ipc" + "call" + ] + ++ (pkgs.lib.splitString " " cmd); - wallpaper = ("${pkgs.custom.raw-data}/pacific.png"); - matugenSchemeType = "scheme-tonal-spot"; - in - { - imports = [ - flakes.niri.homeModules.niri - flakes.matugen.nixosModules.default - flakes.noctalia.homeModules.default - ]; + wallpaper = ("${pkgs.custom.raw-data}/pacific.png"); + matugenSchemeType = "scheme-tonal-spot"; + in + { + imports = [ + flakes.niri.homeModules.niri + flakes.matugen.nixosModules.default + flakes.noctalia.homeModules.default + ]; - home.packages = - with pkgs; - [ - matugen - glib - dconf - gsettings-desktop-schemas - xwayland-satellite - # gtk - nwg-look - # qt config tool - kdePackages.qt6ct + home.packages = + with pkgs; + [ + matugen + glib + dconf + gsettings-desktop-schemas + xwayland-satellite + # gtk + nwg-look + # qt config tool + kdePackages.qt6ct - # media control - playerctl - # brightness control - brightnessctl - pavucontrol + # media control + playerctl + # brightness control + brightnessctl + pavucontrol - fira - jetbrains-mono - fira-mono - noto-fonts - ] - ++ custom.maple-fonts-pack; + fira + jetbrains-mono + fira-mono + noto-fonts + ] + ++ custom.maple-fonts-pack; - programs.niri.settings = { - # main laptop screen - outputs."eDP-1" = { - mode = { - width = 1928; - height = 1200; - refresh = 59.987; - }; - position = { - x = 0; - y = 0; - }; - }; - - outputs."LG Electronics LG ULTRAWIDE 411NTBK28189" = { - mode = { - width = 3440; - height = 1440; - refresh = 59.987; - }; - position = { - x = -3440; - y = 240; - }; - - # focus the external screen first - focus-at-startup = true; - }; - - outputs."LG Electronics LG ULTRAWIDE 409NTAB3P496" = { - mode = { - width = 3440; - height = 1440; - refresh = 59.987; - }; - position = { - x = -3440; - y = 240; - }; - - # focus the external screen first - focus-at-startup = true; - }; - }; - - home.sessionVariables = { - QT_QPA_PLATFORMTHEME = "qt6ct"; - XCURSOR_THEME = "Adwaita"; - XCURSOR_SIZE = "10"; - DEFAULT_BROWSER = "${config.programs.firefox.package}/bin/firefox"; - BROWSER = "${config.programs.firefox.package}/bin/firefox"; - }; - - programs.niri.settings = { - input = { - keyboard = { - xkb = { - layout = "us"; - options = "grp:win_space_toggle,compose:ralt"; + programs.niri.settings = { + # main laptop screen + outputs."eDP-1" = { + mode = { + width = 1928; + height = 1200; + refresh = 59.987; + }; + position = { + x = 0; + y = 0; }; - numlock = true; }; - mouse = { - accel-speed = 0.5; + outputs."LG Electronics LG ULTRAWIDE 411NTBK28189" = { + mode = { + width = 3440; + height = 1440; + refresh = 59.987; + }; + position = { + x = -3440; + y = 240; + }; + + # focus the external screen first + focus-at-startup = true; }; - touchpad = { - dwt = true; - tap = true; - tap-button-map = "left-right-middle"; - click-method = "clickfinger"; - natural-scroll = false; - }; + outputs."LG Electronics LG ULTRAWIDE 409NTAB3P496" = { + mode = { + width = 3440; + height = 1440; + refresh = 59.987; + }; + position = { + x = -3440; + y = 240; + }; - focus-follows-mouse = { - enable = true; - max-scroll-amount = "0%"; + # focus the external screen first + focus-at-startup = true; }; - - workspace-auto-back-and-forth = true; }; - debug = { - render-drm-device = "/dev/dri/by-path/pci-0000:00:02.0-render"; + home.sessionVariables = { + QT_QPA_PLATFORMTHEME = "qt6ct"; + XCURSOR_THEME = "Adwaita"; + XCURSOR_SIZE = "10"; + DEFAULT_BROWSER = "${config.programs.firefox.package}/bin/firefox"; + BROWSER = "${config.programs.firefox.package}/bin/firefox"; }; - cursor = { - theme = "Adwaita"; - size = 10; - }; + programs.niri.settings = { + input = { + keyboard = { + xkb = { + layout = "us"; + options = "grp:win_space_toggle,compose:ralt"; + }; + numlock = true; + }; - gestures.hot-corners.enable = true; + mouse = { + accel-speed = 0.5; + }; - layout = { - gaps = 8; - center-focused-column = "never"; - always-center-single-column = true; + touchpad = { + dwt = true; + tap = true; + tap-button-map = "left-right-middle"; + click-method = "clickfinger"; + natural-scroll = false; + }; - preset-column-widths = [ - { proportion = 0.33333; } - { proportion = 0.5; } - { proportion = 0.66667; } - { proportion = 1.0; } + focus-follows-mouse = { + enable = true; + max-scroll-amount = "0%"; + }; + + workspace-auto-back-and-forth = true; + }; + + debug = { + render-drm-device = "/dev/dri/by-path/pci-0000:00:02.0-render"; + }; + + cursor = { + theme = "Adwaita"; + size = 10; + }; + + gestures.hot-corners.enable = true; + + layout = { + gaps = 8; + center-focused-column = "never"; + always-center-single-column = true; + + preset-column-widths = [ + { proportion = 0.33333; } + { proportion = 0.5; } + { proportion = 0.66667; } + { proportion = 1.0; } + ]; + + default-column-width = { + proportion = 0.5; + }; + + shadow = { + softness = 20; + spread = 5; + offset = { + x = 0; + y = 5; + }; + }; + + focus-ring = { + width = 1; + active.color = "${config.programs.matugen.theme.colors.primary.default.color}"; + inactive.color = "${config.programs.matugen.theme.colors.surface.default.color}"; + urgent.color = "${config.programs.matugen.theme.colors.error.default.color}"; + }; + + border = { + active.color = "${config.programs.matugen.theme.colors.primary.default.color}"; + inactive.color = "${config.programs.matugen.theme.colors.surface.default.color}"; + urgent.color = "${config.programs.matugen.theme.colors.error.default.color}"; + }; + + shadow = { + color = "${config.programs.matugen.theme.colors.shadow.default.color}70"; + }; + + tab-indicator = { + active.color = "${config.programs.matugen.theme.colors.primary.default.color}"; + inactive.color = "${config.programs.matugen.theme.colors.primary_container.default.color}"; + urgent.color = "${config.programs.matugen.theme.colors.error.default.color}"; + }; + + insert-hint = { + display.color = "${config.programs.matugen.theme.colors.primary.default.color}80"; + }; + }; + + hotkey-overlay.skip-at-startup = true; + + screenshot-path = "~/Documents/personal/pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"; + + workspaces."01-browser" = { + name = "browser"; + }; + workspaces."02-programming" = { + name = "programming"; + }; + workspaces."03-chat" = { + name = "chat"; + }; + + window-rules = [ + { + matches = [ + { + + app-id = "firefox$"; + title = "Extension: (Bitwarden Password Manager)"; + } + ]; + open-floating = true; + open-focused = true; + block-out-from = "screen-capture"; + } + { + matches = [ + { + app-id = "firefox$"; + title = "^Picture-in-Picture$"; + } + ]; + open-floating = true; + } + + { + matches = [ { app-id = "firefox"; } ]; + open-on-workspace = "browser"; + } + + { + matches = [ + { + app-id = "org.gnome.Nautilus"; + title = "Open Files"; + } + { + app-id = "steam"; + title = "Steam Settings"; + } + { app-id = "pavucontrol"; } + ]; + open-floating = true; + } + + { + matches = [ + { app-id = "discord"; } + { app-id = "org.element.desktop"; } # TODO + { app-id = "signal"; } # TODO + ]; + open-on-workspace = "chat"; + } + + { + matches = [ + { app-id = "dev.zed.Zed"; } + ]; + open-on-workspace = "programming"; + } + + { + geometry-corner-radius = { + top-left = 8.0; + top-right = 8.0; + bottom-right = 8.0; + bottom-left = 8.0; + }; + clip-to-geometry = true; + } ]; - default-column-width = { - proportion = 0.5; - }; + spawn-at-startup = [ + { argv = [ "firefox" ]; } + { argv = [ "discord" ]; } + { argv = [ "signal-desktop" ]; } + { argv = [ "zeditor" ]; } + { + argv = [ "${pkgs.lib.getExe' flakes.noctalia.packages.${pkgs.system}.default "noctalia-shell"}" ]; + } + { + sh = '' + systemctl --user import-environment NIRI_SOCKET + systemctl --user restart kanata + ''; + } + ]; - shadow = { - softness = 20; - spread = 5; - offset = { - x = 0; - y = 5; + animations = { }; + + binds = { + "Ctrl+Alt+Delete" = { + hotkey-overlay.title = "Power menu"; + action.spawn = noctalia "sessionMenu toggle"; }; - }; - focus-ring = { - width = 1; - active.color = "${config.programs.matugen.theme.colors.primary.default.color}"; - inactive.color = "${config.programs.matugen.theme.colors.surface.default.color}"; - urgent.color = "${config.programs.matugen.theme.colors.error.default.color}"; - }; - - border = { - active.color = "${config.programs.matugen.theme.colors.primary.default.color}"; - inactive.color = "${config.programs.matugen.theme.colors.surface.default.color}"; - urgent.color = "${config.programs.matugen.theme.colors.error.default.color}"; - }; - - shadow = { - color = "${config.programs.matugen.theme.colors.shadow.default.color}70"; - }; - - tab-indicator = { - active.color = "${config.programs.matugen.theme.colors.primary.default.color}"; - inactive.color = "${config.programs.matugen.theme.colors.primary_container.default.color}"; - urgent.color = "${config.programs.matugen.theme.colors.error.default.color}"; - }; - - insert-hint = { - display.color = "${config.programs.matugen.theme.colors.primary.default.color}80"; - }; - }; - - hotkey-overlay.skip-at-startup = true; - - screenshot-path = "~/Documents/personal/pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"; - - workspaces."01-browser" = { - name = "browser"; - }; - workspaces."02-programming" = { - name = "programming"; - }; - workspaces."03-chat" = { - name = "chat"; - }; - - window-rules = [ - { - matches = [ - { - - app-id = "firefox$"; - title = "Extension: (Bitwarden Password Manager)"; - } - ]; - open-floating = true; - open-focused = true; - block-out-from = "screen-capture"; - } - { - matches = [ - { - app-id = "firefox$"; - title = "^Picture-in-Picture$"; - } - ]; - open-floating = true; - } - - { - matches = [ { app-id = "firefox"; } ]; - open-on-workspace = "browser"; - } - - { - matches = [ - { - app-id = "org.gnome.Nautilus"; - title = "Open Files"; - } - { - app-id = "steam"; - title = "Steam Settings"; - } - { app-id = "pavucontrol"; } - ]; - open-floating = true; - } - - { - matches = [ - { app-id = "discord"; } - { app-id = "org.element.desktop"; } # TODO - { app-id = "signal"; } # TODO - ]; - open-on-workspace = "chat"; - } - - { - matches = [ - { app-id = "dev.zed.Zed"; } - ]; - open-on-workspace = "programming"; - } - - { - geometry-corner-radius = { - top-left = 8.0; - top-right = 8.0; - bottom-right = 8.0; - bottom-left = 8.0; + "Mod+P" = { + hotkey-overlay.title = "Run an Application"; + action.spawn = noctalia "launcher toggle"; }; - clip-to-geometry = true; - } - ]; - spawn-at-startup = [ - { argv = [ "firefox" ]; } - { argv = [ "discord" ]; } - { argv = [ "signal-desktop" ]; } - { argv = [ "zeditor" ]; } - { - argv = [ "${pkgs.lib.getExe' flakes.noctalia.packages.${pkgs.system}.default "noctalia-shell"}" ]; - } - { - sh = '' - systemctl --user import-environment NIRI_SOCKET - systemctl --user restart kanata - ''; - } - ]; - - animations = { }; - - binds = { - "Ctrl+Alt+Delete" = { - hotkey-overlay.title = "Power menu"; - action.spawn = noctalia "sessionMenu toggle"; - }; - - "Mod+P" = { - hotkey-overlay.title = "Run an Application"; - action.spawn = noctalia "launcher toggle"; - }; - - "Mod+L" = { - hotkey-overlay.title = "Lock the Screen"; - action.spawn = noctalia "lockScreen lock"; - }; - - "Mod+Shift+Slash".action.show-hotkey-overlay = { }; - - "Mod+Return" = { - hotkey-overlay.title = "Open a Terminal"; - action.spawn = "kitty"; - }; - - "XF86AudioRaiseVolume" = { - allow-when-locked = true; - action.spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05+"; - }; - "XF86AudioLowerVolume" = { - allow-when-locked = true; - action.spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05-"; - }; - "XF86AudioMute" = { - allow-when-locked = true; - action.spawn-sh = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; - }; - "XF86AudioMicMute" = { - allow-when-locked = true; - action.spawn-sh = "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; - }; - "XF86AudioPlay" = { - allow-when-locked = true; - action.spawn-sh = "playerctl play-pause"; - }; - "XF86AudioStop" = { - allow-when-locked = true; - action.spawn-sh = "playerctl stop"; - }; - "XF86AudioPrev" = { - allow-when-locked = true; - action.spawn-sh = "playerctl previous"; - }; - "XF86AudioNext" = { - allow-when-locked = true; - action.spawn-sh = "playerctl next"; - }; - "Mod+Period" = { - allow-when-locked = true; - action.spawn-sh = "playerctl nest"; - }; - "Mod+Comma" = { - allow-when-locked = true; - action.spawn-sh = "playerctl previous"; - }; - "Mod+Slash" = { - allow-when-locked = true; - action.spawn-sh = "playerctl play-pause"; - }; - - # TODO - "XF86MonBrightnessUp" = { - allow-when-locked = true; - action.spawn = [ - "brightnessctl" - "--device=amdgpu_bl1" - "--class=backlight" - "set" - "+10%" - ]; - }; - "XF86MonBrightnessDown" = { - allow-when-locked = true; - action.spawn = [ - "brightnessctl" - "--device=amdgpu_bl1" - "--class=backlight" - "set" - "10%-" - ]; - }; - - "Mod+Q" = { - repeat = false; - action.close-window = { }; - }; - - "Mod+Left".action.focus-column-left = { }; - "Mod+Down".action.focus-window-or-workspace-down = { }; - "Mod+Up".action.focus-window-or-workspace-up = { }; - "Mod+Right".action.focus-column-right = { }; - - "Mod+Shift+Left".action.move-column-left = { }; - "Mod+Shift+Down".action.move-window-down-or-to-workspace-down = { }; - "Mod+Shift+Up".action.move-window-up-or-to-workspace-up = { }; - "Mod+Shift+Right".action.move-column-right = { }; - - "Mod+Home".action.focus-column-first = { }; - "Mod+End".action.focus-column-last = { }; - "Mod+Shift+Home".action.move-column-to-first = { }; - "Mod+Shift+End".action.move-column-to-last = { }; - - "Mod+Ctrl+Left".action.focus-monitor-left = { }; - "Mod+Ctrl+Down".action.focus-monitor-down = { }; - "Mod+Ctrl+Up".action.focus-monitor-up = { }; - "Mod+Ctrl+Right".action.focus-monitor-right = { }; - - "Mod+Shift+Ctrl+Left".action.move-column-to-monitor-left = { }; - "Mod+Shift+Ctrl+Down".action.move-column-to-monitor-down = { }; - "Mod+Shift+Ctrl+Up".action.move-column-to-monitor-up = { }; - "Mod+Shift+Ctrl+Right".action.move-column-to-monitor-right = { }; - - "Mod+1".action.focus-workspace = 1; - "Mod+2".action.focus-workspace = 2; - "Mod+3".action.focus-workspace = 3; - "Mod+4".action.focus-workspace = 4; - "Mod+5".action.focus-workspace = 5; - "Mod+6".action.focus-workspace = 6; - "Mod+7".action.focus-workspace = 7; - "Mod+8".action.focus-workspace = 8; - "Mod+9".action.focus-workspace = 9; - "Mod+Shift+1".action.move-column-to-workspace = 1; - "Mod+Shift+2".action.move-column-to-workspace = 2; - "Mod+Shift+3".action.move-column-to-workspace = 3; - "Mod+Shift+4".action.move-column-to-workspace = 4; - "Mod+Shift+5".action.move-column-to-workspace = 5; - "Mod+Shift+6".action.move-column-to-workspace = 6; - "Mod+Shift+7".action.move-column-to-workspace = 7; - "Mod+Shift+8".action.move-column-to-workspace = 8; - "Mod+Shift+9".action.move-column-to-workspace = 9; - - "Mod+WheelScrollDown" = { - cooldown-ms = 150; - action.focus-workspace-down = { }; - }; - "Mod+WheelScrollUp" = { - cooldown-ms = 150; - action.focus-workspace-up = { }; - }; - "Mod+Shift+WheelScrollDown".action.focus-column-left = { }; - "Mod+Shift+WheelScrollUp".action.focus-column-right = { }; - - # "Mod+Shift+WheelScrollDown" = { - # cooldown-ms = 150; - # action.move-column-to-workspace-down = { }; - # }; - # "Mod+Shift+WheelScrollUp" = { - # cooldown-ms = 150; - # action.move-column-to-workspace-up = { }; - # }; - - # "Mod+WheelScrollRight".action.focus-column-right = { }; - # "Mod+WheelScrollLeft".action.focus-column-left = { }; - # "Mod+Shift+WheelScrollRight".action.move-column-right = { }; - # "Mod+Shift+WheelScrollLeft".action.move-column-left = { }; - - "Mod+BracketLeft".action.consume-or-expel-window-left = { }; - "Mod+BracketRight".action.consume-or-expel-window-right = { }; - - "Mod+Shift+BracketLeft".action.consume-window-into-column = { }; - "Mod+Shift+BracketRight".action.expel-window-from-column = { }; - - "Mod+R".action.switch-preset-column-width = { }; - "Mod+Shift+R".action.switch-preset-window-height = { }; - "Mod+Ctrl+R".action.reset-window-height = { }; - - "Mod+D".action.maximize-column = { }; - "Mod+F".action.fullscreen-window = { }; - "Mod+S".action.expand-column-to-available-width = { }; - "Mod+C".action.center-column = { }; - "Mod+Shift+C".action.center-visible-columns = { }; - - "Mod+Minus".action.set-column-width = "-10%"; - "Mod+Equal".action.set-column-width = "+10%"; - "Mod+Shift+Minus".action.set-window-height = "-10%"; - "Mod+Shift+Equal".action.set-window-height = "+10%"; - - "Mod+E".action.toggle-window-floating = { }; - "Mod+Shift+E".action.switch-focus-between-floating-and-tiling = { }; - - "Mod+W".action.toggle-column-tabbed-display = { }; - - "Mod+Shift+S".action.screenshot = { }; - - "Mod+Escape" = { - allow-inhibiting = false; - action.toggle-keyboard-shortcuts-inhibit = { }; - }; - - "Mod+Shift+P".action.power-off-monitors = { }; - }; - }; - - programs.noctalia-shell = { - enable = true; - systemd.enable = false; - settings = { - general = { - # avatarImage = cfg.pfp; - }; - colorSchemes = { - darkMode = true; - generateTemplatesForPredefined = true; - inherit matugenSchemeType; - predefinedScheme = "Noctalia (default)"; - useWallpaperColors = true; - }; - location = { - monthBeforeDay = false; - name = "Amsterdam"; - }; - wallpaper = { - enabled = true; - setWallpaperOnAllMonitors = true; - fillMode = "crop"; - }; - appLauncher = { - enableClipboardHistory = true; - terminalCommand = "kitty -e"; - }; - sessionMenu = { - enableCountdown = true; - countdownDuration = 5000; - }; - controlCenter = { - position = "close_to_bar_button"; - shortcuts = { - left = [ - { - id = "WiFi"; - } - { - id = "Bluetooth"; - } - { - id = "PowerProfile"; - } - { - id = "KeepAwake"; - } - ]; - right = [ ]; + "Mod+L" = { + hotkey-overlay.title = "Lock the Screen"; + action.spawn = noctalia "lockScreen lock"; }; - }; - bar = { - density = "compact"; - position = "right"; - backgroundOpacity = 0.5; - widgets = { - left = [ - { - id = "ControlCenter"; - useDistroLogo = true; - } - { - id = "NotificationHistory"; - } - { - id = "plugin:catwalk"; - } - ]; - center = [ - { - hideUnoccupied = false; - id = "Workspace"; - labelMode = "none"; - } - ]; - right = [ - { - id = "Tray"; - drawerEnabled = false; - } - { - id = "WiFi"; - } - { - id = "Bluetooth"; - } - { - id = "Brightness"; - } - { - id = "Volume"; - } - ] - ++ [ { id = "Battery"; } ] - ++ [ - { - id = "KeyboardLayout"; - displayMode = "forceOpen"; - } - { - formatHorizontal = "HH:mm"; - formatVertical = "HH mm"; - id = "Clock"; - useMonospacedFont = true; - usePrimaryColor = true; - } + + "Mod+Shift+Slash".action.show-hotkey-overlay = { }; + + "Mod+Return" = { + hotkey-overlay.title = "Open a Terminal"; + action.spawn = "kitty"; + }; + + "XF86AudioRaiseVolume" = { + allow-when-locked = true; + action.spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05+"; + }; + "XF86AudioLowerVolume" = { + allow-when-locked = true; + action.spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05-"; + }; + "XF86AudioMute" = { + allow-when-locked = true; + action.spawn-sh = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; + }; + "XF86AudioMicMute" = { + allow-when-locked = true; + action.spawn-sh = "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; + }; + "XF86AudioPlay" = { + allow-when-locked = true; + action.spawn-sh = "playerctl play-pause"; + }; + "XF86AudioStop" = { + allow-when-locked = true; + action.spawn-sh = "playerctl stop"; + }; + "XF86AudioPrev" = { + allow-when-locked = true; + action.spawn-sh = "playerctl previous"; + }; + "XF86AudioNext" = { + allow-when-locked = true; + action.spawn-sh = "playerctl next"; + }; + "Mod+Period" = { + allow-when-locked = true; + action.spawn-sh = "playerctl nest"; + }; + "Mod+Comma" = { + allow-when-locked = true; + action.spawn-sh = "playerctl previous"; + }; + "Mod+Slash" = { + allow-when-locked = true; + action.spawn-sh = "playerctl play-pause"; + }; + + # TODO + "XF86MonBrightnessUp" = { + allow-when-locked = true; + action.spawn = [ + "brightnessctl" + "--device=amdgpu_bl1" + "--class=backlight" + "set" + "+10%" ]; }; + "XF86MonBrightnessDown" = { + allow-when-locked = true; + action.spawn = [ + "brightnessctl" + "--device=amdgpu_bl1" + "--class=backlight" + "set" + "10%-" + ]; + }; + + "Mod+Q" = { + repeat = false; + action.close-window = { }; + }; + + "Mod+Left".action.focus-column-left = { }; + "Mod+Down".action.focus-window-or-workspace-down = { }; + "Mod+Up".action.focus-window-or-workspace-up = { }; + "Mod+Right".action.focus-column-right = { }; + + "Mod+Shift+Left".action.move-column-left = { }; + "Mod+Shift+Down".action.move-window-down-or-to-workspace-down = { }; + "Mod+Shift+Up".action.move-window-up-or-to-workspace-up = { }; + "Mod+Shift+Right".action.move-column-right = { }; + + "Mod+Home".action.focus-column-first = { }; + "Mod+End".action.focus-column-last = { }; + "Mod+Shift+Home".action.move-column-to-first = { }; + "Mod+Shift+End".action.move-column-to-last = { }; + + "Mod+Ctrl+Left".action.focus-monitor-left = { }; + "Mod+Ctrl+Down".action.focus-monitor-down = { }; + "Mod+Ctrl+Up".action.focus-monitor-up = { }; + "Mod+Ctrl+Right".action.focus-monitor-right = { }; + + "Mod+Shift+Ctrl+Left".action.move-column-to-monitor-left = { }; + "Mod+Shift+Ctrl+Down".action.move-column-to-monitor-down = { }; + "Mod+Shift+Ctrl+Up".action.move-column-to-monitor-up = { }; + "Mod+Shift+Ctrl+Right".action.move-column-to-monitor-right = { }; + + "Mod+1".action.focus-workspace = 1; + "Mod+2".action.focus-workspace = 2; + "Mod+3".action.focus-workspace = 3; + "Mod+4".action.focus-workspace = 4; + "Mod+5".action.focus-workspace = 5; + "Mod+6".action.focus-workspace = 6; + "Mod+7".action.focus-workspace = 7; + "Mod+8".action.focus-workspace = 8; + "Mod+9".action.focus-workspace = 9; + "Mod+Shift+1".action.move-column-to-workspace = 1; + "Mod+Shift+2".action.move-column-to-workspace = 2; + "Mod+Shift+3".action.move-column-to-workspace = 3; + "Mod+Shift+4".action.move-column-to-workspace = 4; + "Mod+Shift+5".action.move-column-to-workspace = 5; + "Mod+Shift+6".action.move-column-to-workspace = 6; + "Mod+Shift+7".action.move-column-to-workspace = 7; + "Mod+Shift+8".action.move-column-to-workspace = 8; + "Mod+Shift+9".action.move-column-to-workspace = 9; + + "Mod+WheelScrollDown" = { + cooldown-ms = 150; + action.focus-workspace-down = { }; + }; + "Mod+WheelScrollUp" = { + cooldown-ms = 150; + action.focus-workspace-up = { }; + }; + "Mod+Shift+WheelScrollDown".action.focus-column-left = { }; + "Mod+Shift+WheelScrollUp".action.focus-column-right = { }; + + # "Mod+Shift+WheelScrollDown" = { + # cooldown-ms = 150; + # action.move-column-to-workspace-down = { }; + # }; + # "Mod+Shift+WheelScrollUp" = { + # cooldown-ms = 150; + # action.move-column-to-workspace-up = { }; + # }; + + # "Mod+WheelScrollRight".action.focus-column-right = { }; + # "Mod+WheelScrollLeft".action.focus-column-left = { }; + # "Mod+Shift+WheelScrollRight".action.move-column-right = { }; + # "Mod+Shift+WheelScrollLeft".action.move-column-left = { }; + + "Mod+BracketLeft".action.consume-or-expel-window-left = { }; + "Mod+BracketRight".action.consume-or-expel-window-right = { }; + + "Mod+Shift+BracketLeft".action.consume-window-into-column = { }; + "Mod+Shift+BracketRight".action.expel-window-from-column = { }; + + "Mod+R".action.switch-preset-column-width = { }; + "Mod+Shift+R".action.switch-preset-window-height = { }; + "Mod+Ctrl+R".action.reset-window-height = { }; + + "Mod+D".action.maximize-column = { }; + "Mod+F".action.fullscreen-window = { }; + "Mod+S".action.expand-column-to-available-width = { }; + "Mod+C".action.center-column = { }; + "Mod+Shift+C".action.center-visible-columns = { }; + + "Mod+Minus".action.set-column-width = "-10%"; + "Mod+Equal".action.set-column-width = "+10%"; + "Mod+Shift+Minus".action.set-window-height = "-10%"; + "Mod+Shift+Equal".action.set-window-height = "+10%"; + + "Mod+E".action.toggle-window-floating = { }; + "Mod+Shift+E".action.switch-focus-between-floating-and-tiling = { }; + + "Mod+W".action.toggle-column-tabbed-display = { }; + + "Mod+Shift+S".action.screenshot = { }; + + "Mod+Escape" = { + allow-inhibiting = false; + action.toggle-keyboard-shortcuts-inhibit = { }; + }; + + "Mod+Shift+P".action.power-off-monitors = { }; }; - templates = { - gtk = true; - qt = true; - niri = true; + }; + + programs.noctalia-shell = { + enable = true; + systemd.enable = false; + settings = { + general = { + # avatarImage = cfg.pfp; + }; + colorSchemes = { + darkMode = true; + generateTemplatesForPredefined = true; + inherit matugenSchemeType; + predefinedScheme = "Noctalia (default)"; + useWallpaperColors = true; + }; + location = { + monthBeforeDay = false; + name = "Amsterdam"; + }; + wallpaper = { + enabled = true; + setWallpaperOnAllMonitors = true; + fillMode = "crop"; + }; + appLauncher = { + enableClipboardHistory = true; + terminalCommand = "kitty -e"; + }; + sessionMenu = { + enableCountdown = true; + countdownDuration = 5000; + }; + controlCenter = { + position = "close_to_bar_button"; + shortcuts = { + left = [ + { + id = "WiFi"; + } + { + id = "Bluetooth"; + } + { + id = "PowerProfile"; + } + { + id = "KeepAwake"; + } + ]; + right = [ ]; + }; + }; + bar = { + density = "compact"; + position = "right"; + backgroundOpacity = 0.5; + widgets = { + left = [ + { + id = "ControlCenter"; + useDistroLogo = true; + } + { + id = "NotificationHistory"; + } + { + id = "plugin:catwalk"; + } + ]; + center = [ + { + hideUnoccupied = false; + id = "Workspace"; + labelMode = "none"; + } + ]; + right = [ + { + id = "Tray"; + drawerEnabled = false; + } + { + id = "WiFi"; + } + { + id = "Bluetooth"; + } + { + id = "Brightness"; + } + { + id = "Volume"; + } + ] + ++ [ { id = "Battery"; } ] + ++ [ + { + id = "KeyboardLayout"; + displayMode = "forceOpen"; + } + { + formatHorizontal = "HH:mm"; + formatVertical = "HH mm"; + id = "Clock"; + useMonospacedFont = true; + usePrimaryColor = true; + } + ]; + }; + }; + templates = { + gtk = true; + qt = true; + niri = true; + }; + }; + }; + + home.file.".cache/noctalia/wallpapers.json" = { + text = builtins.toJSON { + defaultWallpaper = wallpaper; + }; + }; + + home.activation.themeFiles = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + mkdir -p ${config.xdg.configHome}/gtk-4.0 + mkdir -p ${config.xdg.configHome}/gtk-3.0 + mkdir -p ${config.xdg.configHome}/qt5ct/colors + mkdir -p ${config.xdg.configHome}/qt6ct/colors + + touch ${config.xdg.configHome}/gtk-4.0/gtk.css + touch ${config.xdg.configHome}/gtk-3.0/gtk.css + touch ${config.xdg.configHome}/qt5ct/colors/noctalia.conf + touch ${config.xdg.configHome}/qt6ct/colors/noctalia.conf + ''; + + programs.matugen = { + enable = true; + wallpaper = wallpaper; + type = matugenSchemeType; + }; + + gtk.cursorTheme = { + package = pkgs.adwaita-icon-theme; + name = "Adwaita"; + size = 24; + }; + + dconf.settings = { + # appearance + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + enable-hot-corners = true; + gtk-enable-primary-paste = false; }; }; }; - - home.file.".cache/noctalia/wallpapers.json" = { - text = builtins.toJSON { - defaultWallpaper = wallpaper; - }; - }; - - home.activation.themeFiles = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - mkdir -p ${config.xdg.configHome}/gtk-4.0 - mkdir -p ${config.xdg.configHome}/gtk-3.0 - mkdir -p ${config.xdg.configHome}/qt5ct/colors - mkdir -p ${config.xdg.configHome}/qt6ct/colors - - touch ${config.xdg.configHome}/gtk-4.0/gtk.css - touch ${config.xdg.configHome}/gtk-3.0/gtk.css - touch ${config.xdg.configHome}/qt5ct/colors/noctalia.conf - touch ${config.xdg.configHome}/qt6ct/colors/noctalia.conf - ''; - - programs.matugen = { - enable = true; - wallpaper = wallpaper; - type = matugenSchemeType; - }; - - gtk.cursorTheme = { - package = pkgs.adwaita-icon-theme; - name = "Adwaita"; - size = 24; - }; - - dconf.settings = { - # appearance - "org/gnome/desktop/interface" = { - color-scheme = "prefer-dark"; - enable-hot-corners = true; - gtk-enable-primary-paste = false; - }; - }; - }; + }; } diff --git a/programs/nvim/default.nix b/programs/nvim/default.nix index b2bfdbf..8f850b2 100644 --- a/programs/nvim/default.nix +++ b/programs/nvim/default.nix @@ -1,155 +1,158 @@ -_: { - custom.program.nvim.requirements = [ "cli" ]; - custom.program.nvim.home-config = - { - pkgs, - flakes, - lib, - ... - }: - let - nvim_mime_types = [ - "application/x-zerosize" - "text/english" - "text/plain" - "text/x-makefile" - "text/x-c++hdr" - "text/x-c++src" - "text/x-chdr" - "text/x-csrc" - "text/x-java" - "text/x-moc" - "text/x-pascal" - "text/x-tcl" - "text/x-tex" - "application/x-shellscript" - "text/x-c" - "text/x-c++" - ]; - desktop-entry-name = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanvim"; - desktop-entry = pkgs.makeDesktopItem { - name = desktop-entry-name; - desktopName = "neovim"; - exec = "${./editor-hax.py} %F"; - tryExec = "${./editor-hax.py}"; - terminal = false; - type = "Application"; - categories = [ - "Utility" - "TextEditor" +{ machine, ... }: +{ + custom.program.nvim = machine.program { + requirements = [ "cli" ]; + home-config = + { + pkgs, + flakes, + lib, + ... + }: + let + nvim_mime_types = [ + "application/x-zerosize" + "text/english" + "text/plain" + "text/x-makefile" + "text/x-c++hdr" + "text/x-c++src" + "text/x-chdr" + "text/x-csrc" + "text/x-java" + "text/x-moc" + "text/x-pascal" + "text/x-tcl" + "text/x-tex" + "application/x-shellscript" + "text/x-c" + "text/x-c++" ]; - icon = "terminal"; - mimeTypes = nvim_mime_types; - }; - in - { - home = { - sessionVariables = { - EDITOR = "nvim"; + desktop-entry-name = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanvim"; + desktop-entry = pkgs.makeDesktopItem { + name = desktop-entry-name; + desktopName = "neovim"; + exec = "${./editor-hax.py} %F"; + tryExec = "${./editor-hax.py}"; + terminal = false; + type = "Application"; + categories = [ + "Utility" + "TextEditor" + ]; + icon = "terminal"; + mimeTypes = nvim_mime_types; }; - }; - - home.file.".local/share/applications/${desktop-entry-name}.desktop" = { - source = "${desktop-entry}/share/applications/${desktop-entry-name}.desktop"; - }; - - xdg.mimeApps.associations.added = lib.mergeAttrsList ( - map (mime: { - ${mime} = [ "${desktop-entry-name}.desktop" ]; - }) nvim_mime_types - ); - - imports = [ - flakes.nixvim.homeModules.nixvim - ./options.nix - ./plugins.nix - ./keys.nix - ]; - - programs.nixvim = { - enable = true; - globals.mapleader = " "; - globals.maplocalleader = " "; - - viAlias = true; - vimAlias = true; - - # Highlight and remove extra white spaces - # same color as cursorline as per - # https://github.com/joshdick/onedark.vim/blob/390b893d361c356ac1b00778d849815f2aa44ae4/autoload/onedark.vim - highlight.ExtraWhitespace.bg = "#2C323C"; - match.ExtraWhitespace = "\\s\\+$"; - - clipboard.providers.wl-copy.enable = true; - - performance = { - byteCompileLua.enable = true; - combinePlugins = { - enable = true; - - standalonePlugins = [ - # clashes with lualine - "onedark.nvim" - ]; + in + { + home = { + sessionVariables = { + EDITOR = "nvim"; }; }; - extraLuaPackages = ps: [ ps.magick ]; - extraPackages = [ pkgs.imagemagick ]; + home.file.".local/share/applications/${desktop-entry-name}.desktop" = { + source = "${desktop-entry}/share/applications/${desktop-entry-name}.desktop"; + }; - # package = (import inputs.unstable { inherit (pkgs) system; }).neovim-unwrapped; - package = pkgs.neovim-unwrapped; + xdg.mimeApps.associations.added = lib.mergeAttrsList ( + map (mime: { + ${mime} = [ "${desktop-entry-name}.desktop" ]; + }) nvim_mime_types + ); - colorschemes.onedark = { + imports = [ + flakes.nixvim.homeModules.nixvim + ./options.nix + ./plugins.nix + ./keys.nix + ]; + + programs.nixvim = { enable = true; - settings = { - style = "deep"; + globals.mapleader = " "; + globals.maplocalleader = " "; - highlights = { - # bright green doccomments - "@lsp.type.comment".fg = "#77B767"; - "@comment.documentation.rust".fg = "#77B767"; - "@comment.documentation".fg = "#77B767"; - "@comment".fg = "#426639"; - # "Visual".bg = "#2a2e36"; - # "Cursorline".bg = "#2a2e36"; + viAlias = true; + vimAlias = true; + + # Highlight and remove extra white spaces + # same color as cursorline as per + # https://github.com/joshdick/onedark.vim/blob/390b893d361c356ac1b00778d849815f2aa44ae4/autoload/onedark.vim + highlight.ExtraWhitespace.bg = "#2C323C"; + match.ExtraWhitespace = "\\s\\+$"; + + clipboard.providers.wl-copy.enable = true; + + performance = { + byteCompileLua.enable = true; + combinePlugins = { + enable = true; + + standalonePlugins = [ + # clashes with lualine + "onedark.nvim" + ]; }; - }; + + extraLuaPackages = ps: [ ps.magick ]; + extraPackages = [ pkgs.imagemagick ]; + + # package = (import inputs.unstable { inherit (pkgs) system; }).neovim-unwrapped; + package = pkgs.neovim-unwrapped; + + colorschemes.onedark = { + enable = true; + settings = { + style = "deep"; + + highlights = { + # bright green doccomments + "@lsp.type.comment".fg = "#77B767"; + "@comment.documentation.rust".fg = "#77B767"; + "@comment.documentation".fg = "#77B767"; + "@comment".fg = "#426639"; + # "Visual".bg = "#2a2e36"; + # "Cursorline".bg = "#2a2e36"; + }; + + }; + }; + + extraConfigLuaPre = '' + require("neoconf").setup({}) + ''; + extraConfigLua = '' + require("render-markdown").setup { + latex_converter = '${pkgs.python312Packages.pylatexenc}/bin/latex2text', + } + '' + + # local lspconfig = require 'lspconfig' + # local configs = require 'lspconfig.configs' + # if not configs.foo_lsp then + # configs.noteslsp = { + # default_config = { + # -- cmd = {'${pkgs.custom.noteslsp}/bin/noteslsp'}, + # cmd = {'./noteslsp/target/debug/noteslsp'}, + # filetypes = {'markdown'}, + # root_dir = function(fname) + # return lspconfig.util.find_git_ancestor(fname) + # end, + # settings = {} + # , + # }, + # } + # end + # + # lspconfig.noteslsp.setup{} + # '' + + (builtins.readFile ./config.lua); + extraConfigLuaPost = '' + + ''; }; - - extraConfigLuaPre = '' - require("neoconf").setup({}) - ''; - extraConfigLua = '' - require("render-markdown").setup { - latex_converter = '${pkgs.python312Packages.pylatexenc}/bin/latex2text', - } - '' - - # local lspconfig = require 'lspconfig' - # local configs = require 'lspconfig.configs' - # if not configs.foo_lsp then - # configs.noteslsp = { - # default_config = { - # -- cmd = {'${pkgs.custom.noteslsp}/bin/noteslsp'}, - # cmd = {'./noteslsp/target/debug/noteslsp'}, - # filetypes = {'markdown'}, - # root_dir = function(fname) - # return lspconfig.util.find_git_ancestor(fname) - # end, - # settings = {} - # , - # }, - # } - # end - # - # lspconfig.noteslsp.setup{} - # '' - + (builtins.readFile ./config.lua); - extraConfigLuaPost = '' - - ''; }; - }; + }; } diff --git a/programs/tmux/default.nix b/programs/tmux/default.nix index dc6d148..d00d05a 100644 --- a/programs/tmux/default.nix +++ b/programs/tmux/default.nix @@ -1,202 +1,205 @@ -_: { - custom.program.tmux.requirements = [ "cli" ]; - custom.program.tmux.home-config = - { pkgs, ... }: - { - programs.tmux = { - enable = true; - mouse = true; - clock24 = true; +{ machine, ... }: +{ + custom.program.tmux = machine.program { + requirements = [ "cli" ]; + home-config = + { pkgs, ... }: + { + programs.tmux = { + enable = true; + mouse = true; + clock24 = true; - shortcut = "k"; + shortcut = "k"; - plugins = with pkgs; [ - { - plugin = tmuxPlugins.mkTmuxPlugin { - pluginName = "suspend"; - version = "1a2f806"; - src = pkgs.fetchFromGitHub { - owner = "MunifTanjim"; - repo = "tmux-suspend"; - rev = "1a2f806666e0bfed37535372279fa00d27d50d14"; - sha256 = "0j7vjrwc7gniwkv1076q3wc8ccwj42zph5wdmsm9ibz6029wlmzv"; + plugins = with pkgs; [ + { + plugin = tmuxPlugins.mkTmuxPlugin { + pluginName = "suspend"; + version = "1a2f806"; + src = pkgs.fetchFromGitHub { + owner = "MunifTanjim"; + repo = "tmux-suspend"; + rev = "1a2f806666e0bfed37535372279fa00d27d50d14"; + sha256 = "0j7vjrwc7gniwkv1076q3wc8ccwj42zph5wdmsm9ibz6029wlmzv"; + }; }; - }; - extraConfig = '' - set -g @suspend_key 'F11' - ''; - } - { - plugin = tmuxPlugins.mode-indicator; - } - ]; + extraConfig = '' + set -g @suspend_key 'F11' + ''; + } + { + plugin = tmuxPlugins.mode-indicator; + } + ]; - extraConfig = '' - # unbind every single normal keybinding - unbind-key -a + extraConfig = '' + # unbind every single normal keybinding + unbind-key -a - set -g status-left "#{?client_prefix,#[bg=colour2],#[bg=colour1]}#[fg=colour0] #S " + set -g status-left "#{?client_prefix,#[bg=colour2],#[bg=colour1]}#[fg=colour0] #S " - # for special characters to work right - # like - # set-window-option -g xterm-keys on - set -g default-terminal "screen-256color" + # for special characters to work right + # like + # set-window-option -g xterm-keys on + set -g default-terminal "screen-256color" - set -g set-titles on - set -g allow-passthrough on - set -s escape-time 0 + set -g set-titles on + set -g allow-passthrough on + set -s escape-time 0 - set-option -g default-shell ${pkgs.fish}/bin/fish - set -ga terminal-features "\*:hyperlinks" + set-option -g default-shell ${pkgs.fish}/bin/fish + set -ga terminal-features "\*:hyperlinks" - set-window-option -g mode-keys vi + set-window-option -g mode-keys vi - # clipboard stuff - bind -T copy-mode-vi v send-keys -X begin-selection - bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel - bind v copy-mode - bind p paste-buffer -p - set -s set-clipboard on + # clipboard stuff + bind -T copy-mode-vi v send-keys -X begin-selection + bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel + bind v copy-mode + bind p paste-buffer -p + set -s set-clipboard on - # get back normal terminal emulator bindings - bind-key -n S-PPage copy-mode -u - bind-key -T copy-mode -n S-NPage send-keys -X page-down + # get back normal terminal emulator bindings + bind-key -n S-PPage copy-mode -u + bind-key -T copy-mode -n S-NPage send-keys -X page-down - # don't scroll to end when copying with mouse - bind-key -T copy-mode MouseDragEnd1Pane send-keys -X copy-pipe - bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe - bind-key -T copy-mode DoubleClick1Pane select-pane \; send-keys -X select-word \; run-shell -d 0.3 \; send-keys -X copy-pipe - bind-key -T copy-mode TripleClick1Pane select-pane \; send-keys -X select-line \; run-shell -d 0.3 \; send-keys -X copy-pipe - bind-key -T copy-mode-vi DoubleClick1Pane select-pane \; send-keys -X select-word \; run-shell -d 0.3 \; send-keys -X copy-pipe - bind-key -T copy-mode-vi TripleClick1Pane select-pane \; send-keys -X select-line \; run-shell -d 0.3 \; send-keys -X copy-pipe + # don't scroll to end when copying with mouse + bind-key -T copy-mode MouseDragEnd1Pane send-keys -X copy-pipe + bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe + bind-key -T copy-mode DoubleClick1Pane select-pane \; send-keys -X select-word \; run-shell -d 0.3 \; send-keys -X copy-pipe + bind-key -T copy-mode TripleClick1Pane select-pane \; send-keys -X select-line \; run-shell -d 0.3 \; send-keys -X copy-pipe + bind-key -T copy-mode-vi DoubleClick1Pane select-pane \; send-keys -X select-word \; run-shell -d 0.3 \; send-keys -X copy-pipe + bind-key -T copy-mode-vi TripleClick1Pane select-pane \; send-keys -X select-line \; run-shell -d 0.3 \; send-keys -X copy-pipe - # window control - bind t new-window -c "#{pane_current_path}" - bind-key Tab next-window - bind-key BTab previous-window - set -g automatic-rename-format "#{?#{==:#{pane_current_path},$HOME},~,#{b:pane_current_path}} (#{pane_current_command})" - set -g renumber-windows on - bind-key Q confirm-before -p "kill-window #W? (y/n)" kill-window - bind A last-window + # window control + bind t new-window -c "#{pane_current_path}" + bind-key Tab next-window + bind-key BTab previous-window + set -g automatic-rename-format "#{?#{==:#{pane_current_path},$HOME},~,#{b:pane_current_path}} (#{pane_current_command})" + set -g renumber-windows on + bind-key Q confirm-before -p "kill-window #W? (y/n)" kill-window + bind A last-window - bind-key 1 select-window -t :0 - bind-key 2 select-window -t :1 - bind-key 3 select-window -t :2 - bind-key 4 select-window -t :3 - bind-key 5 select-window -t :4 - bind-key 6 select-window -t :5 - bind-key 7 select-window -t :6 - bind-key 8 select-window -t :7 - bind-key 9 select-window -t :8 - bind-key 0 select-window -t :9 + bind-key 1 select-window -t :0 + bind-key 2 select-window -t :1 + bind-key 3 select-window -t :2 + bind-key 4 select-window -t :3 + bind-key 5 select-window -t :4 + bind-key 6 select-window -t :5 + bind-key 7 select-window -t :6 + bind-key 8 select-window -t :7 + bind-key 9 select-window -t :8 + bind-key 0 select-window -t :9 - # pane control - bind h select-pane -L - bind j select-pane -D - bind k select-pane -U - bind l select-pane -R - bind Left select-pane -L - bind Down select-pane -D - bind Up select-pane -U - bind Right select-pane -R - bind L split-window -h -c "#{pane_current_path}" - bind J split-window -v -c "#{pane_current_path}" - bind H split-window -h -b -c "#{pane_current_path}" - bind K split-window -v -b -c "#{pane_current_path}" - bind S-Left split-window -h -c "#{pane_current_path}" - bind S-Down split-window -v -c "#{pane_current_path}" - bind S-Up split-window -h -b -c "#{pane_current_path}" - bind S-Right split-window -v -b -c "#{pane_current_path}" - bind-key -r -T prefix M-h resize-pane -L 5 - bind-key -r -T prefix M-j resize-pane -D 5 - bind-key -r -T prefix M-k resize-pane -U 5 - bind-key -r -T prefix M-l resize-pane -R 5 - bind x swap-pane -D + # pane control + bind h select-pane -L + bind j select-pane -D + bind k select-pane -U + bind l select-pane -R + bind Left select-pane -L + bind Down select-pane -D + bind Up select-pane -U + bind Right select-pane -R + bind L split-window -h -c "#{pane_current_path}" + bind J split-window -v -c "#{pane_current_path}" + bind H split-window -h -b -c "#{pane_current_path}" + bind K split-window -v -b -c "#{pane_current_path}" + bind S-Left split-window -h -c "#{pane_current_path}" + bind S-Down split-window -v -c "#{pane_current_path}" + bind S-Up split-window -h -b -c "#{pane_current_path}" + bind S-Right split-window -v -b -c "#{pane_current_path}" + bind-key -r -T prefix M-h resize-pane -L 5 + bind-key -r -T prefix M-j resize-pane -D 5 + bind-key -r -T prefix M-k resize-pane -U 5 + bind-key -r -T prefix M-l resize-pane -R 5 + bind x swap-pane -D - # double-click ^k (or lshift with kanata) for previous pane like ^w in vim - bind -r ^k select-pane -l - bind-key q confirm-before -p "kill-pane #P? (y/n)" kill-pane + # double-click ^k (or lshift with kanata) for previous pane like ^w in vim + bind -r ^k select-pane -l + bind-key q confirm-before -p "kill-pane #P? (y/n)" kill-pane - # bind-key o choose-tree -wZ - # bind-key O choose-tree -sZ + # bind-key o choose-tree -wZ + # bind-key O choose-tree -sZ - # get back command mode and some other basics... - bind : command-prompt - bind r source-file ~/.config/tmux/tmux.conf \; display "config reloaded" - bind-key ? list-keys + # get back command mode and some other basics... + bind : command-prompt + bind r source-file ~/.config/tmux/tmux.conf \; display "config reloaded" + bind-key ? list-keys - # Scroll oin man etc - tmux_commands_with_legacy_scroll="nano less more man git" + # Scroll oin man etc + tmux_commands_with_legacy_scroll="nano less more man git" - bind-key -T root WheelUpPane \ - if-shell -Ft= '#{?mouse_any_flag,1,#{pane_in_mode}}' \ - 'send -Mt=' \ - 'if-shell -t= "#{?alternate_on,true,false} || echo \"#{tmux_commands_with_legacy_scroll}\" | grep -q \"#{pane_current_command}\"" \ - "send -t= Up" "copy-mode -et="' + bind-key -T root WheelUpPane \ + if-shell -Ft= '#{?mouse_any_flag,1,#{pane_in_mode}}' \ + 'send -Mt=' \ + 'if-shell -t= "#{?alternate_on,true,false} || echo \"#{tmux_commands_with_legacy_scroll}\" | grep -q \"#{pane_current_command}\"" \ + "send -t= Up" "copy-mode -et="' - bind-key -T root WheelDownPane \ - if-shell -Ft = '#{?pane_in_mode,1,#{mouse_any_flag}}' \ - 'send -Mt=' \ - 'if-shell -t= "#{?alternate_on,true,false} || echo \"#{tmux_commands_with_legacy_scroll}\" | grep -q \"#{pane_current_command}\"" \ - "send -t= Down" "send -Mt="' + bind-key -T root WheelDownPane \ + if-shell -Ft = '#{?pane_in_mode,1,#{mouse_any_flag}}' \ + 'send -Mt=' \ + 'if-shell -t= "#{?alternate_on,true,false} || echo \"#{tmux_commands_with_legacy_scroll}\" | grep -q \"#{pane_current_command}\"" \ + "send -t= Down" "send -Mt="' - bind-key -T copy-mode-vi ] \ - send-keys -X clear-selection \; \ - send-keys -X search-forward "--> " \; \ - send-keys -X next-word \; \ - send-keys -X begin-selection \; \ - send-keys -X jump-forward ":" \; \ - send-keys -X jump-to-forward ":" \; + bind-key -T copy-mode-vi ] \ + send-keys -X clear-selection \; \ + send-keys -X search-forward "--> " \; \ + send-keys -X next-word \; \ + send-keys -X begin-selection \; \ + send-keys -X jump-forward ":" \; \ + send-keys -X jump-to-forward ":" \; - bind-key -T copy-mode-vi [ \ - send-keys -X clear-selection \; \ - send-keys -X start-of-line \; \ - send-keys -X search-backward "--> " \; \ - send-keys -X next-word \; \ - send-keys -X begin-selection \; \ - send-keys -X jump-forward ":" \; \ - send-keys -X jump-to-forward ":" \; + bind-key -T copy-mode-vi [ \ + send-keys -X clear-selection \; \ + send-keys -X start-of-line \; \ + send-keys -X search-backward "--> " \; \ + send-keys -X next-word \; \ + send-keys -X begin-selection \; \ + send-keys -X jump-forward ":" \; \ + send-keys -X jump-to-forward ":" \; - bind-key [ copy-mode \; send-keys [ - bind-key ] copy-mode \; send-keys ] + bind-key [ copy-mode \; send-keys [ + bind-key ] copy-mode \; send-keys ] - bind d select-pane -l \; send-keys [ + bind d select-pane -l \; send-keys [ - # f: file search - # unbound: git files - # g: git hashes - # u: urls - # C-d: numbers - # M-i: ips - # include line and column numbers in file search - # rebind `f` so we can reuse it here - bind-key -T prefix C-f command-prompt { find-window -Z "%%" } - # jyn is so sorry, and so am I now - # https://github.com/jyn514/dotfiles/blob/65be3c004113290f41f858f4d7f1a6799fabab19/config/tmux.conf#L203-L212 - # see `search-regex.sh` for wtf this means - # TODO: include shell variable names - bind-key f copy-mode \; send-keys -X search-backward '(^|/|\<|[[:space:]"])((\.|\.\.)|[[:alnum:]~_"-]*)((/[][[:alnum:]_.#$%&+=@"-]+)+([/ "]|\.([][[:alnum:]_.#$%&+=@"-]+(:[0-9]+)?(:[0-9]+)?)|[][[:alnum:]_.#$%&+=@"-]+(:[0-9]+)(:[0-9]+)?)|(/[][[:alnum:]_.#$%&+=@"-]+){2,}([/ "]|\.([][[:alnum:]_.#$%&+=@"-]+(:[0-9]+)?(:[0-9]+)?)|[][[:alnum:]_.#$%&+=@"-]+(:[0-9]+)(:[0-9]+)?)?|(\.|\.\.)/([][[:alnum:]_.#$%&+=@"-]+(:[0-9]+)?(:[0-9]+)?))' - # urls - bind-key u copy-mode \; send-keys -X search-backward '(https?://|git@|git://|ssh://|ftp://|file:///)[[:alnum:]?=%/_.:,;~@!#$&*+-]*' - # hashes - bind-key g copy-mode \; send-keys -X search-backward '[[:<:]]([0-9a-f]{7,40}|[[:alnum:]]{52}|[0-9a-f]{64})[[:>:]]' - # ips - bind-key M-i copy-mode \; send-keys -X search-backward '[[:digit:]]{1,3}\.[[:digit:]]{1,3}\.[[:digit:]]{1,3}\.[[:digit:]]{1,3}' + # f: file search + # unbound: git files + # g: git hashes + # u: urls + # C-d: numbers + # M-i: ips + # include line and column numbers in file search + # rebind `f` so we can reuse it here + bind-key -T prefix C-f command-prompt { find-window -Z "%%" } + # jyn is so sorry, and so am I now + # https://github.com/jyn514/dotfiles/blob/65be3c004113290f41f858f4d7f1a6799fabab19/config/tmux.conf#L203-L212 + # see `search-regex.sh` for wtf this means + # TODO: include shell variable names + bind-key f copy-mode \; send-keys -X search-backward '(^|/|\<|[[:space:]"])((\.|\.\.)|[[:alnum:]~_"-]*)((/[][[:alnum:]_.#$%&+=@"-]+)+([/ "]|\.([][[:alnum:]_.#$%&+=@"-]+(:[0-9]+)?(:[0-9]+)?)|[][[:alnum:]_.#$%&+=@"-]+(:[0-9]+)(:[0-9]+)?)|(/[][[:alnum:]_.#$%&+=@"-]+){2,}([/ "]|\.([][[:alnum:]_.#$%&+=@"-]+(:[0-9]+)?(:[0-9]+)?)|[][[:alnum:]_.#$%&+=@"-]+(:[0-9]+)(:[0-9]+)?)?|(\.|\.\.)/([][[:alnum:]_.#$%&+=@"-]+(:[0-9]+)?(:[0-9]+)?))' + # urls + bind-key u copy-mode \; send-keys -X search-backward '(https?://|git@|git://|ssh://|ftp://|file:///)[[:alnum:]?=%/_.:,;~@!#$&*+-]*' + # hashes + bind-key g copy-mode \; send-keys -X search-backward '[[:<:]]([0-9a-f]{7,40}|[[:alnum:]]{52}|[0-9a-f]{64})[[:>:]]' + # ips + bind-key M-i copy-mode \; send-keys -X search-backward '[[:digit:]]{1,3}\.[[:digit:]]{1,3}\.[[:digit:]]{1,3}\.[[:digit:]]{1,3}' - bind-key -T copy-mode-vi o send-keys -X copy-pipe \ - 'cd #{pane_current_path}; xargs -I {} echo "echo {}" | bash | xargs ${../nvim/editor-hax.py} xdg-open-proxy' \; \ - if -F "#{alternate_on}" { send-keys -X cancel } - # save the buffer, then open an editor in the current pane - bind-key -T copy-mode-vi O send-keys -X copy-pipe-and-cancel \ - 'tmux send-keys "C-q"; xargs -I {} tmux send-keys "vim {}"; tmux send-keys "C-m"' - # search for the highlighted text - bind-key -T copy-mode-vi s send-keys -X copy-pipe \ - "cd #{pane_current_path}; xargs -I {} open 'https://www.google.com/search?q={}'" \; \ - if -F "#{alternate_on}" { send-keys -X cancel } - # save buffer and retype into the shell - bind-key -T copy-mode-vi Tab send-keys -X copy-selection-and-cancel \; paste-buffer -p + bind-key -T copy-mode-vi o send-keys -X copy-pipe \ + 'cd #{pane_current_path}; xargs -I {} echo "echo {}" | bash | xargs ${../nvim/editor-hax.py} xdg-open-proxy' \; \ + if -F "#{alternate_on}" { send-keys -X cancel } + # save the buffer, then open an editor in the current pane + bind-key -T copy-mode-vi O send-keys -X copy-pipe-and-cancel \ + 'tmux send-keys "C-q"; xargs -I {} tmux send-keys "vim {}"; tmux send-keys "C-m"' + # search for the highlighted text + bind-key -T copy-mode-vi s send-keys -X copy-pipe \ + "cd #{pane_current_path}; xargs -I {} open 'https://www.google.com/search?q={}'" \; \ + if -F "#{alternate_on}" { send-keys -X cancel } + # save buffer and retype into the shell + bind-key -T copy-mode-vi Tab send-keys -X copy-selection-and-cancel \; paste-buffer -p - ''; + ''; + }; }; - }; + }; } diff --git a/programs/zed/default.nix b/programs/zed/default.nix index f028d5a..d47f4ca 100644 --- a/programs/zed/default.nix +++ b/programs/zed/default.nix @@ -1,176 +1,182 @@ -_: { - custom.program.zed.requirements = [ "work" ]; - custom.program.zed.home-config = - { pkgs, ... }: - { - home.packages = pkgs.custom.maple-fonts-pack; +{ machine, ... }: +{ + custom.program.zed = machine.program { + requirements = [ + "work" + "graphical" + ]; + home-config = + { pkgs, ... }: + { + home.packages = pkgs.custom.maple-fonts-pack; - programs.zed-editor = { - enable = true; - extensions = [ - "nix" - "intellij-newui-theme" - "charmed-icons" - "astro" - ]; - userSettings = { - - ssh_connections = [ - { - host = "icecube"; - args = [ ]; - projects = [ - { - paths = [ - "/home/jana/src/eii-test" - ]; - } - { - paths = [ - "/home/jana/src/example" - ]; - } - { - paths = [ - "/home/jana/src/fitgirl-ddl" - ]; - } - { - paths = [ - "/home/jana/src/libs-team/tools/unstable-api" - ]; - } - { - paths = [ - "/home/jana/src/ml-kem-hang" - ]; - } - { - paths = [ - "/home/jana/src/opendal/core" - ]; - } - { - paths = [ - "/home/jana/src/rust" - ]; - } - { - paths = [ - "/home/jana/src/span-lowering-tests" - ]; - } - ]; - } + programs.zed-editor = { + enable = true; + extensions = [ + "nix" + "intellij-newui-theme" + "charmed-icons" + "astro" ]; - icon_theme = "Warm Charmed Icons"; - ui_font_size = 16; - buffer_font_size = 16; - theme = { - mode = "system"; - light = "One Light"; - dark = "JetBrains New Dark"; - }; - disable_ai = true; + userSettings = { - preview_tabs = { - enabled = true; - enable_preview_from_file_finder = true; - }; - - close_on_file_delete = true; - confirm_quit = true; - - edit_predictions_disabled_in = [ - "comment" - "string" - ]; - - vim_mode = true; - cursor_blink = false; - vertical_scroll_margin = 0; - - inlay_hints = { - enabled = true; - }; - - project_panel = { - dock = "right"; - git_status = false; - }; - minimap = { - show = "auto"; - thumb = "always"; - thumb_border = "left_open"; - }; - tab_bar = { - show = true; - show_nav_history_buttons = false; - show_tab_bar_buttons = false; - }; - tabs = { - file_icons = true; - git_status = false; - activate_on_close = "history"; - show_close_button = "hover"; - }; - lsp = { - rust-analyzer = { - initialization_options = { - inlayHints = { - lifetimeElisionHints = "always"; - discriminantHints = "always"; - }; - diagnostic = { - refreshSupport = true; - }; - }; - binary = { - path_lookup = true; - }; + ssh_connections = [ + { + host = "icecube"; + args = [ ]; + projects = [ + { + paths = [ + "/home/jana/src/eii-test" + ]; + } + { + paths = [ + "/home/jana/src/example" + ]; + } + { + paths = [ + "/home/jana/src/fitgirl-ddl" + ]; + } + { + paths = [ + "/home/jana/src/libs-team/tools/unstable-api" + ]; + } + { + paths = [ + "/home/jana/src/ml-kem-hang" + ]; + } + { + paths = [ + "/home/jana/src/opendal/core" + ]; + } + { + paths = [ + "/home/jana/src/rust" + ]; + } + { + paths = [ + "/home/jana/src/span-lowering-tests" + ]; + } + ]; + } + ]; + icon_theme = "Warm Charmed Icons"; + ui_font_size = 16; + buffer_font_size = 16; + theme = { + mode = "system"; + light = "One Light"; + dark = "JetBrains New Dark"; }; - nil = { - binary = { - ignore_system_version = false; - path = "${pkgs.lib.getExe' pkgs.nil "nil"}"; - }; + disable_ai = true; - initialization_options = { - formatting = { - command = [ "${pkgs.lib.getExe' pkgs.nixfmt "nixfmt"}" ]; - }; - }; + preview_tabs = { + enabled = true; + enable_preview_from_file_finder = true; }; - }; - diagnostics = { - button = false; - include_warnings = true; - inline = { + + close_on_file_delete = true; + confirm_quit = true; + + edit_predictions_disabled_in = [ + "comment" + "string" + ]; + + vim_mode = true; + cursor_blink = false; + vertical_scroll_margin = 0; + + inlay_hints = { enabled = true; }; - }; - terminal = { - "dock" = "left"; - "env" = { - # "EDITOR": "zeditor --wait" - "EDITOR" = "vim"; + + project_panel = { + dock = "right"; + git_status = false; }; - "font_size" = 12; - "font_family" = "Maple Mono NF"; - "line_height" = "standard"; - }; - buffer_font_family = "Maple Mono NF"; + minimap = { + show = "auto"; + thumb = "always"; + thumb_border = "left_open"; + }; + tab_bar = { + show = true; + show_nav_history_buttons = false; + show_tab_bar_buttons = false; + }; + tabs = { + file_icons = true; + git_status = false; + activate_on_close = "history"; + show_close_button = "hover"; + }; + lsp = { + rust-analyzer = { + initialization_options = { + inlayHints = { + lifetimeElisionHints = "always"; + discriminantHints = "always"; + }; + diagnostic = { + refreshSupport = true; + }; + }; + binary = { + path_lookup = true; + }; + }; + nil = { + binary = { + ignore_system_version = false; + path = "${pkgs.lib.getExe' pkgs.nil "nil"}"; + }; - # "diagnostics_max_severity": "off", + initialization_options = { + formatting = { + command = [ "${pkgs.lib.getExe' pkgs.nixfmt "nixfmt"}" ]; + }; + }; + }; + }; + diagnostics = { + button = false; + include_warnings = true; + inline = { + enabled = true; + }; + }; + terminal = { + "dock" = "left"; + "env" = { + # "EDITOR": "zeditor --wait" + "EDITOR" = "vim"; + }; + "font_size" = 12; + "font_family" = "Maple Mono NF"; + "line_height" = "standard"; + }; + buffer_font_family = "Maple Mono NF"; - "experimental.theme_overrides" = { - "syntax" = { - "comment.doc" = { - "color" = "#77B767"; + # "diagnostics_max_severity": "off", + + "experimental.theme_overrides" = { + "syntax" = { + "comment.doc" = { + "color" = "#77B767"; + }; }; }; }; }; }; - }; + }; } diff --git a/users/default.nix b/users/default.nix index 8b87d45..bde2b12 100644 --- a/users/default.nix +++ b/users/default.nix @@ -1,9 +1,8 @@ -{ pkgs, inputs, ... }: +{ pkgs, ... }: { imports = [ - (inputs.self + /modules/users.nix) + (../modules/users.nix) ]; - users.groups.media = { }; custom.users = { vivian = {