{ [ u, U, udiaeresis, Udiaeresis ] };
};
'';
-in
-{
- environment.systemPackages = [ pkgs.xorg.xkbcomp ];
- services.xserver.xkb.extraLayouts.dashie = {
+in {
+ environment.systemPackages = mkDashDefault [pkgs.xorg.xkbcomp];
+ services.xserver.xkb.extraLayouts.enIntUmlaut = {
description = "US layout with 'umlaut'";
- languages = [ "eng" ];
- symbolsFile = "${dashie}";
+ languages = ["eng"];
+ symbolsFile = "${layout}";
};
}
-
-
diff --git a/docs/default.nix b/docs/default.nix
new file mode 100644
index 0000000..1fd8a1e
--- /dev/null
+++ b/docs/default.nix
@@ -0,0 +1,61 @@
+# with friendly help by stylix: https://github.com/danth/stylix/blob/master/docs/default.nix
+{
+ pkgs,
+ buildSystems,
+ lib,
+ ...
+}: let
+ makeOptionsDoc = configuration: pkgs.nixosOptionsDoc {options = configuration;};
+ generateDocs = obj: ''
+ touch src/${obj.fst}.md
+ sed '/*Declared by:*/,/^$/d' <${obj.snd.optionsCommonMark} >> src/${obj.fst}.md
+ '';
+ summaryAppend = name: ''
+ echo "- [${name}](${name}.md)" >> src/SUMMARY.md
+ '';
+ system = (buildSystems {root = ../example/.;})."example".options;
+ makeOptionsDocPrograms = names: pkgs.nixosOptionsDoc {options = lib.attrByPath (lib.splitString "." names) null system.mods;};
+ conf = makeOptionsDoc system.conf;
+ basePath = ../modules/programs;
+ pathToAttrs = path:
+ lib.attrsets.mapAttrsToList (
+ name: meta: {
+ inherit name;
+ inherit meta;
+ }
+ )
+ (builtins.readDir path);
+ pathToStrings = path: prefix: let
+ mapFn = attrs:
+ if attrs.meta == "directory"
+ then pathToStrings "${basePath}/${attrs.name}" attrs.name
+ else if prefix != ""
+ then "${prefix}.${attrs.name}"
+ else attrs.name;
+ in
+ map
+ mapFn
+ (pathToAttrs path);
+ filteredNames = builtins.filter (names: !(lib.strings.hasInfix "default" names)) (
+ map (name: lib.strings.removeSuffix ".nix" name) (lib.lists.flatten (pathToStrings basePath ""))
+ );
+ deduplicatedNames = map (name: lib.strings.splitString "." name |> lib.lists.unique |> lib.strings.concatStringsSep ".") filteredNames;
+ mods = map makeOptionsDocPrograms deduplicatedNames;
+ docs = lib.strings.concatLines (map generateDocs (lib.lists.zipLists deduplicatedNames mods));
+ summary = lib.strings.concatStringsSep " " (map summaryAppend deduplicatedNames);
+in
+ pkgs.stdenvNoCC.mkDerivation {
+ name = "dashNix-book";
+ src = ./.;
+
+ patchPhase = ''
+ sed '/*Declared by:*/,/^$/d' <${conf.optionsCommonMark} >> src/conf.md
+ ${docs}
+ echo "[README](README.md)\n # Options\n - [Base Config](conf.md)" >> src/SUMMARY.md
+ ${summary}
+ '';
+
+ buildPhase = ''
+ ${pkgs.mdbook}/bin/mdbook build --dest-dir $out
+ '';
+ }
diff --git a/docs/src/README.md b/docs/src/README.md
new file mode 100644
index 0000000..3658e00
--- /dev/null
+++ b/docs/src/README.md
@@ -0,0 +1,329 @@
+
+
+
+
+
+
+An opinionated flake to bootstrap NixOS systems with default configurations for various programs and services from both NixOS and HomeManager which can be enabled, disabled, configured or replaced at will.
+
+# Usage
+
+This flake is intended to be used as an input to your own NixOS configuration:
+
+```nix
+dashNix = {
+ url = "github:Xetibo/DashNix";
+ inputs = {
+ # ensure these are here to update the packages on your own
+ nixpkgs.follows = "nixpkgs";
+ stable.follows = "stable";
+ };
+};
+```
+
+You can then configure your systems in your flake outputs with a provided library command:
+
+Please note that overriding inputs will invalidate the cache configuration, this means you will have to add this manually:
+
+```nix
+ builders-use-substitutes = true;
+
+ extra-substituters = [
+ "https://hyprland.cachix.org"
+ "https://anyrun.cachix.org"
+ "https://cache.garnix.io"
+ "https://oxipaste.cachix.org"
+ "https://oxinoti.cachix.org"
+ "https://oxishut.cachix.org"
+ "https://oxidash.cachix.org"
+ "https://oxicalc.cachix.org"
+ "https://hyprdock.cachix.org"
+ "https://reset.cachix.org"
+ "https://dashvim.cachix.org"
+ ];
+
+ extra-trusted-public-keys = [
+ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+ "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
+ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+ "oxipaste.cachix.org-1:n/oA3N3Z+LJP7eIWOwuoLd9QnPyZXqFjLgkahjsdDGc="
+ "oxinoti.cachix.org-1:dvSoJl2Pjo5HMaNngdBbSaixK9BSf2N8gzjP2MdGvfc="
+ "oxishut.cachix.org-1:axyAGF3XMh1IyMAW4UMbQCdMNovDH0KH6hqLLRJH8jU="
+ "oxidash.cachix.org-1:5K2FNHp7AS8VF7LmQkJAUG/dm6UHCz4ngshBVbjFX30="
+ "oxicalc.cachix.org-1:qF3krFc20tgSmtR/kt6Ku/T5QiG824z79qU5eRCSBTQ="
+ "hyprdock.cachix.org-1:HaROK3fBvFWIMHZau3Vq1TLwUoJE8yRbGLk0lEGzv3Y="
+ "reset.cachix.org-1:LfpnUUdG7QM/eOkN7NtA+3+4Ar/UBeYB+3WH+GjP9Xo="
+ "dashvim.cachix.org-1:uLRdxp1WOWHnsZZtu3SwUWZRsvC7SXo0Gyk3tIefuL0="
+ ];
+```
+
+```nix
+nixosConfigurations = inputs.dashNix.dashNixLib.buildSystems { root = ./.; };
+```
+
+This command will build each system that is placed within the hosts/ directory.
+In this directory create one directory for each system you want to configure with DashNix.
+This will automatically pick up the hostname for the system and look for 3 different files that are explained below.
+(Optionally, you can also change the parameter root (./.) to define a different starting directory than hosts/)
+
+In order for your configuration to work, you are required to at least provide a single config file with a further config file being optional for custom configuration.
+The hardware.nix specifies additional NixOS configuration, while home.nix specifies additional home-manager configuration. (both optional)
+
+|- flake.nix\
+|- flake.lock\
+|- hosts/\
+|--- system1/\
+|------ configuration.nix (required)\
+|------ hardware.nix (optional)\
+|------ home.nix (optional)\
+|--- system2/\
+|------ configuration.nix (required)\
+|------ hardware.nix (optional)\
+|------ home.nix (optional)\
+|--- system3/\
+|------ configuration.nix (required)\
+|------ hardware.nix (optional)\
+|------ home.nix (optional)
+
+Here is a minimal required configuration.nix (the TODOs mention a required change):
+
+```nix
+{config, ...}: {
+ # TODO denote important changes
+
+ # variables for system
+ conf = {
+ # TODO your username
+ username = "YOURNAME";
+ # TODO only needed when you use intel -> amd is default
+ # cpu = "intel";
+ # TODO your xkb layout
+ locale = "something.UTF-8";
+ # TODO your timezone
+ timezone = "CONTINENT/CITY";
+ };
+
+ # modules
+ mods = {
+ # default disk config has root home boot and swap partition, overwrite if you want something different
+ sops.enable = false;
+ nextcloud.enable = false;
+ wm.monitors = [
+ # Example
+ # {
+ # name = "DP-1";
+ # resolutionX = 3440;
+ # resolutionY = 1440;
+ # refreshrate = 180;
+ # positionX = 2560;
+ # positionY = 0;
+ # scale = 1;
+ # transform = "0";
+ # vrr = false;
+ # }
+ ];
+ gpu.nvidia.enable = true;
+ kdeConnect.enable = true;
+ # login manager:
+ # default is greetd
+ # greetd = { };
+ # sddm = { };
+ # gdm = { };
+ drives = {
+ # default assumes ROOT, BOOT, HOME and SWAP labaled drives exist
+ # for an example without HOME see below
+ # defaultDrives.enable = false;
+ # extraDrives = [
+ # {
+ # name = "boot";
+ # drive = {
+ # device = "/dev/disk/by-label/BOOT";
+ # fsType = "vfat";
+ # options = [ "rw" "fmask=0022" "dmask=0022" "noatime" ];
+ # };
+ # }
+ # {
+ # name = "";
+ # drive = {
+ # device = "/dev/disk/by-label/ROOT";
+ # fsType = "ext4";
+ # options = [ "noatime" "nodiratime" "discard" ];
+ # };
+ # }
+ # ];
+ # You can also use disko to format your disks on installation.
+ # Please refer to the Documentation about the drives module for an example.
+ };
+ };
+}
+```
+
+## First Login
+
+After logging in the first time, your password will be set to "firstlogin", please change this to whatever you like.
+
+## Configuring pkgs
+
+While DashNix offers a default pkgs config, you may want to permit an unsecure packages,
+add additional modules/inputs, or add an overlay to them.
+You can configure both stable and unstable pkgs the following way:
+
+Please note that modules and inputs are merged together to ensure functionality.
+
+```nix
+currentSystem = "x86_64-linux";
+permittedPackages = [
+ "some package"
+];
+config = {
+ system = currentSystem;
+ config = {
+ allowUnfree = true;
+ permittedInsecurePackages = permittedPackages;
+ };
+ inputs = {
+ # Some inputs
+ }
+ mods = {
+ home = [
+ # Some home manager module
+ ];
+ nixos = [
+ # Some nixos module
+ ];
+}
+};
+unstableBundle = {
+ pkgs = inputs.unstable;
+ inherit config mods;
+};
+inputs.dashNix.dashNixLib.buildSystems {
+ root = ./.;
+ inherit unstableBundle;
+}
+```
+
+With this you could also change your input to something different should you wish to do so.
+Note that overriding inputs via the flake still works,
+this way however ensures you can also configure the inputs.
+
+## Stable/Unstable
+
+Sometimes you want to differentiate between systems that are stable and unstable, e.g. for servers and desktops/laptops.
+This can be done with the overridePkgs flag for the lib function:
+
+(overridePkgs simply inverts the default bundle that is used for the nix standard library as well as NixOS itself)
+
+```nix
+nixosConfigurations =
+ inputs.dashNix.dashNixLib.buildSystems {
+ root = ./stable;
+ inherit stableBundle;
+ overridePkgs = true;
+ }
+ // inputs.dashNix.dashNixLib.buildSystems {
+ inherit unstableBundle;
+ root = ./unstable;
+ };
+```
+
+You can now place your systems in the respective directories.
+Keep in mind that the hosts directory will still need to exist in each variant.
+E.g. stable/hosts/yourserver and unstable/hosts/yourdesktop
+
+# Installation via ISO
+
+You can find a custom ISO in the releases: [Link](https://github.com/Xetibo/DashNix/releases).
+With this, you will receive the example config in /iso/example alongside the gnome desktop environment,
+as well as a few tools like gnome-disks, Neovim, Vscodium, a browser etc.
+
+Alternatively, you can use whatever NixOS installer and just install your config from there, just make sure to set the drive configuration before.
+
+## Commands
+
+First, copy the read-only config from /iso/example-config to a location of your choice.
+
+```sh
+cp /iso/example-config ~/config -r
+```
+
+Then configure as you please and choose a command below depending on your disk installation variant.
+
+Installation via manual configuration:
+
+```sh
+sudo nixos-install --flake # --root --option experimental-features "nix-command flakes pipe-operators"
+#example
+#nixos-install --flake ~/config#globi --root /mnt --option experimental-features "nix-command flakes pipe-operators"
+```
+
+Installation via disko:
+
+```sh
+sudo disko-install --flake # --disk --option experimental-features "nix-command flakes pipe-operators"
+#example
+#disko-install -- --flake ~/config#globi --disk main /dev/nvme0n1 --option experimental-features "nix-command flakes pipe-operators"
+```
+
+# Installation via flake
+
+If you already have nix installed, you can instead just copy the default config onto your system and install DashNix with it.
+To create the example config for a base to start with, you can just run this flake with the mkFlake command:
+
+```sh
+nix run github:Xetibo/DashNix#mkFlake
+```
+
+This command will put the default configuration into $HOME/gits/nixos
+
+# Modules
+
+This configuration features several modules that can be used as preconfigured "recipies".
+These modules attempt to combine the home-manager and nixos packages/options to one single configuration file for each new system.
+For package lists, please check the individual modules, as the lists can be long.
+
+- Hyprland: Installs and configures Hyprland with various additional packages
+- Niri: Installs and configures Niri with various additional packages
+- acpid : Enables the acpid daemon
+- base packages : A list of system packages to be installed by default
+- bluetooth : Configures/enables bluetooth and installs tools for bluetooth
+- coding packages : A list of coding packages to be installed by default
+- drives : A drive configuration module
+- firefox: Enables and configures firefox (extensions and settings)
+- fish: Enables and configures fish shell
+- gaming : Configures gaming related features (launchers, gamemode)
+- git : Git key and config module
+- gnome_services : Gnome services for minimal enviroments -> Window managers etc
+- gpu : GPU settings (AMD)
+- greetd : Enables and configures the greetd/regreet login manager with Hyprland
+- home packages : A list of home packages to be installed by default
+- kde_connect : Enables KDE connect and opens its ports
+- keepassxc : Configures keepassxc
+- kitty: Enables and configures kitty terminal
+- layout : Modules to configure keyboard layout system wide
+- media packages : A list of media packages to be installed by default
+- mime: Mime type configuration
+- nextcloud : Handles synchronization via nextcloud cmd. (requires config.sops.secrets.nextcloud)
+- oxi: My own programs, can be selectively disabled, or as a whole
+- piper : Installs and enables piper alongside its daemon
+- plymouth: enable or disable plymouth
+- printing : Enables and configures printing services
+- scripts: Various preconfigured scripts with the ability to add more
+- sops: Enables sops-nix
+- starship : Configures the starship prompt
+- stylix : Configures system themes, can also be applied to dashvim if used.
+- teams: For the poor souls that have to use this....
+- virtualbox : Enables and configures virtualbox
+- xkb: Keyboard layout configuration
+- xone : Installs the xone driver
+- yazi: Installs yazi and sets custom keybinds
+
+# Credits
+
+- [Fufexan](https://github.com/fufexan) for the xdg-mime config:
+- [Catppuccin](https://github.com/catppuccin) for base16 colors and zen-browser css
+- [Danth](https://github.com/danth) for providing a base for the nix docs
+- [chermnyx](https://github.com/chermnyx) for providing a base for zen configuration
+- [voronind-com](https://github.com/voronind-com) for providing the darkreader configuration
+- [Nix-Artwork](https://github.com/NixOS/nixos-artwork/tree/master/logo) for the Nix/NixOS logo (Tim Cuthbertson (@timbertson))
+- [xddxdd](https://github.com/xddxdd) for the CachyOS-Kernel flake
diff --git a/nix/.gitignore b/docs/src/SUMMARY.md
similarity index 100%
rename from nix/.gitignore
rename to docs/src/SUMMARY.md
diff --git a/docs/src/coding.md b/docs/src/coding.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/src/conf.md b/docs/src/conf.md
new file mode 100755
index 0000000..aa51f0b
--- /dev/null
+++ b/docs/src/conf.md
@@ -0,0 +1 @@
+# This file handles the basic configuration for settings like language, timezone, input, cpu etc.
diff --git a/docs/src/logo.svg b/docs/src/logo.svg
new file mode 100644
index 0000000..08baa43
--- /dev/null
+++ b/docs/src/logo.svg
@@ -0,0 +1,238 @@
+
+
+
+DashNix DashNix DashNix DashNix ";
+ run = "backspace";
+ desc = "Delete the character before the cursor";
+ }
+ {
+ on = [""];
+ run = "escape";
+ desc = "Exit visual mode clear selected or cancel search";
+ }
+ {
+ on = ["q"];
+ run = "quit";
+ desc = "Exit the process";
+ }
+ {
+ on = ["Q"];
+ run = "quit --no-cwd-file";
+ desc = "Exit the process without writing cwd-file";
+ }
+ {
+ on = [""];
+ run = "close";
+ desc = "Close the current tab or quit if it is last tab";
+ }
+ {
+ on = [""];
+ run = "suspend";
+ desc = "Suspend the process";
+ }
+
+ # Navigation
+ {
+ on = ["l"];
+ run = "arrow -1";
+ desc = "Move cursor up";
+ }
+ {
+ on = ["k"];
+ run = "arrow 1";
+ desc = "Move cursor down";
+ }
+
+ {
+ on = ["L"];
+ run = "arrow -5";
+ desc = "Move cursor up 5 lines";
+ }
+ {
+ on = ["K"];
+ run = "arrow 5";
+ desc = "Move cursor down 5 lines";
+ }
+
+ {
+ on = [""];
+ run = "arrow -50%";
+ desc = "Move cursor up half page";
+ }
+ {
+ on = [""];
+ run = "arrow 50%";
+ desc = "Move cursor down half page";
+ }
+ {
+ on = [""];
+ run = "arrow -100%";
+ desc = "Move cursor up one page";
+ }
+ {
+ on = [""];
+ run = "arrow 100%";
+ desc = "Move cursor down one page";
+ }
+
+ {
+ on = ["j"];
+ run = "leave";
+ desc = "Go back to the parent directory";
+ }
+ {
+ on = [";"];
+ run = "enter";
+ desc = "Enter the child directory";
+ }
+
+ {
+ on = ["J"];
+ run = "back";
+ desc = "Go back to the previous directory";
+ }
+ {
+ on = ["P"];
+ run = "forward";
+ desc = "Go forward to the next directory";
+ }
+
+ {
+ on = [""];
+ run = "peek -5";
+ desc = "Peek up 5 units in the preview";
+ }
+ {
+ on = [""];
+ run = "peek 5";
+ desc = "Peek down 5 units in the preview";
+ }
+
+ {
+ on = [""];
+ run = "arrow -1";
+ desc = "Move cursor up";
+ }
+ {
+ on = [""];
+ run = "arrow 1";
+ desc = "Move cursor down";
+ }
+ {
+ on = [""];
+ run = "leave";
+ desc = "Go back to the parent directory";
+ }
+ {
+ on = [""];
+ run = "enter";
+ desc = "Enter the child directory";
+ }
+
+ {
+ on = [
+ "g"
+ "g"
+ ];
+ run = "arrow -99999999";
+ desc = "Move cursor to the top";
+ }
+ {
+ on = ["G"];
+ run = "arrow 99999999";
+ desc = "Move cursor to the bottom";
+ }
+
+ # Selection
+ {
+ on = ["v"];
+ run = "visual_mode";
+ desc = "Enter visual mode (selection mode)";
+ }
+ {
+ on = ["V"];
+ run = "visual_mode --unset";
+ desc = "Enter visual mode (unset mode)";
+ }
+ {
+ on = [""];
+ run = "select_all --state=true";
+ desc = "Select all files";
+ }
+ {
+ on = [""];
+ run = "select_all --state=none";
+ desc = "Inverse selection of all files";
+ }
+
+ # Operation
+ {
+ on = ["o"];
+ run = "open";
+ desc = "Open the selected files";
+ }
+ {
+ on = ["O"];
+ run = "open --interactive";
+ desc = "Open the selected files interactively";
+ }
+ {
+ on = [""];
+ run = "open";
+ desc = "Open the selected files";
+ }
+ {
+ on = [""];
+ run = "open --interactive";
+ desc = "Open the selected files interactively";
+ } # It's cool if you're using a terminal that supports CSI u
+ {
+ on = ["y"];
+ run = "yank";
+ desc = "Copy the selected files";
+ }
+ {
+ on = ["x"];
+ run = "yank --cut";
+ desc = "Cut the selected files";
+ }
+ {
+ on = ["p"];
+ run = "paste";
+ desc = "Paste the files";
+ }
+ {
+ on = ["P"];
+ run = "paste --force";
+ desc = "Paste the files (overwrite if the destination exists)";
+ }
+ {
+ on = ["-"];
+ run = "link";
+ desc = "Symlink the absolute path of files";
+ }
+ {
+ on = ["_"];
+ run = "link --relative";
+ desc = "Symlink the relative path of files";
+ }
+ {
+ on = ["d"];
+ run = "remove";
+ desc = "Move the files to the trash";
+ }
+ {
+ on = ["D"];
+ run = "remove --permanently";
+ desc = "Permanently delete the files";
+ }
+ {
+ on = ["a"];
+ run = "create";
+ desc = "Create a file or directory (ends with / for directories)";
+ }
+ {
+ on = ["r"];
+ run = "rename";
+ desc = "Rename a file or directory";
+ }
+ {
+ on = [";"];
+ run = "shell";
+ desc = "Run a shell command";
+ }
+ {
+ on = [":"];
+ run = "shell --block";
+ desc = "Run a shell command (block the UI until the command finishes)";
+ }
+ {
+ on = ["."];
+ run = "hidden toggle";
+ desc = "Toggle the visibility of hidden files";
+ }
+ {
+ on = [
+ ""
+ "f"
+ "g>"
+ ];
+ run = "search fd";
+ desc = "Search files by name using fd";
+ }
+ {
+ on = [
+ ""
+ "f"
+ "G>"
+ ];
+ run = "search rg";
+ desc = "Search files by content using ripgrep";
+ }
+ {
+ on = [""];
+ run = "search none";
+ desc = "Cancel the ongoing search";
+ }
+ {
+ on = ["Z"];
+ run = "plugin zoxide";
+ desc = "Jump to a directory using zoxide";
+ }
+ {
+ on = ["z"];
+ run = "plugin fzf";
+ desc = "Jump to a directory or reveal a file using fzf";
+ }
+
+ # Copy
+ {
+ on = [
+ "c"
+ "c"
+ ];
+ run = "copy path";
+ desc = "Copy the absolute path";
+ }
+ {
+ on = [
+ "c"
+ "d"
+ ];
+ run = "copy dirname";
+ desc = "Copy the path of the parent directory";
+ }
+ {
+ on = [
+ "c"
+ "f"
+ ];
+ run = "copy filename";
+ desc = "Copy the name of the file";
+ }
+ {
+ on = [
+ "c"
+ "n"
+ ];
+ run = "copy name_without_ext";
+ desc = "Copy the name of the file without the extension";
+ }
+
+ # Find
+ {
+ on = ["/"];
+ run = "find --smart";
+ }
+ {
+ on = ["?"];
+ run = "find --previous --smart";
+ }
+ {
+ on = ["n"];
+ run = "find_arrow";
+ }
+ {
+ on = ["N"];
+ run = "find_arrow --previous";
+ }
+
+ # Sorting
+ {
+ on = [
+ ","
+ "a"
+ ];
+ run = "sort alphabetical --dir_first";
+ desc = "Sort alphabetically";
+ }
+ {
+ on = [
+ ","
+ "A"
+ ];
+ run = "sort alphabetical --reverse --dir_first";
+ desc = "Sort alphabetically (reverse)";
+ }
+ {
+ on = [
+ ","
+ "c"
+ ];
+ run = "sort created --dir_first";
+ desc = "Sort by creation time";
+ }
+ {
+ on = [
+ ","
+ "C"
+ ];
+ run = "sort created --reverse --dir_first";
+ desc = "Sort by creation time (reverse)";
+ }
+ {
+ on = [
+ ","
+ "m"
+ ];
+ run = "sort modified --dir_first";
+ desc = "Sort by modified time";
+ }
+ {
+ on = [
+ ","
+ "M"
+ ];
+ run = "sort modified --reverse --dir_first";
+ desc = "Sort by modified time (reverse)";
+ }
+ {
+ on = [
+ ","
+ "n"
+ ];
+ run = "sort natural --dir_first";
+ desc = "Sort naturally";
+ }
+ {
+ on = [
+ ","
+ "N"
+ ];
+ run = "sort natural --reverse --dir_first";
+ desc = "Sort naturally (reverse)";
+ }
+ {
+ on = [
+ ","
+ "s"
+ ];
+ run = "sort size --dir_first";
+ desc = "Sort by size";
+ }
+ {
+ on = [
+ ","
+ "S"
+ ];
+ run = "sort size --reverse --dir_first";
+ desc = "Sort by size (reverse)";
+ }
+
+ # Tabs
+ {
+ on = ["t"];
+ run = "tab_create --current";
+ desc = "Create a new tab using the current path";
+ }
+
+ {
+ on = ["1"];
+ run = "tab_switch 0";
+ desc = "Switch to the first tab";
+ }
+ {
+ on = ["2"];
+ run = "tab_switch 1";
+ desc = "Switch to the second tab";
+ }
+ {
+ on = ["3"];
+ run = "tab_switch 2";
+ desc = "Switch to the third tab";
+ }
+ {
+ on = ["4"];
+ run = "tab_switch 3";
+ desc = "Switch to the fourth tab";
+ }
+ {
+ on = ["5"];
+ run = "tab_switch 4";
+ desc = "Switch to the fifth tab";
+ }
+ {
+ on = ["6"];
+ run = "tab_switch 5";
+ desc = "Switch to the sixth tab";
+ }
+ {
+ on = ["7"];
+ run = "tab_switch 6";
+ desc = "Switch to the seventh tab";
+ }
+ {
+ on = ["8"];
+ run = "tab_switch 7";
+ desc = "Switch to the eighth tab";
+ }
+ {
+ on = ["9"];
+ run = "tab_switch 8";
+ desc = "Switch to the ninth tab";
+ }
+
+ {
+ on = ["["];
+ run = "tab_switch -1 --relative";
+ desc = "Switch to the previous tab";
+ }
+ {
+ on = ["]"];
+ run = "tab_switch 1 --relative";
+ desc = "Switch to the next tab";
+ }
+
+ {
+ on = ["{"];
+ run = "tab_swap -1";
+ desc = "Swap the current tab with the previous tab";
+ }
+ {
+ on = ["}"];
+ run = "tab_swap 1";
+ desc = "Swap the current tab with the next tab";
+ }
+
+ # Tasks
+ {
+ on = ["w"];
+ run = "tasks_show";
+ desc = "Show the tasks manager";
+ }
+
+ # Goto
+ {
+ on = [
+ "g"
+ "h"
+ ];
+ run = "cd ~";
+ desc = "Go to the home directory";
+ }
+ {
+ on = [
+ "g"
+ "c"
+ ];
+ run = "cd ~/.config";
+ desc = "Go to the config directory";
+ }
+ {
+ on = [
+ "g"
+ "d"
+ ];
+ run = "cd ~/Downloads";
+ desc = "Go to the downloads directory";
+ }
+ {
+ on = [
+ "g"
+ "t"
+ ];
+ run = "cd /tmp";
+ desc = "Go to the temporary directory";
+ }
+ {
+ on = [
+ "g"
+ ""
+ ];
+ run = "cd --interactive";
+ desc = "Go to a directory interactively";
+ }
+
+ # Help
+ {
+ on = ["~"];
+ run = "help";
+ desc = "Open help";
+ }
+ ];
+
+ tasks.keymap = [
+ {
+ on = [""];
+ run = "close";
+ desc = "Hide the task manager";
+ }
+ {
+ on = [""];
+ run = "close";
+ desc = "Hide the task manager";
+ }
+ {
+ on = ["w"];
+ run = "close";
+ desc = "Hide the task manager";
+ }
+
+ {
+ on = ["k"];
+ run = "arrow -1";
+ desc = "Move cursor up";
+ }
+ {
+ on = ["j"];
+ run = "arrow 1";
+ desc = "Move cursor down";
+ }
+
+ {
+ on = [""];
+ run = "arrow -1";
+ desc = "Move cursor up";
+ }
+ {
+ on = [""];
+ run = "arrow 1";
+ desc = "Move cursor down";
+ }
+
+ {
+ on = [""];
+ run = "inspect";
+ desc = "Inspect the task";
+ }
+ {
+ on = ["x"];
+ run = "cancel";
+ desc = "Cancel the task";
+ }
+
+ {
+ on = ["~"];
+ run = "help";
+ desc = "Open help";
+ }
+ ];
+
+ select.keymap = [
+ {
+ on = [""];
+ run = "close";
+ desc = "Cancel selection";
+ }
+ {
+ on = [""];
+ run = "close";
+ desc = "Cancel selection";
+ }
+ {
+ on = [""];
+ run = "close --submit";
+ desc = "Submit the selection";
+ }
+
+ {
+ on = ["k"];
+ run = "arrow -1";
+ desc = "Move cursor up";
+ }
+ {
+ on = ["j"];
+ run = "arrow 1";
+ desc = "Move cursor down";
+ }
+
+ {
+ on = ["K"];
+ run = "arrow -5";
+ desc = "Move cursor up 5 lines";
+ }
+ {
+ on = ["J"];
+ run = "arrow 5";
+ desc = "Move cursor down 5 lines";
+ }
+
+ {
+ on = [""];
+ run = "arrow -1";
+ desc = "Move cursor up";
+ }
+ {
+ on = [""];
+ run = "arrow 1";
+ desc = "Move cursor down";
+ }
+
+ {
+ on = ["~"];
+ run = "help";
+ desc = "Open help";
+ }
+ ];
+
+ input.keymap = [
+ {
+ on = "";
+ run = "backspace";
+ desc = "Delete the character before the cursor";
+ }
+ {
+ on = [""];
+ run = "close";
+ desc = "Cancel input";
+ }
+ {
+ on = [""];
+ run = "close --submit";
+ desc = "Submit the input";
+ }
+ {
+ on = [""];
+ run = "escape";
+ desc = "Go back the normal mode or cancel input";
+ }
+
+ # Mode
+ {
+ on = ["i"];
+ run = "insert";
+ desc = "Enter insert mode";
+ }
+ {
+ on = ["a"];
+ run = "insert --append";
+ desc = "Enter append mode";
+ }
+ {
+ on = ["v"];
+ run = "visual";
+ desc = "Enter visual mode";
+ }
+ {
+ on = ["V"];
+ run = [
+ "move -999"
+ "visual"
+ "move 999"
+ ];
+ desc = "Enter visual mode and select all";
+ }
+
+ # Navigation
+ {
+ on = ["h"];
+ run = "move -1";
+ desc = "Move cursor left";
+ }
+ {
+ on = ["l"];
+ run = "move 1";
+ desc = "Move cursor right";
+ }
+
+ {
+ on = ["0"];
+ run = "move -999";
+ desc = "Move to the BOL";
+ }
+ {
+ on = ["$"];
+ run = "move 999";
+ desc = "Move to the EOL";
+ }
+ {
+ on = ["I"];
+ run = [
+ "move -999"
+ "insert"
+ ];
+ desc = "Move to the BOL and enter insert mode";
+ }
+ {
+ on = ["A"];
+ run = [
+ "move 999"
+ "insert --append"
+ ];
+ desc = "Move to the EOL and enter append mode";
+ }
+
+ {
+ on = [""];
+ run = "move -1";
+ desc = "Move cursor left";
+ }
+ {
+ on = [""];
+ run = "move 1";
+ desc = "Move cursor right";
+ }
+
+ {
+ on = ["b"];
+ run = "backward";
+ desc = "Move to the beginning of the previous word";
+ }
+ {
+ on = ["w"];
+ run = "forward";
+ desc = "Move to the beginning of the next word";
+ }
+ {
+ on = ["e"];
+ run = "forward --end-of-word";
+ desc = "Move to the end of the next word";
+ }
+
+ # Deletion
+ {
+ on = ["d"];
+ run = "delete --cut";
+ desc = "Cut the selected characters";
+ }
+ {
+ on = ["D"];
+ run = [
+ "delete --cut"
+ "move 999"
+ ];
+ desc = "Cut until the EOL";
+ }
+ {
+ on = ["c"];
+ run = "delete --cut --insert";
+ desc = "Cut the selected characters and enter insert mode";
+ }
+ {
+ on = ["C"];
+ run = [
+ "delete --cut --insert"
+ "move 999"
+ ];
+ desc = "Cut until the EOL and enter insert mode";
+ }
+ {
+ on = ["x"];
+ run = [
+ "delete --cut"
+ "move 1 --in-operating"
+ ];
+ desc = "Cut the current character";
+ }
+
+ # Yank/Paste
+ {
+ on = ["y"];
+ run = "yank";
+ desc = "Copy the selected characters";
+ }
+ {
+ on = ["p"];
+ run = "paste";
+ desc = "Paste the copied characters after the cursor";
+ }
+ {
+ on = ["P"];
+ run = "paste --before";
+ desc = "Paste the copied characters before the cursor";
+ }
+
+ # Undo/Redo
+ {
+ on = ["u"];
+ run = "undo";
+ desc = "Undo the last operation";
+ }
+ {
+ on = [""];
+ run = "redo";
+ desc = "Redo the last operation";
+ }
+
+ # Help
+ {
+ on = ["~"];
+ run = "help";
+ desc = "Open help";
+ }
+ ];
+
+ help.keymap = [
+ {
+ on = [""];
+ run = "escape";
+ desc = "Clear the filter or hide the help";
+ }
+ {
+ on = ["q"];
+ run = "close";
+ desc = "Exit the process";
+ }
+ {
+ on = [""];
+ run = "close";
+ desc = "Hide the help";
+ }
+
+ # Navigation
+ {
+ on = ["k"];
+ run = "arrow -1";
+ desc = "Move cursor up";
+ }
+ {
+ on = ["j"];
+ run = "arrow 1";
+ desc = "Move cursor down";
+ }
+
+ {
+ on = ["K"];
+ run = "arrow -5";
+ desc = "Move cursor up 5 lines";
+ }
+ {
+ on = ["J"];
+ run = "arrow 5";
+ desc = "Move cursor down 5 lines";
+ }
+
+ {
+ on = [""];
+ run = "arrow -1";
+ desc = "Move cursor up";
+ }
+ {
+ on = [""];
+ run = "arrow 1";
+ desc = "Move cursor down";
+ }
+
+ # Filtering
+ {
+ on = ["/"];
+ run = "filter";
+ desc = "Apply a filter for the help items";
+ }
+ ];
+ };
+}
diff --git a/nix/base/base_packages.nix b/nix/base/base_packages.nix
deleted file mode 100644
index ebde6aa..0000000
--- a/nix/base/base_packages.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{ config, pkgs, ... }:
-{
- environment.systemPackages = with pkgs; [
- openssl
- dbus
- glib
- gtk4
- gtk3
- libadwaita
- gtk-layer-shell
- gtk4-layer-shell
- direnv
- dconf
- gsettings-desktop-schemas
- gnome.nixos-gsettings-overrides
- bibata-cursors
- xorg.xkbutils
- libxkbcommon
- icon-library
- gnome.adwaita-icon-theme
- hicolor-icon-theme
- morewaita-icon-theme
- kdePackages.breeze-icons
- gnome.seahorse
- upower
- ];
-
- gtk.iconCache.enable = false;
-
- fonts.packages = with pkgs; [
- cantarell-fonts
- ];
-
- nix.settings.experimental-features = "nix-command flakes";
- programs.fish.enable = true;
- programs.fish.promptInit = ''
- ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
- '';
-
- programs.nix-ld.enable = true;
- programs.nix-ld.libraries = with pkgs; [
- jdk
- zlib
- ];
- virtualisation.docker.enable = true;
-
- programs.dconf.enable = true;
- services.upower.enable = true;
- services.printing.enable = true;
- services.dbus.enable = true;
- services.dbus.packages = with pkgs; [
- gnome2.GConf
- ];
- services.avahi = {
- enable = true;
- nssmdns4 = true;
- openFirewall = true;
- };
- # services.xserver.desktopManager.gnome.extraGSettingsOverrides = ''
- # [org.gnome.desktop.interface]
- # gtk-theme='adw-gtk3'
- # cursor-theme='Bibata-Modern-Classsic'
- # cursor-size=24
- # '';
-
- programs.direnv = {
- package = pkgs.direnv;
- silent = false;
- loadInNixShell = true;
- direnvrcExtra = "";
- nix-direnv = {
- enable = true;
- package = pkgs.nix-direnv;
- };
- };
- programs.ssh.startAgent = true;
-
-}
diff --git a/nix/base/big_g.nix b/nix/base/big_g.nix
deleted file mode 100644
index f5cc767..0000000
--- a/nix/base/big_g.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ pkgs, ... }: {
- services = {
- # needed for GNOME services outside of GNOME Desktop
- dbus.packages = with pkgs; [
- gcr
- gnome.gnome-settings-daemon
- ];
-
- gnome.gnome-keyring.enable = true;
-
- gvfs.enable = true;
- };
-}
diff --git a/nix/base/common_hardware.nix b/nix/base/common_hardware.nix
deleted file mode 100644
index d514dc0..0000000
--- a/nix/base/common_hardware.nix
+++ /dev/null
@@ -1,102 +0,0 @@
-{ pkgs, config, ... }:
-{
- # Bootloader.
- boot.loader.systemd-boot.enable = true;
- boot.loader.efi.canTouchEfiVariables = true;
-
- # Enable networking
- networking.networkmanager.enable = true;
- services.flatpak.enable = true;
-
- # Set your time zone.
- time.timeZone = "Europe/Zurich";
-
- # Select internationalisation properties.
- i18n.defaultLocale = "en_US.UTF-8";
-
- # Enable the X11 windowing system.
- services.xserver.enable = true;
-
- # Configure keymap in X11
- services.xserver = {
- xkb.layout = "us";
- xkb.variant = "";
- };
-
- # Enable CUPS to print documents.
- services.printing.enable = true;
-
- # Enable sound with pipewire.
- sound.enable = true;
- hardware.pulseaudio.enable = false;
- security.rtkit.enable = true;
- services.pipewire = {
- enable = true;
- alsa.enable = true;
- alsa.support32Bit = true;
- pulse.enable = true;
- };
-
- environment.variables = {
- XDG_CACHE_HOME = "$HOME/.cache";
- DIRENV_LOG_FORMAT = "";
- };
-
- nix.settings.trusted-users = [
- "dashie"
- ];
-
- # allows user change later on
- users.mutableUsers = true;
- users.users.dashie = {
- isNormalUser = true;
- description = "dashie";
- extraGroups = [ "networkmanager" "wheel" "gamemode" "docker" ];
- packages = with pkgs; [
- home-manager
- xdg-desktop-portal-gtk
- ];
- # this password will only last for the first login
- # e.g. login, then change to whatever else, this also ensures no public hash is available
- password = "firstlogin";
- };
-
- system.stateVersion = "unstable";
- boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-
- fileSystems."/" =
- {
- device = "/dev/disk/by-label/ROOT";
- fsType = "btrfs";
- options = [
- "noatime"
- "nodiratime"
- "discard"
- ];
- };
-
- fileSystems."/boot" =
- {
- device = "/dev/disk/by-label/BOOT";
- fsType = "vfat";
- options = [ "rw" "fmask=0022" "dmask=0022" "noatime" ];
- };
-
- fileSystems."/home" =
- {
- device = "/dev/disk/by-label/HOME";
- fsType = "btrfs";
- options = [
- "noatime"
- "nodiratime"
- "discard"
- ];
- };
-
- swapDevices =
- [{ device = "/dev/disk/by-label/SWAP"; }];
-
- boot.kernelParams = [
- "resume=\"PARTLABEL=SWAP\""
- ] ++ config.programs.boot.boot_params;
-}
diff --git a/nix/base/env.nix b/nix/base/env.nix
deleted file mode 100644
index 5166603..0000000
--- a/nix/base/env.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ pkgs
-, ...
-}: {
- environment.variables = {
- GSETTINGS_SCHEMA_DIR = "${pkgs.glib.getSchemaPath pkgs.gsettings-desktop-schemas}";
- NEOVIDE_MAXIMIZED = "0";
- GPG_TTY = "$(tty)";
- EDITOR = "neovide --no-fork";
- SUDO_EDITOR = "neovide --no-fork";
- SCRIPTS = "$HOME/.config/scripts";
- };
- environment.sessionVariables = {
- NIXOS_OZONE_WL = "1";
- GOPATH = "$HOME/.go";
- };
-}
diff --git a/nix/base/login_manager.nix b/nix/base/login_manager.nix
deleted file mode 100644
index 34d3280..0000000
--- a/nix/base/login_manager.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ inputs
-, lib
-, config
-, pkgs
-, ...
-}:
-let
- regreet_override = pkgs.greetd.regreet.overrideAttrs (final: prev: {
- SESSION_DIRS = "${config.services.xserver.displayManager.sessionData.desktops}/share";
- });
- session = {
- command = "${lib.getExe pkgs.hyprland} --config /etc/greetd/hyprgreet.conf";
- user = "dashie";
- };
-in
-{
- imports = [
- inputs.hyprland.nixosModules.default
- ];
-
- services.xserver.displayManager.session = [
- {
- manage = "desktop";
- name = "Hyprland";
- start = ''
- ${lib.getExe pkgs.hyprland} & waitPID=$!
- '';
- }
- ];
-
- # greetd display manager
- programs.hyprland.enable = true;
- services.greetd = {
- enable = true;
- settings = {
- terminal.vt = 1;
- default_session = session;
- };
- };
-
- environment.etc."greetd/environments".text = ''
- Hyprland
- '';
-
- environment.etc."greetd/hyprgreet.conf".text = ''
- exec-once=gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-
- monitor=${config.programs.ironbar.monitor},3440x1440@180,0x0,1
- monitor=_,disable
-
- input {
- force_no_accel = true
- }
-
- misc {
- disable_splash_rendering = true
- disable_hyprland_logo = true
- }
-
- exec-once=regreet --style /home/dashie/.config/gtk-3.0/gtk.css; hyprctl dispatch exit
- '';
-
- # unlock GPG keyring on login
- security.pam.services.greetd.enableGnomeKeyring = true;
-}
diff --git a/nix/flake.lock b/nix/flake.lock
deleted file mode 100644
index 42051be..0000000
--- a/nix/flake.lock
+++ /dev/null
@@ -1,636 +0,0 @@
-{
- "nodes": {
- "Hyprspace": {
- "inputs": {
- "hyprland": [
- "hyprland"
- ]
- },
- "locked": {
- "lastModified": 1715376791,
- "narHash": "sha256-QKecFhWAB7sagSE+FXztINDqYqLro2nYp94f+ZtE/f4=",
- "owner": "KZDKM",
- "repo": "Hyprspace",
- "rev": "8049b2794ca19d49320093426677d8c2911e7327",
- "type": "github"
- },
- "original": {
- "owner": "KZDKM",
- "repo": "Hyprspace",
- "type": "github"
- }
- },
- "anyrun": {
- "inputs": {
- "flake-parts": "flake-parts",
- "nixpkgs": "nixpkgs"
- },
- "locked": {
- "lastModified": 1713259062,
- "narHash": "sha256-WTO84hUL8IlNuHDK2yOCeJ38EewFzGt5E0kzBjNWxa8=",
- "owner": "Kirottu",
- "repo": "anyrun",
- "rev": "f9d30e34fa4ccb2797c6becec37e8bcff6585d39",
- "type": "github"
- },
- "original": {
- "owner": "Kirottu",
- "repo": "anyrun",
- "type": "github"
- }
- },
- "crane": {
- "inputs": {
- "nixpkgs": [
- "ironbar",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1713979152,
- "narHash": "sha256-apdecPuh8SOQnkEET/kW/UcfjCRb8JbV5BKjoH+DcP4=",
- "owner": "ipetkov",
- "repo": "crane",
- "rev": "a5eca68a2cf11adb32787fc141cddd29ac8eb79c",
- "type": "github"
- },
- "original": {
- "owner": "ipetkov",
- "repo": "crane",
- "type": "github"
- }
- },
- "flake-parts": {
- "inputs": {
- "nixpkgs-lib": [
- "anyrun",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1696343447,
- "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
- "flake-utils": {
- "inputs": {
- "systems": "systems_4"
- },
- "locked": {
- "lastModified": 1705309234,
- "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_2": {
- "inputs": {
- "systems": "systems_5"
- },
- "locked": {
- "lastModified": 1705309234,
- "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "home-manager": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1715380449,
- "narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=",
- "owner": "nix-community",
- "repo": "home-manager",
- "rev": "d7682620185f213df384c363288093b486b2883f",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "home-manager",
- "type": "github"
- }
- },
- "hyprcursor": {
- "inputs": {
- "hyprlang": [
- "hyprland",
- "hyprlang"
- ],
- "nixpkgs": [
- "hyprland",
- "nixpkgs"
- ],
- "systems": [
- "hyprland",
- "systems"
- ]
- },
- "locked": {
- "lastModified": 1713612213,
- "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
- "owner": "hyprwm",
- "repo": "hyprcursor",
- "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
- "type": "github"
- },
- "original": {
- "owner": "hyprwm",
- "repo": "hyprcursor",
- "type": "github"
- }
- },
- "hyprland": {
- "inputs": {
- "hyprcursor": "hyprcursor",
- "hyprlang": "hyprlang",
- "hyprwayland-scanner": "hyprwayland-scanner",
- "nixpkgs": "nixpkgs_2",
- "systems": "systems",
- "xdph": "xdph"
- },
- "locked": {
- "lastModified": 1715448710,
- "narHash": "sha256-ntVaQOHnfejEiqHUY07kWrytdXVlXtg1RLv65T9w2/c=",
- "ref": "refs/heads/main",
- "rev": "494b9415a1157279a1e1782ba635fc2ef6a18155",
- "revCount": 4668,
- "submodules": true,
- "type": "git",
- "url": "https://github.com/hyprwm/Hyprland"
- },
- "original": {
- "submodules": true,
- "type": "git",
- "url": "https://github.com/hyprwm/Hyprland"
- }
- },
- "hyprland-protocols": {
- "inputs": {
- "nixpkgs": [
- "hyprland",
- "xdph",
- "nixpkgs"
- ],
- "systems": [
- "hyprland",
- "xdph",
- "systems"
- ]
- },
- "locked": {
- "lastModified": 1691753796,
- "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
- "owner": "hyprwm",
- "repo": "hyprland-protocols",
- "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
- "type": "github"
- },
- "original": {
- "owner": "hyprwm",
- "repo": "hyprland-protocols",
- "type": "github"
- }
- },
- "hyprlang": {
- "inputs": {
- "nixpkgs": [
- "hyprland",
- "nixpkgs"
- ],
- "systems": [
- "hyprland",
- "systems"
- ]
- },
- "locked": {
- "lastModified": 1713121246,
- "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
- "owner": "hyprwm",
- "repo": "hyprlang",
- "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
- "type": "github"
- },
- "original": {
- "owner": "hyprwm",
- "repo": "hyprlang",
- "type": "github"
- }
- },
- "hyprlang_2": {
- "inputs": {
- "nixpkgs": [
- "hyprlock",
- "nixpkgs"
- ],
- "systems": "systems_2"
- },
- "locked": {
- "lastModified": 1713121246,
- "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
- "owner": "hyprwm",
- "repo": "hyprlang",
- "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
- "type": "github"
- },
- "original": {
- "owner": "hyprwm",
- "repo": "hyprlang",
- "type": "github"
- }
- },
- "hyprlock": {
- "inputs": {
- "hyprlang": "hyprlang_2",
- "nixpkgs": "nixpkgs_3",
- "systems": "systems_3"
- },
- "locked": {
- "lastModified": 1714843107,
- "narHash": "sha256-89WxndRGO3CGuWE5XCaHKnsV3IKBRdOWqScp6o8enT4=",
- "owner": "hyprwm",
- "repo": "hyprlock",
- "rev": "c87af3aa1f6e6bd06cffaabcc400bd45e26d565a",
- "type": "github"
- },
- "original": {
- "owner": "hyprwm",
- "repo": "hyprlock",
- "type": "github"
- }
- },
- "hyprwayland-scanner": {
- "inputs": {
- "nixpkgs": [
- "hyprland",
- "nixpkgs"
- ],
- "systems": [
- "hyprland",
- "systems"
- ]
- },
- "locked": {
- "lastModified": 1715287423,
- "narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=",
- "owner": "hyprwm",
- "repo": "hyprwayland-scanner",
- "rev": "e2fc1c0eb8b392110588f478cce644348ead7271",
- "type": "github"
- },
- "original": {
- "owner": "hyprwm",
- "repo": "hyprwayland-scanner",
- "type": "github"
- }
- },
- "ironbar": {
- "inputs": {
- "crane": "crane",
- "naersk": "naersk",
- "nixpkgs": "nixpkgs_5",
- "rust-overlay": "rust-overlay"
- },
- "locked": {
- "lastModified": 1715272723,
- "narHash": "sha256-/pHq16sUYKOpwtSDDlnQ3M3lBy9abQq39UNSzadFd8w=",
- "owner": "JakeStanger",
- "repo": "ironbar",
- "rev": "386955c1ea07869277b646c203f7b976d83db427",
- "type": "github"
- },
- "original": {
- "owner": "JakeStanger",
- "repo": "ironbar",
- "type": "github"
- }
- },
- "naersk": {
- "inputs": {
- "nixpkgs": "nixpkgs_4"
- },
- "locked": {
- "lastModified": 1713520724,
- "narHash": "sha256-CO8MmVDmqZX2FovL75pu5BvwhW+Vugc7Q6ze7Hj8heI=",
- "owner": "nix-community",
- "repo": "naersk",
- "rev": "c5037590290c6c7dae2e42e7da1e247e54ed2d49",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "naersk",
- "type": "github"
- }
- },
- "nix-flatpak": {
- "locked": {
- "lastModified": 1711997375,
- "narHash": "sha256-KvU4gOtuFMS9Il67glRGtdNfguAINT9pCaXtvCL8uI8=",
- "owner": "gmodena",
- "repo": "nix-flatpak",
- "rev": "45bf66f7068db79b552da864c0e87452be624d6c",
- "type": "github"
- },
- "original": {
- "owner": "gmodena",
- "repo": "nix-flatpak",
- "type": "github"
- }
- },
- "nixpkgs": {
- "locked": {
- "lastModified": 1696193975,
- "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_2": {
- "locked": {
- "lastModified": 1715087517,
- "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_3": {
- "locked": {
- "lastModified": 1715266358,
- "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_4": {
- "locked": {
- "lastModified": 1714314149,
- "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "type": "indirect"
- }
- },
- "nixpkgs_5": {
- "locked": {
- "lastModified": 1714253743,
- "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_6": {
- "locked": {
- "lastModified": 1715266358,
- "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
- "owner": "NixOs",
- "repo": "nixpkgs",
- "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
- "type": "github"
- },
- "original": {
- "owner": "NixOs",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_7": {
- "locked": {
- "lastModified": 1706487304,
- "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "root": {
- "inputs": {
- "Hyprspace": "Hyprspace",
- "anyrun": "anyrun",
- "home-manager": "home-manager",
- "hyprland": "hyprland",
- "hyprlock": "hyprlock",
- "ironbar": "ironbar",
- "nix-flatpak": "nix-flatpak",
- "nixpkgs": "nixpkgs_6",
- "rust-overlay": "rust-overlay_2"
- }
- },
- "rust-overlay": {
- "inputs": {
- "flake-utils": "flake-utils",
- "nixpkgs": [
- "ironbar",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1714443211,
- "narHash": "sha256-lKTA3XqRo4aVgkyTSCtpcALpGXdmkilHTtN00eRg0QU=",
- "owner": "oxalica",
- "repo": "rust-overlay",
- "rev": "ce35c36f58f82cee6ec959e0d44c587d64281b6f",
- "type": "github"
- },
- "original": {
- "owner": "oxalica",
- "repo": "rust-overlay",
- "type": "github"
- }
- },
- "rust-overlay_2": {
- "inputs": {
- "flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_7"
- },
- "locked": {
- "lastModified": 1715393623,
- "narHash": "sha256-nSUFcUqyTQQ/aYFIB05mpCzytcKvfKMy3ZQAe0fP26A=",
- "type": "tarball",
- "url": "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"
- },
- "original": {
- "type": "tarball",
- "url": "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"
- }
- },
- "systems": {
- "locked": {
- "lastModified": 1689347949,
- "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
- "owner": "nix-systems",
- "repo": "default-linux",
- "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default-linux",
- "type": "github"
- }
- },
- "systems_2": {
- "locked": {
- "lastModified": 1689347949,
- "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
- "owner": "nix-systems",
- "repo": "default-linux",
- "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default-linux",
- "type": "github"
- }
- },
- "systems_3": {
- "locked": {
- "lastModified": 1689347949,
- "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
- "owner": "nix-systems",
- "repo": "default-linux",
- "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default-linux",
- "type": "github"
- }
- },
- "systems_4": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "systems_5": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "xdph": {
- "inputs": {
- "hyprland-protocols": "hyprland-protocols",
- "hyprlang": [
- "hyprland",
- "hyprlang"
- ],
- "nixpkgs": [
- "hyprland",
- "nixpkgs"
- ],
- "systems": [
- "hyprland",
- "systems"
- ]
- },
- "locked": {
- "lastModified": 1714662532,
- "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=",
- "owner": "hyprwm",
- "repo": "xdg-desktop-portal-hyprland",
- "rev": "1f228ba2f1f254195c0b571302b37482861abee3",
- "type": "github"
- },
- "original": {
- "owner": "hyprwm",
- "repo": "xdg-desktop-portal-hyprland",
- "type": "github"
- }
- }
- },
- "root": "root",
- "version": 7
-}
diff --git a/nix/flake.nix b/nix/flake.nix
deleted file mode 100644
index 58f47c2..0000000
--- a/nix/flake.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{
- description = "Dashie dots";
-
- inputs =
- {
- nixpkgs.url = "github:NixOs/nixpkgs/nixos-unstable";
-
- nix-flatpak = {
- url = "github:gmodena/nix-flatpak";
- };
-
- home-manager = {
- url = "github:nix-community/home-manager";
- inputs.nixpkgs.follows = "nixpkgs";
- };
-
- hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-
- hyprlock.url = "github:hyprwm/hyprlock";
-
- Hyprspace = {
- url = "github:KZDKM/Hyprspace";
- inputs.hyprland.follows = "hyprland";
- };
-
- ironbar = {
- url = "github:JakeStanger/ironbar";
- };
-
- rust-overlay = {
- url = "https://github.com/oxalica/rust-overlay/archive/master.tar.gz";
- };
-
- anyrun.url = "github:Kirottu/anyrun";
- };
-
- outputs = { ... }@inputs:
- let
- pkgs = import inputs.nixpkgs {
- system = "x86_64-linux";
- config = {
- allowUnfree = true;
- };
- overlays = [
- # because allowing rust nightly is too hard by default....
- (import
- inputs.rust-overlay
- )
- ];
- };
- base_imports = [
- inputs.home-manager.nixosModules.home-manager
- ./base/default.nix
- ./programs
- ];
- in
- {
- nixosConfigurations."marmo" = inputs.nixpkgs.lib.nixosSystem {
- specialArgs = {
- inherit inputs pkgs;
- mod = ./hardware/marmo/base_config.nix;
- };
- modules = [
- ./hardware/marmo/default.nix
- ./programs/gaming/default.nix
- ] ++ base_imports;
- };
- nixosConfigurations."overheating" = inputs.nixpkgs.lib.nixosSystem {
- specialArgs = {
- inherit inputs pkgs;
- mod = ./hardware/overheating/base_config.nix;
- };
- modules = [
- ./hardware/overheating/default.nix
- ] ++ base_imports;
- };
- nixosConfigurations."spaceship" = inputs.nixpkgs.lib.nixosSystem {
- specialArgs = {
- inherit inputs pkgs;
- mod = ./hardware/spaceship/base_config.nix;
- };
- modules = [
- ./hardware/spaceship/default.nix
- ./hardware/streamdeck.nix
- ./programs/gaming/default.nix
- ] ++ base_imports;
- };
- };
-
- nixConfig = {
- builders-use-substitutes = true;
-
- extra-substituters = [
- "https://hyprland.cachix.org"
- "https://anyrun.cachix.org"
- ];
-
- extra-trusted-public-keys = [
- "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
- "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
- ];
- };
-}
diff --git a/nix/hardware/marmo/base_config.nix b/nix/hardware/marmo/base_config.nix
deleted file mode 100644
index 2276588..0000000
--- a/nix/hardware/marmo/base_config.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- imports = [
- ../../modules
- ];
- wayland.windowManager.hyprland.settings.monitor = [
- # default
- "DP-1,1920x1080@144,0x0,1"
- # all others
- ",highrr,auto,1"
- ];
- programs.ironbar.monitor = "DP-1";
-}
diff --git a/nix/hardware/marmo/configuration.nix b/nix/hardware/marmo/configuration.nix
deleted file mode 100644
index 89ca0f6..0000000
--- a/nix/hardware/marmo/configuration.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-{
- imports = [
- ../../modules/gamemode.nix
- ../../modules/boot_params.nix
- ];
- boot.kernelPackages = pkgs.linuxPackages_zen;
- programs.boot.boot_params = [
- "amdgpu.ppfeaturemask=0xffffffff"
- ];
- networking.hostName = "marmo";
- programs.gamemode = {
- device = 1;
- };
-}
diff --git a/nix/hardware/marmo/default.nix b/nix/hardware/marmo/default.nix
deleted file mode 100644
index 2e9bfbc..0000000
--- a/nix/hardware/marmo/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- imports = [
- ./marmo.nix
- ./configuration.nix
- ];
-}
diff --git a/nix/hardware/marmo/marmo.nix b/nix/hardware/marmo/marmo.nix
deleted file mode 100644
index 3969c18..0000000
--- a/nix/hardware/marmo/marmo.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ config, lib, modulesPath, ... }:
-{
- imports =
- [
- (modulesPath + "/installer/scan/not-detected.nix")
- ];
-
- boot.initrd.kernelModules = [ ];
- boot.extraModulePackages = [ ];
-
- # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
- # (the default) this is the recommended approach. When using systemd-networkd it's
- # still possible to use this option, but it's recommended to use it in conjunction
- # with explicit per-interface declarations with `networking.interfaces..useDHCP`.
- networking.useDHCP = lib.mkDefault true;
- # networking.interfaces.enp15s0.useDHCP = lib.mkDefault true;
- # networking.interfaces.wlp16s0.useDHCP = lib.mkDefault true;
-
- nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
- hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
- services.fstrim.enable = lib.mkDefault true;
- nix.settings.auto-optimise-store = true;
-}
diff --git a/nix/hardware/overheating/base_config.nix b/nix/hardware/overheating/base_config.nix
deleted file mode 100644
index ee120c7..0000000
--- a/nix/hardware/overheating/base_config.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- imports = [
- ../../modules
- ];
- wayland.windowManager.hyprland.settings.monitor = [
- # default
- "eDP-1,2944x1840@90,0x0,2"
-
- # all others
- ",highrr,auto,1"
- ];
- programs.ironbar.monitor = "eDP-1";
- programs.ironbar.battery = [
- { type = "upower"; class = "memory-usage"; }
- ];
-}
diff --git a/nix/hardware/overheating/configuration.nix b/nix/hardware/overheating/configuration.nix
deleted file mode 100644
index bf150ce..0000000
--- a/nix/hardware/overheating/configuration.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }:
-{
- boot.kernelPackages = pkgs.linuxPackages_latest;
- networking.hostName = "overheating";
-}
diff --git a/nix/hardware/overheating/default.nix b/nix/hardware/overheating/default.nix
deleted file mode 100644
index 3091cdc..0000000
--- a/nix/hardware/overheating/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- imports = [
- ./overheating.nix
- ./configuration.nix
- ];
-}
diff --git a/nix/hardware/overheating/overheating.nix b/nix/hardware/overheating/overheating.nix
deleted file mode 100644
index e30f979..0000000
--- a/nix/hardware/overheating/overheating.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ config, lib, modulesPath, ... }:
-{
- imports =
- [
- (modulesPath + "/installer/scan/not-detected.nix")
- ];
-
- boot.initrd.kernelModules = [ ];
- boot.kernelModules = [ "kvm-amd" ];
- boot.extraModulePackages = [ ];
-
- # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
- # (the default) this is the recommended approach. When using systemd-networkd it's
- # still possible to use this option, but it's recommended to use it in conjunction
- # with explicit per-interface declarations with `networking.interfaces..useDHCP`.
- networking.useDHCP = lib.mkDefault true;
- # networking.interfaces.enp15s0.useDHCP = lib.mkDefault true;
- # networking.interfaces.wlp16s0.useDHCP = lib.mkDefault true;
-
- nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
- hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
- services.fstrim.enable = lib.mkDefault true;
- nix.settings.auto-optimise-store = true;
-}
diff --git a/nix/hardware/spaceship/base_config.nix b/nix/hardware/spaceship/base_config.nix
deleted file mode 100644
index da11987..0000000
--- a/nix/hardware/spaceship/base_config.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- imports = [
- ../../modules
- ];
- wayland.windowManager.hyprland.settings.monitor = [
- # default
- "DP-2,2560x1440@165,0x0,1"
- "DP-1,3440x1440@180,2560x0,1"
- "HDMI-A-1,1920x1200@60,6000x0,1"
- "HDMI-A-1,transform,1"
-
- # all others
- ",highrr,auto,1"
- ];
- wayland.windowManager.hyprland.settings.workspace = [
- # workspaces
- # monitor middle
- "2,monitor:DP-1, default:true"
- "4,monitor:DP-1"
- "6,monitor:DP-1"
- "8,monitor:DP-1"
- "9,monitor:DP-1"
- "10,monitor:DP-1"
-
- # monitor left
- "1,monitor:DP-2, default:true"
- "5,monitor:DP-2"
- "7,monitor:DP-2"
-
- # monitor right
- "3,monitor:HDMI-A-1, default:true"
- ];
- programs.ironbar.monitor = "DP-1";
- programs.hyprland.hyprpaper = ''
- #load
- preload = /home/dashie/Pictures/backgrounds/shinobu_2k.jpg
- preload = /home/dashie/Pictures/backgrounds/shino_wide.png
- preload = /home/dashie/Pictures/backgrounds/shinobu_1200.jpg
-
- #set
- wallpaper = DP-2,/home/dashie/Pictures/backgrounds/shinobu_2k.jpg
- wallpaper = DP-1,/home/dashie/Pictures/backgrounds/shino_wide.png
- wallpaper = HDMI-A-1,/home/dashie/Pictures/backgrounds/shinobu_1200.jpg
- splash = true
- '';
- programs.hyprland.extra_autostart = [ "streamdeck -n" ];
-}
diff --git a/nix/hardware/spaceship/configuration.nix b/nix/hardware/spaceship/configuration.nix
deleted file mode 100644
index a13352f..0000000
--- a/nix/hardware/spaceship/configuration.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ pkgs, lib, ... }:
-{
- imports = [
- ../../modules/gamemode.nix
- ../../modules/boot_params.nix
- ../../modules/ironbar_config.nix
- ];
- boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
- programs.boot.boot_params = [
- "amdgpu.ppfeaturemask=0xffffffff"
- ];
- networking.hostName = "spaceship";
-
- programs.gamemode = {
- device = 0;
- };
- users.extraGroups.vboxusers.members = [ "dashie" ];
- virtualisation.virtualbox.host.enable = true;
-
- # enable hardware acceleration and rocm
- hardware.xone.enable = true;
- hardware.opengl.extraPackages = with pkgs; [
- libvdpau-va-gl
- vaapiVdpau
- rocmPackages.clr.icd
- rocm-opencl-runtime
- ];
- hardware.opengl = {
- enable = true;
- driSupport = lib.mkDefault true;
- driSupport32Bit = lib.mkDefault true;
- };
- boot.initrd.kernelModules = [ "amdgpu" ];
- programs.ironbar.monitor = "DP-1";
-}
diff --git a/nix/hardware/spaceship/default.nix b/nix/hardware/spaceship/default.nix
deleted file mode 100644
index 5ac7293..0000000
--- a/nix/hardware/spaceship/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- imports = [
- ./spaceship.nix
- ./configuration.nix
- ];
-}
diff --git a/nix/hardware/spaceship/spaceship.nix b/nix/hardware/spaceship/spaceship.nix
deleted file mode 100644
index 43ae303..0000000
--- a/nix/hardware/spaceship/spaceship.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ config, lib, modulesPath, ... }:
-{
- imports =
- [
- (modulesPath + "/installer/scan/not-detected.nix")
- ];
-
- boot.initrd.kernelModules = [ ];
- boot.kernelModules = [ "kvm-amd" ];
- boot.extraModulePackages = [ ];
-
- fileSystems."/drive2" =
- {
- device = "/dev/disk/by-label/DRIVE2";
- fsType = "ext4";
- options = [
- "noatime"
- "nodiratime"
- "discard"
- ];
- };
-
- # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
- # (the default) this is the recommended approach. When using systemd-networkd it's
- # still possible to use this option, but it's recommended to use it in conjunction
- # with explicit per-interface declarations with `networking.interfaces..useDHCP`.
- networking.useDHCP = lib.mkDefault true;
- # networking.interfaces.enp15s0.useDHCP = lib.mkDefault true;
- # networking.interfaces.wlp16s0.useDHCP = lib.mkDefault true;
-
- nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
- hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
- services.fstrim.enable = lib.mkDefault true;
- nix.settings.auto-optimise-store = true;
-}
diff --git a/nix/hardware/streamdeck.nix b/nix/hardware/streamdeck.nix
deleted file mode 100644
index c8a082f..0000000
--- a/nix/hardware/streamdeck.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- #programs.streamdeck-ui = {
- # enable = true;
- # autoStart = false; # optional
- #};
-}
diff --git a/nix/modules/boot_params.nix b/nix/modules/boot_params.nix
deleted file mode 100644
index 6df3ee5..0000000
--- a/nix/modules/boot_params.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib, ... }: {
- options.programs.boot = {
- boot_params = lib.mkOption {
- default = [ ];
- example = [ "resume=something" ];
- description = ''
- Boot params
- '';
- };
- };
-}
diff --git a/nix/modules/default.nix b/nix/modules/default.nix
deleted file mode 100644
index 8c9ce42..0000000
--- a/nix/modules/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- imports = [
- ./ironbar_config.nix
- ./hyprpaper_config.nix
- ];
-}
diff --git a/nix/modules/gamemode.nix b/nix/modules/gamemode.nix
deleted file mode 100644
index 220dcef..0000000
--- a/nix/modules/gamemode.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib, ... }: {
- options.programs.gamemode = {
- device = lib.mkOption {
- default = 0;
- example = 0;
- description = ''
- GPU device number
- '';
- };
- };
-}
diff --git a/nix/modules/hyprpaper_config.nix b/nix/modules/hyprpaper_config.nix
deleted file mode 100644
index 3f9776c..0000000
--- a/nix/modules/hyprpaper_config.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, ... }: {
- options.programs.hyprland = {
- hyprpaper = lib.mkOption {
- default = '''';
- example = ''
- hyprpaper stuff
- '';
- type = lib.types.lines;
- description = ''
- hyprpaper
- '';
- };
- extra_autostart = lib.mkOption {
- default = [ ];
- example = [ "your application" ];
- type = lib.types.listOf lib.types.str;
- description = ''
- Extra exec_once.
- '';
- };
- };
-}
diff --git a/nix/modules/ironbar_config.nix b/nix/modules/ironbar_config.nix
deleted file mode 100644
index f77886c..0000000
--- a/nix/modules/ironbar_config.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ lib, ... }: {
- options.programs.ironbar = {
- monitor = lib.mkOption {
- default = "";
- example = "eDP-1";
- type = lib.types.str;
- description = ''
- Extra settings for foo.
- '';
- };
-
- battery = lib.mkOption {
- default = [];
- example = [];
- };
- };
-}
diff --git a/nix/override/cambalache.nix b/nix/override/cambalache.nix
deleted file mode 100644
index 7b119fb..0000000
--- a/nix/override/cambalache.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{ stdenv
-, lib
-, pkgs
-, fetchFromGitLab
-, nix-update-script
-}:
-
-pkgs.python3.pkgs.buildPythonApplication rec {
- pname = "cambalache";
- version = "0.90.1";
-
- format = "other";
-
- # Did not fetch submodule since it is only for tests we don't run.
- src = fetchFromGitLab {
- domain = "gitlab.gnome.org";
- owner = "jpu";
- repo = pname;
- rev = version;
- sha256 = "sha256-YuRxqrGJvhMMZApD/tQSWkUg/nZnp/xryBJSjXCXO4w=";
- };
-
- nativeBuildInputs = with pkgs; [
- meson
- ninja
- pkg-config
- gobject-introspection # for setup hook
- desktop-file-utils # for update-desktop-database
- shared-mime-info # for update-mime-database
- wrapGAppsHook
- ];
-
- pythonPath = with pkgs.python3.pkgs; [
- pygobject3
- lxml
- ];
-
- buildInputs = with pkgs; [
- glib
- gtk3
- gtk4
- gtksourceview4
- gtksourceview5
- webkitgtk_4_1
- webkitgtk_6_0
- # For extra widgets support.
- libadwaita
- libhandy
- ];
-
- # Prevent double wrapping.
- dontWrapGApps = true;
-
- postPatch = ''
- patchShebangs postinstall.py
- # those programs are used at runtime not build time
- # https://gitlab.gnome.org/jpu/cambalache/-/blob/0.12.1/meson.build#L79-80
- substituteInPlace ./meson.build \
- --replace "find_program('broadwayd', required: true)" "" \
- --replace "find_program('gtk4-broadwayd', required: true)" ""
- '';
-
- preFixup = ''
- # Let python wrapper use GNOME flags.
- makeWrapperArgs+=(
- # For broadway daemons
- --prefix PATH : "${lib.makeBinPath [ pkgs.gtk3 pkgs.gtk4 ]}"
- "''${gappsWrapperArgs[@]}"
- )
- '';
-
- postFixup = ''
- # Wrap a helper script in an unusual location.
- wrapPythonProgramsIn "$out/${pkgs.python3.sitePackages}/cambalache/priv/merengue" "$out $pythonPath"
- '';
-
- passthru = {
- updateScript = nix-update-script { };
- };
-
- meta = with lib; {
- homepage = "https://gitlab.gnome.org/jpu/cambalache";
- description = "RAD tool for GTK 4 and 3 with data model first philosophy";
- mainProgram = "cambalache";
- maintainers = teams.gnome.members;
- license = with licenses; [
- lgpl21Only # Cambalache
- gpl2Only # tools
- ];
- platforms = platforms.unix;
- };
-}
diff --git a/nix/override/default.nix b/nix/override/default.nix
deleted file mode 100644
index b34cd63..0000000
--- a/nix/override/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-#{pkgs, ...}:{
-# hello = pkgs.callPackage ./ncspot.nix;
-#}
-{ }
diff --git a/nix/override/ncspot.nix b/nix/override/ncspot.nix
deleted file mode 100644
index 837a7ed..0000000
--- a/nix/override/ncspot.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ pkgs
-, stdenv
-, lib
-, fetchFromGitHub
-, rustPlatform
-, withALSA ? false
-, withClipboard ? true
-, withCover ? false
-, withPulseAudio ? true
-, withPortAudio ? false
-, withMPRIS ? true
-, withNotify ? true
-, withCross ? true
-, nix-update-script
-, testers
-, ncspot
-}:
-
-rustPlatform.buildRustPackage rec {
- pname = "ncspot";
- version = "1.1.0";
-
- src = fetchFromGitHub {
- owner = "hrkfdn";
- repo = "ncspot";
- rev = "v${version}";
- hash = "sha256-RgA3jV/vD6qgIVQCZ0Sm+9CST4SlqN4MUurVM3nIdh0=";
- };
-
- cargoHash = "sha256-8ZUgm1O4NmZpxgNRKnh1MNhiFNoBWQHo22kyP3hWJwI=";
-
- nativeBuildInputs = [ pkgs.pkg-config ]
- ++ lib.optional withClipboard pkgs.python3;
-
- buildInputs = [ pkgs.ncurses ]
- ++ lib.optional stdenv.isLinux pkgs.openssl
- ++ lib.optional withALSA pkgs.alsa-lib
- ++ lib.optional withClipboard pkgs.xorg.libxcb
- ++ lib.optional withCover pkgs.ueberzug
- ++ lib.optional withPulseAudio pkgs.libpulseaudio
- ++ lib.optional withPortAudio pkgs.portaudio
- ++ lib.optional (withMPRIS || withNotify) pkgs.dbus
- ++ lib.optional stdenv.isDarwin pkgs.Cocoa;
-
- env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DNCURSES_UNCTRL_H_incl";
-
- buildNoDefaultFeatures = true;
-
- buildFeatures = [ "cursive/pancurses-backend" ]
- ++ lib.optional withALSA "alsa_backend"
- ++ lib.optional withClipboard "share_clipboard"
- ++ lib.optional withCover "cover"
- ++ lib.optional withPulseAudio "pulseaudio_backend"
- ++ lib.optional withPortAudio "portaudio_backend"
- ++ lib.optional withMPRIS "mpris"
- ++ lib.optional withCross "crossterm_backend"
- ++ lib.optional withNotify "notify";
-
- postInstall = ''
- install -D --mode=444 $src/misc/ncspot.desktop $out/share/applications/${pname}.desktop
- install -D --mode=444 $src/images/logo.svg $out/share/icons/hicolor/scalable/apps/${pname}.png
- '';
-
- passthru = {
- updateScript = nix-update-script { };
- tests.version = testers.testVersion { package = ncspot; };
- };
-
- meta = with lib; {
- description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes";
- homepage = "https://github.com/hrkfdn/ncspot";
- changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}";
- license = licenses.bsd2;
- maintainers = with maintainers; [ marsam liff ];
- mainProgram = "ncspot";
- };
-}
diff --git a/nix/override/oxicalc.nix b/nix/override/oxicalc.nix
deleted file mode 100644
index 7f4e20c..0000000
--- a/nix/override/oxicalc.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ pkgs
-, lib
-, fetchFromGitHub
-}:
-let
- toolchain = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.minimal);
- rustPlatform = pkgs.makeRustPlatform {
- cargo = toolchain;
- rustc = toolchain;
- };
-in
-rustPlatform.buildRustPackage rec {
- pname = "oxicalc";
- version = "0.2.4";
-
- src = fetchFromGitHub {
- owner = "DashieTM";
- repo = "OxiCalc";
- rev = "${version}";
- hash = "sha256-7qrnA0jnLg2mckpxCe66+axU3jE6nOBu7HefmP8I2Xc=";
- };
-
- cargoHash = "sha256-nxLXT9SVorsgj7qzwX8Ipx8SDvyTYMAcpepTg62QL7o=";
-
- nativeBuildInputs = with pkgs;[
- pkg-config
- wrapGAppsHook4
- ];
-
- buildInputs = with pkgs;[
- gtk4
- libadwaita
- ];
-
- postInstall = ''
- install -D --mode=444 $src/${pname}.desktop $out/share/applications/${pname}.desktop
- install -D --mode=444 $src/${pname}.svg $out/share/pixmaps/${pname}.svg
- '';
-
- meta = with lib; {
- description = "A small, simple calculator written in rust/gtk4";
- homepage = "https://github.com/DashieTM/OxiCalc";
- changelog = "https://github.com/DashieTM/OxiCalc/releases/tag/${version}";
- license = licenses.gpl3;
- maintainers = with maintainers; [ DashieTM ];
- mainProgram = "oxicalc";
- };
-}
diff --git a/nix/override/oxidash.nix b/nix/override/oxidash.nix
deleted file mode 100644
index 60b78a1..0000000
--- a/nix/override/oxidash.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ pkgs
-, lib
-, fetchFromGitHub
-}:
-let
- toolchain = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.minimal);
- rustPlatform = pkgs.makeRustPlatform {
- cargo = toolchain;
- rustc = toolchain;
- };
-in
-rustPlatform.buildRustPackage rec {
- pname = "oxidash";
- version = "1.0";
-
- src = fetchFromGitHub {
- owner = "DashieTM";
- repo = "OxiDash";
- rev = "${version}";
- hash = "sha256-GVkmqwn3mHriMHUfEej4LW0MaYURqtsftC5L+Cox+5E=";
- };
-
- cargoHash = "sha256-seFHiBht0vc+iqQw5bd22qVvdhCMqDthWuth3NTm8OY=";
-
- nativeBuildInputs = with pkgs;[
- pkg-config
- glib
- wrapGAppsHook4
- ];
-
- buildInputs = with pkgs;[
- dbus
- gtk4
- gtk4-layer-shell
- libadwaita
- ];
-
- meta = with lib; {
- description = "A work in progress notification daemon made with rust and gtk.";
- homepage = "https://github.com/DashieTM/OxiDash";
- changelog = "https://github.com/DashieTM/OxiDash/releases/tag/${version}";
- license = licenses.gpl3;
- maintainers = with maintainers; [ DashieTM ];
- mainProgram = "oxidash";
- };
-}
diff --git a/nix/override/oxinoti.nix b/nix/override/oxinoti.nix
deleted file mode 100644
index 30c76b2..0000000
--- a/nix/override/oxinoti.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ pkgs
-, lib
-, fetchFromGitHub
-}:
-let
- toolchain = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.minimal);
- rustPlatform = pkgs.makeRustPlatform {
- cargo = toolchain;
- rustc = toolchain;
- };
-in
-rustPlatform.buildRustPackage rec {
- pname = "oxinoti";
- version = "1.0";
-
- src = fetchFromGitHub {
- owner = "DashieTM";
- repo = "OxiNoti";
- rev = "${version}";
- hash = "sha256-fsrtLb14mCuYb1ibJAzPCrPNXdlcU/J7ZGYoVfppFBM=";
- };
-
- cargoHash = "sha256-jIdev6K5MQ8jASDo1KWU89rSLd9UhI2MhTT4l7pP+tA=";
-
- nativeBuildInputs = with pkgs;[
- pkg-config
- wrapGAppsHook4
- ];
-
- buildInputs = with pkgs;[
- dbus
- gtk3
- gtk-layer-shell
- ];
-
- meta = with lib; {
- description = "A work in progress notification daemon made with rust and gtk.";
- homepage = "https://github.com/DashieTM/OxiNoti";
- changelog = "https://github.com/DashieTM/OxiNoti/releases/tag/${version}";
- license = licenses.gpl3;
- maintainers = with maintainers; [ DashieTM ];
- mainProgram = "oxinoti";
- };
-}
diff --git a/nix/override/oxipaste.nix b/nix/override/oxipaste.nix
deleted file mode 100644
index 463fe95..0000000
--- a/nix/override/oxipaste.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ pkgs
-, lib
-, fetchFromGitHub
-}:
-let
- toolchain = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.minimal);
- rustPlatform = pkgs.makeRustPlatform {
- cargo = toolchain;
- rustc = toolchain;
- };
-in
-rustPlatform.buildRustPackage rec {
- pname = "oxipaste";
- version = "1.0";
-
- src = fetchFromGitHub {
- owner = "DashieTM";
- repo = "OxiPaste";
- rev = "${version}";
- hash = "sha256-2copt808b4cpmE8HO2H960xLs7OegvOUYYS/6z7fNMk=";
- };
-
- cargoHash = "sha256-RXaL5y0hohP9VJ7IJCEfdJjyxwY2l555xSwRa9ZiNKc=";
-
- nativeBuildInputs = with pkgs;[
- pkg-config
- wrapGAppsHook4
- ];
-
- buildInputs = with pkgs;[
- dbus
- gtk4
- libadwaita
- gtk4-layer-shell
- ];
-
- meta = with lib; {
- description = "A work in progress notification daemon made with rust and gtk.";
- homepage = "https://github.com/DashieTM/OxiPaste";
- changelog = "https://github.com/DashieTM/OxiPaste/releases/tag/${version}";
- license = licenses.gpl3;
- maintainers = with maintainers; [ DashieTM ];
- mainProgram = "oxipaste";
- };
-}
diff --git a/nix/override/oxishut.nix b/nix/override/oxishut.nix
deleted file mode 100644
index 98036bb..0000000
--- a/nix/override/oxishut.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ pkgs
-, lib
-, fetchFromGitHub
-}:
-let
- toolchain = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.minimal);
- rustPlatform = pkgs.makeRustPlatform {
- cargo = toolchain;
- rustc = toolchain;
- };
-in
-rustPlatform.buildRustPackage rec {
- pname = "oxishut";
- version = "1.0";
-
- src = fetchFromGitHub {
- owner = "DashieTM";
- repo = "OxiShut";
- rev = "${version}";
- hash = "sha256-aCNnNxmIHq+IjjviWNGSHfdXT55s367GTAeQoaTZ/KA=";
- };
-
- cargoHash = "sha256-UeoBSHwMGfhkgRT7kmelcG3/omtB03Wh4IZrTy3yf3Y=";
-
- nativeBuildInputs = with pkgs;[
- pkg-config
- glib
- wrapGAppsHook4
- ];
-
- buildInputs = with pkgs;[
- gtk4
- libadwaita
- gtk4-layer-shell
- ];
-
- meta = with lib; {
- description = "";
- homepage = "https://github.com/DashieTM/OxiShut";
- changelog = "https://github.com/DashieTM/OxiShut/releases/tag/${version}";
- license = licenses.gpl3;
- maintainers = with maintainers; [ DashieTM ];
- mainProgram = "oxishut";
- };
-}
diff --git a/nix/override/reset.nix b/nix/override/reset.nix
deleted file mode 100644
index 50f4f83..0000000
--- a/nix/override/reset.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ pkgs
-, lib
-, fetchFromGitHub
-}:
-let
- toolchain = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.minimal);
- rustPlatform = pkgs.makeRustPlatform {
- cargo = toolchain;
- rustc = toolchain;
- };
-in
-rustPlatform.buildRustPackage rec {
- pname = "reset";
- version = "1.2.0";
-
- src = fetchFromGitHub {
- owner = "Xetibo";
- repo = "ReSet";
- rev = "${version}";
- hash = "sha256-6n7IaYQAw0VSkQFO1wXwQjuGbhvheiV6ZJDkpaEIeLU=";
- };
-
- cargoHash = "sha256-S3Z2tHQuv17Dvg2VMFDeOvDzyLfIPROcFMsYOoCscqM=";
-
- nativeBuildInputs = with pkgs;[
- pkg-config
- glib
- wrapGAppsHook4
- ];
-
- buildInputs = with pkgs;[
- gtk4
- libadwaita
- pulseaudio
- dbus
- gdk-pixbuf
- gnome.adwaita-icon-theme
- ];
-
- postInstall = ''
- install -D --mode=444 $src/${pname}.desktop $out/share/applications/${pname}.desktop
- install -D --mode=444 $src/src/resources/icons/ReSet.svg $out/share/pixmaps/ReSet.svg
- '';
-
- meta = with lib; {
- description = "";
- homepage = "https://github.com/Xetibo/ReSet";
- changelog = "https://github.com/Xetibo/ReSet/releases/tag/${version}";
- license = licenses.gpl3;
- maintainers = with maintainers; [ DashieTM ];
- mainProgram = "reset";
- };
-}
diff --git a/nix/override/streamdeck.nix b/nix/override/streamdeck.nix
deleted file mode 100644
index 705155f..0000000
--- a/nix/override/streamdeck.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-{ lib
-, pkgs
-, python3Packages
-, fetchFromGitHub
-, writeText
-, makeDesktopItem
-}:
-
-python3Packages.buildPythonApplication rec {
- pname = "streamdeck-ui";
- version = "4.1.2";
-
- src = fetchFromGitHub {
- repo = "streamdeck-linux-gui";
- owner = "streamdeck-linux-gui";
- rev = "v${version}";
- sha256 = "sha256-CSsFPGnKVQUCND6YOA9kfO41KS85C57YL9LcrWlQRKo=";
- };
-
- patches = [
- # nixpkgs has a newer pillow version
- ./streamdeck.patch
- ];
-
- desktopItems =
- let
- common = {
- name = "streamdeck-ui";
- desktopName = "Stream Deck UI";
- icon = "streamdeck-ui";
- exec = "streamdeck";
- comment = "UI for the Elgato Stream Deck";
- categories = [ "Utility" ];
- };
- in
- builtins.map makeDesktopItem [
- common
- (common // {
- name = "${common.name}-noui";
- exec = "${common.exec} --no-ui";
- noDisplay = true;
- })
- ];
-
- postInstall =
- let
- udevRules = ''
- SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", TAG+="uaccess"
- '';
- in
- ''
- mkdir -p $out/lib/systemd/user
- substitute scripts/streamdeck.service $out/lib/systemd/user/streamdeck.service \
- --replace '' $out/bin/streamdeck
-
- mkdir -p "$out/etc/udev/rules.d"
- cp ${writeText "70-streamdeck.rules" udevRules} $out/etc/udev/rules.d/70-streamdeck.rules
-
- mkdir -p "$out/share/pixmaps"
- cp streamdeck_ui/logo.png $out/share/pixmaps/streamdeck-ui.png
- '';
-
- dontWrapQtApps = true;
- dontWrapGApps = true;
- makeWrapperArgs = [ "\${qtWrapperArgs[@]}" "\${gappsWrapperArgs[@]}" ];
-
- format = "pyproject";
-
- nativeBuildInputs = [
- pkgs.python3Packages.poetry-core
- pkgs.copyDesktopItems
- pkgs.qt6.wrapQtAppsHook
- pkgs.wrapGAppsHook
- ];
-
- propagatedBuildInputs = with pkgs.python3Packages; [
- importlib-metadata
- setuptools
- filetype
- cairosvg
- pillow
- pynput
- pyside6
- streamdeck
- xlib
- ] ++ lib.optionals stdenv.isLinux [
- pkgs.qt6.qtwayland
- ];
-
- nativeCheckInputs = [
- pkgs.xvfb-run
- pkgs.python3Packages.pytest
- ];
-
- # checkPhase = ''
- # xvfb-run pytest tests
- # '';
-
- meta = with lib; {
- description = "Linux compatible UI for the Elgato Stream Deck";
- homepage = "https://streamdeck-linux-gui.github.io/streamdeck-linux-gui/";
- license = licenses.mit;
- mainProgram = "streamdeck";
- maintainers = with maintainers; [ majiir ];
- };
-}
diff --git a/nix/override/streamdeck.patch b/nix/override/streamdeck.patch
deleted file mode 100644
index 3c8cf05..0000000
--- a/nix/override/streamdeck.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 54a8c19..0b95fb3 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -14,11 +14,11 @@ packages = [
- [tool.poetry.dependencies]
- python = ">=3.8,<3.13"
- streamdeck = "^0.9.5"
--pillow = "10.2.0"
-+pillow = "^10.2.0"
- pyside6 = "^6.4.2"
- CairoSVG = "^2.5.2"
- filetype = "^1.0.10"
--importlib-metadata = "^6.8.0"
-+importlib-metadata = "^7.0.0"
- evdev = "^1.6.1"
-
- [tool.poetry.group.docs.dependencies]
diff --git a/nix/programs/coding.nix b/nix/programs/coding.nix
deleted file mode 100644
index 16edde3..0000000
--- a/nix/programs/coding.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ pkgs
-, ...
-}:
-{
- imports = [
- ./nvim/default.nix
- ];
-
- home.packages = with pkgs; [
- #basics
- git
- gcc
- meson
- ninja
- tree-sitter
- unzip
- pkg-config
- sqlite
- plantuml
- d-spy
-
- #editors
- neovide
- ##fallback
- vscodium
-
- #rust
- rustup
-
- #python
- python3
- python312Packages.python-lsp-server
- python312Packages.python-lsp-ruff
- python312Packages.python-lsp-black
-
- #ts/js
- nodejs_20
- deno
- typescript
- nodePackages.typescript-language-server
- nodePackages.prettier
-
- #go
- go
- gopls
-
- #typst
- typst
- typst-lsp
- typstfmt
- ltex-ls
-
- #java
- gradle
- maven
- jdt-language-server
- adoptopenjdk-jre-bin
-
- #.!
- dotnet-sdk_8
- omnisharp-roslyn
- csharpier
-
- #zig
- zig
- zls
- ];
-}
diff --git a/nix/programs/common.nix b/nix/programs/common.nix
deleted file mode 100644
index b4f59d3..0000000
--- a/nix/programs/common.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{ pkgs
-, lib
-, ...
-}:
-let callPackage = lib.callPackageWith (pkgs);
-in
-{
- manual = {
- html.enable = false;
- json.enable = false;
- manpages.enable = false;
- };
-
- fonts.fontconfig.enable = true;
- home.packages = with pkgs; [
- vesktop
- kitty
- firefox
- fish
- ripgrep
- rm-improved
- bat
- fd
- lsd
- (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
- flatpak
- networkmanager
- zoxide
- fastfetch
- pkgs.gnome.gnome-keyring
- dbus
- killall
- adw-gtk3
- qt5ct
- qt6ct
- gnutar
- fishPlugins.tide
- nix-index
- libnotify
- zenith
- nh
- amberol
- pulseaudio
- playerctl
- ncspot
- poppler_utils
- neofetch
- brave
- greetd.regreet
- (callPackage
- ../override/oxinoti.nix
- { })
- (callPackage
- ../override/oxidash.nix
- { })
- (callPackage
- ../override/oxicalc.nix
- { })
- (callPackage
- ../override/oxipaste.nix
- { })
- (callPackage
- ../override/oxishut.nix
- { })
- (callPackage
- ../override/streamdeck.nix
- { })
- (callPackage
- ../override/reset.nix
- { })
- (callPackage
- ../override/cambalache.nix
- { })
- ];
-
- home.username = "dashie";
- home.homeDirectory = "/home/dashie";
- home.stateVersion = "24.05";
-
- home.sessionPath = [
- "$HOME/.cargo/bin"
- ];
-
- home.sessionVariables = {
- GOROOT = "$HOME/.go";
- };
-
- home.keyboard = null;
-
- home.file.".local/share/flatpak/overrides/global".text = ''
- [Context]
- filesystems=xdg-config/gtk-3.0;xdg-config/gtk-4.0
- '';
-
- dconf.settings = {
- "org/gnome/desktop/interface" = {
- gtk-theme = "adw-gtk3";
- cursor-theme = "Bibata-Modern-Classic";
- cursor-size = 24;
- icon-theme = "MoreWaita";
- };
- };
-
- programs.nix-index =
- {
- enable = true;
- enableFishIntegration = true;
- };
- home.sessionVariables =
- {
- FLAKE = "home/dasshie/gits/dotFiles/nix";
- };
-}
diff --git a/nix/programs/default.nix b/nix/programs/default.nix
deleted file mode 100644
index 1418c7b..0000000
--- a/nix/programs/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ inputs, pkgs, mod, ... }:
-let
- base_imports = [
- inputs.hyprland.homeManagerModules.default
- inputs.hyprlock.homeManagerModules.default
- inputs.anyrun.homeManagerModules.default
- inputs.ironbar.homeManagerModules.default
- inputs.nix-flatpak.homeManagerModules.nix-flatpak
- ];
-in
-{
- xdg.portal.config.common.default = "*";
- xdg.portal = {
- enable = true;
- extraPortals = [
- pkgs.xdg-desktop-portal-gtk
- ];
- };
- home-manager.useGlobalPkgs = true;
- home-manager.useUserPackages = true;
-
- home-manager.users.dashie = {
- #home-manager overlap -> use flake instead
- disabledModules = [ "programs/hyprlock.nix" ];
- imports = [
- {
- _module = { args = { inherit inputs; }; };
- }
- ./hyprland/default.nix
- ./flatpak.nix
- ./common.nix
- ./coding.nix
- ./xdg.nix
- ./media.nix
- ./utils.nix
- ./oxi/default.nix
- ./themes/default.nix
- ./individual_configs/default.nix
- mod
- ] ++ base_imports;
- };
-}
diff --git a/nix/programs/flatpak.nix b/nix/programs/flatpak.nix
deleted file mode 100644
index 4abc89d..0000000
--- a/nix/programs/flatpak.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ lib, ... }: {
-
- services.flatpak.remotes = lib.mkOptionDefault [{
- name = "flathub-stable";
- location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
- }];
- services.flatpak.uninstallUnmanaged = true;
- services.flatpak.packages = [
- # fallback if necessary, but generally avoided as nix is superior :)
- "com.github.tchx84.Flatseal"
- "io.github.Foldex.AdwSteamGtk"
- ];
-}
-
diff --git a/nix/programs/gaming/default.nix b/nix/programs/gaming/default.nix
deleted file mode 100644
index 5216390..0000000
--- a/nix/programs/gaming/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ pkgs
-, config
-, ...
-}: {
- imports = [
- # ./anyrun.nix
- # ./config.nix
- ];
-
- environment.systemPackages = with pkgs; [
- gamemode
- steam
- lutris
- wine
- adwsteamgtk
- ];
-
- programs.steam.enable = true;
- programs.gamemode.enable = true;
- programs.gamemode = {
- enableRenice = true;
- settings = {
- general = {
- governor = "performance";
- };
- gpu = {
- apply_gpu_optimisations = "accept-responsibility";
- gpu_device = config.programs.gamemode.device;
- amd_performance_level = "high";
- };
- custom = {
- start = "notify-send -a 'Gamemode' 'Optimizations activated'";
- end = "notify-send -a 'Gamemode' 'Optimizations deactivated'";
- };
- };
- };
-}
diff --git a/nix/programs/hyprland/anyrun.nix b/nix/programs/hyprland/anyrun.nix
deleted file mode 100644
index 08d78dc..0000000
--- a/nix/programs/hyprland/anyrun.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ inputs, pkgs, ... }: {
- programs.anyrun = {
- enable = true;
- config = {
- plugins = [
- inputs.anyrun.packages.${pkgs.system}.applications
- inputs.anyrun.packages.${pkgs.system}.rink
- inputs.anyrun.packages.${pkgs.system}.translate
- inputs.anyrun.packages.${pkgs.system}.websearch
- ];
- #position = "center";
- hideIcons = false;
- width = { fraction = 0.3; };
- y = { fraction = 0.5; };
- layer = "overlay";
- hidePluginInfo = true;
- closeOnClick = true;
- };
-
- extraCss = ''
- #window {
- border-radius: 10px;
- background-color: none;
- }
-
- box#main {
- border-radius: 10px;
- }
-
- list#main {
- border-radius: 10px;
- margin: 0px 10px 10px 10px;
- }
-
- list#plugin {
- border-radius: 10px;
- }
-
- list#match {
- border-radius: 10px;
- }
-
- entry#entry {
- border: none;
- border-radius: 10px;
- margin: 10px 10px 0px 10px;
- }
-
- label#match-desc {
- font-size: 12px;
- border-radius: 10px;
- }
-
- label#match-title {
- font-size: 12px;
- border-radius: 10px;
- }
-
- label#plugin {
- font-size: 16px;
- border-radius: 10px;
- }
-
- * {
- border-radius: 10px;
- }
- '';
- };
-}
diff --git a/nix/programs/hyprland/config.nix b/nix/programs/hyprland/config.nix
deleted file mode 100644
index f3ab6b6..0000000
--- a/nix/programs/hyprland/config.nix
+++ /dev/null
@@ -1,261 +0,0 @@
-{ pkgs
-, inputs
-, config
-, ...
-}:
-{
- wayland.windowManager.hyprland.enable = true;
- wayland.windowManager.hyprland.settings = {
- "$mod" = "SUPER";
-
- bindm = [
- "$mod, mouse:272, movewindow"
- "$mod, mouse:273, resizewindow"
- ];
-
- bind = [
- # screenshots
- "$mod SUPER,S,exec,grim -g \"$(slurp)\" - | wl-copy"
- "$mod SUPERSHIFTALT,S,exec, grim -g \"$(slurp)\" $HOME/gits/ost-5semester/Screenshots/$(date +'%Y_%m_%d_%I_%M_%S.png') && (date +'%Y_%m_%d_%I_%M_%S.png') | wl-copy"
- "$mod SUPERSHIFT,S,exec,grim -g \"$(slurp)\" - | satty -f -"
- "$mod SUPERCONTROLSHIFT,S,exec,grim -c -g \"2560,0 3440x1440\" - | wl-copy"
-
- # regular programs
- "$mod SUPER,F,exec,firefox"
- "$mod SUPER,T,exec,kitty -1"
- "$mod SUPER,E,exec,nautilus -w"
- "$mod SUPER,N,exec,neovide"
- "$mod SUPER,M,exec,oxidash"
- "$mod SUPER,R,exec,anyrun"
- "$mod SUPER,G,exec,oxicalc"
- "$mod SUPER,D,exec,oxishut"
- "$mod SUPER,A,exec,oxipaste"
- "$mod SUPERSHIFT,L,exec, playerctl -a pause & hyprlock & systemctl hibernate"
-
- # media keys
- ",XF86AudioMute,exec, $HOME/.config/scripts/audio_control.sh mute"
- ",XF86AudioLowerVolume,exec, $HOME/.config/scripts/audio_control.sh sink -5%"
- ",XF86AudioRaiseVolume,exec, $HOME/.config/scripts/audio_control.sh sink +5%"
- ",XF86AudioPlay,exec, playerctl play-pause"
- ",XF86AudioNext,exec, playerctl next"
- ",XF86AudioPrev,exec, playerctl previous"
- ",XF86MonBrightnessDown,exec, $HOME/.config/scripts/change-brightness brightness 10%-"
- ",XF86MonBrightnessUp,exec, $HOME/.config/scripts/change-brightness brightness +10%"
-
- # hyprland keybinds
- # misc
- "$mod SUPER,V,togglefloating,"
- "$mod SUPER,B,fullscreen,"
- "$mod SUPER,C,togglesplit"
- "$mod SUPER,Q,killactive,"
- "$mod SUPERSHIFTALT,M,exit,"
- "$mod SUPERSHIFT,W,togglespecialworkspace"
-
- # move
- "$mod SUPER,left,movewindow,l"
- "$mod SUPER,right,movewindow,r"
- "$mod SUPER,up,movewindow,u"
- "$mod SUPER,down,movewindow,d"
-
- # workspaces
- "$mod SUPER,1,workspace,1"
- "$mod SUPER,2,workspace,2"
- "$mod SUPER,3,workspace,3"
- "$mod SUPER,4,workspace,4"
- "$mod SUPER,5,workspace,5"
- "$mod SUPER,6,workspace,6"
- "$mod SUPER,7,workspace,7"
- "$mod SUPER,8,workspace,8"
- "$mod SUPER,9,workspace,9"
- "$mod SUPER,0,workspace,10"
-
- # move to workspace
- "$mod SUPERSHIFT,1,movetoworkspace,1"
- "$mod SUPERSHIFT,2,movetoworkspace,2"
- "$mod SUPERSHIFT,3,movetoworkspace,3"
- "$mod SUPERSHIFT,4,movetoworkspace,4"
- "$mod SUPERSHIFT,5,movetoworkspace,5"
- "$mod SUPERSHIFT,6,movetoworkspace,6"
- "$mod SUPERSHIFT,7,movetoworkspace,7"
- "$mod SUPERSHIFT,8,movetoworkspace,8"
- "$mod SUPERSHIFT,9,movetoworkspace,9"
- "$mod SUPERSHIFT,0,movetoworkspace,10"
-
-
- # move to workspace silent
- "$mod SUPERSHIFTALT,1,movetoworkspacesilent,1"
- "$mod SUPERSHIFTALT,2,movetoworkspacesilent,2"
- "$mod SUPERSHIFTALT,3,movetoworkspacesilent,3"
- "$mod SUPERSHIFTALT,4,movetoworkspacesilent,4"
- "$mod SUPERSHIFTALT,5,movetoworkspacesilent,5"
- "$mod SUPERSHIFTALT,6,movetoworkspacesilent,6"
- "$mod SUPERSHIFTALT,7,movetoworkspacesilent,7"
- "$mod SUPERSHIFTALT,8,movetoworkspacesilent,8"
- "$mod SUPERSHIFTALT,9,movetoworkspacesilent,9"
- "$mod SUPERSHIFTALT,0,movetoworkspacesilent,10"
-
- # preselection
- "$mod SUPERALT,j,layoutmsg,preselect l"
- "$mod SUPERALT,k,layoutmsg,preselect d"
- "$mod SUPERALT,l,layoutmsg,preselect u"
- "$mod SUPERALT,semicolon,layoutmsg,preselect r"
- "$mod SUPERALT,h,layoutmsg,preselect n"
- ];
-
- binde = [
- # hyprland keybinds
- # focus
- "$mod SUPER,J,movefocus,l"
- "$mod SUPER,semicolon,movefocus,r"
- "$mod SUPER,L,movefocus,u"
- "$mod SUPER,K,movefocus,d"
-
- # resize
- "$mod SUPER,U,resizeactive,-20 0"
- "$mod SUPER,P,resizeactive,20 0"
- "$mod SUPER,O,resizeactive,0 -20"
- "$mod SUPER,I,resizeactive,0 20"
- ];
-
- general = {
- gaps_out = "3,5,5,5";
- border_size = 3;
- "col.active_border" = "0xFFFF0000 0xFF00FF00 0xFF0000FF 45deg";
- "col.inactive_border" = "0x66333333";
- allow_tearing = true;
- };
-
- decoration = {
- rounding = 4;
- };
-
- animations = {
- bezier = "penguin,0.05,0.9,0.1,1.0";
- animation = [
- "windowsMove,1,4,default"
- "windows,1,7,default,popin 70%"
- "windowsOut,1,7,default,popin 70%"
- "border,1,10,default"
- "fade,1,7,default"
- "workspaces,1,6,default"
- "layers,1,3,default,popin"
- ];
- };
-
- dwindle = {
- preserve_split = true;
- pseudotile = 0;
- permanent_direction_override = false;
- };
-
- input = {
- kb_layout = "dashie";
- repeat_delay = 200;
- force_no_accel = true;
- touchpad = {
- natural_scroll = true;
- tap-to-click = true;
- tap-and-drag = true;
- };
- };
-
- misc = {
- vrr = 1;
- animate_manual_resizes = 1;
- enable_swallow = true;
- disable_splash_rendering = true;
- disable_hyprland_logo = true;
- swallow_regex = "^(.*)(kitty)(.*)$";
- initial_workspace_tracking = 1;
- };
-
- cursor = {
- # conversion seems to be borked right now, i want a smooth bibata :(
- enable_hyprcursor = false;
- };
-
- gestures = {
- workspace_swipe = true;
- };
-
- env = [
- "GTK_CSD,0"
- "TERM,\"kitty /bin/fish\""
- "XDG_CURRENT_DESKTOP=Hyprland"
- "XDG_SESSION_TYPE=wayland"
- "XDG_SESSION_DESKTOP=Hyprland"
- "HYPRCURSOR_THEME,Bibata-Modern-Classic"
- "HYPRCURSOR_SIZE,24"
- "XCURSOR_THEME,Bibata-Modern-Classic"
- "XCURSOR_SIZE,24"
- "QT_QPA_PLATFORM,wayland"
- "QT_QPA_PLATFORMTHEME,qt5ct"
- "QT_WAYLAND_FORCE_DPI,96"
- "QT_AUTO_SCREEN_SCALE_FACTOR,0"
- "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
- "QT_SCALE_FACTOR,1"
- "EDITOR,\"neovide --novsync --nofork\""
- "WLR_DRM_NO_ATOMIC,1"
- "GTK_USE_PORTAL, 1"
- ];
-
- layerrule = [
- # layer rules
- # mainly to disable animations within slurp and grim
- "noanim, selection"
- ];
-
- windowrule = [
- # window rules
- "tile,^(.*)(Spotify)(.*)$"
- "float,^(.*)(OxiCalc)(.*)$"
- "float,^(.*)(winecfg.exe)(.*)$"
- "float,^(.*)(speed.exe)(.*)$"
- "float,^(.*)(copyq)(.*)$"
- "center,^(.*)(swappy)(.*)$"
- "float,title:^(.*)(Spirit)(.*)$"
- "float,title:^(.*)(reset)(.*)$"
- "workspace 10 silent,^(.*)(steam)(.*)$"
- "workspace 9 silent,^(.*)(dota)(.*)$"
- "workspace 9 silent,^(.*)(battlebits)(.*)$"
- "workspace 9 silent,^(.*)(aoe)(.*)$"
- "suppressevent fullscreen maximize,^(.*)(neovide)(.*)$"
- ];
-
- windowrulev2 = [
- "immediate,class:^(.*)(Pal)$"
- "immediate,class:^(.*)(dota2)$"
- "immediate,class:^(.*)(needforspeedheat.exe)$"
- "forceinput,class:^(.*)(Pal)$"
- "forceinput,class:^(.*)(Battlefield 4)$"
- ];
-
- exec-once = [
- # environment
- "systemctl --user import-environment"
- "dbus-update-activation-environment --systemd --all"
- "hyprctl setcursor Bibata-Modern-Classic 24"
-
- # other programs
- "hyprpaper"
- "ironbar"
- "firefox"
- "oxipaste_daemon"
- # TODO: is this necessary?
- #"/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1"
- "nextcloud --background"
- "oxinoti"
- ] ++ config.programs.hyprland.extra_autostart;
-
- #plugin = {
- # hyprspace = {
- # bind = [
- # "SUPER, W, overview:toggle, toggle"
- # ];
- # };
- #};
- };
- #wayland.windowManager.hyprland.plugins = [
- # inputs.Hyprspace.packages.${pkgs.system}.Hyprspace
- #];
-}
diff --git a/nix/programs/hyprland/default.nix b/nix/programs/hyprland/default.nix
deleted file mode 100644
index 6a444ca..0000000
--- a/nix/programs/hyprland/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ inputs
-, pkgs
-, ...
-}: {
- imports = [
- ./anyrun.nix
- ./config.nix
- ./ironbar.nix
- ./hyprpaper.nix
- ./hyprlock.nix
- ];
-
- home.packages = with pkgs; [
- xorg.xprop
- grim
- slurp
- satty
- xdg-desktop-portal-gtk
- # xdg-desktop-portal-hyprland
- copyq
- gnome.nautilus
- gnome.sushi
- wl-clipboard
- hyprcursor
- hyprpaper
- hyprpicker
- ];
-}
diff --git a/nix/programs/hyprland/hyprlock.nix b/nix/programs/hyprland/hyprlock.nix
deleted file mode 100644
index 99ed9d9..0000000
--- a/nix/programs/hyprland/hyprlock.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ pkgs
-, inputs
-, config
-, ...
-}:
-{
- programs.hyprlock.enable = true;
- programs.hyprlock = {
-
- backgrounds = [
- {
- monitor = "";
- path = "";
- color = "rgba(26, 27, 38, 1.0)";
- }
- ];
-
- input-fields = [
- {
- monitor = "${config.programs.ironbar.monitor}";
-
- placeholder_text = "password or something";
- }
- ];
-
- labels = [
- {
- monitor = "";
- text = "$TIME";
- font_size = 50;
- valign = "center";
- halign = "center";
- }
- ];
-
- };
-}
diff --git a/nix/programs/hyprland/hyprpaper.nix b/nix/programs/hyprland/hyprpaper.nix
deleted file mode 100644
index 8b93285..0000000
--- a/nix/programs/hyprland/hyprpaper.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, ... }: {
- xdg.configFile."hypr/hyprpaper.conf" = {
- text = config.programs.hyprland.hyprpaper;
- };
-}
diff --git a/nix/programs/hyprland/ironbar.nix b/nix/programs/hyprland/ironbar.nix
deleted file mode 100644
index 0682d27..0000000
--- a/nix/programs/hyprland/ironbar.nix
+++ /dev/null
@@ -1,257 +0,0 @@
-{ config, ... }: {
-
- programs.ironbar =
- {
- enable = true;
- style = ''
- @import url("/home/dashie/.config/gtk-3.0/gtk.css");
-
- * {
- color: #71bbe6;
- padding: 0px;
- margin: 0px;
- }
-
- .background {
- background-color: rgba(0, 0, 0, 0);
- }
-
- .workspaces {
- margin: 2px 0px 0px 5px;
- border-radius: 10px;
- /* background-color: #2b2c3b; */
- background-color: #1E1E2E;
- padding: 2px 5px 2px 5px;
- }
-
- .workspaces .item {
- margin: 0px 3px 0px 3px;
- font-size: 13px;
- border-radius: 100%;
- padding: 0px 2px 0px 3px;
- background-color: rgba(0, 0, 0, 0);
- }
-
- .workspaces .item:hover {
- background-color: #3e4152;
- }
-
- .workspaces .item.focused {
- background-color: #3e4152;
- }
-
- .audio-box {
- padding: 2em;
- background-color: #1E1E2E;
- border-radius: 5px;
- }
-
- .audio-slider {
- padding: 5px;
- margin: 5px;
- }
-
- .audio-button {
- padding: 5px 10px 5px 10px;
- margin: 0px 1em 20px 1em;
- border-radius: 100%;
- font-size: 17px;
- }
-
- .audio-button-box {
- padding: 0px 2.5em 0px 2.5em;
- }
-
- .focused {
- /* margin: 2px 0px 0px 0px; */
- padding: 0px 5px 0px 5px;
- /* background-color: 1a1b26; */
- background-color: #1E1E2E;
- font-size: 17px;
- border-radius: 10px;
- }
-
- #bar #end {
- margin: 0px 5px 0px 0px;
- padding: 0px 5px 0px 5px;
- background-color: #1E1E2E;
- border-radius: 10px;
- }
-
- .popup-button {
- padding: 0px 5px 0px 3px;
- margin: 0em 3px;
- border-radius: 100%;
- font-size: 13px;
- background-color: #1E1E2E;
- }
-
- .popup-button-box {
- padding: 2px 0px 2px 0px;
- }
-
- .clock {
- padding: 0px 5px 0px 5px;
- font-size: 17px;
- background-color: #1E1E2E;
- }
-
- .clock:hover {
- background-color: #3e4152;
- }
-
- .custom button {
- background-color: #1E1E2E;
- }
-
- .custom button:hover {
- background-color: #3e4152;
- }
-
- .memory-usage {
- font-size: 15px;
- margin: 0px 5px 0px 0px;
- }
-
- .memory-usage:hover {
- background-color: #3e4152;
- }
-
- .popup-clock {
- background-color: #1E1E2E;
- border-radius: 5px;
- padding: 2px 8px 10px 8px;
- }
-
- .popup-clock .calendar-clock {
- font-size: 2.5em;
- padding-bottom: 0.1em;
- }
-
- .popup-clock .calendar {
- border-radius: 5px;
- font-size: 1.05em;
- }
-
- .popup-clock .calendar:selected {
- background-color: #3e4152;
- }
- '';
- features = [
- #"another_feature"
- ];
- config = {
- monitors."${config.programs.ironbar.monitor}" = {
- end = config.programs.ironbar.battery ++ [
- {
- type = "sys_info";
- format = [
- " {memory_percent}"
- ];
- interval.memory = 30;
- class = "memory-usage";
- }
- {
- type = "custom";
- bar = [
- {
- type = "button";
- class = "popup-button";
- label = "";
- on_click = "popup:toggle";
- }
- ];
- class = "popup-button-box";
- popup = [
- {
- type = "box";
- orientation = "vertical";
- class = "audio-box";
- widgets = [
- {
- type = "box";
- orientation = "horizontal";
- widgets = [
- {
- type = "button";
- class = "audio-button";
- label = "";
- on_click = "!/home/dashie/.config/eww/scripts/audio_control.sh bluetooth";
- }
- {
- type = "button";
- class = "audio-button";
- label = "";
- on_click = "!/home/dashie/.config/eww/scripts/audio_control.sh internal";
- }
- ];
- class = "audio-button-box";
- }
- {
- type = "label";
- label = "Output";
- }
- {
- type = "slider";
- class = "audio-slider";
- step = 1.0;
- length = 200;
- value = "pactl get-sink-volume @DEFAULT_SINK@ | awk -F'/' '{ print $2 }' | tr -d ' %'";
- on_change = "!pactl set-sink-volume @DEFAULT_SINK@ $0%";
- }
- {
- type = "label";
- label = "Input";
- }
- {
- type = "slider";
- class = "audio-slider";
- step = 1.0;
- length = 200;
- value = "pactl get-source-volume @DEFAULT_SOURCE@ | awk -F'/' '{ print $2 }' | tr -d ' %'";
- on_change = "!pactl set-source-volume @DEFAULT_SOURCE@ $0%";
- }
- ];
- }
- ];
- }
- {
- type = "custom";
- bar = [
- {
- type = "button";
- class = "popup-button";
- label = "";
- on_click = "!oxidash --css /home/dashie/gits/oxidash/style.css";
- }
- ];
- class = "popup-button-box";
- }
- {
- type = "clock";
- format = "%I:%M";
- format_popup = "%I:%M:%S";
- locale = "en_US";
- }
- { type = "tray"; }
- ];
- position = "top";
- height = 10;
- anchor_to_edges = true;
- start = [{
- type = "workspaces";
- all_monitors = true;
- }];
- center = [
- {
- type = "focused";
- show_icon = true;
- show_title = true;
- icon_size = 20;
- truncate = "end";
- }
- ];
- };
- };
- };
-}
diff --git a/nix/programs/individual_configs/default.nix b/nix/programs/individual_configs/default.nix
deleted file mode 100644
index 8c7425d..0000000
--- a/nix/programs/individual_configs/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- imports = [
- ./kitty.nix
- ./yazi.nix
- ./fish.nix
- ./ncspot.nix
- ];
-}
diff --git a/nix/programs/individual_configs/fish.nix b/nix/programs/individual_configs/fish.nix
deleted file mode 100644
index 1859164..0000000
--- a/nix/programs/individual_configs/fish.nix
+++ /dev/null
@@ -1,140 +0,0 @@
-{
- xdg.configFile."fish/config.fish" = {
- text =
- ''
- if status is-interactive
- # Commands to run in interactive sessions can go here
- end
-
- # =============================================================================
- #
- # Utility functions for zoxide.
- #
-
- export NIX_PATH="$NIX_PATH:$HOME/gits/dotFiles/nix/."
-
- set EDITOR "neovide --no-fork"
-
- alias rebuild='sudo nixos-rebuild switch --flake /home/dashie/gits/dotFiles/nix/.'
- abbr --add ls 'lsd'
- abbr --add :q 'exit'
- abbr --add gh 'git push origin'
- abbr --add gl 'git pull origin'
- abbr --add gm 'git commit -m'
- abbr --add ga "git add -A"
- abbr --add g+ 'bear -- g++ -Wextra -Werror -std=c++20'
- abbr --add s "kitty +kitten ssh"
- abbr --add zl 'z "" '
- abbr --add nv 'neovide'
- abbr --add cr 'cargo run'
- abbr --add grep 'rg'
- abbr --add cat 'bat'
- abbr --add find 'fd'
- abbr --add rm 'rip'
-
- set fish_greeting
- # pwd based on the value of _ZO_RESOLVE_SYMLINKS.
- function __zoxide_pwd
- builtin pwd -L
- end
-
- # A copy of fish's internal cd function. This makes it possible to use
- # `alias cd=z` without causing an infinite loop.
- if ! builtin functions --query __zoxide_cd_internal
- if builtin functions --query cd
- builtin functions --copy cd __zoxide_cd_internal
- else
- alias __zoxide_cd_internal='builtin cd'
- end
- end
-
- # cd + custom logic based on the value of _ZO_ECHO.
- function __zoxide_cd
- __zoxide_cd_internal $argv
- end
-
- # =============================================================================
- #
- # Hook configuration for zoxide.
- #
-
- # Initialize hook to add new entries to the database.
- function __zoxide_hook --on-variable PWD
- test -z "$fish_private_mode"
- and command zoxide add -- (__zoxide_pwd)
- end
-
- # =============================================================================
- #
- # When using zoxide with --no-cmd, alias these internal functions as desired.
- #
-
- if test -z $__zoxide_z_prefix
- set __zoxide_z_prefix 'z!'
- end
- set __zoxide_z_prefix_regex ^(string escape --style=regex $__zoxide_z_prefix)
-
- # Jump to a directory using only keywords.
- function __zoxide_z
- set -l argc (count $argv)
- if test $argc -eq 0
- __zoxide_cd $HOME
- else if test "$argv" = -
- __zoxide_cd -
- else if test $argc -eq 1 -a -d $argv[1]
- __zoxide_cd $argv[1]
- else if set -l result (string replace --regex $__zoxide_z_prefix_regex \'\' $argv[-1]); and test -n $result
- __zoxide_cd $result
- else
- set -l result (command zoxide query --exclude (__zoxide_pwd) -- $argv)
- and __zoxide_cd $result
- end
- end
-
- # Completions.
- function __zoxide_z_complete
- set -l tokens (commandline --current-process --tokenize)
- set -l curr_tokens (commandline --cut-at-cursor --current-process --tokenize)
-
- if test (count $tokens) -le 2 -a (count $curr_tokens) -eq 1
- # If there are < 2 arguments, use `cd` completions.
- complete --do-complete "\'\' "(commandline --cut-at-cursor --current-token) | string match --regex '.*/$'
- else if test (count $tokens) -eq (count $curr_tokens); and ! string match --quiet --regex $__zoxide_z_prefix_regex. $tokens[-1]
- # If the last argument is empty and the one before doesn't start with
- # $__zoxide_z_prefix, use interactive selection.
- set -l query $tokens[2..-1]
- set -l result (zoxide query --exclude (__zoxide_pwd) --interactive -- $query)
- and echo $__zoxide_z_prefix$result
- commandline --function repaint
- end
- end
- complete --command __zoxide_z --no-files --arguments '(__zoxide_z_complete)'
-
- # Jump to a directory using interactive search.
- function __zoxide_zi
- set -l result (command zoxide query --interactive -- $argv)
- and __zoxide_cd $result
- end
-
- # =============================================================================
- #
- # Commands for zoxide. Disable these using --no-cmd.
- #
-
- abbr --erase z &>/dev/null
- alias z=__zoxide_z
-
- abbr --erase zi &>/dev/null
- alias zi=__zoxide_zi
-
- # =============================================================================
- #
- # To initialize zoxide, add this to your configuration (usually
- # ~/.config/fish/config.fish):
- #
- # zoxide init fish | source
-
- direnv hook fish | source
- '';
- };
-}
diff --git a/nix/programs/individual_configs/kitty.nix b/nix/programs/individual_configs/kitty.nix
deleted file mode 100644
index 60ef324..0000000
--- a/nix/programs/individual_configs/kitty.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
- programs.kitty = {
- enable = true;
-
- settings = {
- enable_audio_bell = "no";
- window_alert_on_bell = "no";
- background_opacity = "0.8";
- cursor_blink_interval = "0";
- window_padding_width = "1";
- shell_integration = "yes";
- sync_with_monitor = "no";
-
- font_family = "JetBrainsMono Nerd Font Mono";
- bold_font = "JetBrainsMono Nerd Font Mono Extra Bold";
- italic_font = "JetBrainsMono Nerd Font Mono Extra Italic";
- bold_italic_font = "JetBrainsMono Nerd Font Mono Extra Bold Italic";
-
- background = "#1a1b25";
- foreground = "#c5c8c6";
-
- selection_background = "#b2ceee";
- selection_foreground = "#080808";
-
- url_color = "#73daca";
- cursor = "#c0caf5";
- cursor_text_color = "#1a1b25";
-
- active_tab_background = "#7aa2f7";
- active_tab_foreground = "#16161e";
- inactive_tab_background = "#292e42";
- inactive_tab_foreground = "#545c7e";
-
- active_border_color = "#7aa2f7";
- inactive_border_color = "#292e42";
-
- color0 = "#15161e";
- color1 = "#c94448";
- color2 = "#9ece6a";
- color3 = "#e0af68";
- color4 = "#7aa2f7";
- color5 = "#bb9af7";
- color6 = "#7dcfff";
- color7 = "#a9b1d6";
-
- color8 = "#414868";
- color9 = "#f2201f";
- color10 = "#9ece6a";
- color11 = "#e0af68";
- color12 = "#7aa2f7";
- color13 = "#bb9af7";
- color14 = "#7dcfff";
- color15 = "#c0caf5";
-
- color16 = "#ff9e64";
- color17 = "#db4b4b";
-
- shell = "fish";
- };
-
- };
-}
diff --git a/nix/programs/individual_configs/ncspot.nix b/nix/programs/individual_configs/ncspot.nix
deleted file mode 100644
index 931535b..0000000
--- a/nix/programs/individual_configs/ncspot.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ pkgs, ... }: {
- xdg.configFile."ncspot/config.toml".source = (pkgs.formats.toml { }).generate "ncspot" {
- notify = true;
- shuffle = true;
- cover_max_scale = 2;
- initial_screen = "library";
- library_tabs = [ "playlists" ];
- theme = {
- background = "#1a1b26";
- primary = "#9aa5ce";
- secondary = "#414868";
- title = "#9ece6a";
- playing = "#7aa2f7";
- playing_selected = "#bb9af7";
- playing_bg = "#24283b";
- highlight = "#c0caf5";
- highlight_bg = "#24283b";
- error = "#414868";
- error_bg = "#f7768e";
- statusbar = "#ff9e64";
- statusbar_progress = "#7aa2f7";
- statusbar_bg = "#1a1b26";
- cmdline = "#c0caf5";
- cmdline_bg = "#24283b";
- search_match = "#f7768e";
- };
- keybindings = {
- "j" = "move left 1";
- "k" = "move down 1";
- "l" = "move up 1";
- ";" = "move right 1";
- };
- notification_format = {
- title = "%artists";
- body = "%title";
- };
- };
-}
diff --git a/nix/programs/individual_configs/yazi.nix b/nix/programs/individual_configs/yazi.nix
deleted file mode 100644
index 486c94a..0000000
--- a/nix/programs/individual_configs/yazi.nix
+++ /dev/null
@@ -1,1494 +0,0 @@
-{
- # don't ask....
- programs.yazi =
- {
- enable = true;
- settings = {
- log = {
- enabled = false;
- };
- opener = {
-
- folder = [
- {
- run = "open - R \"$@\"";
- orphan = true;
- display_name = "Reveal in Finder";
- }
- {
- run = "$EDITOR \"$@\"";
- orphan = true;
- }
- ];
- archive = [
- {
- run = "unar \"$1\"";
- display_name = "Extract here";
- }
- ];
- text = [
- {
- run = "$EDITOR \"$@\"";
- orphan = true;
- }
- ];
- image = [
- {
- run = "imv \"$@\"";
- orphan = true;
- display_name = "Open";
- }
- {
- run = "exiftool \"$1\"; echo \"Press enter to exit\"; read";
- block = true;
- display_name = "Show EXIF";
- }
- ];
- pdf = [{
- run = "zathura \"$@\"";
- orphan = true;
- display_name = "Open";
- }];
- video = [
- {
- run = "mpv \"$@\"";
- orphan = true;
- }
- {
- run = "mediainfo \"$1\"; echo \"Press enter to exit\"; read";
- block = true;
- display_name = "Show media info";
- }
- ];
- audio = [
- {
- run = "xdg-open \"$@\"";
- orphan = true;
- }
- { run = "mediainfo \"$1\"; echo \"Press enter to exit\"; read"; block = true; display_name = "Show media info"; }
- ];
- fallback = [
- {
- run = "xdg-open \"$@\"";
- orphan = true;
- display_name = "Open";
- }
- {
- run = "xdg-open - R \"$@\"";
- orphan = true;
- display_name = "Reveal in Finder";
- }
- ];
- };
- plugin = {
- prepend_previewers = [
- {
- name = "*.md";
- run = "glow";
- }
- { mime = "text/csv"; run = "miller"; }
- ];
- };
- };
- keymap =
- {
- manager.keymap = [
- {
- on = [
- ""
- ];
- run = "escape";
- desc = "Exit visual mode clear selected or cancel search";
- }
- {
- on = [
- "q"
- ];
- run = "quit";
- desc = "Exit the process";
- }
- {
- on = [
- "Q"
- ];
- run = "quit --no-cwd-file";
- desc = "Exit the process without writing cwd-file";
- }
- {
- on = [
- ""
- ];
- run = "close";
- desc = "Close the current tab or quit if it is last tab";
- }
- {
- on = [
- ""
- ];
- run = "suspend";
- desc = "Suspend the process";
- }
-
- # Navigation
- {
- on = [
- "l"
- ];
- run = "arrow -1";
- desc = "Move cursor up";
- }
- {
- on = [
- "k"
- ];
- run = "arrow 1";
- desc = "Move cursor down";
- }
-
- {
- on = [
- "L"
- ];
- run = "arrow -5";
- desc = "Move cursor up 5 lines";
- }
- {
- on = [
- "K"
- ];
- run = "arrow 5";
- desc = "Move cursor down 5 lines";
- }
-
- {
- on = [
- ""
- ];
- run = "arrow -50%";
- desc = "Move cursor up half page";
- }
- {
- on = [
- ""
- ];
- run = "arrow 50%";
- desc = "Move cursor down half page";
- }
- {
- on = [
- ""
- ];
- run = "arrow -100%";
- desc = "Move cursor up one page";
- }
- {
- on = [
- ""
- ];
- run = "arrow 100%";
- desc = "Move cursor down one page";
- }
-
- {
- on = [
- "j"
- ];
- run = "leave";
- desc = "Go back to the parent directory";
- }
- {
- on = [
- ";"
- ];
- run = "enter";
- desc = "Enter the child directory";
- }
-
- {
- on = [
- "J"
- ];
- run = "back";
- desc = "Go back to the previous directory";
- }
- {
- on = [
- "P"
- ];
- run = "forward";
- desc = "Go forward to the next directory";
- }
-
- {
- on = [
- ""
- ];
- run = "peek -5";
- desc = "Peek up 5 units in the preview";
- }
- {
- on = [
- ""
- ];
- run = "peek 5";
- desc = "Peek down 5 units in the preview";
- }
-
- {
- on = [
- ""
- ];
- run = "arrow -1";
- desc = "Move cursor up";
- }
- {
- on = [
- ""
- ];
- run = "arrow 1";
- desc = "Move cursor down";
- }
- {
- on = [
- ""
- ];
- run = "leave";
- desc = "Go back to the parent directory";
- }
- {
- on = [
- ""
- ];
- run = "enter";
- desc = "Enter the child directory";
- }
-
- {
- on = [
- "g"
- "g"
- ];
- run = "arrow -99999999";
- desc = "Move cursor to the top";
- }
- {
- on = [
- "G"
- ];
- run = "arrow 99999999";
- desc = "Move cursor to the bottom";
- }
-
- # Selection
- {
- on = [
- "v"
- ];
- run = "visual_mode";
- desc = "Enter visual mode (selection mode)";
- }
- {
- on = [
- "V"
- ];
- run = "visual_mode --unset";
- desc = "Enter visual mode (unset mode)";
- }
- {
- on = [
- ""
- ];
- run = "select_all --state=true";
- desc = "Select all files";
- }
- {
- on = [
- ""
- ];
- run = "select_all --state=none";
- desc = "Inverse selection of all files";
- }
-
- # Operation
- {
- on = [
- "o"
- ];
- run = "open";
- desc = "Open the selected files";
- }
- {
- on = [
- "O"
- ];
- run = "open --interactive";
- desc = "Open the selected files interactively";
- }
- {
- on = [
- ""
- ];
- run = "open";
- desc = "Open the selected files";
- }
- {
- on = [
- ""
- ];
- run = "open --interactive";
- desc = "Open the selected files interactively";
- } # It's cool if you're using a terminal that supports CSI u
- {
- on = [
- "y"
- ];
- run = "yank";
- desc = "Copy the selected files";
- }
- {
- on = [
- "x"
- ];
- run = "yank --cut";
- desc = "Cut the selected files";
- }
- {
- on = [
- "p"
- ];
- run = "paste";
- desc = "Paste the files";
- }
- {
- on = [
- "P"
- ];
- run = "paste --force";
- desc = "Paste the files (overwrite if the destination exists)";
- }
- {
- on = [
- "-"
- ];
- run = "link";
- desc = "Symlink the absolute path of files";
- }
- {
- on = [
- "_"
- ];
- run = "link --relative";
- desc = "Symlink the relative path of files";
- }
- {
- on = [
- "d"
- ];
- run = "remove";
- desc = "Move the files to the trash";
- }
- {
- on = [
- "D"
- ];
- run = "remove --permanently";
- desc = "Permanently delete the files";
- }
- {
- on = [
- "a"
- ];
- run = "create";
- desc = "Create a file or directory (ends with / for directories)";
- }
- {
- on = [
- "r"
- ];
- run = "rename";
- desc = "Rename a file or directory";
- }
- {
- on = [
- ";"
- ];
- run = "shell";
- desc = "Run a shell command";
- }
- {
- on = [
- ":"
- ];
- run = "shell --block";
- desc = "Run a shell command (block the UI until the command finishes)";
- }
- {
- on = [
- "."
- ];
- run = "hidden toggle";
- desc = "Toggle the visibility of hidden files";
- }
- {
- on = [
- ""
- "f"
- "g>"
- ];
- run = "search fd";
- desc = "Search files by name using fd";
- }
- {
- on = [
- ""
- "f"
- "G>"
- ];
- run = "search rg";
- desc = "Search files by content using ripgrep";
- }
- {
- on = [
- ""
- ];
- run = "search none";
- desc = "Cancel the ongoing search";
- }
- {
- on = [
- "z"
- ];
- run = "jump zoxide";
- desc = "Jump to a directory using zoxide";
- }
- {
- on = [
- "Z"
- ];
- run = "jump fzf";
- desc = "Jump to a directory or reveal a file using fzf";
- }
-
- # Copy
- {
- on = [
- "c"
- "c"
- ];
- run = "copy path";
- desc = "Copy the absolute path";
- }
- {
- on = [
- "c"
- "d"
- ];
- run = "copy dirname";
- desc = "Copy the path of the parent directory";
- }
- {
- on = [
- "c"
- "f"
- ];
- run = "copy filename";
- desc = "Copy the name of the file";
- }
- {
- on = [
- "c"
- "n"
- ];
- run = "copy name_without_ext";
- desc = "Copy the name of the file without the extension";
- }
-
- # Find
- {
- on = [
- "/"
- ];
- run = "find --smart";
- }
- {
- on = [
- "?"
- ];
- run = "find --previous --smart";
- }
- {
- on = [
- "n"
- ];
- run = "find_arrow";
- }
- {
- on = [
- "N"
- ];
- run = "find_arrow --previous";
- }
-
- # Sorting
- {
- on = [
- ","
- "a"
- ];
- run = "sort alphabetical --dir_first";
- desc = "Sort alphabetically";
- }
- {
- on = [
- ","
- "A"
- ];
- run = "sort alphabetical --reverse --dir_first";
- desc = "Sort alphabetically (reverse)";
- }
- {
- on = [
- ","
- "c"
- ];
- run = "sort created --dir_first";
- desc = "Sort by creation time";
- }
- {
- on = [
- ","
- "C"
- ];
- run = "sort created --reverse --dir_first";
- desc = "Sort by creation time (reverse)";
- }
- {
- on = [
- ","
- "m"
- ];
- run = "sort modified --dir_first";
- desc = "Sort by modified time";
- }
- {
- on = [
- ","
- "M"
- ];
- run = "sort modified --reverse --dir_first";
- desc = "Sort by modified time (reverse)";
- }
- {
- on = [
- ","
- "n"
- ];
- run = "sort natural --dir_first";
- desc = "Sort naturally";
- }
- {
- on = [
- ","
- "N"
- ];
- run = "sort natural --reverse --dir_first";
- desc = "Sort naturally (reverse)";
- }
- {
- on = [
- ","
- "s"
- ];
- run = "sort size --dir_first";
- desc = "Sort by size";
- }
- {
- on = [
- ","
- "S"
- ];
- run = "sort size --reverse --dir_first";
- desc = "Sort by size (reverse)";
- }
-
- # Tabs
- {
- on = [
- "t"
- ];
- run = "tab_create --current";
- desc = "Create a new tab using the current path";
- }
-
- {
- on = [
- "1"
- ];
- run = "tab_switch 0";
- desc = "Switch to the first tab";
- }
- {
- on = [
- "2"
- ];
- run = "tab_switch 1";
- desc = "Switch to the second tab";
- }
- {
- on = [
- "3"
- ];
- run = "tab_switch 2";
- desc = "Switch to the third tab";
- }
- {
- on = [
- "4"
- ];
- run = "tab_switch 3";
- desc = "Switch to the fourth tab";
- }
- {
- on = [
- "5"
- ];
- run = "tab_switch 4";
- desc = "Switch to the fifth tab";
- }
- {
- on = [
- "6"
- ];
- run = "tab_switch 5";
- desc = "Switch to the sixth tab";
- }
- {
- on = [
- "7"
- ];
- run = "tab_switch 6";
- desc = "Switch to the seventh tab";
- }
- {
- on = [
- "8"
- ];
- run = "tab_switch 7";
- desc = "Switch to the eighth tab";
- }
- {
- on = [
- "9"
- ];
- run = "tab_switch 8";
- desc = "Switch to the ninth tab";
- }
-
- {
- on = [
- "["
- ];
- run = "tab_switch -1 --relative";
- desc = "Switch to the previous tab";
- }
- {
- on = [
- "]"
- ];
- run = "tab_switch 1 --relative";
- desc = "Switch to the next tab";
- }
-
- {
- on = [
- "{"
- ];
- run = "tab_swap -1";
- desc = "Swap the current tab with the previous tab";
- }
- {
- on = [
- "}"
- ];
- run = "tab_swap 1";
- desc = "Swap the current tab with the next tab";
- }
-
- # Tasks
- {
- on = [
- "w"
- ];
- run = "tasks_show";
- desc = "Show the tasks manager";
- }
-
- # Goto
- {
- on = [
- "g"
- "h"
- ];
- run = "cd ~";
- desc = "Go to the home directory";
- }
- {
- on = [
- "g"
- "c"
- ];
- run = "cd ~/.config";
- desc = "Go to the config directory";
- }
- {
- on = [
- "g"
- "d"
- ];
- run = "cd ~/Downloads";
- desc = "Go to the downloads directory";
- }
- {
- on = [
- "g"
- "t"
- ];
- run = "cd /tmp";
- desc = "Go to the temporary directory";
- }
- {
- on = [
- "g"
- ""
- ];
- run = "cd --interactive";
- desc = "Go to a directory interactively";
- }
-
- # Help
- {
- on = [
- "~"
- ];
- run = "help";
- desc = "Open help";
- }
- ];
-
- tasks.keymap = [
- {
- on = [
- ""
- ];
- run = "close";
- desc = "Hide the task manager";
- }
- {
- on = [
- ""
- ];
- run = "close";
- desc = "Hide the task manager";
- }
- {
- on = [
- "w"
- ];
- run = "close";
- desc = "Hide the task manager";
- }
-
- {
- on = [
- "k"
- ];
- run = "arrow -1";
- desc = "Move cursor up";
- }
- {
- on = [
- "j"
- ];
- run = "arrow 1";
- desc = "Move cursor down";
- }
-
- {
- on = [
- ""
- ];
- run = "arrow -1";
- desc = "Move cursor up";
- }
- {
- on = [
- ""
- ];
- run = "arrow 1";
- desc = "Move cursor down";
- }
-
- {
- on = [
- ""
- ];
- run = "inspect";
- desc = "Inspect the task";
- }
- {
- on = [
- "x"
- ];
- run = "cancel";
- desc = "Cancel the task";
- }
-
- {
- on = [
- "~"
- ];
- run = "help";
- desc = "Open help";
- }
- ];
-
-
- select.keymap = [
- {
- on = [
- ""
- ];
- run = "close";
- desc = "Cancel selection";
- }
- {
- on = [
- ""
- ];
- run = "close";
- desc = "Cancel selection";
- }
- {
- on = [
- ""
- ];
- run = "close --submit";
- desc = "Submit the selection";
- }
-
- {
- on = [
- "k"
- ];
- run = "arrow -1";
- desc = "Move cursor up";
- }
- {
- on = [
- "j"
- ];
- run = "arrow 1";
- desc = "Move cursor down";
- }
-
- {
- on = [
- "K"
- ];
- run = "arrow -5";
- desc = "Move cursor up 5 lines";
- }
- {
- on = [
- "J"
- ];
- run = "arrow 5";
- desc = "Move cursor down 5 lines";
- }
-
- {
- on = [
- ""
- ];
- run = "arrow -1";
- desc = "Move cursor up";
- }
- {
- on = [
- ""
- ];
- run = "arrow 1";
- desc = "Move cursor down";
- }
-
- {
- on = [
- "~"
- ];
- run = "help";
- desc = "Open help";
- }
- ];
-
-
- input.keymap = [
- {
- on = [
- ""
- ];
- run = "close";
- desc = "Cancel input";
- }
- {
- on = [
- ""
- ];
- run = "close --submit";
- desc = "Submit the input";
- }
- {
- on = [
- ""
- ];
- run = "escape";
- desc = "Go back the normal mode or cancel input";
- }
-
- # Mode
- {
- on = [
- "i"
- ];
- run = "insert";
- desc = "Enter insert mode";
- }
- {
- on = [
- "a"
- ];
- run = "insert --append";
- desc = "Enter append mode";
- }
- {
- on = [
- "v"
- ];
- run = "visual";
- desc = "Enter visual mode";
- }
- {
- on = [
- "V"
- ];
- run = [
- "move -999"
- "visual"
- "move 999"
- ];
- desc = "Enter visual mode and select all";
- }
-
- # Navigation
- {
- on = [
- "h"
- ];
- run = "move -1";
- desc = "Move cursor left";
- }
- {
- on = [
- "l"
- ];
- run = "move 1";
- desc = "Move cursor right";
- }
-
- {
- on = [
- "0"
- ];
- run = "move -999";
- desc = "Move to the BOL";
- }
- {
- on = [
- "$"
- ];
- run = "move 999";
- desc = "Move to the EOL";
- }
- {
- on = [
- "I"
- ];
- run = [
- "move -999"
- "insert"
- ];
- desc = "Move to the BOL and enter insert mode";
- }
- {
- on = [
- "A"
- ];
- run = [
- "move 999"
- "insert --append"
- ];
- desc = "Move to the EOL and enter append mode";
- }
-
- {
- on = [
- ""
- ];
- run = "move -1";
- desc = "Move cursor left";
- }
- {
- on = [
- ""
- ];
- run = "move 1";
- desc = "Move cursor right";
- }
-
- {
- on = [
- "b"
- ];
- run = "backward";
- desc = "Move to the beginning of the previous word";
- }
- {
- on = [
- "w"
- ];
- run = "forward";
- desc = "Move to the beginning of the next word";
- }
- {
- on = [
- "e"
- ];
- run = "forward --end-of-word";
- desc = "Move to the end of the next word";
- }
-
- # Deletion
- {
- on = [
- "d"
- ];
- run = "delete --cut";
- desc = "Cut the selected characters";
- }
- {
- on = [
- "D"
- ];
- run = [
- "delete --cut"
- "move 999"
- ];
- desc = "Cut until the EOL";
- }
- {
- on = [
- "c"
- ];
- run = "delete --cut --insert";
- desc = "Cut the selected characters and enter insert mode";
- }
- {
- on = [
- "C"
- ];
- run = [
- "delete --cut --insert"
- "move 999"
- ];
- desc = "Cut until the EOL and enter insert mode";
- }
- {
- on = [
- "x"
- ];
- run = [
- "delete --cut"
- "move 1 --in-operating"
- ];
- desc = "Cut the current character";
- }
-
- # Yank/Paste
- {
- on = [
- "y"
- ];
- run = "yank";
- desc = "Copy the selected characters";
- }
- {
- on = [
- "p"
- ];
- run = "paste";
- desc = "Paste the copied characters after the cursor";
- }
- {
- on = [
- "P"
- ];
- run = "paste --before";
- desc = "Paste the copied characters before the cursor";
- }
-
- # Undo/Redo
- {
- on = [
- "u"
- ];
- run = "undo";
- desc = "Undo the last operation";
- }
- {
- on = [
- ""
- ];
- run = "redo";
- desc = "Redo the last operation";
- }
-
- # Help
- {
- on = [
- "~"
- ];
- run = "help";
- desc = "Open help";
- }
- ];
-
- help.keymap = [
- {
- on = [
- ""
- ];
- run = "escape";
- desc = "Clear the filter or hide the help";
- }
- {
- on = [
- "q"
- ];
- run = "close";
- desc = "Exit the process";
- }
- {
- on = [
- ""
- ];
- run = "close";
- desc = "Hide the help";
- }
-
- # Navigation
- {
- on = [
- "k"
- ];
- run = "arrow -1";
- desc = "Move cursor up";
- }
- {
- on = [
- "j"
- ];
- run = "arrow 1";
- desc = "Move cursor down";
- }
-
- {
- on = [
- "K"
- ];
- run = "arrow -5";
- desc = "Move cursor up 5 lines";
- }
- {
- on = [
- "J"
- ];
- run = "arrow 5";
- desc = "Move cursor down 5 lines";
- }
-
- {
- on = [
- ""
- ];
- run = "arrow -1";
- desc = "Move cursor up";
- }
- {
- on = [
- ""
- ];
- run = "arrow 1";
- desc = "Move cursor down";
- }
-
- # Filtering
- {
- on = [
- "/"
- ];
- run = "filter";
- desc = "Apply a filter for the help items";
- }
- ];
- };
- theme = {
- manager = {
- cwd = {
- fg = "#94e2d5";
- };
-
- # Hovered
- hovered = {
- reversed = true;
- };
- preview_hovered = { underline = true; };
-
- # Find
- find_keyword = {
- fg = "#f9e2af";
- bold = true;
- italic = true;
- underline = true;
- };
- find_position = {
- fg = "#f5c2e7";
- bg = "reset";
- bold = true;
- italic = true;
- };
-
- # Marker
- marker_copied = {
- fg = "#a6e3a1";
- bg = "#a6e3a1";
- };
- marker_cut = {
- fg = "#f38ba8";
- bg = "#f38ba8";
- };
- marker_marked = {
- fg = "#f9e2af";
- bg = "#f9e2af";
- };
- marker_selected = {
- fg = "#779EF0";
- bg = "#89b4fa";
- };
-
- # Tab
- tab_active = {
- fg = "#1e1e2e";
- bg = "#cdd6f4";
- };
- tab_inactive = {
- fg = "#cdd6f4";
- bg = "#45475a";
- };
- tab_width = 1;
-
- # Count
- count_copied = {
- fg = "#1e1e2e";
- bg = "#a6e3a1";
- };
- count_cut = {
- fg = "#1e1e2e";
- bg = "#f38ba8";
- };
- count_selected = {
- fg = "#1e1e2e";
- bg = "#89b4fa";
- };
-
- # Border
- border_symbol = "│";
- border_style = { fg = "#7f849c"; };
-
- };
- status = {
- separator_open = "";
- separator_close = "";
- separator_style = {
- fg = "#45475a";
- bg = "#45475a";
- };
-
- # Mode
- mode_normal = {
- fg = "#1e1e2e";
- bg = "#89b4fa";
- bold = true;
- };
- mode_select = {
- fg = "#1e1e2e";
- bg = "#a6e3a1";
- bold = true;
- };
- mode_unset = {
- fg = "#1e1e2e";
- bg = "#f2cdcd";
- bold = true;
- };
-
- # Progress
- progress_label = {
- fg = "#ffffff";
- bold = true;
- };
- progress_normal = {
- fg = "#89b4fa";
- bg = "#45475a";
- };
- progress_error = {
- fg = "#f38ba8";
- bg = "#45475a";
- };
-
- # Permissions
- permissions_t = { fg = "#89b4fa"; };
- permissions_r = { fg = "#f9e2af"; };
- permissions_w = { fg = "#f38ba8"; };
- permissions_x = { fg = "#a6e3a1"; };
- permissions_s = { fg = "#7f849c"; };
- };
-
- input = {
- border = {
- fg = "#89b4fa";
- };
- title = { };
- value = { };
- selected = { reversed = true; };
- };
- select = {
- border = {
- fg = "#89b4fa";
- };
- active = { fg = "#f5c2e7"; };
- inactive = { };
- };
- tasks = {
- border = {
- fg = "#89b4fa";
- };
- title = { };
- hovered = {
- underline = true;
- };
- };
- which = {
- mask = {
- bg = "#313244";
- };
- cand = { fg = "#94e2d5"; };
- rest = { fg = "#9399b2"; };
- desc = { fg = "#f5c2e7"; };
- separator = " ";
- separator_style = { fg = "#585b70"; };
- };
- help = {
- on = {
- fg = "#f5c2e7";
- };
- exec = { fg = "#94e2d5"; };
- desc = { fg = "#9399b2"; };
- hovered = {
- bg = "#585b70";
- bold = true;
- };
- footer = {
- fg = "#45475a";
- bg = "#cdd6f4";
- };
- };
- filetype = {
- rules = [
- # Images
- {
- mime = "image/*";
- fg = "#94e2d5";
- }
-
- # Videos
- {
- mime = "video/*";
- fg = "#f9e2af";
- }
- {
- mime = "audio/*";
- fg = "#f9e2af";
- }
-
- # Archives
- {
- mime = "application/zip";
- fg = "#f5c2e7";
- }
- {
- mime = "application/gzip";
- fg = "#f5c2e7";
- }
- {
- mime = "application/x-tar";
- fg = "#f5c2e7";
- }
- {
- mime = "application/x-bzip";
- fg = "#f5c2e7";
- }
- {
- mime = "application/x-bzip2";
- fg = "#f5c2e7";
- }
- {
- mime = "application/x-7z-compressed";
- fg = "#f5c2e7";
- }
- {
- mime = "application/x-rar";
- fg = "#f5c2e7";
- }
-
- # Fallback
- {
- name = "*";
- fg = "#cdd6f4";
- }
- {
- name = "*/";
- fg = "#89b4fa";
- }
- ];
- };
- };
- };
-}
-
-
-
-
-
-
-
-
-
-
diff --git a/nix/programs/media.nix b/nix/programs/media.nix
deleted file mode 100644
index 8f6dc12..0000000
--- a/nix/programs/media.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ pkgs, ... }:
-{
- home.packages = with pkgs; [
- # base audio
- pipewire
- wireplumber
- # audio control
- playerctl
- # images
- imv
- # videos
- mpv
- # pdf
- zathura
- evince
- libreoffice-fresh
- onlyoffice-bin
- pdftk
- # spotify
- #ncspot
- # video editing
- kdenlive
- # image creation
- inkscape
- gimp
- krita
- ];
- programs.obs-studio.enable = true;
- programs.obs-studio.plugins = with pkgs; [
- obs-studio-plugins.obs-vaapi
- ];
-}
diff --git a/nix/programs/nvim/default.nix b/nix/programs/nvim/default.nix
deleted file mode 100644
index c0f7885..0000000
--- a/nix/programs/nvim/default.nix
+++ /dev/null
@@ -1,171 +0,0 @@
-{ lib, pkgs, ... }:
-{
- programs.neovim = {
- enable = true;
- extraPackages = with pkgs; [
- # Telescope
- ripgrep
- # lua
- lua-language-server
- stylua
- # nix
- nil
- # go
- gopls
- # jafuck
- jdt-language-server
- taplo
- typst-lsp
- sqls
- shfmt
- texlab
- nixpkgs-fmt
- crate2nix
- ruff-lsp
- nodePackages.pyright
- lemminx
- marksman
- clang-tools_18
- ];
-
- plugins = with pkgs.vimPlugins; [
- lazy-nvim
- ];
-
- extraLuaConfig =
- let
- plugins = with pkgs.vimPlugins; [
- # LazyVim
- LazyVim
- bufferline-nvim
- cmp-buffer
- cmp-nvim-lsp
- cmp-path
- cmp_luasnip
- conform-nvim
- dashboard-nvim
- dressing-nvim
- flash-nvim
- friendly-snippets
- gitsigns-nvim
- indent-blankline-nvim
- lualine-nvim
- neo-tree-nvim
- neoconf-nvim
- neodev-nvim
- noice-nvim
- nui-nvim
- nvim-cmp
- nvim-lint
- nvim-lspconfig
- nvim-notify
- nvim-spectre
- nvim-treesitter.withAllGrammars
- nvim-treesitter-context
- nvim-treesitter-textobjects
- nvim-ts-autotag
- nvim-ts-context-commentstring
- nvim-web-devicons
- nvim-jdtls
- omnisharp-extended-lsp-nvim
- neotest
- neotest-java
- neotest-rust
- persistence-nvim
- plenary-nvim
- telescope-fzf-native-nvim
- telescope-nvim
- todo-comments-nvim
- tokyonight-nvim
- trouble-nvim
- vim-illuminate
- vim-startuptime
- which-key-nvim
- { name = "LuaSnip"; path = luasnip; }
- #{ name = "catppuccin"; path = catppuccin-nvim; }
- { name = "mini.ai"; path = mini-nvim; }
- { name = "mini.bufremove"; path = mini-nvim; }
- { name = "mini.comment"; path = mini-nvim; }
- { name = "mini.indentscope"; path = mini-nvim; }
- { name = "mini.pairs"; path = mini-nvim; }
- { name = "mini.surround"; path = mini-nvim; }
- ];
- mkEntryFromDrv = drv:
- if lib.isDerivation drv then
- { name = "${lib.getName drv}"; path = drv; }
- else
- drv;
- lazyPath = pkgs.linkFarm "lazy-plugins" (builtins.map mkEntryFromDrv plugins);
- in
- ''
- require("lazy").setup({
- defaults = {
- lazy = true,
- },
- performance = {
- rtp = {
- disabled_plugins = {
- "gzip",
- "netrw",
- "tarPlugin",
- "tohtml",
- "tutor",
- "zipPlugin",
- },
- },
- },
- dev = {
- -- reuse files from pkgs.vimPlugins.*
- path = "${lazyPath}",
- patterns = { "." },
- -- fallback to download
- fallback = true,
- },
- spec = {
- { "LazyVim/LazyVim", import = "lazyvim.plugins" },
- { import = "lazyvim.plugins.extras.ui.alpha" },
- { import = "lazyvim.plugins.extras.lang.rust" },
- { import = "lazyvim.plugins.extras.lang.tailwind" },
- { import = "lazyvim.plugins.extras.lang.java" },
- { import = "lazyvim.plugins.extras.lang.go" },
- { import = "lazyvim.plugins.extras.lang.clangd" },
- { import = "lazyvim.plugins.extras.lang.typescript" },
- { import = "lazyvim.plugins.extras.lang.python" },
- { import = "lazyvim.plugins.extras.lang.markdown" },
- { import = "lazyvim.plugins.extras.lang.cmake" },
- { import = "lazyvim.plugins.extras.lang.omnisharp" },
- { import = "lazyvim.plugins.extras.lang.json" },
- { import = "lazyvim.plugins.extras.lang.tex" },
- { import = "lazyvim.plugins.extras.util.dot" },
- { import = "lazyvim.plugins.extras.dap.core" },
- { import = "lazyvim.plugins.extras.test.core" },
- { "nvim-telescope/telescope-fzf-native.nvim", enabled = true },
- -- disable mason.nvim, use programs.neovim.extraPackages
- { "williamboman/mason-lspconfig.nvim", enabled = false },
- --{ "williamboman/mason.nvim", enabled = false },
- -- treesitter handled by xdg.configFile."nvim/parser", put this line at the end of spec to clear ensure_installed
- { "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
- { import = "plugins" },
- { import = "plugins.plugins" },
- },
- install = { colorscheme = { "tokyonight" } },
- checker = { enabled = true, notify = false },
- change_detection = { enabled = true, notify = false },
- })
- '';
- };
-
- # https://github.com/nvim-treesitter/nvim-treesitter#i-get-query-error-invalid-node-type-at-position
- xdg.configFile."nvim/parser".source =
- let
- parsers = pkgs.symlinkJoin {
- name = "treesitter-parsers";
- paths = (pkgs.vimPlugins.nvim-treesitter.withAllGrammars).dependencies;
- };
- in
- "${parsers}/parser";
-
- # Normal LazyVim config here, see https://github.com/LazyVim/starter/tree/main/lua
- xdg.configFile."nvim/lua".source = ./lua;
- xdg.configFile."nvim/ftplugin".source = ./ftplugin;
-}
diff --git a/nix/programs/nvim/ftplugin/java.lua b/nix/programs/nvim/ftplugin/java.lua
deleted file mode 100644
index 1a4f22e..0000000
--- a/nix/programs/nvim/ftplugin/java.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-local config = {
- cmd = { "jdtls" },
- root_dir = vim.fs.dirname(vim.fs.find({ "gradlew", ".git", "mvnw" }, { upward = true })[1]),
-}
-require("jdtls").start_or_attach(config)
diff --git a/nix/programs/nvim/lua/config/autocmds.lua b/nix/programs/nvim/lua/config/autocmds.lua
deleted file mode 100644
index 291710e..0000000
--- a/nix/programs/nvim/lua/config/autocmds.lua
+++ /dev/null
@@ -1,16 +0,0 @@
--- nvimtree
-local function open_nvim_tree(data)
- local directory = vim.fn.isdirectory(data.file) == 1
-
- if not directory then
- return
- end
- print("FUCK")
- -- change to the directory
- vim.cmd.cd(data.file)
-
- -- open the tree
- require("nvim-tree.api").tree.open()
-end
-
-vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
diff --git a/nix/programs/nvim/lua/config/keymaps.lua b/nix/programs/nvim/lua/config/keymaps.lua
deleted file mode 100644
index b325537..0000000
--- a/nix/programs/nvim/lua/config/keymaps.lua
+++ /dev/null
@@ -1,202 +0,0 @@
-local Util = require("lazyvim.util")
-
-local function map(mode, lhs, rhs, opts)
- local keys = require("lazy.core.handler").handlers.keys
- ---@cast keys LazyKeysHandler
- -- do not create the map if a lazy keys handler exists
- if not keys.active[keys.parse({ lhs, mode = mode }).id] then
- opts = opts or {}
- opts.silent = opts.silent ~= false
- vim.keymap.set(mode, lhs, rhs, opts)
- end
-end
-local opts = { noremap = true, silent = true }
-local term_opts = { silent = true }
-
--- crimes against humanity, but I don't care
-map("n", "j", "h", opts)
-map("n", "l", "k", opts)
-map("n", "k", "j", opts)
-map("n", ";", "l", opts)
-map("v", "j", "h", opts)
-map("v", "k", "j", opts)
-map("v", "l", "k", opts)
-map("v", ";", "l", opts)
-
--- test plugin
-map("n", "OO", ':lua require("test_plugin").test()', { desc = "Toggle breakpoint" })
-
--- debug
-map("n", "db", ':lua require("dap").toggle_breakpoint()', { desc = "Toggle breakpoint" })
-map("n", "do", ':lua require("dap").step_over()', { desc = "Step over" })
-map("n", "di", ':lua require("dap").step_into()', { desc = "Step into" })
-map("n", "dc", ':lua require("dap").continue()', { desc = "Continue" })
-map("n", "du", function()
- require("dapui").toggle()
-end, { desc = "Toggle DAP UI" })
-map("n", "de", function()
- require("dapui").eval()
-end, { desc = "DAP Eval" })
-
--- window movement
-map("n", "", [[wincmd h]], opts)
-map("n", "", [[wincmd l]], opts)
-map("n", "", [[wincmd j]], opts)
-map("i", "", [[wincmd h]], opts)
-map("i", "", [[wincmd l]], opts)
-map("i", "", [[wincmd j]], opts)
-
--- toggle terminal
-local lazyterm = function()
- Util.terminal(nil, { cwd = Util.root(), esc_esc = false, ctrl_hjkl = false })
-end
-map("n", "", lazyterm, { desc = "Terminal (root dir)" })
-map("t", "", "close", { desc = "Hide Terminal" })
-
--- semicolon thing
--- map("i","" ,"A;", {desc = "add semi and newline"})
--- map("i","" ,"A;", {desc = "add semi"})
-map("n", "m", "$a;", { desc = "add semi and newline" })
-map("n", "n", "$a;", { desc = "add semi" })
-
--- tab switching
-map("n", "", ":BufferLineCyclePrev", opts)
-map("n", "", ":BufferLineCycleNext", opts)
-
--- git
-map("n", "gq", function()
- require("telescope.builtin").git_commits()
-end, { desc = "Commits" })
-map("n", "gw", function()
- require("telescope.builtin").git_bcommits()
-end, { desc = "Commits in branch" })
-map("n", "gb", function()
- require("telescope.builtin").git_branches()
-end, { desc = "Branches" })
-map("n", "gr", function()
- require("telescope.builtin").git_status()
-end, { desc = "Git status" })
-map("n", "ga", function()
- require("telescope.builtin").git_stash()
-end, { desc = "Git stash" })
-map("n", "gg", function()
- Util.terminal({ "gitui" }, { cwd = Util.root() })
-end, { desc = "gitui (root dir)" })
-map("n", "gG", function()
- Util.terminal({ "gitui" })
-end, { desc = "gitui (cwd)" })
-map("n", "gB", function()
- require("gitblame")
- vim.cmd(":GitBlameToggle")
-end, { desc = "git blame" })
-
--- harpoon man
-map("n", "h1", function()
- require("harpoon.ui").nav_file(1)
-end, { desc = "First Harpoon File" })
-map("n", "h2", function()
- require("harpoon.ui").nav_file(2)
-end, { desc = "Second Harpoon File" })
-map("n", "h3", function()
- require("harpoon.ui").nav_file(3)
-end, { desc = "First Harpoon File" })
-map("n", "ha", function()
- require("harpoon.mark").add_file()
-end, { desc = "First Harpoon File" })
-map("n", "hd", function()
- require("harpoon.mark").remove_file()
-end, { desc = "First Harpoon File" })
-map("n", "hm", ":Telescope harpoon marks", { noremap = true, silent = true, desc = "Show harpoon marks" })
-
--- telescope
-map("n", "fb", function()
- require("telescope").extensions.file_browser.file_browser({})
-end, { desc = "File Browser" })
-map("n", "ff", function()
- require("telescope.builtin").find_files()
-end, { desc = "Find Files" })
-map("n", "fg", function()
- Live_grep_from_project_git_root()
-end, { desc = "Live Grep (root)" })
-map("n", "fG", function()
- require("telescope.builtin").live_grep()
-end, { desc = "Live Grep (cwd)" })
-map("n", "fh", function()
- require("telescope.builtin").help_tags()
-end, { desc = "Help" })
-map("n", "fp", function()
- require("telescope").extensions.project.project({})
-end, { noremap = true, silent = true, desc = "Projects" })
-map("n", "z", function()
- require("telescope").extensions.zoxide.list({})
-end, { desc = "Zoxide" })
-
--- neoscroll
-local t = {}
-t[""] = { "scroll", { "-vim.wo.scroll", "true", "250" } }
-t[""] = { "scroll", { "vim.wo.scroll", "true", "250" } }
-require("neoscroll.config").set_mappings(t)
-
--- trouble
-map("n", "t", "TroubleToggle", term_opts)
-
--- format
-map({ "n", "v" }, "", function()
- Util.format({ force = true })
-end, { desc = "Format" })
-
--- better yank
-function Better_yank(opts)
- local current_line = unpack(vim.api.nvim_win_get_cursor(0))
- vim.api.nvim_command(current_line .. "," .. (opts.count - (current_line - 1)) .. "y")
-end
-
-vim.api.nvim_create_user_command("BetterYank", Better_yank, { count = 1 })
-map("n", "by", ":BetterYank", term_opts)
-
--- better delete
-function Better_delete(opts)
- local current_line = unpack(vim.api.nvim_win_get_cursor(0))
- vim.api.nvim_command(current_line .. "," .. (opts.count - (current_line - 1)) .. "d")
-end
-
-vim.api.nvim_create_user_command("BetterDelete", Better_delete, { count = 1 })
-map("n", "bd", ":BetterDelete", term_opts)
-
--- neovide zoom
-local change_scale_factor = function(delta)
- vim.g.neovide_scale_factor = vim.g.neovide_scale_factor * delta
-end
-vim.keymap.set("n", "", function()
- change_scale_factor(1.25)
-end)
-vim.keymap.set("n", "", function()
- change_scale_factor(1 / 1.25)
-end)
-
--- neovide paste
-vim.g.neovide_input_use_logo = 1
-vim.api.nvim_set_keymap("i", "", "pI", { noremap = true, silent = true })
-
-function Get_git_root()
- local opts = {}
- local function is_git_repo()
- vim.fn.system("git rev-parse --is-inside-work-tree")
-
- return vim.v.shell_error == 0
- end
- if is_git_repo() then
- local dot_git_path = vim.fn.finddir(".git", ".;")
- local root = vim.fn.fnamemodify(dot_git_path, ":h")
- opts = {
- cwd = root,
- }
- end
- return opts
-end
-
-function Live_grep_from_project_git_root()
- local opts = Get_git_root()
- require("telescope.builtin").live_grep(opts)
-end
-
diff --git a/nix/programs/nvim/lua/config/lazy.lua b/nix/programs/nvim/lua/config/lazy.lua
deleted file mode 100644
index 858e048..0000000
--- a/nix/programs/nvim/lua/config/lazy.lua
+++ /dev/null
@@ -1,56 +0,0 @@
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
- vim.fn.system({
- "git",
- "clone",
- "--filter=blob:none",
- "https://github.com/folke/lazy.nvim.git",
- "--branch=stable",
- lazypath,
- })
-end
-vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
-
-require("lazy").setup({
- spec = {
- { "LazyVim/LazyVim", import = "lazyvim.plugins" },
- { import = "lazyvim.plugins.extras.ui.alpha" },
- -- { import = "lazyvim.plugins.extras.ui.edgy" },
- { import = "plugins" },
- { import = "plugins.plugins" },
- { import = "lazyvim.plugins.extras.lang.rust" },
- { import = "lazyvim.plugins.extras.lang.tailwind" },
- { import = "lazyvim.plugins.extras.lang.java" },
- { import = "lazyvim.plugins.extras.lang.go" },
- { import = "lazyvim.plugins.extras.lang.clangd" },
- { import = "lazyvim.plugins.extras.lang.typescript" },
- { import = "lazyvim.plugins.extras.lang.python" },
- { import = "lazyvim.plugins.extras.lang.markdown" },
- { import = "lazyvim.plugins.extras.lang.cmake" },
- { import = "lazyvim.plugins.extras.lang.omnisharp" },
- { import = "lazyvim.plugins.extras.lang.json" },
- { import = "lazyvim.plugins.extras.lang.tex" },
- { import = "lazyvim.plugins.extras.util.dot" },
- { import = "lazyvim.plugins.extras.dap.core" },
- { import = "lazyvim.plugins.extras.test.core" },
- },
- defaults = {
- lazy = true,
- version = false,
- },
- install = { colorscheme = { "tokyonight", "catppuccin-mocha" } },
- checker = { enabled = true, notify = false },
- change_detection = { enabled = true, notify = false },
- performance = {
- rtp = {
- disabled_plugins = {
- "gzip",
- "netrw",
- "tarPlugin",
- "tohtml",
- "tutor",
- "zipPlugin",
- },
- },
- },
-})
diff --git a/nix/programs/nvim/lua/config/lsp-keymap.lua b/nix/programs/nvim/lua/config/lsp-keymap.lua
deleted file mode 100644
index df316e9..0000000
--- a/nix/programs/nvim/lua/config/lsp-keymap.lua
+++ /dev/null
@@ -1,126 +0,0 @@
-local M = {}
-
----@type PluginLspKeys
-M._keys = nil
-
----@return (LazyKeys|{has?:string})[]
-function M.get()
- local format = function()
- require("lazyvim.util").format({ force = true })
- end
- if not M._keys then
- ---@class PluginLspKeys
- M._keys = {
- { "cld", vim.diagnostic.open_float, desc = "Line Diagnostics" },
- { "cl", "LspInfo", desc = "Lsp Info" },
- { "ca", "Telescope lsp_definitions", desc = "Goto Definition", has = "definition" },
- { "cs", "Telescope lsp_references", desc = "References" },
- { "cA", vim.lsp.buf.declaration, desc = "Goto Declaration" },
- { "cf", "Telescope lsp_implementations", desc = "Goto Implementation" },
- { "cd", "Telescope lsp_type_definitions", desc = "Goto Type Definition" },
- { "ce", vim.lsp.buf.hover, desc = "Hover" },
- { "cw", vim.lsp.buf.signature_help, desc = "Signature Help", has = "signatureHelp" },
- { "", vim.lsp.buf.signature_help, mode = "i", desc = "Signature Help", has = "signatureHelp" },
- { "]d", M.diagnostic_goto(true), desc = "Next Diagnostic" },
- { "[d", M.diagnostic_goto(false), desc = "Prev Diagnostic" },
- { "]e", M.diagnostic_goto(true, "ERROR"), desc = "Next Error" },
- { "[e", M.diagnostic_goto(false, "ERROR"), desc = "Prev Error" },
- { "]w", M.diagnostic_goto(true, "WARN"), desc = "Next Warning" },
- { "[w", M.diagnostic_goto(false, "WARN"), desc = "Prev Warning" },
- { "", format, desc = "Format Range", mode = "v", has = "documentRangeFormatting" },
- { "cr", ":IncRename ", desc = "Rename", has = "rename" },
- {
- "cq",
- function()
- vim.lsp.buf.code_action({
- context = {
- only = {
- "quickfix",
- "quickfix.ltex",
- "source",
- "source.fixAll",
- "source.organizeImports",
- "",
- },
- },
- })
- end,
- desc = "Fix",
- mode = { "n", "v" },
- has = "codeAction",
- },
- {
- "cQ",
- function()
- vim.lsp.buf.code_action({
- context = {
- only = {
- "refactor",
- "refactor.inline",
- "refactor.extract",
- "refactor.rewrite",
- },
- },
- })
- end,
- desc = "Refactor",
- mode = { "n", "v" },
- has = "codeAction",
- },
- }
- end
- return M._keys
-end
-
----@param method string
-function M.has(buffer, method)
- method = method:find("/") and method or "textDocument/" .. method
- local clients = require("lazyvim.util").lsp.get_clients({ bufnr = buffer })
- for _, client in ipairs(clients) do
- if client.supports_method(method) then
- return true
- end
- end
- return false
-end
-
----@return (LazyKeys|{has?:string})[]
-function M.resolve(buffer)
- local Keys = require("lazy.core.handler.keys")
- if not Keys.resolve then
- return {}
- end
- local spec = M.get()
- local opts = require("lazyvim.util").opts("nvim-lspconfig")
- local clients = require("lazyvim.util").lsp.get_clients({ bufnr = buffer })
- for _, client in ipairs(clients) do
- local maps = opts.servers[client.name] and opts.servers[client.name].keys or {}
- vim.list_extend(spec, maps)
- end
- return Keys.resolve(spec)
-end
-
-function M.on_attach(_, buffer)
- local Keys = require("lazy.core.handler.keys")
- local keymaps = M.resolve(buffer)
-
- for _, keys in pairs(keymaps) do
- if not keys.has or M.has(buffer, keys.has) then
- local opts = Keys.opts(keys)
- opts.has = nil
- opts.silent = opts.silent ~= false
- opts.buffer = buffer
- vim.keymap.set(keys.mode or "n", keys.lhs, keys.rhs, opts)
- end
- end
-end
-
-function M.diagnostic_goto(next, severity)
- local go = next and vim.diagnostic.goto_next or vim.diagnostic.goto_prev
- severity = severity and vim.diagnostic.severity[severity] or nil
- return function()
- go({ severity = severity })
- end
-end
-
-return M
diff --git a/nix/programs/nvim/lua/config/options.lua b/nix/programs/nvim/lua/config/options.lua
deleted file mode 100644
index e9c9543..0000000
--- a/nix/programs/nvim/lua/config/options.lua
+++ /dev/null
@@ -1,33 +0,0 @@
--- Options are automatically loaded before lazy.nvim startup
--- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
--- Add any additional options here
-local options = {
- fileencoding = "utf-8",
- number = true,
- showmode = true,
- termguicolors = true,
- spelllang = "en_us",
- shell = "fish",
- relativenumber = false,
- scrolloff = 5,
- scrolljump = 5,
- wrap = false,
-}
-vim.filetype.add({
- extension = {
- typst = "typst",
- typ = "typst",
- },
-})
-vim.o.guifont = "JetBrainsMono Nerd Font:h14"
-vim.g.neovide_refresh_rate_idle = 180
-vim.g.neovide_refresh_rate_idle = 5
-vim.g.neovide_hide_mouse_when_typing = true
-vim.g.mkdp_browser = "/usr/bin/firefox"
-vim.g.mkdp_auto_start = 1
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-vim.g.autoformat = false
-for k, v in pairs(options) do
- vim.opt[k] = v
-end
diff --git a/nix/programs/nvim/lua/plugins/cmp.lua b/nix/programs/nvim/lua/plugins/cmp.lua
deleted file mode 100644
index d8650fc..0000000
--- a/nix/programs/nvim/lua/plugins/cmp.lua
+++ /dev/null
@@ -1,144 +0,0 @@
-return {
- {
- "L3MON4D3/LuaSnip",
- build = (not jit.os:find("Windows"))
- and "echo -e 'NOTE: jsregexp is optional, so not a big deal if it fails to build\n'; make install_jsregexp"
- or nil,
- dependencies = {
- "rafamadriz/friendly-snippets",
- config = function()
- require("luasnip.loaders.from_vscode").lazy_load()
- end,
- },
- opts = {
- history = true,
- delete_check_events = "TextChanged",
- updateevents = "TextChanged,TextChangedI",
- enable_autosnippets = true,
- },
- keys = function()
- return {}
- end,
- config = function(_, opts)
- require("luasnip").setup(opts)
- end,
- },
- {
- "hrsh7th/nvim-cmp",
- version = false,
- event = "InsertEnter",
- dependencies = {
- "hrsh7th/cmp-nvim-lsp",
- "hrsh7th/cmp-buffer",
- "FelipeLema/cmp-async-path",
- "saadparwaiz1/cmp_luasnip",
- "Saecki/crates.nvim",
- { "roobert/tailwindcss-colorizer-cmp.nvim", config = true },
- },
- opts = function()
- vim.api.nvim_set_hl(0, "CmpGhostText", { link = "Comment", default = true })
- local cmp = require("cmp")
- local defaults = require("cmp.config.default")()
- local luasnip = require("luasnip")
- local compare = require("cmp.config.compare")
- return {
- preselect = cmp.PreselectMode.None,
- completion = {
- -- completeopt = "menu,menuone,noinsert",
- },
- snippet = {
- expand = function(args)
- luasnip.lsp_expand(args.body)
- end,
- },
- mapping = {
- [""] = cmp.mapping.scroll_docs(-4),
- [""] = cmp.mapping.scroll_docs(4),
- [""] = cmp.mapping.complete(),
- [""] = cmp.mapping.abort(),
- [""] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
- [""] = cmp.mapping.confirm({
- behavior = cmp.ConfirmBehavior.Replace,
- select = false,
- }), -- Accept cur
- [""] = cmp.mapping(function(fallback)
- if cmp.visible() then
- cmp.select_next_item({ behavior = cmp.SelectBehavior.Insert })
- else
- fallback()
- end
- end, { "i", "s" }),
- [""] = cmp.mapping(function(fallback)
- if cmp.visible() then
- cmp.select_prev_item({ behavior = cmp.SelectBehavior.Insert })
- else
- fallback()
- end
- end, {
- "i",
- "s",
- }),
- [""] = cmp.mapping(function(fallback)
- if luasnip.expandable() then
- luasnip.expand()
- elseif luasnip.expand_or_jumpable() then
- luasnip.expand_or_jump()
- else
- fallback()
- end
- end, {
- "i",
- "s",
- }),
- [""] = cmp.mapping(function(fallback)
- if luasnip.expand_or_jumpable(-1) then
- luasnip.jump(-1)
- else
- fallback()
- end
- end, {
- "i",
- "s",
- }),
- },
- sources = cmp.config.sources({
- { name = "nvim_lsp", priority = 99 },
- { name = "luasnip", priority = 3, max_item_count = 3 },
- { name = "buffer", priority = 2, max_item_count = 2, keyword_length = 5 },
- { name = "async_path", priority = 1, max_item_count = 2, keyword_length = 3, trigger_characters = {} },
- { name = "crates" },
- }),
- sorting = {
- priority_weight = 90,
- comparators = {
- compare.exact,
- compare.score,
- compare.offset,
- compare.kind,
- },
- },
- formatting = {
- preselect = cmp.PreselectMode.None,
- format = function(entry, item)
- local icons = require("lazyvim.config").icons.kinds
- if icons[item.kind] then
- item.kind = icons[item.kind] .. item.kind
- end
- return require("tailwindcss-colorizer-cmp").formatter(entry, item)
- end,
- },
- experimental = {
- ghost_text = {
- hl_group = "CmpGhostText",
- },
- },
- }
- end,
- config = function(_, opts)
- local cmp = require("cmp")
- require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets" })
- cmp.setup(opts)
- end,
- },
-}
-
diff --git a/nix/programs/nvim/lua/plugins/dashboard.lua b/nix/programs/nvim/lua/plugins/dashboard.lua
deleted file mode 100644
index 82715ad..0000000
--- a/nix/programs/nvim/lua/plugins/dashboard.lua
+++ /dev/null
@@ -1,100 +0,0 @@
-return {
- {
- "goolord/alpha-nvim",
- event = "VimEnter",
- opts = function()
- local alpha = require("alpha")
- local dashboard = require("alpha.themes.dashboard")
- dashboard.section.header.val = {
- [[ _______ ___ _______. __ __ __ _______ ]],
- [[| \ / \ / || | | | | | | ____|]],
- [[| .--. | / ^ \ | (----`| |__| | | | | |__ ]],
- [[| | | | / /_\ \ \ \ | __ | | | | __| ]],
- [[| '--' | / _____ \ .----) | | | | | | | | |____ ]],
- [[|_______/ /__/ \__\ |_______/ |__| |__| |__| |_______|]],
- [[ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⢤⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ]],
- [[ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠪⣍⣒⠒⠦⠤⠤⠤⠄⠠⡜⡐⠁⠪⡢⡀⠀⠀⠀⠀⠀⠀⠀⠀⣀⠤⢄⠀⠀⠀⠀⠀⠀⠀ ]],
- [[ ⠀⠀⠀⠈⠛⠯⣉⠁⣐⣂⠐⠮⠥⠟⣓⣲⣾⣿⣿⣿⣶⡃⠀⠀⠈⢞⢆⠀⠀⠀⠀⠀⠀⡰⢁⠂⠄⣇⠀⠀⠀⠀⠀⠀ ]],
- [[ ⠀⠀⠀⠀⣠⠤⠤⠭⠷⠎⡡⠔⠒⠘⠀⢹⣿⣿⣿⣿⣿⠀⠈⠀⠀⠀⢢⢣⠀⠀⠀⠀⢀⡇⠈⠀⢰⢰⠀⠀⠀⠀⠀⠀ ]],
- [[ ⠀⠀⠀⢸⢰⠀⠀⠀⡩⢋⣀⣤⣤⣤⣤⣤⣿⣿⠟⠿⣿⡀⠀⠀⠀⠀⠀⠆⢳⠀⠀⠀⢸⠀⠂⠀⠀⡈⡆⠀⠀⠀⠀⠀ ]],
- [[ ⠀⠀⠀⠀⢣⢂⠀⠮⡪⠛⠉⢋⠝⠻⢿⢿⡿⢁⠔⢋⣸⠇⠀⠀⠀⠀⠀⡘⣆⢣⠀⠀⡼⠀⠀⠀⠀⡇⣇⠀⠀⠀⠀⠀ ]],
- [[ ⠀⠀⠀⠀⠀⡣⢲⡊⠀⠀⠀⠀⠀⡴⠃⣼⠡⢪⠔⠋⠀⠀⠀⢀⠀⠀⠀⢸⣿⡄⢆⠀⡇⠀⠀⠀⠀⠁⢸⠀⠀⠀⠀⠀ ]],
- [[ ⠀⠀⠀⠀⢰⢡⡇⠀⠀⢀⠔⠠⠊⣰⠞⡇⢠⠃⠀⣠⣶⣿⣷⣷⣷⠄⠀⠈⡟⣷⡸⡄⡇⠀⠀⠀⠀⠀⢸⠀⠀⠀⠀⠀ ]],
- [[ ⠀⠀⠀⠀⡇⣾⠀⣀⠔⣁⣤⣦⢺⣿⡆⡆⡃⠀⢨⠃⢸⣿⣿⣿⠏⠀⠠⢀⢠⣿⡇⣧⡇⠀⠀⠀⠀⠀⢸⣆⢔⡲⡆⠀ ]],
- [[ ⠀⠀⣠⠞⠼⠧⢙⡒⣾⣿⣿⡷⡘⣟⣷⣜⡃⠀⡼⠀⠀⠷⠗⠋⠀⠀⠀⢀⡟⣿⣿⢀⠓⠀⠀⠀⠀⠀⢸⢋⠊⠀⡇⠀ ]],
- [[ ⠘⠛⠒⠒⠉⠉⠁⡇⣿⣽⣿⡇⠈⢹⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡀⣠⠟⠀⣷⣿⣇⠱⡀⠀⠀⠀⡄⢀⠃⠀⡄⡇⠀ ]],
- [[ ⠀⠀⠀⠀⠀⠀⠀⡇⢸⣏⢀⣧⠀⠈⠆⠀⠀⠀⠀⠀⠀⠀⠀⡠⢊⡴⡟⠀⡼⢁⢸⡙⣠⠁⠀⠀⠀⢇⠆⠀⢀⢳⡇⠀ ]],
- [[ ⠀⠀⠀⠀⠀⠀⠀⢳⢀⣵⢸⣯⣷⣤⣀⠀⠀⠀⠀⠀⢀⣐⠮⠔⡎⠘⠀⠈⢀⢮⣿⣷⠁⠇⠠⠀⢰⠎⠀⠀⡘⣸⠀⠀ ]],
- [[ ⠀⠀⠀⠀⠀⠀⢀⠎⢬⢘⣯⠛⢻⠏⣿⣿⣶⣶⡶⠋⠉⠀⠀⢸⠀⠀⡔⠀⣪⣿⣿⢻⠀⠸⠈⡇⠛⠀⠠⢀⢃⡇⠀⠀ ]],
- [[ ⠀⠀⠀⠀⠀⠈⡹⡡⣪⡏⠛⠀⠀⢠⡟⢻⣿⣿⡇⠀⠀⠀⠀⢼⡆⠠⡇⢰⣿⣿⣿⣻⡄⠀⡆⠁⠀⣠⠃⠌⠼⠤⠤⡀ ]],
- [[ ⠀⠀⠀⣀⡠⢞⣳⣽⢸⡇⠀⡇⠀⠸⠀⣼⣿⣿⡇⠀⠀⠀⠀⠈⡇⣰⠃⣶⡍⣼⣿⣏⠃⠀⠁⢠⠊⣀⣜⠤⠐⢂⢆⠇ ]],
- [[ ⠀⠀⠈⠉⠉⠁⠀⢇⢸⡟⠀⡇⠀⡇⢸⢷⣹⣿⡇⠀⠀⠀⠀⠀⢳⡽⠃⡞⣇⣿⣧⣿⠀⠀⢸⠃⢠⠃⠀⢀⠤⢢⠞⠀ ]],
- [[ ⠀⠀⠀⠀⠀⠀⠀⢸⡀⡇⠀⠁⢠⠁⣿⠈⣿⣿⠇⠀⠀⠀⠀⠀⠀⠁⡆⡇⣾⠿⣹⣿⠀⠀⠃⡰⠃⡰⢔⣡⠞⠁⠀⠀ ]],
- [[ ⠀⠀⠀⠀⠀⠀⠀⠀⢇⢠⠀⠂⡌⠀⢽⠁⣟⡟⠀⠀⠀⠀⠀⠀⠀⠀⣇⢶⢹⣤⣿⠇⠀⣀⣈⠝⡱⠒⠉⠀⠀⠀⠀⠀ ]],
- [[ ⠀⠀⠀⠀⠀⠀⠀⠀⠈⣎⡄⠀⡷⠀⢸⠀⢹⠇⠀⠀⠀⠀⠀⠀⠀⠀⠫⣼⣾⣿⢋⠤⠤⠥⢆⡞⠀⠀⠀⠀⠀⠀⠀⠀ ]],
- [[ ⠀⠀⠀⠀⠀⠀⠀⠀⢀⢫⣡⢸⠎⢃⢘⠀⢈⡄⠀⠀⠀⠀⠀⠀⠀⠀⢀⡽⣽⢀⡋⠉⠑⠉⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀ ]],
- [[ ⠀⠀⠀⠀⠀⠀⠀⠀⠘⠉⠳⡯⣇⢆⠻⣆⠈⣤⠀⠀⠀⠀⣀⡀⠤⢚⡨⠷⣝⠗⠑⢄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ]],
- [[ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠫⣗⠳⡜⠵⠀⡍⡥⠤⠤⠤⠄⠒⠉⠀⠀⠀⠉⠉⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ]],
- [[ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⠫⡆⣇⠇⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ]],
- [[ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢰⡙⡰⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ]],
- [[ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣦⠞⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ]],
- }
- dashboard.section.buttons.val = {
- dashboard.button("f", " Find file", ":lua require('telescope.builtin').find_files()"),
- dashboard.button("y", " Yazi", ":lua require('yazi').yazi()"),
- dashboard.button("p", " Find project", ":lua require('telescope').extensions.project.project{}"),
- dashboard.button("t", " Zoxide", ":lua require('telescope').extensions.zoxide.list{}"),
- dashboard.button("c", " Configuration", ":e ~/.config/nvim/init.lua "),
- dashboard.button("q", " Quit Neovim", ":qa"),
- }
-
- local function footer()
- return "dashie@dashie.org"
- end
-
- dashboard.section.footer.val = footer()
-
- dashboard.section.footer.opts.hl = "Type"
- dashboard.section.header.opts.hl = "Include"
- dashboard.section.buttons.opts.hl = "Keyword"
-
- dashboard.opts.opts.noautocmd = true
-
- -- alpha.pad_margin(dashboard.section.header.val, dashboard.opts , 0, 0)
- alpha.setup(dashboard.opts)
- end,
- config = function(_, dashboard)
- -- close Lazy and re-open when the dashboard is ready
- if vim.o.filetype == "lazy" then
- vim.cmd.close()
- vim.api.nvim_create_autocmd("User", {
- pattern = "AlphaReady",
- callback = function()
- require("lazy").show()
- end,
- })
- end
-
- require("alpha").setup({
- layout = {
- { type = "padding", val = 1 },
- dashboard.section.header,
- { type = "padding", val = 1 },
- dashboard.section.buttons,
- { type = "padding", val = 1 },
- dashboard.section.footer,
- },
- })
-
- vim.api.nvim_create_autocmd("User", {
- pattern = "LazyVimStarted",
- callback = function()
- local stats = require("lazy").stats()
- local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100)
- dashboard.section.footer.val = "⚡ Neovim loaded " .. stats.count .. " plugins in " .. ms .. "ms"
- pcall(vim.cmd.AlphaRedraw)
- end,
- })
- end,
- },
-}
diff --git a/nix/programs/nvim/lua/plugins/disabled.lua b/nix/programs/nvim/lua/plugins/disabled.lua
deleted file mode 100644
index 76dc307..0000000
--- a/nix/programs/nvim/lua/plugins/disabled.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
- {
- { "rcarriga/nvim-notify", enabled = false },
- },
- { { "folke/noice.nvim", enabled = false } },
- { { "nvimtools/none-ls.nvim", enabled = false } },
- { { "nvimdev/dashboard-nvim", enabled = false } },
- { { "nvim-neo-tree/neo-tree.nvim", enabled = false } },
-}
diff --git a/nix/programs/nvim/lua/plugins/lsp.lua b/nix/programs/nvim/lua/plugins/lsp.lua
deleted file mode 100644
index 52f7d55..0000000
--- a/nix/programs/nvim/lua/plugins/lsp.lua
+++ /dev/null
@@ -1,169 +0,0 @@
-return {
- {
- "williamboman/mason.nvim",
- --opts = function()
- -- return {
- -- ensure_installed = {},
- -- }
- --end,
- },
- {
- "neovim/nvim-lspconfig",
- ---@class PluginLspOpts
- opts = {
- -- inlay_hints = {
- -- enabled = true,
- -- },
- format_notify = false,
- -- LSP Server Settings
- ---@type lspconfig.options
- servers = {
- rust_analyzer = {
- mason = false,
- },
- marksman = {
- mason = false,
- },
- clangd = {
- mason = false,
- },
- jdtls = {
- mason = false,
- },
- gopls = {
- mason = false,
- },
- pyright = {
- mason = false,
- },
- ruff_lsp = {
- mason = false,
- },
- texlab = {
- mason = false,
- },
- taplo = {
- keys = {
- {
- "K",
- function()
- if vim.fn.expand("%:t") == "Cargo.toml" and require("crates").popup_available() then
- require("crates").show_popup()
- else
- vim.lsp.buf.hover()
- end
- end,
- desc = "Show Crate Documentation",
- },
- },
- mason = false,
- },
- bashls = {
- mason = false,
- },
- ansiblels = {
- mason = false,
- },
- omnisharp = {
- mason = false,
- cmd = { "OmniSharp" },
- },
- typst_lsp = {
- settings = {
- experimentalFormatterMode = "on",
- exportPdf = "onSave",
- },
- mason = false,
- },
- nil_ls = {
- settings = {
- ["nil"] = {
- formatting = {
- command = { "nixpkgs-fmt" },
- },
- },
- },
- mason = false,
- },
- ltex = {
- settings = {
- ltex = {
- checkFrequency = "save",
- },
- },
- filetypes = {
- "bib",
- "gitcommit",
- "markdown",
- "org",
- "plaintex",
- "rst",
- "rnoweb",
- "tex",
- "pandoc",
- "typst",
- "typ",
- },
- mason = false,
- },
- sqlls = {
- mason = false,
- },
- lemminx = {
- mason = false,
- },
- opencl_ls = {
- mason = false,
- },
- yamlls = {
- mason = false,
- },
- lua_ls = {
- mason = false,
- {
- Lua = {
- workspace = {
- checkThirdParty = false,
- },
- completion = {
- callSnippet = "Replace",
- },
- },
- },
- },
- },
- },
- init = function()
- local keys = require("lazyvim.plugins.lsp.keymaps").get()
- local my_keys = require("config.lsp-keymap").get()
- local count = 0
- for _ in pairs(my_keys) do
- keys[#keys + 1] = my_keys[count]
- count = count + 1
- end
- end,
- },
- {
- "stevearc/conform.nvim",
- opts = {
- keys = {
- {
- -- Customize or remove this keymap to your liking
- "cF",
- function()
- require("conform").format({ async = true, lsp_fallback = true })
- end,
- mode = "",
- desc = "Format buffer",
- },
- },
- formatters_by_ft = {
- typst = { "typstfmt" },
- nix = { "nixpkgs-fmt" },
- lua = { "stylua" },
- sh = { "shfmt" },
- cs = { "dotnet-csharpier" },
- },
- },
- },
-}
diff --git a/nix/programs/nvim/lua/plugins/plugins.lua b/nix/programs/nvim/lua/plugins/plugins.lua
deleted file mode 100644
index 8c0b441..0000000
--- a/nix/programs/nvim/lua/plugins/plugins.lua
+++ /dev/null
@@ -1,276 +0,0 @@
-local Util = require("lazyvim.util")
-
-return {
- {
- "LazyVim/LazyVim",
- opts = {
- colorscheme = "tokyonight-night",
- -- colorscheme = "catppuccin-mocha",
- },
- },
- {
- "nvim-telescope/telescope.nvim",
- cmd = "Telescope",
- keys = function()
- return {}
- end,
- opts = {
- defaults = {
- layout_strategy = "flex",
- layout_config = {
- flex = {
- height = 0.95,
- width = 0.95,
- flip_columns = 100,
- },
- vertical = { preview_height = 0.5, preview_cutoff = 5 },
- horizontal = { preview_width = 0.7, preview_cutoff = 99 },
- },
- },
- },
- },
- {
- "nvim-telescope/telescope-project.nvim",
- lazy = true,
- },
- {
- "nvim-telescope/telescope-file-browser.nvim",
- lazy = true,
- config = function()
- require("telescope").load_extension("file_browser")
- end,
- },
- {
- "jvgrootveld/telescope-zoxide",
- lazy = true,
- config = function()
- local z_utils = require("telescope._extensions.zoxide.utils")
- local t = require("telescope")
- -- Configure the extension
- t.setup({
- extensions = {
- zoxide = {
- prompt_title = "[ Queries ]",
- mappings = {
- default = {
- after_action = function(selection)
- print("Update to (" .. selection.z_score .. ") " .. selection.path)
- end,
- },
- [""] = {
- before_action = function(selection)
- print("before C-s")
- end,
- action = function(selection)
- vim.cmd("edit " .. selection.path)
- end,
- },
- [""] = { action = z_utils.create_basic_command("split") },
- },
- },
- },
- })
-
- -- Load the extension
- t.load_extension("zoxide")
- end,
- },
- {
- "lervag/vimtex",
- config = function()
- vim.cmd("let g:vimtex_quickfix_mode=0")
- vim.cmd("let g:vimtex_view_general_viewer = 'evince'")
- vim.cmd("let g:vimtex_compiler_method = 'latexmk'")
- vim.cmd(
- "let g:vimtex_compiler_latexmk = {'options': ['-pdf', '-shell-escape', '-file-line-error', '--extra-mem-bot=10000000', '-synctex=1', '-interaction=nonstopmode',],}"
- )
- end,
- },
- {
- "jbyuki/instant.nvim",
- config = function()
- vim.cmd("let g:instant_username = 'dashie'")
- end,
- },
- {
- "nvim-treesitter/nvim-treesitter",
- opts = {
- textobjects = {
- select = {
- enable = true,
- lookahead = true,
- keymaps = {
- -- You can use the capture groups defined in textobjects.scm
- ["af"] = "@function.outer",
- ["if"] = "@function.inner",
- ["ac"] = "@class.outer",
- ["ic"] = "@class.inner",
- },
- },
- },
- },
- },
- {
- "karb94/neoscroll.nvim",
- config = function()
- require("neoscroll").setup()
- end,
- },
- {
- "kaarmu/typst.vim",
- lazy = true,
- event = "FileType typst",
- },
- {
- "folke/which-key.nvim",
- event = "VeryLazy",
- opts = {
- plugins = { spelling = true },
- defaults = {
- mode = { "n", "v" },
- ["g"] = { name = "+goto" },
- ["gz"] = { name = "+surround" },
- ["]"] = { name = "+next" },
- ["["] = { name = "+prev" },
- [""] = { name = "+tabs" },
- ["b"] = { name = "+buffer" },
- ["c"] = { name = "+code" },
- ["f"] = { name = "+file/find" },
- ["g"] = { name = "+git" },
- ["gh"] = { name = "+hunks" },
- ["q"] = { name = "+quit/session" },
- ["s"] = { name = "+search" },
- ["u"] = { name = "+ui" },
- ["w"] = { name = "+windows" },
- ["x"] = { name = "+diagnostics/quickfix" },
- ["h"] = { name = "+harpoon" },
- ["d"] = { name = "+DAP" },
- },
- },
- config = function(_, opts)
- local wk = require("which-key")
- wk.setup(opts)
- wk.register(opts.defaults)
- end,
- },
- {
- "f-person/git-blame.nvim",
- lazy = true,
- },
- {
- "mg979/vim-visual-multi",
- },
- {
- "barreiroleo/ltex_extra.nvim",
- ft = { "markdown", "tex", "typst", "typ" },
- lazy = true,
- },
- {
- "smjonas/inc-rename.nvim",
- lazy = true,
- event = "BufEnter",
- config = function()
- require("inc_rename").setup({
- cmd_name = "IncRename", -- the name of the command
- hl_group = "Substitute", -- the highlight group used for highlighting the identifier's new name
- preview_empty_name = true, -- whether an empty new name should be previewed; if false the command preview will be cancelled instead
- show_message = true, -- whether to display a `Renamed m instances in n files` message after a rename operation
- input_buffer_type = nil, -- the type of the external input buffer to use (the only supported value is currently "dressing")
- post_hook = nil, -- callback to run after renaming, receives the result table (from LSP handler) as an argument
- })
- end,
- },
- {
- "nvim-tree/nvim-tree.lua",
- dependencies = { "nvim-tree/nvim-web-devicons" },
- config = function()
- require("nvim-tree").setup({
- renderer = {
- group_empty = true,
- },
- view = {
- side = "right",
- },
- diagnostics = {
- enable = true,
- },
- })
- end,
- keys = {
- {
- "fe",
- function()
- require("nvim-tree.api").tree.toggle()
- end,
- desc = "Explorer NvimTree (root dir)",
- },
- {
- "fE",
- function()
- require("nvim-tree.api").tree.toggle()
- end,
- desc = "Explorer NvimTree (cwd)",
- },
- { "", "fe", desc = "Explorer NvimTree (root dir)", remap = true },
- { "", "fE", desc = "Explorer NvimTree (cwd)", remap = true },
- },
- },
- {
- "rcarriga/nvim-dap-ui",
- keys = {
- {
- "dk",
- function()
- require("dap").down()
- end,
- desc = "Down",
- },
- {
- "dl",
- function()
- require("dap").up()
- end,
- desc = "Up",
- },
- {
- "d;",
- function()
- require("dap").run_last()
- end,
- desc = "Run Last",
- },
- },
- },
- {
- "nvim-neotest/neotest",
- dependencies = {
- "rcasia/neotest-java",
- },
- opts = {
- adapters = {
- ["neotest-java"] = {
- ignore_wrapper = false, -- whether to ignore maven/gradle wrapper
- junit_jar = "/home/dashie/.local/share/nvim/mason/bin/junit-standalone.jar",
- -- default: .local/share/nvim/neotest-java/junit-platform-console-standalone-[version].jar
- },
- },
- },
- },
- {
- "DashieTM/test_plugin",
- lazy = false,
- opts = {
- what = 0,
- },
- },
- {
- "DreamMaoMao/yazi.nvim",
- dependencies = {
- "nvim-telescope/telescope.nvim",
- "nvim-lua/plenary.nvim",
- },
- keys = {
- { "fy", "Yazi