eRgo35/nix-config
1
0
Fork 0
mirror of https://github.com/eRgo35/nix-config.git synced 2026-02-04 07:06:12 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

alejandra and dwm xf86 keys

Browse Source
This commit is contained in:
Michał Czyż
2024-04-22 08:26:49 +02:00
parent 038bc3b7e5
commit 5d6abd228e
34 changed files with 360 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
home-manager/features/cli/aliases.nix
View File

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

5
home-manager/features/cli/bash.nix
View File

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

6
home-manager/features/cli/zsh/default.nix
View File

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

9
home-manager/features/desktop/common/default.nix
View File

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

1
home-manager/features/desktop/dwm/betterlockscreen.nix
View File

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

7
home-manager/features/desktop/dwm/theming.nix
View File

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

28
home-manager/features/desktop/hyprland/default.nix
View File

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

7
home-manager/features/neovim.nix
View File

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

4
home-manager/home.nix
View File

@@ -76,7 +76,7 @@
# The home.packages option allows you to install Nix packages into your
# environment.
home.packages = (with pkgs; [
home.packages = with pkgs; [
# > graphics <
tuxpaint
krita
@@ -143,7 +143,7 @@
docker
docker-compose
]);
];
services.gnome-keyring = {
enable = true;

2
hosts/common/default.nix
View File

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

4
hosts/common/packages.nix
View File

@@ -19,7 +19,7 @@
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.
# wget
ntfs3g
@@ -27,7 +27,7 @@
unstable.nh
nix-output-monitor
nvd
]);
];
fonts.packages = with pkgs; [
nerdfonts

3
hosts/common/services.nix
View File

@@ -6,9 +6,8 @@
pkgs,
...
}: {
# I use zsh btw
environment.shells = with pkgs; [ bash zsh ];
environment.shells = with pkgs; [bash zsh];
users.defaultUserShell = pkgs.zsh;
programs.zsh.enable = true;

2
hosts/common/users.nix
View File

@@ -14,7 +14,7 @@
openssh.authorizedKeys.keys = [
"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
];
}

6
hosts/thor/gui.nix
View File

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

37
hosts/thor/hardware-configuration.nix
View File

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

6
hosts/zion/gui.nix
View File

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

32
hosts/zion/hardware-configuration.nix
View File

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

3
hosts/zion/nvidia.nix
View File

@@ -5,7 +5,7 @@
config,
pkgs,
...
}:{
}: {
# Enable OpenGL
hardware.opengl = {
enable = true;
@@ -17,7 +17,6 @@
services.xserver.videoDrivers = ["nvidia"];
hardware.nvidia = {
# Modesetting is required.
modesetting.enable = true;

3
pkgs/papyrus/default.nix
View File

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

67
pkgs/papyrus/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
# source of the latter disappears much faster.
version = "6.6.0";
@@ -23,8 +36,8 @@ let
genericName = "SQL Integrated Development Environment";
categories = ["Development"];
};
in stdenv.mkDerivation {
in
stdenv.mkDerivation {
pname = "papyrus";
version = "6.6.0";
@@ -99,26 +112,26 @@ in stdenv.mkDerivation {
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";
# # };
}
# 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
# '';
#
# # 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
# '';
#

4
pkgs/tikz-uml/default.nix
View File

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

20
pkgs/tikz-uml/tikzuml.nix
View File

@@ -1,6 +1,10 @@
{ lib, stdenvNoCC, fetchurl, mkShell }:
let
pkgs = import <nixpkgs> { };
{
lib,
stdenvNoCC,
fetchurl,
mkShell,
}: let
pkgs = import <nixpkgs> {};
version = "1.0";
date = "2016-03-29";
@@ -12,14 +16,14 @@ let
sha256 = "0cbc4a20c8ed40162b3b9ab1400b174293ec1ad7508e640ca879e78c45a105d0";
};
tikzuml = { pkgs = [ pkgs.tikzuml ]; };
tikzuml = {pkgs = [pkgs.tikzuml];};
texpkgs = pkgs.texlive.combine {
inherit (pkgs.texlive) scheme-full;
inherit tikzuml;
};
in stdenvNoCC.mkDerivation (finalAttrs: {
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tikz-uml";
inherit version;
@@ -42,7 +46,7 @@ in stdenvNoCC.mkDerivation (finalAttrs: {
homepage = "https://perso.ensta-paris.fr/~kielbasi/tikzuml/index.php";
description = "A LaTeX package for drawing UML diagrams using pgf/tikz";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ eRgo35 ];
maintainers = with maintainers; [eRgo35];
platforms = platforms.unix;
};
})
})