alejandra and dwm xf86 keys

This commit is contained in:
2024-04-22 08:26:49 +02:00
parent 038bc3b7e5
commit 5d6abd228e
34 changed files with 360 additions and 302 deletions

View File

@@ -83,14 +83,14 @@
specialArgs = {inherit inputs outputs;}; specialArgs = {inherit inputs outputs;};
modules = [ modules = [
# > Main NixOS configuration file < # > Main NixOS configuration file <
./hosts/zion/configuration.nix ./hosts/zion/configuration.nix
]; ];
}; };
thor = nixpkgs.lib.nixosSystem { thor = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;}; specialArgs = {inherit inputs outputs;};
modules = [ modules = [
# > Main NixOS configuration file < # > Main NixOS configuration file <
./hosts/thor/configuration.nix ./hosts/thor/configuration.nix
]; ];
}; };
}; };

View File

@@ -8,32 +8,32 @@
fgrep = "fgrep --color=auto"; fgrep = "fgrep --color=auto";
egrep = "egrep --color=auto"; egrep = "egrep --color=auto";
l="eza -G --icons"; l = "eza -G --icons";
ll="eza -l --icons"; ll = "eza -l --icons";
lg="eza -lG"; lg = "eza -lG";
lall="eza -lahF --icons --git"; lall = "eza -lahF --icons --git";
lalg="eza -laGhF --icons --git"; lalg = "eza -laGhF --icons --git";
latree="eza -laGghHT --git --icons"; latree = "eza -laGghHT --git --icons";
la = "eza -la --git --icons"; la = "eza -la --git --icons";
lsd = "eza -laD"; lsd = "eza -laD";
cls="clear"; cls = "clear";
# df="df -ahiT --total"; # df="df -ahiT --total";
userlist="cut -d: -f1 /etc/passwd"; userlist = "cut -d: -f1 /etc/passwd";
free="free -mt"; free = "free -mt";
du="du -ach | sort -h"; du = "du -ach | sort -h";
ps="ps auxf"; ps = "ps auxf";
sudo="sudo "; sudo = "sudo ";
reload="exec $SHELL -l"; reload = "exec $SHELL -l";
xclip = "xclip -selection c"; xclip = "xclip -selection c";
mkdir="mkdir -pv"; mkdir = "mkdir -pv";
psmem="ps -e -orss=,args= | sort -b -k1 -nr"; psmem = "ps -e -orss=,args= | sort -b -k1 -nr";
psmem10="ps -e -orss=,args= | sort -b -k1 -nr | head -10"; psmem10 = "ps -e -orss=,args= | sort -b -k1 -nr | head -10";
pscpu="ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr"; pscpu = "ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr";
pscpu10="ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr | head -10"; pscpu10 = "ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr | head -10";
gua = "git remote | xargs -L1 git push --all"; gua = "git remote | xargs -L1 git push --all";
}; };

View File

@@ -1,5 +1,6 @@
let cli = import ./aliases.nix; in let
{ cli = import ./aliases.nix;
in {
programs.bash = { programs.bash = {
enable = true; enable = true;
shellAliases = cli.myAliases; shellAliases = cli.myAliases;

View File

@@ -1,4 +1,8 @@
{config, pkgs, ...}: let {
config,
pkgs,
...
}: let
cli = import ../aliases.nix; cli = import ../aliases.nix;
in { in {
home.packages = with pkgs; [ home.packages = with pkgs; [

View File

@@ -1,6 +1,10 @@
{lib, pkgs, config, ...}: { {
lib,
pkgs,
config,
...
}: {
imports = [ imports = [
]; ];
# dconf.settings."org/gnome/desktop/interface".color-scheme = # dconf.settings."org/gnome/desktop/interface".color-scheme =
@@ -11,5 +15,4 @@
# else "default"; # else "default";
# xdg.portal.enable = true; # xdg.portal.enable = true;
} }

View File

@@ -2,6 +2,5 @@
services.betterlockscreen = { services.betterlockscreen = {
enable = true; enable = true;
package = pkgs.unstable.betterlockscreen; package = pkgs.unstable.betterlockscreen;
}; };
} }

View File

@@ -56,16 +56,16 @@
# xprop | grep -i 'class' # xprop | grep -i 'class'
opacity-rule = [ opacity-rule = [
"90:class_g = 'neovide'" "90:class_g = 'neovide'"
"90:class_g = 'code-oss'" "90:class_g = 'code-oss'"
"90:class_g = 'discord'" "90:class_g = 'discord'"
"90:class_g = 'Emacs'" "90:class_g = 'Emacs'"
"90:class_g = 'TelegramDesktop'" "90:class_g = 'TelegramDesktop'"
"90:class_g = 'Spotify'" "90:class_g = 'Spotify'"
"90:class_g = 'easyeffects'" "90:class_g = 'easyeffects'"
"90:class_g = 'kitty'" "90:class_g = 'kitty'"
"90:class_g = 'Nemo'" "90:class_g = 'Nemo'"
"97:class_g = 'firefox'" "97:class_g = 'firefox'"
]; ];
# Exclude conditions for background blur. # Exclude conditions for background blur.
@@ -95,5 +95,5 @@
#"nordify.glsl:class_g = 'miru'" #"nordify.glsl:class_g = 'miru'"
]; ];
}; };
}; };
} }

View File

@@ -1,4 +1,9 @@
{lib, config, pkgs, ...}: { {
lib,
config,
pkgs,
...
}: {
# enable gtk # enable gtk
gtk = { gtk = {
enable = true; enable = true;

View File

@@ -26,18 +26,18 @@ in {
xdg-desktop-portal-hyprland xdg-desktop-portal-hyprland
]; ];
# wayland.windowManger.hyprland = { # wayland.windowManger.hyprland = {
# enable = true; # enable = true;
# # package = hyprland; # # package = hyprland;
# systemd = { # systemd = {
# enable = true; # enable = true;
# # Same as default but stop graphical-session too # # Same as default but stop graphical-session too
# extraCommands = lib.mkBefore [ # extraCommands = lib.mkBefore [
# "systemctl --user stop graphical-session.target" # "systemctl --user stop graphical-session.target"
# "systemctl --user start hyprland-session.target" # "systemctl --user start hyprland-session.target"
# ]; # ];
# }; # };
# #
# #TODO: Add hyprland config # #TODO: Add hyprland config
# }; # };
} }

View File

@@ -1,6 +1,9 @@
{inputs, pkgs, ...}: { {
inputs,
nixpkgs.overlays = [ pkgs,
...
}: {
nixpkgs.overlays = [
inputs.neovim-nightly-overlay.overlay inputs.neovim-nightly-overlay.overlay
]; ];

View File

@@ -76,7 +76,7 @@
# The home.packages option allows you to install Nix packages into your # The home.packages option allows you to install Nix packages into your
# environment. # environment.
home.packages = (with pkgs; [ home.packages = with pkgs; [
# > graphics < # > graphics <
tuxpaint tuxpaint
krita krita
@@ -143,7 +143,7 @@
docker docker
docker-compose docker-compose
]); ];
services.gnome-keyring = { services.gnome-keyring = {
enable = true; enable = true;
@@ -155,7 +155,7 @@
}; };
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
}; };
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.

View File

@@ -12,9 +12,9 @@
./services.nix ./services.nix
./users.nix ./users.nix
./docker.nix ./docker.nix
./x.nix
]; ];
nixpkgs = { nixpkgs = {
# You can add overlays here # You can add overlays here
overlays = [ overlays = [

View File

@@ -19,7 +19,7 @@
randomizedDelaySec = "45min"; randomizedDelaySec = "45min";
}; };
environment.systemPackages = (with pkgs; [ environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget # wget
ntfs3g ntfs3g
@@ -27,7 +27,7 @@
unstable.nh unstable.nh
nix-output-monitor nix-output-monitor
nvd nvd
]); ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
nerdfonts nerdfonts

View File

@@ -6,9 +6,8 @@
pkgs, pkgs,
... ...
}: { }: {
# I use zsh btw # I use zsh btw
environment.shells = with pkgs; [ bash zsh ]; environment.shells = with pkgs; [bash zsh];
users.defaultUserShell = pkgs.zsh; users.defaultUserShell = pkgs.zsh;
programs.zsh.enable = true; programs.zsh.enable = true;
@@ -40,11 +39,11 @@
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
# started in user sessions. # started in user sessions.
programs.mtr.enable = true; programs.mtr.enable = true;
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
}; };
# This setups a SSH server. Very important if you're setting up a headless system. # This setups a SSH server. Very important if you're setting up a headless system.
# Feel free to remove if you don't need it. # Feel free to remove if you don't need it.

View File

@@ -14,7 +14,7 @@
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDfqPj+a2gmoUl3TuGSZxf0zRBabVWvXRrjLF7sFlqjMbfkx428F3L7C8OC3Z9XDT4ysbpgWcPuVKNtK5kkKGjSLHAgB2CgvD15K11Q+ag1+uyePaiOypZYJewvv1hhqU5IrVcxUbTsbREH/IsdQSlNSuyNFIr3oFnrff5iKEKEwEvSDeiqpqRh56pAkF6Kb15aYqZO7X9rbfoa8Sgj3VJXN0181lXMjXkNsYVa3gDmKv89C6qutg+KOpHlXgn4AfIRcCw8ik6OGBEfi/gUeb3SYpD+7undNLyloxCbGwHQ40IdoqPatyhTNS4jm9kb+Tno4hj0pbLHZSUdXgGaSfGx1W0MVVY0mm0Hu7EmYDBHUTfmPmPxnolWh8UH+XdkNPnwZfyZlyBcVVkVzog1ZCs1i9Y6oS1ZIbzuz+WxBPPDIHMRdmxv6+PMc5kZyrpuX1PgFb7Xt5cRNAL5/wywoi9Z45SS7qP9zNSb443UaaXzUatqnlawZ0GS0qXJh3ljwJ8= mike@odin" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDfqPj+a2gmoUl3TuGSZxf0zRBabVWvXRrjLF7sFlqjMbfkx428F3L7C8OC3Z9XDT4ysbpgWcPuVKNtK5kkKGjSLHAgB2CgvD15K11Q+ag1+uyePaiOypZYJewvv1hhqU5IrVcxUbTsbREH/IsdQSlNSuyNFIr3oFnrff5iKEKEwEvSDeiqpqRh56pAkF6Kb15aYqZO7X9rbfoa8Sgj3VJXN0181lXMjXkNsYVa3gDmKv89C6qutg+KOpHlXgn4AfIRcCw8ik6OGBEfi/gUeb3SYpD+7undNLyloxCbGwHQ40IdoqPatyhTNS4jm9kb+Tno4hj0pbLHZSUdXgGaSfGx1W0MVVY0mm0Hu7EmYDBHUTfmPmPxnolWh8UH+XdkNPnwZfyZlyBcVVkVzog1ZCs1i9Y6oS1ZIbzuz+WxBPPDIHMRdmxv6+PMc5kZyrpuX1PgFb7Xt5cRNAL5/wywoi9Z45SS7qP9zNSb443UaaXzUatqnlawZ0GS0qXJh3ljwJ8= mike@odin"
]; ];
extraGroups = [ "networkmanager" "wheel" "docker" "libvirtd" ]; extraGroups = ["networkmanager" "wheel" "docker" "libvirtd"];
}; };
}; };
} }

28
hosts/common/x.nix Normal file
View File

@@ -0,0 +1,28 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
services.udisks2.enable = true;
security.polkit.enable = true;
services.upower.enable = config.powerManagement.enable;
services.gvfs.enable = true;
services.autorandr = {
enable = true;
};
environment.systemPackages = with pkgs; [
autorandr
xorg.xrandr
xorg.libX11
xorg.libX11.dev
xorg.libXft
xorg.libXinerama
xorg.xbacklight
pulseaudioFull
];
}

View File

@@ -11,6 +11,7 @@
enable = true; enable = true;
layout = "pl"; layout = "pl";
xkbVariant = ""; xkbVariant = "";
libinput.enable = true;
displayManager = { displayManager = {
lightdm = { lightdm = {
@@ -42,11 +43,6 @@
}; };
}; };
environment.systemPackages = (with pkgs; [
autorandr
xorg.xrandr
]);
services.autorandr = { services.autorandr = {
enable = true; enable = true;
}; };

View File

@@ -1,31 +1,40 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
]; pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
boot.kernelParams = [ "resume=/var/swapfile" "resume_offset=16230400" ]; boot.kernelParams = ["resume=/var/swapfile" "resume_offset=16230400"];
boot.resumeDevice = "/dev/disk/by-uuid/9bf8fe18-8b72-4e43-a472-546260574b1e"; boot.resumeDevice = "/dev/disk/by-uuid/9bf8fe18-8b72-4e43-a472-546260574b1e";
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/9bf8fe18-8b72-4e43-a472-546260574b1e"; device = "/dev/disk/by-uuid/9bf8fe18-8b72-4e43-a472-546260574b1e";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/09BA-3F6F"; device = "/dev/disk/by-uuid/09BA-3F6F";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ { device = "/var/swapfile"; size = 32 * 1024; } ]; swapDevices = [
{
device = "/var/swapfile";
size = 32 * 1024;
}
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@@ -65,12 +65,6 @@
]; ];
}; };
environment.systemPackages = (with pkgs; [
autorandr
xorg.xrandr
]);
services.autorandr = { services.autorandr = {
enable = true; enable = true;
defaultTarget = "zion"; defaultTarget = "zion";

View File

@@ -1,31 +1,35 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
]; pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/8af14034-1aec-4b6f-b8c4-de13e6987ac5"; device = "/dev/disk/by-uuid/8af14034-1aec-4b6f-b8c4-de13e6987ac5";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/CEC7-B082"; device = "/dev/disk/by-uuid/CEC7-B082";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-uuid/00a782e1-71c2-4121-8608-9ed1104d6aa5"; } {device = "/dev/disk/by-uuid/00a782e1-71c2-4121-8608-9ed1104d6aa5";}
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@@ -5,7 +5,7 @@
config, config,
pkgs, pkgs,
... ...
}:{ }: {
# Enable OpenGL # Enable OpenGL
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
@@ -17,7 +17,6 @@
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = ["nvidia"];
hardware.nvidia = { hardware.nvidia = {
# Modesetting is required. # Modesetting is required.
modesetting.enable = true; modesetting.enable = true;
@@ -41,7 +40,7 @@
open = false; open = false;
# Enable the Nvidia settings menu, # Enable the Nvidia settings menu,
# accessible via `nvidia-settings`. # accessible via `nvidia-settings`.
nvidiaSettings = true; nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU. # Optionally, you may need to select the appropriate driver version for your specific GPU.

View File

@@ -1,3 +1,2 @@
{ pkgs ? import <nixpkgs> {} }: {pkgs ? import <nixpkgs> {}}:
pkgs.callPackage ./papyrus.nix {} pkgs.callPackage ./papyrus.nix {}

View File

@@ -1,6 +1,19 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook, fontconfig, freetype, glib, gtk3, jdk17, lib, xorg, zlib, alsaLib }: {
let stdenv,
fetchurl,
makeDesktopItem,
makeWrapper,
autoPatchelfHook,
fontconfig,
freetype,
glib,
gtk3,
jdk17,
lib,
xorg,
zlib,
alsaLib,
}: let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the # Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster. # source of the latter disappears much faster.
version = "6.6.0"; version = "6.6.0";
@@ -23,102 +36,102 @@ let
genericName = "SQL Integrated Development Environment"; genericName = "SQL Integrated Development Environment";
categories = ["Development"]; categories = ["Development"];
}; };
in
stdenv.mkDerivation {
pname = "papyrus";
version = "6.6.0";
in stdenv.mkDerivation { system = "x86_64-linux";
pname = "papyrus";
version = "6.6.0";
system = "x86_64-linux"; inherit src;
inherit src; nativeBuildInputs = [
makeWrapper
autoPatchelfHook
];
nativeBuildInputs = [ buildInputs = [
makeWrapper fontconfig
autoPatchelfHook freetype
]; glib
gtk3
jdk17
xorg.libX11
xorg.libXrender
xorg.libXtst
zlib
alsaLib
];
buildInputs = [ # Extract and copy executable in $out/bin
fontconfig installPhase = ''
freetype # Remove the bundled Java Runtime Environment as we will use our own.
glib rm -rf jre
gtk3
jdk17
xorg.libX11
xorg.libXrender
xorg.libXtst
zlib
alsaLib
];
# Extract and copy executable in $out/bin # Create the directory where DBeaver will reside within the Nix store.
installPhase = '' mkdir -p $out/
# Remove the bundled Java Runtime Environment as we will use our own.
rm -rf jre
# Create the directory where DBeaver will reside within the Nix store. # Copy all the files from the build directory to the Nix store.
mkdir -p $out/ cp -r . $out/Papyrus
# Copy all the files from the build directory to the Nix store. # The binaries will be automatically patched by autoPatchelfHook.
cp -r . $out/Papyrus # This adds necessary runtime dependencies to the ELF files.
# The binaries will be automatically patched by autoPatchelfHook. # Create a wrapper script for launching DBeaver.
# This adds necessary runtime dependencies to the ELF files. # - Sets Java path
# - Sets library path for GTK and X11
# - Sets GSettings schema path
makeWrapper $out/Papyrus/papyrus $out/bin/Papyrus \
--prefix PATH : ${jdk17}/bin \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [glib gtk3 xorg.libXtst]} \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
# Create a wrapper script for launching DBeaver. # Create a directory for the desktop entry.
# - Sets Java path mkdir -p $out/share/applications
# - Sets library path for GTK and X11
# - Sets GSettings schema path
makeWrapper $out/Papyrus/papyrus $out/bin/Papyrus \
--prefix PATH : ${jdk17}/bin \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [glib gtk3 xorg.libXtst]} \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
# Create a directory for the desktop entry. # Copy the generated desktop entry to the appropriate location.
mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications
# Copy the generated desktop entry to the appropriate location. # Create a directory for storing the DBeaver icon.
cp ${desktopItem}/share/applications/* $out/share/applications mkdir -p $out/share/pixmaps
# Create a directory for storing the DBeaver icon. # Symlink the DBeaver icon to the standard location.
mkdir -p $out/share/pixmaps ln -s $out/Papyrus/icon.xpm $out/share/pixmaps/papyrus.xpm
'';
# Symlink the DBeaver icon to the standard location. meta = with lib; {
ln -s $out/Papyrus/icon.xpm $out/share/pixmaps/papyrus.xpm homepage = "https://eclipse.dev/papyrus/index.php";
''; description = "Open source Model-Based Engineering tool";
# longDescription = ''
# Multi-platform database tool for developers, SQL programmers, database
# administrators and analysts. Supports all popular databases: MySQL,
# PostgreSQL, MariaDB, SQLite, Oracle, DB2, SQL Server, Sybase, MS Access,
# Teradata, Firebird, Derby, etc.
# '';
license = licenses.free;
platforms = ["x86_64-linux"];
maintainers = [maintainers.eRgo35];
};
}
# desktopItem = makeDesktopItem {
# name = "dbeaver-ee";
# exec = "dbeaver";
# icon = "dbeaver";
# desktopName = "dbeaver-ee";
# comment = "SQL Integrated Development Environment";
# genericName = "SQL Integrated Development Environment";
# categories = ["Development"];
# };
#
# # src = pkgs.fetchurl {
# # url = "https://download.eclipse.org/modeling/mdt/papyrus/rcp/2023-12/6.6.0/papyrus-2023-12-6.6.0-linux64.tar.gz";
# # sha512 = "ab1f1c0192fa7791550ef284c221a5445e02a699f4a82ec9b08f2c4b1f894b387751c37a6c5109f7709afea265126210682a266adb00fb26768057c0321ba802";
# # };
# # unpackPhase = "tar -xf $src -C $out/bin/papyrus --strip-components=1";
#
# installPhase = ''
# mkdir -p $out/bin
# tar -xf $src -C $out/bin --strip-components=1
# '';
#
meta = with lib; {
homepage = "https://eclipse.dev/papyrus/index.php";
description = "Open source Model-Based Engineering tool";
# longDescription = ''
# Multi-platform database tool for developers, SQL programmers, database
# administrators and analysts. Supports all popular databases: MySQL,
# PostgreSQL, MariaDB, SQLite, Oracle, DB2, SQL Server, Sybase, MS Access,
# Teradata, Firebird, Derby, etc.
# '';
license = licenses.free;
platforms = ["x86_64-linux"];
maintainers = [maintainers.eRgo35];
};
}
# desktopItem = makeDesktopItem {
# name = "dbeaver-ee";
# exec = "dbeaver";
# icon = "dbeaver";
# desktopName = "dbeaver-ee";
# comment = "SQL Integrated Development Environment";
# genericName = "SQL Integrated Development Environment";
# categories = ["Development"];
# };
#
# # src = pkgs.fetchurl {
# # url = "https://download.eclipse.org/modeling/mdt/papyrus/rcp/2023-12/6.6.0/papyrus-2023-12-6.6.0-linux64.tar.gz";
# # sha512 = "ab1f1c0192fa7791550ef284c221a5445e02a699f4a82ec9b08f2c4b1f894b387751c37a6c5109f7709afea265126210682a266adb00fb26768057c0321ba802";
# # };
# # unpackPhase = "tar -xf $src -C $out/bin/papyrus --strip-components=1";
#
# installPhase = ''
# mkdir -p $out/bin
# tar -xf $src -C $out/bin --strip-components=1
# '';
#

View File

@@ -1,4 +1,2 @@
{ pkgs ? import <nixpkgs> {} }: {pkgs ? import <nixpkgs> {}}:
pkgs.callPackage ./tikzuml.nix {} pkgs.callPackage ./tikzuml.nix {}

View File

@@ -1,6 +1,10 @@
{ lib, stdenvNoCC, fetchurl, mkShell }: {
let lib,
pkgs = import <nixpkgs> { }; stdenvNoCC,
fetchurl,
mkShell,
}: let
pkgs = import <nixpkgs> {};
version = "1.0"; version = "1.0";
date = "2016-03-29"; date = "2016-03-29";
@@ -12,37 +16,37 @@ let
sha256 = "0cbc4a20c8ed40162b3b9ab1400b174293ec1ad7508e640ca879e78c45a105d0"; sha256 = "0cbc4a20c8ed40162b3b9ab1400b174293ec1ad7508e640ca879e78c45a105d0";
}; };
tikzuml = { pkgs = [ pkgs.tikzuml ]; }; tikzuml = {pkgs = [pkgs.tikzuml];};
texpkgs = pkgs.texlive.combine { texpkgs = pkgs.texlive.combine {
inherit (pkgs.texlive) scheme-full; inherit (pkgs.texlive) scheme-full;
inherit tikzuml; inherit tikzuml;
}; };
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tikz-uml";
inherit version;
in stdenvNoCC.mkDerivation (finalAttrs: { inherit src;
pname = "tikz-uml";
inherit version;
inherit src; installPhase = ''
runHook preInstall
installPhase = '' mkdir -p $out/share/texmf-nix/latex/tikz-uml
runHook preInstall mkdir -p $out/share/texmf-nix/doc/tikz-uml
cp -prd doc/. $out/share/texmf-nix/doc/tikz-uml
cp -prd tikz-uml.sty $out/share/texmf-nix/latex/tikz-uml/
mkdir -p $out/share/texmf-nix/latex/tikz-uml # install -Dm644 "$src/tikzuml-v${version}-${date}/tikz-uml.sty" "$out/share/texmf-nix/tex/latex/tikz-uml/tikz-uml.sty"
mkdir -p $out/share/texmf-nix/doc/tikz-uml
cp -prd doc/. $out/share/texmf-nix/doc/tikz-uml
cp -prd tikz-uml.sty $out/share/texmf-nix/latex/tikz-uml/
# install -Dm644 "$src/tikzuml-v${version}-${date}/tikz-uml.sty" "$out/share/texmf-nix/tex/latex/tikz-uml/tikz-uml.sty" runHook postInstall
'';
runHook postInstall meta = with lib; {
''; homepage = "https://perso.ensta-paris.fr/~kielbasi/tikzuml/index.php";
description = "A LaTeX package for drawing UML diagrams using pgf/tikz";
meta = with lib; { license = licenses.gpl2Plus;
homepage = "https://perso.ensta-paris.fr/~kielbasi/tikzuml/index.php"; maintainers = with maintainers; [eRgo35];
description = "A LaTeX package for drawing UML diagrams using pgf/tikz"; platforms = platforms.unix;
license = licenses.gpl2Plus; };
maintainers = with maintainers; [ eRgo35 ]; })
platforms = platforms.unix;
};
})