faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' of github.com:bloxx12/nichts

Browse source
This commit is contained in:
Charlie Root 2024-10-23 11:20:10 +02:00
commit e1bb4993ca
Signed by: faukah
SSH key fingerprint: SHA256:jpYIt4Vkz1NBTQcks/N9OPTfTFxE6KF2W/rV7hrfrIw
8 changed files with 125 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

127
flake.lock generated
View file

@ -34,18 +34,12 @@
} }
}, },
"crane": { "crane": {
"inputs": {
"nixpkgs": [
"helix",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1709610799, "lastModified": 1727974419,
"narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "81c393c776d5379c030607866afef6406ca1be57", "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -85,11 +79,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1729444244, "lastModified": 1729588452,
"narHash": "sha256-EKsHcsEdM6Ep4BiZ7meTspTc8YHfohR10DAltML/324=", "narHash": "sha256-wwkldM3Ru+3aBBibjYi4MskJzkA7BM3YhL/m3a0x58k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "e622d87bd6d6fa49c486ed32920dbacb15e67f2d", "rev": "dd66a43b14c37c5461bdc4324be3fd32e720c996",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -244,11 +238,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1709126324, "lastModified": 1726560853,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -338,11 +332,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1729331287, "lastModified": 1729477666,
"narHash": "sha256-CiQsoNEOGHkSfG/0JJMegHfwXUAI0PwAIVj3i3FmGao=", "narHash": "sha256-ri40XjKyZIMH5wBCFNa50dq5wTBPF5qH/NVDo+syhNM=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "be2884d80061493ab1999d73ffa51dfb4f59639d", "rev": "6d64e6288add793caf1c841ea295518414c04ea0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -385,11 +379,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729459288, "lastModified": 1729551526,
"narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -419,27 +413,6 @@
"type": "github" "type": "github"
} }
}, },
"hyprchroma": {
"inputs": {
"hyprland": [
"hyprland"
],
"nix-filter": "nix-filter"
},
"locked": {
"lastModified": 1729227619,
"narHash": "sha256-6l7rNESQY5LeS6BSMBTk7quSqDkgPSf7yFD4yiST3cw=",
"owner": "alexhulbert",
"repo": "hyprchroma",
"rev": "a741598975d9a10bb1cbed44470ca8d68dfd9277",
"type": "github"
},
"original": {
"owner": "alexhulbert",
"repo": "hyprchroma",
"type": "github"
}
},
"hyprcursor": { "hyprcursor": {
"inputs": { "inputs": {
"hyprlang": [ "hyprlang": [
@ -483,11 +456,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1729378105, "lastModified": 1729553322,
"narHash": "sha256-rDOABbycdmMH57XyN/9xEDuKIpnsw5vjSrJJWgVQvKI=", "narHash": "sha256-CjdhWsojvgZEr2t8eK6HaaWmLxirnaEckeXt/kveQNs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "08cc063e175e48cea44d26b7e3762f4b8611f0c5", "rev": "5e96d738e698f22969ca502d042d5751711c6d8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -513,11 +486,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728383680, "lastModified": 1729596320,
"narHash": "sha256-/SeOrMuPEOjngI+MBlzqxQ/sJxkJFIYoef+wJ/PmX2w=", "narHash": "sha256-sBPr6O2Ad916f+L7biAjmJVx4TLDITC4joKgeOT47V8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-plugins", "repo": "hyprland-plugins",
"rev": "d05eb1ffba2ebffb5b4e1b407f134a4dcb411a88", "rev": "4d7f0b5d8b952f31f7d2e29af22ab0a55ca5c219",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -892,21 +865,6 @@
} }
}, },
"nix-filter": { "nix-filter": {
"locked": {
"lastModified": 1710156097,
"narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "3342559a24e85fc164b295c3444e8a139924675b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-filter_2": {
"locked": { "locked": {
"lastModified": 1693833173, "lastModified": 1693833173,
"narHash": "sha256-hlMABKrGbEiJD5dwUSfnw1CQ3bG7KKwDV+Nx3bEZd7U=", "narHash": "sha256-hlMABKrGbEiJD5dwUSfnw1CQ3bG7KKwDV+Nx3bEZd7U=",
@ -949,11 +907,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1709479366, "lastModified": 1728018373,
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1007,11 +965,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1729181673, "lastModified": 1729307008,
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1039,11 +997,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1729181673, "lastModified": 1729449015,
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", "rev": "89172919243df199fe237ba0f776c3e3e3d72367",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1087,11 +1045,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1729256560, "lastModified": 1729413321,
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2836,7 +2794,6 @@
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"helix": "helix", "helix": "helix",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprchroma": "hyprchroma",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-plugins": "hyprland-plugins", "hyprland-plugins": "hyprland-plugins",
"hyprsplit": "hyprsplit", "hyprsplit": "hyprsplit",
@ -2855,21 +2812,17 @@
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"flake-utils": [
"helix",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"helix", "helix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1709604635, "lastModified": 1728268235,
"narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", "rev": "25685cc2c7054efc31351c172ae77b21814f2d42",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2962,11 +2915,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729397826, "lastModified": 1729570661,
"narHash": "sha256-PKiCeeV0D8qBRVzlGlx3DE+/0WU8U8maMjB2rRJMBBA=", "narHash": "sha256-gZj1hMVvZjE4inSUElqQuA9iiUioB/zIqgl0i3XcliU=",
"owner": "gerg-l", "owner": "gerg-l",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "1a8fa34b656d67c1d7d4c2b76cba03bf4d65dee4", "rev": "96cf0aad6fe67a31567a51e54dc6b9fcbe90626a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2980,7 +2933,7 @@
"hyprland": [ "hyprland": [
"hyprland" "hyprland"
], ],
"nix-filter": "nix-filter_2" "nix-filter": "nix-filter"
}, },
"locked": { "locked": {
"lastModified": 1729443896, "lastModified": 1729443896,

5
flake.nix
View file

@ -43,11 +43,6 @@
inputs.hyprland.follows = "hyprland"; inputs.hyprland.follows = "hyprland";
}; };
hyprchroma = {
url = "github:alexhulbert/hyprchroma";
inputs.hyprland.follows = "hyprland";
};
hyprsplit = { hyprsplit = {
url = "github:shezdy/hyprsplit"; url = "github:shezdy/hyprsplit";
inputs.hyprland.follows = "hyprland"; inputs.hyprland.follows = "hyprland";

21
hosts/temperance/configuration.nix
View file

@ -3,13 +3,32 @@
lib, lib,
pkgs, pkgs,
... ...
}: { }: let
inherit
(
pkgs.callPackage ./kernel/xanmod.nix {
inherit lib;
inherit
(pkgs)
stdenv
fetchFromGitHub
kernelPatches
buildLinux
variant
;
}
)
xanmod_blox
;
in {
# Time Zone # Time Zone
time.timeZone = "Europe/Zurich"; time.timeZone = "Europe/Zurich";
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
console.keyMap = "de"; console.keyMap = "de";
security.polkit.enable = true; security.polkit.enable = true;
# boot.kernelPackages = pkgs.linuxPackagesFor xanmod_blox;
boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
services = { services = {

64
hosts/temperance/kernel/xanmod.nix Normal file
View file

@ -0,0 +1,64 @@
{
lib,
stdenv,
fetchFromGitHub,
buildLinux,
kernelPatches,
...
}: let
pname = "linux-xanmod";
version = "6.11.5";
vendorSuffix = "xanmod1";
modDirVersion = lib.versions.pad 3 "${version}-xanmod1";
inherit (lib.modules) mkForce;
inherit (lib.kernel) freeform yes no;
xanmod_blox = buildLinux {
inherit pname version modDirVersion;
src = fetchFromGitHub {
owner = "xanmod";
repo = "linux";
rev = "refs/tags/${version}-${vendorSuffix}";
hash = "sha256-G4u0LQtIeJ0dNAmjNH0OKihmbkivYVbrbXDB9vPw2xI=";
};
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
enableCommonConfig = true;
# Default Xanmod options
structuredExtraConfig = {
# CPUFreq governor Performance
CPU_FREQ_DEFAULT_GOV_PERFORMANCE = mkForce 60 yes;
CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = mkForce 60 no;
# Full preemption
PREEMPT = mkForce 60 yes;
PREEMPT_VOLUNTARY = mkForce 60 no;
# Google's BBRv3 TCP congestion Control
TCP_CONG_BBR = yes;
DEFAULT_BBR = yes;
# Preemptive Full Tickless Kernel at 250Hz
HZ = freeform "250";
HZ_250 = yes;
HZ_1000 = no;
# RCU_BOOST and RCU_EXP_KTHREAD
RCU_EXPERT = yes;
RCU_FANOUT = freeform "64";
RCU_FANOUT_LEAF = freeform "16";
RCU_BOOST = yes;
RCU_BOOST_DELAY = freeform "0";
RCU_EXP_KTHREAD = yes;
};
};
in {
inherit
xanmod_blox
;
}

2
modules/programs/editors/emacs/module.nix
View file

@ -88,7 +88,7 @@ in {
# :tools lookup & :lang org +roam # :tools lookup & :lang org +roam
sqlite sqlite
# :lang latex & :lang org (latex previews) # :lang latex & :lang org (latex previews)
texlive.combined.scheme-medium # texlive.combined.scheme-medium
# :lang nix # :lang nix
age age
]; ];

2
modules/wms/wayland/hyprland/decorations.nix
View file

@ -64,8 +64,6 @@ in {
"size 70% 70%, class:^(code), title: ^(Open*)" "size 70% 70%, class:^(code), title: ^(Open*)"
"center, class: ^(code), title: ^(Open*)" "center, class: ^(code), title: ^(Open*)"
"float, class:^(org.keepassxc.KeePassXC)$" "float, class:^(org.keepassxc.KeePassXC)$"
"plugin:chromakey,fullscreen:0"
# "chromakey_background = rgb(07121b)"
]; ];
}; };
}; };

2
modules/wms/wayland/hyprland/module.nix
View file

@ -8,7 +8,6 @@
cfg = config.modules.usrEnv.desktops.hyprland; cfg = config.modules.usrEnv.desktops.hyprland;
inherit (config.meta.mainUser) username; inherit (config.meta.mainUser) username;
inherit (inputs'.hyprsplit.packages) hyprsplit; inherit (inputs'.hyprsplit.packages) hyprsplit;
hyprchroma = inputs'.hyprchroma.packages.default;
inherit (lib) mkIf mkDefault; inherit (lib) mkIf mkDefault;
in { in {
imports = [ imports = [
@ -49,7 +48,6 @@ in {
# Split-monitor-workspaces provides awesome-like workspace behaviour # Split-monitor-workspaces provides awesome-like workspace behaviour
plugins = [ plugins = [
hyprsplit hyprsplit
hyprchroma
]; ];
# Xwayland for X applications # Xwayland for X applications

10
modules/wms/wayland/hyprland/workspaces.nix
View file

@ -10,16 +10,6 @@
in { in {
home-manager.users.${username} = { home-manager.users.${username} = {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
# Monitor config
# monitor = [
# "eDP-1,1920x1080,0x0,1"
# # "DP-2,1920x1080,0x0,1"
# # "HDMI-A-2,1920x1080,1920x0,1"
# # "HDMI-A-1,1920x1080,3840x0,1"
# # Had the shadow monitor bug, so had to disable all unknown monitors.
# "Unknown-1,disable"
# ];
# INFO: This is a custom function to map all of my monitors to workspaces. # INFO: This is a custom function to map all of my monitors to workspaces.
# Since I use split-monitor-workspaces, I map 10 workspaces to each monitor # Since I use split-monitor-workspaces, I map 10 workspaces to each monitor
# and set the first one to be the default one. # and set the first one to be the default one.