changes
This commit is contained in:
krizej
parent
4e452106cc
commit
74e4e7d6f8
47 changed files with 1151 additions and 757 deletions
3
.idea/.gitignore
vendored
Normal file
3
.idea/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
10
.idea/codeStyles/Project.xml
Normal file
10
.idea/codeStyles/Project.xml
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<component name="ProjectCodeStyleConfiguration">
|
||||
<code_scheme name="Project" version="173">
|
||||
<option name="OTHER_INDENT_OPTIONS">
|
||||
<value>
|
||||
<option name="INDENT_SIZE" value="2" />
|
||||
<option name="TAB_SIZE" value="2" />
|
||||
</value>
|
||||
</option>
|
||||
</code_scheme>
|
||||
</component>
|
||||
5
.idea/codeStyles/codeStyleConfig.xml
Normal file
5
.idea/codeStyles/codeStyleConfig.xml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
<component name="ProjectCodeStyleConfiguration">
|
||||
<state>
|
||||
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
||||
</state>
|
||||
</component>
|
||||
36
.idea/inspectionProfiles/Project_Default.xml
Normal file
36
.idea/inspectionProfiles/Project_Default.xml
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="GrazieInspection" enabled="false" level="GRAMMAR_ERROR" enabled_by_default="false" />
|
||||
<inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="myValues">
|
||||
<value>
|
||||
<list size="1">
|
||||
<item index="0" class="java.lang.String" itemvalue="href" />
|
||||
</list>
|
||||
</value>
|
||||
</option>
|
||||
<option name="myCustomValuesEnabled" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="LanguageDetectionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="PyBroadExceptionInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="ignoredPackages">
|
||||
<value>
|
||||
<list size="2">
|
||||
<item index="0" class="java.lang.String" itemvalue="pygame" />
|
||||
<item index="1" class="java.lang.String" itemvalue="pyrex" />
|
||||
</list>
|
||||
</value>
|
||||
</option>
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PyPep8Inspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="PyPep8NamingInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="PyShadowingBuiltinsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
|
||||
<option name="processCode" value="true" />
|
||||
<option name="processLiterals" value="true" />
|
||||
<option name="processComments" value="true" />
|
||||
</inspection_tool>
|
||||
</profile>
|
||||
</component>
|
||||
6
.idea/inspectionProfiles/profiles_settings.xml
Normal file
6
.idea/inspectionProfiles/profiles_settings.xml
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
<component name="InspectionProjectProfileManager">
|
||||
<settings>
|
||||
<option name="USE_PROJECT_PROFILE" value="false" />
|
||||
<version value="1.0" />
|
||||
</settings>
|
||||
</component>
|
||||
7
.idea/misc.xml
Normal file
7
.idea/misc.xml
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Black">
|
||||
<option name="sdkName" value="Python 3.12 (django_projektwlasny)" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (django_projektwlasny)" project-jdk-type="Python SDK" />
|
||||
</project>
|
||||
8
.idea/modules.xml
Normal file
8
.idea/modules.xml
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/nix.iml" filepath="$PROJECT_DIR$/.idea/nix.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
8
.idea/nix.iml
Normal file
8
.idea/nix.iml
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="PYTHON_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
6
.idea/vcs.xml
Normal file
6
.idea/vcs.xml
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -1,210 +1,9 @@
|
|||
{ pkgs, ...}:
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
./programs
|
||||
./services
|
||||
./misc
|
||||
];
|
||||
|
||||
boot = {
|
||||
loader = {
|
||||
timeout = 2;
|
||||
grub = {
|
||||
enable = true;
|
||||
device = "/dev/disk/by-id/ata-Samsung_SSD_860_EVO_500GB_S4CNNE0M700172J";
|
||||
gfxmodeBios = "auto"; # 1920x1080 did not work
|
||||
splashImage = null;
|
||||
font = null;
|
||||
};
|
||||
};
|
||||
# doesn't even work, todo when fixed: remove xrandr from i3 autostart
|
||||
kernelParams = [
|
||||
"video=DP-3:1920x1080@240"
|
||||
"video=HDMI-3:1920x1080@75"
|
||||
];
|
||||
};
|
||||
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"freeimage-unstable-2021-11-01"
|
||||
"openssl-1.1.1w"
|
||||
];
|
||||
|
||||
networking.hostName = "krizej-pc";
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
time.timeZone = "Europe/Warsaw";
|
||||
|
||||
# services.libinput = {
|
||||
# enable = true;
|
||||
# touchpad = {
|
||||
# naturalScrolling = false; # it's reversed on my laptop for some reason
|
||||
# tapping = true;
|
||||
# tappingButtonMap = "lmr";
|
||||
# scrollMethod = "edge";
|
||||
# };
|
||||
# };
|
||||
|
||||
programs.sway.enable = true;
|
||||
|
||||
services = {
|
||||
xserver = {
|
||||
enable = true;
|
||||
xkb.layout = "pl";
|
||||
|
||||
windowManager.i3.enable = true;
|
||||
|
||||
displayManager = {
|
||||
sessionCommands = ''
|
||||
xrandr --output DP-3 --mode 1920x1080 --rate 239.76 --primary
|
||||
xrandr --output HDMI-3 --mode 1920x1080 --rate 74.97 --right-of DP-3
|
||||
xset r rate 180 50
|
||||
'';
|
||||
};
|
||||
|
||||
autoRepeatDelay = 180;
|
||||
autoRepeatInterval = 50;
|
||||
};
|
||||
|
||||
displayManager = {
|
||||
defaultSession = "none+i3";
|
||||
sddm = {
|
||||
enable = true;
|
||||
theme = "sddm-i3-theme";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
fonts = {
|
||||
enableDefaultPackages = true;
|
||||
packages = with pkgs; [
|
||||
jetbrains-mono
|
||||
dejavu_fonts
|
||||
corefonts
|
||||
vistafonts
|
||||
];
|
||||
fontconfig.defaultFonts = {
|
||||
serif = [ "JetBrains Mono NL" ];
|
||||
sansSerif = [ "JetBrains Mono NL" ];
|
||||
monospace = [ "JetBrains Mono NL" ];
|
||||
};
|
||||
};
|
||||
|
||||
sound.enable = true;
|
||||
hardware.pulseaudio.enable = true;
|
||||
|
||||
# fucking stupid android shit man
|
||||
# users.groups.plugdev.members = [ "krizej" ];
|
||||
# services.udev.extraRules = ''
|
||||
# SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="2e76", MODE="0666", GROUP="plugdev"
|
||||
# '';
|
||||
|
||||
users.users.krizej = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
shell = pkgs.fish;
|
||||
};
|
||||
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme = "gnome";
|
||||
style = "adwaita-dark";
|
||||
};
|
||||
|
||||
programs.nano.enable = false;
|
||||
programs.dconf.enable = true;
|
||||
|
||||
# any-nix-shell
|
||||
programs.fish.enable = true;
|
||||
programs.fish.promptInit = ''
|
||||
${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
|
||||
'';
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
ed # is the standard text editor.
|
||||
vim
|
||||
file
|
||||
wget
|
||||
btop
|
||||
git
|
||||
gcc
|
||||
unzip
|
||||
python311
|
||||
python39
|
||||
ripgrep
|
||||
gnomeExtensions.user-themes
|
||||
xdg-user-dirs
|
||||
man-pages
|
||||
man-pages-posix
|
||||
ntfs3g
|
||||
gnumake
|
||||
xclip
|
||||
tcl
|
||||
pkg-config
|
||||
fish
|
||||
tree
|
||||
openssl_1_1
|
||||
sddm-i3-theme
|
||||
];
|
||||
|
||||
documentation = {
|
||||
enable = true;
|
||||
dev.enable = true;
|
||||
doc.enable = false;
|
||||
info.enable = false;
|
||||
man = {
|
||||
enable = true;
|
||||
generateCaches = false;
|
||||
man-db.enable = false;
|
||||
mandoc.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
programs.gnupg.agent = {
|
||||
enable = true;
|
||||
enableSSHSupport = true;
|
||||
};
|
||||
|
||||
services.openssh.enable = true;
|
||||
|
||||
security.sudo.extraConfig = ''
|
||||
Defaults pwfeedback
|
||||
'';
|
||||
|
||||
hardware = {
|
||||
opengl = {
|
||||
enable = true;
|
||||
driSupport = true;
|
||||
driSupport32Bit = true;
|
||||
extraPackages = with pkgs; [
|
||||
mesa
|
||||
amdvlk
|
||||
libdrm
|
||||
libva
|
||||
vaapiVdpau
|
||||
libvdpau-va-gl
|
||||
rocmPackages.clr.icd
|
||||
];
|
||||
extraPackages32 = with pkgs; [
|
||||
driversi686Linux.mesa
|
||||
driversi686Linux.amdvlk
|
||||
driversi686Linux.vaapiVdpau
|
||||
driversi686Linux.libvdpau-va-gl
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
|
||||
environment.sessionVariables = {
|
||||
AMD_VULKAN_ICD = "RADV";
|
||||
};
|
||||
|
||||
nixpkgs.overlays = import ./pkgs pkgs;
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
system.stateVersion = "23.11";
|
||||
}
|
||||
|
||||
|
|
|
|||
20
flake.lock
20
flake.lock
|
|
@ -7,11 +7,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1718243258,
|
||||
"narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
|
||||
"lastModified": 1719827439,
|
||||
"narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
|
||||
"rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -22,11 +22,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1718318537,
|
||||
"narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
|
||||
"lastModified": 1719848872,
|
||||
"narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
|
||||
"rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -38,11 +38,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1715942738,
|
||||
"narHash": "sha256-85fVkx0bFqblV89A/KLGuJd0IsxCT0wOTIFBQWM1p0o=",
|
||||
"lastModified": 1719938409,
|
||||
"narHash": "sha256-GzmLs/YaKAzpTQr9u4VpU0ISGtBluAyx9qTZC/86wb4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "cbe245e7ed40f92a6d40bb4a458f9003bbe612d7",
|
||||
"rev": "1ec5b968d5751a0c817b7e56974059d01b348bf2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -61,4 +61,4 @@
|
|||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
||||
}
|
||||
|
|
|
|||
11
flake.nix
11
flake.nix
|
|
@ -14,18 +14,11 @@
|
|||
system = "x86_64-linux";
|
||||
modules = [
|
||||
{ nixpkgs.overlays = [ nur.overlay ]; }
|
||||
./configuration.nix
|
||||
nur.nixosModules.nur
|
||||
home-manager.nixosModules.home-manager {
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
users.krizej = import ./home.nix;
|
||||
};
|
||||
}
|
||||
home-manager.nixosModules.home-manager
|
||||
./configuration.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,12 @@
|
|||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./dunst.nix
|
||||
./flameshot.nix
|
||||
./picom.nix
|
||||
./documentation.nix
|
||||
./networking.nix
|
||||
./nix.nix
|
||||
./sudo.nix
|
||||
./system.nix
|
||||
./theme.nix
|
||||
./xdg.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
documentation = {
|
||||
enable = true;
|
||||
dev.enable = true;
|
||||
doc.enable = false;
|
||||
info.enable = false;
|
||||
man = {
|
||||
enable = true;
|
||||
generateCaches = false;
|
||||
man-db.enable = false;
|
||||
mandoc.enable = true;
|
||||
};
|
||||
};
|
||||
home-manager.users.krizej.home.sessionVariables = {
|
||||
# c docs first
|
||||
"MANSECT" = "2:3:3p:3type:1:1p:n:l:8:0:0p:5:4:9:6:7";
|
||||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
man-pages
|
||||
man-pages-posix
|
||||
];
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{ ... }:
|
||||
{
|
||||
networking.hostName = "krizej-pc";
|
||||
networking.networkmanager.enable = true;
|
||||
}
|
||||
|
|
@ -1,12 +1,11 @@
|
|||
{ ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"freeimage-unstable-2021-11-01"
|
||||
"openssl-1.1.1w"
|
||||
];
|
||||
|
||||
nixpkgs.overlays = import ./pkgs pkgs;
|
||||
nixpkgs.overlays = import ../pkgs pkgs;
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
{ ... }:
|
||||
{
|
||||
security.sudo.extraConfig = ''
|
||||
Defaults pwfeedback
|
||||
'';
|
||||
}
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
boot = {
|
||||
loader = {
|
||||
timeout = 2;
|
||||
grub = {
|
||||
enable = true;
|
||||
device = "/dev/disk/by-id/ata-Samsung_SSD_860_EVO_500GB_S4CNNE0M700172J";
|
||||
gfxmodeBios = "auto"; # 1920x1080 did not work, this doesn't either
|
||||
splashImage = null;
|
||||
font = null;
|
||||
};
|
||||
};
|
||||
# this doesn't even work
|
||||
kernelParams = [
|
||||
"video=DP-3:1920x1080@240"
|
||||
"video=HDMI-1:1920x1080@75"
|
||||
];
|
||||
initrd.kernelModules = [ "amdgpu" ];
|
||||
};
|
||||
|
||||
time.timeZone = "Europe/Warsaw";
|
||||
|
||||
sound.enable = true;
|
||||
hardware.pulseaudio.enable = true;
|
||||
|
||||
system.stateVersion = "23.11";
|
||||
|
||||
users.users.krizej = {
|
||||
isNormalUser = true;
|
||||
extraGroups = ["wheel" "input"];
|
||||
};
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
users.krizej = rec {
|
||||
home.stateVersion = "23.11";
|
||||
home.username = "krizej";
|
||||
home.homeDirectory = "/home/krizej";
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.ntfs3g ];
|
||||
}
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [
|
||||
pkgs.gnomeExtensions.user-themes
|
||||
];
|
||||
|
||||
fonts = {
|
||||
enableDefaultPackages = true;
|
||||
packages = with pkgs; [
|
||||
jetbrains-mono
|
||||
];
|
||||
fontconfig.defaultFonts = {
|
||||
serif = [ "JetBrains Mono NL" ];
|
||||
sansSerif = [ "JetBrains Mono NL" ];
|
||||
monospace = [ "JetBrains Mono NL" ];
|
||||
};
|
||||
};
|
||||
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme = "gnome";
|
||||
style = "adwaita-dark";
|
||||
};
|
||||
|
||||
home-manager.users.krizej = {
|
||||
home.pointerCursor = {
|
||||
gtk.enable = true;
|
||||
x11.enable = true;
|
||||
name = "aero-drop";
|
||||
package = pkgs.win7-cursors;
|
||||
};
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
iconTheme = {
|
||||
name = "Arc";
|
||||
package = pkgs.arc-icon-theme;
|
||||
};
|
||||
theme = {
|
||||
name = "Arc-Mono";
|
||||
package = pkgs.arc-mono-gtk-theme;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
HOME = config.home-manager.users.krizej.home.homeDirectory;
|
||||
in {
|
||||
home-manager.users.krizej = {
|
||||
home.packages = with pkgs; [
|
||||
xdg-user-dirs
|
||||
xdg-desktop-portal
|
||||
xdg-desktop-portal-gnome
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,17 +1,18 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, sassc
|
||||
, meson
|
||||
, ninja
|
||||
, glib
|
||||
, gnome
|
||||
, gtk-engine-murrine
|
||||
, inkscape
|
||||
, cinnamon
|
||||
, makeFontsConf
|
||||
, python3
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
sassc,
|
||||
meson,
|
||||
ninja,
|
||||
glib,
|
||||
gnome,
|
||||
gtk-engine-murrine,
|
||||
inkscape,
|
||||
cinnamon,
|
||||
makeFontsConf,
|
||||
python3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arc-theme";
|
||||
version = "i don't care";
|
||||
|
|
@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
# Fontconfig error: Cannot load default config file: No such file: (null)
|
||||
FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
|
||||
FONTCONFIG_FILE = makeFontsConf {fontDirectories = [];};
|
||||
|
||||
mesonFlags = [
|
||||
"-Dthemes=gtk2,gtk3,gtk4"
|
||||
|
|
@ -63,6 +64,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/jnsh/arc-theme";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ simonvandel romildo ];
|
||||
maintainers = with maintainers; [simonvandel romildo];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "darkcold-gtk-theme";
|
||||
version = "v5.1.0";
|
||||
|
|
@ -27,4 +31,3 @@ stdenv.mkDerivation {
|
|||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,4 +12,3 @@ pkgs: [
|
|||
sddm-i3-theme = pkgs.callPackage ./sddm-i3-theme.nix {};
|
||||
})
|
||||
]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitea }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitea,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "e17gtk-revolved";
|
||||
version = "2023-06-13";
|
||||
|
|
@ -27,4 +31,3 @@ stdenv.mkDerivation {
|
|||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,22 @@
|
|||
{ lib, stdenv, fetchFromGitHub, curl, expat
|
||||
, jansson, libpng, libjpeg, libGLU, libGL
|
||||
, libsndfile, libXxf86vm, pcre, pkg-config, SDL2
|
||||
, vim, speex }:
|
||||
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
curl,
|
||||
expat,
|
||||
jansson,
|
||||
libpng,
|
||||
libjpeg,
|
||||
libGLU,
|
||||
libGL,
|
||||
libsndfile,
|
||||
libXxf86vm,
|
||||
pcre,
|
||||
pkg-config,
|
||||
SDL2,
|
||||
vim,
|
||||
speex,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ezquake";
|
||||
version = "3.6.5";
|
||||
|
|
@ -15,9 +29,21 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-Ldv//lsukn985IljXHXDClsYY+Sk1fh41s1NySWkvuE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [pkg-config];
|
||||
buildInputs = [
|
||||
expat curl jansson libpng libjpeg libGLU libGL libsndfile libXxf86vm pcre SDL2 vim speex
|
||||
expat
|
||||
curl
|
||||
jansson
|
||||
libpng
|
||||
libjpeg
|
||||
libGLU
|
||||
libGL
|
||||
libsndfile
|
||||
libXxf86vm
|
||||
pcre
|
||||
SDL2
|
||||
vim
|
||||
speex
|
||||
];
|
||||
|
||||
installPhase = with lib; let
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
gtk3,
|
||||
hicolor-icon-theme,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "oxylite-icon-theme";
|
||||
version = "2024-04-22";
|
||||
|
|
@ -10,10 +16,10 @@ stdenv.mkDerivation {
|
|||
hash = "sha256-syjFs2gkscdlpOmWgraj4l1+WwIaIVFZlhDY4nP99Oo=";
|
||||
};
|
||||
|
||||
# propagatedBuildInputs = [ hicolor-icon-theme ];
|
||||
# propagatedBuildInputs = [ hicolor-icon-theme ];
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
# dontDropIconThemeCache = true;
|
||||
nativeBuildInputs = [gtk3];
|
||||
# dontDropIconThemeCache = true;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
|
@ -47,4 +53,3 @@ stdenv.mkDerivation {
|
|||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, stdenv, fetchzip }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sddm-i3-theme";
|
||||
version = "1";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
{ lib, pkgs }:
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
}:
|
||||
pkgs.vimUtils.buildVimPlugin {
|
||||
name = "vim-darcula-theme";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, stdenv, fetchzip }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "win7-cursors";
|
||||
version = "1";
|
||||
|
|
@ -28,4 +32,3 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "winvista-cursors";
|
||||
version = "1";
|
||||
|
|
@ -23,4 +27,3 @@ stdenv.mkDerivation {
|
|||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,12 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, python3, xorg, shadows ? false }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
python3,
|
||||
xorg,
|
||||
shadows ? false,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "winxp-cursors";
|
||||
version = "2023-11-22";
|
||||
|
|
@ -11,10 +19,13 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-bvkoe/L9KjMcCj5SlcNGoZKZtQwZHGYPFVSZbRfLztY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 xorg.xcursorgen ];
|
||||
nativeBuildInputs = [cmake python3 xorg.xcursorgen];
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
cursor_variant = if shadows then "with-shadow" else "no-shadow";
|
||||
cursor_variant =
|
||||
if shadows
|
||||
then "with-shadow"
|
||||
else "no-shadow";
|
||||
|
||||
buildPhase = ''
|
||||
cd packaging
|
||||
|
|
@ -34,8 +45,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Windows XP Cursors";
|
||||
homepage = "https://github.com/rozniak/xfce-winxp-tc";
|
||||
license = with licenses; [ unfreeRedistributable gpl2Plus ];
|
||||
license = with licenses; [unfreeRedistributable gpl2Plus];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,11 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, python3, gtk3 }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
python3,
|
||||
gtk3,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "winxp-icons";
|
||||
version = "2024-03-27";
|
||||
|
|
@ -11,7 +18,7 @@ stdenv.mkDerivation {
|
|||
hash = "sha256-bvkoe/L9KjMcCj5SlcNGoZKZtQwZHGYPFVSZbRfLztY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 gtk3 ];
|
||||
nativeBuildInputs = [cmake python3 gtk3];
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
buildPhase = ''
|
||||
|
|
@ -33,8 +40,7 @@ stdenv.mkDerivation {
|
|||
meta = with lib; {
|
||||
description = "Windows XP Icons";
|
||||
homepage = "https://github.com/rozniak/xfce-winxp-tc";
|
||||
license = with licenses; [ unfreeRedistributable gpl2Plus ];
|
||||
license = with licenses; [unfreeRedistributable gpl2Plus];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,13 @@
|
|||
{...}:
|
||||
{ ... }:
|
||||
{
|
||||
home-manager.users.krizej.programs.alacritty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
font.size = 10;
|
||||
window.padding = { x = 2; y = 2; };
|
||||
window.padding = {
|
||||
x = 2;
|
||||
y = 2;
|
||||
};
|
||||
cursor = {
|
||||
style = {
|
||||
shape = "Beam";
|
||||
|
|
@ -39,4 +43,5 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
# TODO: this shit ain't working
|
||||
home-manager.users.krizej.programs.autorandr = {
|
||||
enable = true;
|
||||
hooks.postswitch = {
|
||||
"notify-i3" = "${pkgs.i3}/bin/i3-msg restart";
|
||||
|
|
@ -27,8 +29,5 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,87 @@
|
|||
[
|
||||
# i3 is not here because it goes into xsession.windowManager instead of into programs
|
||||
"home-manager"
|
||||
"firefox"
|
||||
"alacritty"
|
||||
"fish"
|
||||
"eza"
|
||||
"yt-dlp"
|
||||
"rofi"
|
||||
"autorandr"
|
||||
"i3status"
|
||||
"ssh"
|
||||
"git"
|
||||
"vim"
|
||||
]
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./alacritty.nix
|
||||
./autorandr.nix
|
||||
./firefox.nix
|
||||
./fish.nix
|
||||
./git.nix
|
||||
./i3.nix
|
||||
./ssh.nix
|
||||
./vim.nix
|
||||
];
|
||||
|
||||
config = {
|
||||
programs = {
|
||||
dconf.enable = true;
|
||||
steam.enable = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
ed # is the standard text editor.
|
||||
ripgrep
|
||||
eza
|
||||
file
|
||||
tree
|
||||
btop
|
||||
unzip
|
||||
wget
|
||||
gcc
|
||||
gnumake
|
||||
pkg-config
|
||||
python39
|
||||
];
|
||||
|
||||
# maybe i can just put it into the packages but idk whatever
|
||||
home-manager.users.krizej.programs = {
|
||||
home-manager.enable = true;
|
||||
eza.enable = true;
|
||||
yt-dlp.enable = true;
|
||||
};
|
||||
home-manager.users.krizej.home.packages = with pkgs; [
|
||||
fortune
|
||||
|
||||
xarchiver
|
||||
gvfs
|
||||
yad
|
||||
pcmanfm
|
||||
|
||||
pavucontrol
|
||||
pamixer
|
||||
|
||||
element-desktop
|
||||
discord
|
||||
|
||||
gamemode
|
||||
ezquake
|
||||
vkquake
|
||||
ericw-tools
|
||||
trenchbroom
|
||||
r2modman
|
||||
|
||||
libreoffice-qt
|
||||
gimp
|
||||
sqlitebrowser
|
||||
feh
|
||||
|
||||
wineWowPackages.stable
|
||||
winetricks
|
||||
|
||||
gdb
|
||||
ccls
|
||||
clang-tools
|
||||
tcl
|
||||
|
||||
gpu-screen-recorder # todo: config this shit so it works
|
||||
gpu-screen-recorder-gtk
|
||||
obs-studio
|
||||
|
||||
jetbrains.pycharm-community
|
||||
jetbrains.clion
|
||||
(pkgs.writeShellScriptBin "clion-nix" ''
|
||||
cd ~/projects/$1
|
||||
nix-shell --run "clion ."
|
||||
'')
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
home-manager.users.krizej.programs.firefox = {
|
||||
enable = true;
|
||||
policies = {
|
||||
DisableTelemetry = true;
|
||||
|
|
@ -46,40 +47,41 @@
|
|||
force = true;
|
||||
engines = {
|
||||
"envs.net - SearXNG" = {
|
||||
urls = [{ template = "https://searx.envs.net/searxng/search?q={searchTerms}"; }];
|
||||
urls = [{template = "https://searx.envs.net/searxng/search?q={searchTerms}";}];
|
||||
icon = "https://envs.net/favicon.ico";
|
||||
iconUpdateURL = "https://envs.net/favicon.ico";
|
||||
updateInterval = 24 * 60 * 60 * 1000;
|
||||
definedAliases = [ "@sx" ];
|
||||
definedAliases = ["@sx"];
|
||||
};
|
||||
|
||||
"Wikipedia (en)".metaData.alias = "@w";
|
||||
# searx sometimes sucks
|
||||
"Google".metaData.alias = "@g";
|
||||
|
||||
"Wikipedia (en)".metaData.alias = "@w";
|
||||
|
||||
"Nix Packages" = {
|
||||
urls = [{ template = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}"; }];
|
||||
urls = [{template = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}";}];
|
||||
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||
definedAliases = [ "@np" ];
|
||||
definedAliases = ["@np"];
|
||||
};
|
||||
"Nix Options" = {
|
||||
urls = [{ template = "https://search.nixos.org/options?channel=unstable&query={searchTerms}"; }];
|
||||
urls = [{template = "https://search.nixos.org/options?channel=unstable&query={searchTerms}";}];
|
||||
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||
definedAliases = [ "@no" ];
|
||||
definedAliases = ["@no"];
|
||||
};
|
||||
"Home Manger" = {
|
||||
urls = [{ template = "https://home-manager-options.extranix.com/?release=master&query={searchTerms}"; }];
|
||||
urls = [{template = "https://home-manager-options.extranix.com/?release=master&query={searchTerms}";}];
|
||||
icon = "https://home-manager-options.extranix.com/images/favicon.png";
|
||||
iconUpdateURL = "https://home-manager-options.extranix.com/images/favicon.png";
|
||||
updateInterval = 24 * 60 * 60 * 1000;
|
||||
definedAliases = [ "@hm" ];
|
||||
definedAliases = ["@hm"];
|
||||
};
|
||||
"Arch Wiki" = {
|
||||
urls = [{ template = "https://wiki.archlinux.org/index.php?search={searchTerms}"; }];
|
||||
urls = [{template = "https://wiki.archlinux.org/index.php?search={searchTerms}";}];
|
||||
icon = "https://wiki.archlinux.org/favicon.ico";
|
||||
iconUpdateURL = "https://wiki.archlinux.org/favicon.ico";
|
||||
updateInterval = 24 * 60 * 60 * 1000;
|
||||
definedAliases = [ "@aw" ];
|
||||
definedAliases = ["@aw"];
|
||||
};
|
||||
|
||||
# the rest can fuck off
|
||||
|
|
@ -92,4 +94,5 @@
|
|||
"services.sync.prefs.sync.extensions.activeThemeID" = "false";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,14 @@
|
|||
{...}:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.fish ];
|
||||
programs.fish.enable = true;
|
||||
users.users.krizej.shell = pkgs.fish;
|
||||
|
||||
programs.fish.promptInit = ''
|
||||
${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
|
||||
'';
|
||||
|
||||
home-manager.users.krizej.programs.fish = {
|
||||
enable = true;
|
||||
|
||||
shellAliases = {
|
||||
|
|
@ -16,6 +25,72 @@
|
|||
|
||||
functions = {
|
||||
"fish_greeting" = "fortune";
|
||||
"fish_prompt" = builtins.readFile ../files/prompt.fish;
|
||||
"fish_prompt" = ''
|
||||
# name: Informative Vcs
|
||||
# author: Mariusz Smykula <mariuszs at gmail.com>
|
||||
|
||||
# function fish_prompt --description 'Write out the prompt'
|
||||
set -l last_pipestatus $pipestatus
|
||||
set -lx __fish_last_status $status # Export for __fish_print_pipestatus.
|
||||
|
||||
if not set -q __fish_git_prompt_show_informative_status
|
||||
set -g __fish_git_prompt_show_informative_status 1
|
||||
end
|
||||
if not set -q __fish_git_prompt_hide_untrackedfiles
|
||||
set -g __fish_git_prompt_hide_untrackedfiles 1
|
||||
end
|
||||
if not set -q __fish_git_prompt_color_branch
|
||||
set -g __fish_git_prompt_color_branch magenta --bold
|
||||
end
|
||||
if not set -q __fish_git_prompt_showupstream
|
||||
set -g __fish_git_prompt_showupstream informative
|
||||
end
|
||||
if not set -q __fish_git_prompt_color_dirtystate
|
||||
set -g __fish_git_prompt_color_dirtystate blue
|
||||
end
|
||||
if not set -q __fish_git_prompt_color_stagedstate
|
||||
set -g __fish_git_prompt_color_stagedstate yellow
|
||||
end
|
||||
if not set -q __fish_git_prompt_color_invalidstate
|
||||
set -g __fish_git_prompt_color_invalidstate red
|
||||
end
|
||||
if not set -q __fish_git_prompt_color_untrackedfiles
|
||||
set -g __fish_git_prompt_color_untrackedfiles $fish_color_normal
|
||||
end
|
||||
if not set -q __fish_git_prompt_color_cleanstate
|
||||
set -g __fish_git_prompt_color_cleanstate green --bold
|
||||
end
|
||||
|
||||
set -l color_cwd
|
||||
set -l suffix
|
||||
if functions -q fish_is_root_user; and fish_is_root_user
|
||||
if set -q fish_color_cwd_root
|
||||
set color_cwd $fish_color_cwd_root
|
||||
else
|
||||
set color_cwd $fish_color_cwd
|
||||
end
|
||||
set suffix '#'
|
||||
else
|
||||
set color_cwd $fish_color_cwd
|
||||
set suffix '$'
|
||||
end
|
||||
|
||||
# PWD
|
||||
set_color $color_cwd
|
||||
echo -n (prompt_pwd)
|
||||
set_color normal
|
||||
|
||||
printf '%s ' (fish_vcs_prompt)
|
||||
|
||||
set -l status_color (set_color $fish_color_status)
|
||||
set -l statusb_color (set_color --bold $fish_color_status)
|
||||
set -l prompt_status (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus)
|
||||
echo -n $prompt_status
|
||||
set_color normal
|
||||
|
||||
echo -n "$suffix "
|
||||
# end
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
{...}:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.git ];
|
||||
home-manager.users.krizej.programs.git = {
|
||||
enable = true;
|
||||
userName = "krizej";
|
||||
userEmail = "60076189+krizej@users.noreply.github.com";
|
||||
# init.defaultBranch = "master";
|
||||
# push.autoSetupRemote = true;
|
||||
extraConfig.init.defaultBranch = "master";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
128
programs/i3.nix
128
programs/i3.nix
|
|
@ -1,5 +1,10 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
{ config, pkgs, ... }:
|
||||
let
|
||||
HOME = config.home-manager.users.krizej.home.homeDirectory;
|
||||
in {
|
||||
services.xserver.windowManager.i3.enable = true;
|
||||
home-manager.users.krizej = {
|
||||
xsession.windowManager.i3 = {
|
||||
enable = true;
|
||||
config = rec {
|
||||
assigns = {
|
||||
|
|
@ -12,7 +17,7 @@
|
|||
|
||||
window = {
|
||||
border = 1;
|
||||
titlebar = false;
|
||||
titlebar = true;
|
||||
};
|
||||
|
||||
floating = {
|
||||
|
|
@ -21,7 +26,7 @@
|
|||
criteria = [
|
||||
{ class = "zenity"; }
|
||||
{ class = "fceux"; }
|
||||
{ title = "Friends List"; } # steam
|
||||
{ title = "Friends List"; }
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -31,15 +36,17 @@
|
|||
};
|
||||
|
||||
fonts = {
|
||||
names = ["JetBrains Mono NL"];
|
||||
names = [ "JetBrains Mono NL" ];
|
||||
size = 10.0;
|
||||
};
|
||||
|
||||
bars = [{
|
||||
bars = [
|
||||
{
|
||||
inherit fonts;
|
||||
trayOutput = "primary";
|
||||
statusCommand = "${pkgs.i3status}/bin/i3status";
|
||||
}];
|
||||
}
|
||||
];
|
||||
|
||||
defaultWorkspace = "workspace number 1";
|
||||
workspaceOutputAssign = [
|
||||
|
|
@ -54,27 +61,19 @@
|
|||
};
|
||||
|
||||
startup = [
|
||||
# { command = "picom &"; notification = false; }
|
||||
{ command = "mpd &"; notification = false; }
|
||||
# { command = "mpd &"; notification = false; }
|
||||
{ command = "dunst &"; notification = false; }
|
||||
{ command = "flameshot &"; notification = false; }
|
||||
|
||||
# { command = "lcd-bar startdaemon 192.168.1.12 &"; notification = false; }
|
||||
# { command = "lcd-bar-status &"; notification = false; }
|
||||
|
||||
{ command = "i3bar-mouse &"; notification = false; }
|
||||
|
||||
# { command = "hydration.sh &"; notification = false; }
|
||||
|
||||
{ command = "i3-msg \"workspace 2; append_layout ~/.config/i3/workspace2.json\""; notification = false; }
|
||||
{ command = "discord &"; notification = false; }
|
||||
{ command = "element-desktop &"; notification = false; }
|
||||
|
||||
# { command = "xrandr --output DP-3 --mode 1920x1080 --rate 239.76 --primary --output HDMI-3 --mode 1920x1080 --rate 74.97 --right-of DP-3 &"; notification = false; }
|
||||
# { command = "xrandr --output DP-3 --mode 1920x1080 --rate 239.76 --primary --output HDMI-3 --mode 1920x1080 --rate 74.97 --right-of DP-3 &"; notification = false; }
|
||||
];
|
||||
|
||||
modes = let
|
||||
cmd_and_center = (cmd: "exec --no-startup-id i3-msg '${cmd}' && i3-center-mouse-on-focus");
|
||||
cmd_and_center = cmd: "exec --no-startup-id i3-msg '${cmd}' && i3-center-mouse-on-focus";
|
||||
in {
|
||||
resize = {
|
||||
"Left" = cmd_and_center "resize shrink width 10 px or 10 ppt";
|
||||
|
|
@ -87,18 +86,18 @@
|
|||
|
||||
modifier = "Mod4";
|
||||
floating.modifier = "Mod4";
|
||||
|
||||
keybindings = let
|
||||
mod = modifier;
|
||||
execns = "exec --no-startup-id";
|
||||
cmd_and_center = (cmd: "${execns} i3-msg '${cmd}' && i3custom-center-mouse-on-focus");
|
||||
cmd_and_center = cmd: "${execns} i3-msg '${cmd}' && i3custom-center-mouse-on-focus";
|
||||
in {
|
||||
# Program keybinds
|
||||
"${mod}+Return" = "${execns} alacritty";
|
||||
"${mod}+Shift+s" = "${execns} flameshot gui";
|
||||
"${mod}+b" = "${execns} firefox";
|
||||
"${mod}+d" = "${execns} rofi -show drun";
|
||||
# hack, see i3 user doc for --release flag
|
||||
"--release ${mod}+k" = "exec xkill";
|
||||
"${mod}+d" = "${execns} dmenu_run";
|
||||
"--release ${mod}+k" = "${execns} xkill";
|
||||
|
||||
# Volume control
|
||||
"Ctrl+F9" = "${execns} pamixer --toggle-mute";
|
||||
|
|
@ -123,7 +122,7 @@
|
|||
"${mod}+Shift+r" = "restart";
|
||||
"${mod}+Shift+e" = "${execns} i3-nagbar -t warning -m 'exit?' -b 'yes' 'i3-msg exit'";
|
||||
# Mouse bindings
|
||||
# "--border --whole-window button8" = "${execns} i3custom-window-actions";
|
||||
"--border button3" = "${execns} i3custom-window-actions";
|
||||
|
||||
"${mod}+Left" = cmd_and_center "focus left";
|
||||
"${mod}+Right" = cmd_and_center "focus right";
|
||||
|
|
@ -138,7 +137,7 @@
|
|||
"${mod}+w" = cmd_and_center "layout tabbed";
|
||||
"${mod}+e" = cmd_and_center "layout toggle split";
|
||||
|
||||
"${mod}+Shift+space" = "${execns} i3custom-floating-toggle && i3custom-center-mouse-on-focus";
|
||||
"${mod}+Shift+space" = "floating toggle; ${execns} i3custom-center-mouse-on-focus";
|
||||
"${mod}+space" = cmd_and_center "focus mode_toggle";
|
||||
|
||||
"${mod}+1" = cmd_and_center "workspace number 1";
|
||||
|
|
@ -164,4 +163,85 @@
|
|||
"${mod}+Shift+0" = cmd_and_center "move container to workspace number 10";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.i3status = {
|
||||
enable = true;
|
||||
enableDefault = false;
|
||||
|
||||
general = {
|
||||
interval = 1;
|
||||
colors = true;
|
||||
color_good = "#91d956";
|
||||
color_bad = "#f43841";
|
||||
color_degraded = "#ffdd33";
|
||||
output_format = "i3bar";
|
||||
};
|
||||
|
||||
modules = {
|
||||
"cpu_usage" = {
|
||||
position = 0;
|
||||
settings = {
|
||||
format = "cpu: %usage";
|
||||
};
|
||||
};
|
||||
|
||||
"memory" = {
|
||||
position = 1;
|
||||
settings = {
|
||||
format = "mem: %used";
|
||||
threshold_degraded = "1G";
|
||||
format_degraded = "MEMORY < %available";
|
||||
};
|
||||
};
|
||||
|
||||
"volume master" = {
|
||||
position = 2;
|
||||
settings = {
|
||||
color_degraded = "#333333";
|
||||
format = "vol: %volume";
|
||||
format_muted = "vol: ---";
|
||||
};
|
||||
};
|
||||
|
||||
"tztime local" = {
|
||||
position = 3;
|
||||
settings = {
|
||||
format = "%Y-%m-%d %H:%M:%S (%A)";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
(pkgs.writeShellScriptBin "i3custom-center-mouse-on-focus" ''
|
||||
eval $(xdotool getwindowfocus getwindowgeometry --shell)
|
||||
MX=$(($X + $WIDTH / 2))
|
||||
MY=$(($Y + $HEIGHT / 2))
|
||||
xdotool mousemove $MX $MY
|
||||
'')
|
||||
|
||||
(pkgs.writeShellScriptBin "i3custom-window-actions" ''
|
||||
yad --splash --mouse --title="i3 window actions" \
|
||||
--gtkrc="${HOME}/.config/i3/i3gtk.css" \
|
||||
--text="i3 window actions" \
|
||||
--button float:0 --button kill:1
|
||||
|
||||
case $? in
|
||||
0) i3-msg "floating toggle";;
|
||||
1) i3-msg "kill";;
|
||||
-1) ;;
|
||||
esac
|
||||
'')
|
||||
|
||||
(pkgs.writeShellScriptBin "i3custom-floating-toggle" ''
|
||||
i3-msg "mark --add _; [con_mark=f] floating disable, border pixel 1, mark --add --toggle _; [con_mark=_] floating enable, border normal; mark --add --toggle f;"
|
||||
'')
|
||||
];
|
||||
|
||||
home.file = {
|
||||
".config/i3/workspace2.json".source = ../files/workspace2.json;
|
||||
".config/i3/i3gtk.css".source = ../files/i3gtk.css;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{...}:
|
||||
{ ... }:
|
||||
{
|
||||
enable = true;
|
||||
services.openssh.enable = true;
|
||||
|
||||
home-manager.users.krizej.programs.ssh = {
|
||||
enable = true;
|
||||
matchBlocks = {
|
||||
"github.com" = {
|
||||
user = "git";
|
||||
|
|
@ -22,4 +24,5 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,12 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.vim ];
|
||||
|
||||
home-manager.users.krizej = {
|
||||
home.sessionVariables = { "EDITOR" = "vim"; };
|
||||
# fixme: not .vim
|
||||
home.file = { ".vim/colors/darcula.vim".source = ../files/darcula.vim; };
|
||||
programs.vim = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
plugins = [
|
||||
|
|
@ -10,9 +17,9 @@
|
|||
vimCache = "~/.cache/vim";
|
||||
in {
|
||||
background = "dark";
|
||||
backupdir = [ "${vimCache}/backup/" ];
|
||||
backupdir = ["${vimCache}/backup/"];
|
||||
copyindent = false;
|
||||
directory = [ "~/.cache/vim/swap/" ];
|
||||
directory = ["~/.cache/vim/swap/"];
|
||||
expandtab = true;
|
||||
hidden = false;
|
||||
history = 420;
|
||||
|
|
@ -27,7 +34,7 @@
|
|||
shiftwidth = 4;
|
||||
smartcase = false;
|
||||
tabstop = 4;
|
||||
undodir = [ "~/.cache/vim/undo/" ];
|
||||
undodir = ["~/.cache/vim/undo/"];
|
||||
undofile = false;
|
||||
};
|
||||
extraConfig = ''
|
||||
|
|
@ -44,4 +51,9 @@
|
|||
let g:c_no_c11 = 1
|
||||
let g:c_gnu = 1
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
# fuck you
|
||||
programs.nano.enable = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,2 +1,5 @@
|
|||
i have no idea what i'm doing
|
||||
|
||||
todo:
|
||||
- fix formatting in pkgs/
|
||||
- laptop config
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
[
|
||||
"picom"
|
||||
"flameshot"
|
||||
"dunst"
|
||||
]
|
||||
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./dunst.nix
|
||||
./flameshot.nix
|
||||
./sddm.nix
|
||||
./xserver.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{...}:
|
||||
{ ... }:
|
||||
{
|
||||
home-manager.users.krizej.services.dunst = {
|
||||
enable = true;
|
||||
settings = {
|
||||
global = {
|
||||
|
|
@ -11,5 +12,5 @@
|
|||
frame_color = "#4c7899";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{...}:
|
||||
{ ... }:
|
||||
{
|
||||
home-manager.users.krizej.services.flameshot = {
|
||||
enable = true;
|
||||
settings = {
|
||||
General = {
|
||||
|
|
@ -7,4 +8,5 @@
|
|||
showStartupLaunchMessage = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
services.displayManager = {
|
||||
defaultSession = "none+i3";
|
||||
sddm = {
|
||||
enable = true;
|
||||
theme = "sddm-i3-theme";
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.sddm-i3-theme ];
|
||||
}
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
services = {
|
||||
xserver = {
|
||||
enable = true;
|
||||
xkb.layout = "pl";
|
||||
|
||||
displayManager = {
|
||||
# THIS SHIT DOESN'T WORK!!!
|
||||
setupCommands = ''
|
||||
xrandr --output DP-3 --mode 1920x1080 --rate 239.76 --primary
|
||||
xrandr --output HDMI-1 --off
|
||||
xset r rate 180 50
|
||||
'';
|
||||
sessionCommands = ''
|
||||
xrandr --output DP-3 --mode 1920x1080 --rate 239.76 --primary
|
||||
xrandr --output HDMI-1 --mode 1920x1080 --rate 74.97 --right-of DP-3
|
||||
xset r rate 180 50
|
||||
'';
|
||||
};
|
||||
|
||||
# THIS SHIT DOESN'T WORK!!!
|
||||
autoRepeatDelay = 180;
|
||||
autoRepeatInterval = 50;
|
||||
};
|
||||
};
|
||||
|
||||
home-manager.users.krizej.xsession.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
xclip
|
||||
xorg.xkill
|
||||
xorg.xev
|
||||
xdotool
|
||||
];
|
||||
|
||||
# https://www.reddit.com/r/linux_gaming/comments/1dkbh5t/games_behaving_differently_on_xorg_than_on/
|
||||
# FUCK YOU LIBINPUT
|
||||
services.libinput.enable = lib.mkForce false;
|
||||
# services.libinput = {
|
||||
# enable = true;
|
||||
# touchpad = {
|
||||
# naturalScrolling = false; # it's reversed on my laptop for some reason
|
||||
# tapping = true;
|
||||
# tappingButtonMap = "lmr";
|
||||
# scrollMethod = "edge";
|
||||
# };
|
||||
# };
|
||||
}
|
||||
Loading…
Reference in a new issue