mirror of
https://github.com/elwrcl/copnix.git
synced 2026-10-31 14:28:02 +03:00
more fixes
This commit is contained in:
1 parent
4f335e4e8b
commit
3379be92ae
18 files changed
+66
-71
No files matched your search
Generated
+1
-1
@@ -678,4 +678,4 @@
|
|||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
"version": 7
|
"version": 7
|
||||||
}
|
}
|
||||||
@@ -25,8 +25,6 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [ ];
|
swapDevices = [ ];
|
||||||
|
|
||||||
networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
}
|
}
|
||||||
@@ -77,4 +77,4 @@
|
|||||||
"format": "\u001b[33m \u001b[32m \u001b[34m \u001b[31m \u001b[36m \u001b[35m \u001b[37m \u001b[97m"
|
"format": "\u001b[33m \u001b[32m \u001b[34m \u001b[31m \u001b[36m \u001b[35m \u001b[37m \u001b[97m"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -98,5 +98,5 @@ export PATH="$HOME/.local/bin:$PATH"
|
|||||||
|
|
||||||
#fetch
|
#fetch
|
||||||
copetch --ascii
|
copetch --ascii
|
||||||
#fastfetch fuck fastfetch i'm better
|
#fuckfastfetch i'm better!
|
||||||
|
|
||||||
@@ -94,11 +94,11 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
device = [
|
device = [
|
||||||
{
|
{
|
||||||
name = "hp--inc-hyperx-cloud-alpha-s-consumer-control";
|
name = "hp--inc-hyperx-cloud-alpha-s-consumer-control";
|
||||||
enabled = false;
|
enabled = false;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
ipc = "noctalia-shell ipc call";
|
ipc = "noctalia-shell ipc call";
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
wayland.windowManager.hyprland.settings = {
|
wayland.windowManager.hyprland.settings = {
|
||||||
"$mainMod" = "SUPER";
|
"$mainMod" = "SUPER";
|
||||||
|
|
||||||
@@ -17,8 +18,8 @@ in {
|
|||||||
|
|
||||||
# interface
|
# interface
|
||||||
"$mainMod, Tab, exec, ${ipc} launcher windows"
|
"$mainMod, Tab, exec, ${ipc} launcher windows"
|
||||||
"$mainMod, P, exec, ${ipc} bar toggle"
|
"$mainMod, P, exec, ${ipc} bar toggle"
|
||||||
"CTRL ALT, Delete, exec, ${ipc} sessionMenu toggle"
|
"CTRL ALT, Delete, exec, ${ipc} sessionMenu toggle"
|
||||||
# plugins
|
# plugins
|
||||||
"$mainMod SHIFT, S, exec, ${ipc} plugin:screen-shot-and-record screenshot"
|
"$mainMod SHIFT, S, exec, ${ipc} plugin:screen-shot-and-record screenshot"
|
||||||
"$mainMod SHIFT, Z, exec, ${ipc} plugin:screen-shot-and-record search"
|
"$mainMod SHIFT, Z, exec, ${ipc} plugin:screen-shot-and-record search"
|
||||||
@@ -26,13 +27,13 @@ in {
|
|||||||
"$mainMod SHIFT, C, exec, ${ipc} plugin:music panel"
|
"$mainMod SHIFT, C, exec, ${ipc} plugin:music panel"
|
||||||
# launchers
|
# launchers
|
||||||
"$mainMod, Return, exec, ghostty"
|
"$mainMod, Return, exec, ghostty"
|
||||||
"$mainMod, W, exec, zen-beta"
|
"$mainMod, W, exec, zen-beta"
|
||||||
"$mainMod, E, exec, nautilus"
|
"$mainMod, E, exec, nautilus"
|
||||||
"$mainMod, Z, exec, code"
|
"$mainMod, Z, exec, code"
|
||||||
"$mainMod ALT, V, exec, pavucontrol"
|
"$mainMod ALT, V, exec, pavucontrol"
|
||||||
"$mainMod SHIFT, V, exec, ${ipc} launcher clipboard"
|
"$mainMod SHIFT, V, exec, ${ipc} launcher clipboard"
|
||||||
"$mainMod SHIFT, L, exec, ${ipc} lockScreen lock"
|
"$mainMod SHIFT, L, exec, ${ipc} lockScreen lock"
|
||||||
"CTRL SHIFT, Escape, exec, ghostty -e btop"
|
"CTRL SHIFT, Escape, exec, ghostty -e btop"
|
||||||
|
|
||||||
# window management
|
# window management
|
||||||
"$mainMod, Q, killactive"
|
"$mainMod, Q, killactive"
|
||||||
|
|||||||
@@ -20,4 +20,4 @@
|
|||||||
"float off, match:class ^(steam)$, match:title ^(Steam)$"
|
"float off, match:class ^(steam)$, match:title ^(Steam)$"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
+12
-12
@@ -2,26 +2,26 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v2;
|
boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v2;
|
||||||
|
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
"preempt=full"
|
"preempt=full"
|
||||||
"i915.enable_guc=2"
|
"i915.enable_guc=2"
|
||||||
"i915.fastboot=1"
|
"i915.fastboot=1"
|
||||||
"mitigations=off"
|
"mitigations=off"
|
||||||
"usbcore.autosuspend=-1"
|
"usbcore.autosuspend=-1"
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.loader = {
|
boot.loader = {
|
||||||
timeout = 5;
|
timeout = 5;
|
||||||
efi = {
|
efi = {
|
||||||
canTouchEfiVariables = true;
|
canTouchEfiVariables = true;
|
||||||
efiSysMountPoint = "/boot";
|
efiSysMountPoint = "/boot";
|
||||||
};
|
};
|
||||||
systemd-boot = {
|
systemd-boot = {
|
||||||
enable = true;
|
enable = true;
|
||||||
configurationLimit = 15;
|
configurationLimit = 15;
|
||||||
consoleMode = "max";
|
consoleMode = "max";
|
||||||
editor = false;
|
editor = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
services.pipewire.wireplumber.extraConfig."51-no-mic-monitor" = {
|
services.pipewire.wireplumber.extraConfig."51-no-mic-monitor" = {
|
||||||
"monitor.alsa.rules" = [
|
"monitor.alsa.rules" = [
|
||||||
{
|
{
|
||||||
matches = [ { "node.name" = "~alsa_input.*"; } ];
|
matches = [{ "node.name" = "~alsa_input.*"; }];
|
||||||
actions = {
|
actions = {
|
||||||
"update-props" = {
|
"update-props" = {
|
||||||
"stream.dont-remix" = true;
|
"stream.dont-remix" = true;
|
||||||
@@ -33,4 +33,4 @@
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -5,18 +5,18 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
animation = "colormix";
|
animation = "colormix";
|
||||||
colormix_col1 = "0x00CC00FF"; # bright violet/purple
|
colormix_col1 = "0x00CC00FF";
|
||||||
colormix_col2 = "0x000000EE"; # deep blue
|
colormix_col2 = "0x000000EE";
|
||||||
colormix_col3 = "0x00880099"; # mid purple
|
colormix_col3 = "0x00880099";
|
||||||
|
|
||||||
bigclock = "en";
|
bigclock = "en";
|
||||||
bigclock_12hr = false;
|
bigclock_12hr = false;
|
||||||
|
|
||||||
fg = "0x00FFFFFF";
|
fg = "0x00FFFFFF";
|
||||||
bg = "0x00000000";
|
bg = "0x00000000";
|
||||||
border_fg = "0x00FFFFFF";
|
border_fg = "0x00FFFFFF";
|
||||||
error_fg = "0x01FF0000";
|
error_fg = "0x01FF0000";
|
||||||
blank_box = true;
|
blank_box = true;
|
||||||
hide_borders = false;
|
hide_borders = false;
|
||||||
|
|
||||||
margin_box_h = 2;
|
margin_box_h = 2;
|
||||||
@@ -27,4 +27,4 @@
|
|||||||
layout = "tr";
|
layout = "tr";
|
||||||
variant = "";
|
variant = "";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
driver = config.elars.hardware.graphics.driver;
|
driver = config.elars.hardware.graphics.driver;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.elars.hardware.graphics.driver = lib.mkOption {
|
options.elars.hardware.graphics.driver = lib.mkOption {
|
||||||
type = lib.types.enum [ "intel" "amd" "nvidia" "hybrid-amd-nvidia" ];
|
type = lib.types.enum [ "intel" "amd" "nvidia" "hybrid-amd-nvidia" ];
|
||||||
default = "intel";
|
default = "intel";
|
||||||
@@ -16,13 +17,13 @@ in {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
(lib.mkIf (driver == "intel") (import ./intel.nix { inherit config lib pkgs; }))
|
(lib.mkIf (driver == "intel") (import ./intel.nix { inherit config lib pkgs; }))
|
||||||
(lib.mkIf (driver == "amd") (import ./amd.nix { inherit config lib pkgs; }))
|
(lib.mkIf (driver == "amd") (import ./amd.nix { inherit config lib pkgs; }))
|
||||||
(lib.mkIf (driver == "nvidia") (import ./nvidia.nix { inherit config lib pkgs; }))
|
(lib.mkIf (driver == "nvidia") (import ./nvidia.nix { inherit config lib pkgs; }))
|
||||||
(lib.mkIf (driver == "hybrid-amd-nvidia") (lib.mkMerge [
|
(lib.mkIf (driver == "hybrid-amd-nvidia") (lib.mkMerge [
|
||||||
(import ./amd.nix { inherit config lib pkgs; })
|
(import ./amd.nix { inherit config lib pkgs; })
|
||||||
(import ./nvidia.nix { inherit config lib pkgs; })
|
(import ./nvidia.nix { inherit config lib pkgs; })
|
||||||
(import ./prime.nix { inherit config lib pkgs; })
|
(import ./prime.nix { inherit config lib pkgs; })
|
||||||
]))
|
]))
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
hardware.nvidia = {
|
hardware.nvidia = {
|
||||||
modesetting.enable = true;
|
modesetting.enable = true;
|
||||||
open = false; # for 20xx series make true for 30xx and newer
|
open = false; # for 20xx series make true for 30xx and newer
|
||||||
nvidiaSettings = true;
|
nvidiaSettings = true;
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
{
|
{
|
||||||
hardware.nvidia.prime = {
|
hardware.nvidia.prime = {
|
||||||
offload.enable = true;
|
offload.enable = true;
|
||||||
amdgpuBusId = "PCI:X:X:X"; # TODO
|
amdgpuBusId = "PCI:X:X:X"; # TODO
|
||||||
nvidiaBusId = "PCI:X:X:X"; # TODO
|
nvidiaBusId = "PCI:X:X:X"; # TODO
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -8,10 +8,7 @@
|
|||||||
via
|
via
|
||||||
vial
|
vial
|
||||||
];
|
];
|
||||||
|
users.groups.plugdev = { };
|
||||||
users.groups.plugdev = {};
|
|
||||||
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
qmk
|
qmk
|
||||||
via
|
via
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
services.resolved = {
|
services.resolved = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
Resolve = {
|
Resolve = {
|
||||||
DNS = "1.1.1.1";
|
DNS = "1.1.1.1";
|
||||||
@@ -17,4 +17,4 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -5,10 +5,6 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
scheduler = "scx_lavd";
|
scheduler = "scx_lavd";
|
||||||
};
|
};
|
||||||
services.ananicy = {
|
|
||||||
enable = false;
|
|
||||||
package = pkgs.ananicy-cpp;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.irqbalance.enable = true;
|
services.irqbalance.enable = true;
|
||||||
}
|
}
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
"https://cache.nixos.org"
|
"https://cache.nixos.org"
|
||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
"https://noctalia.cachix.org"
|
"https://noctalia.cachix.org"
|
||||||
"https://nyx.chaotic.cx"
|
"https://nyx.chaotic.cx"
|
||||||
"https://attic.xuyh0120.win/lantian"
|
"https://attic.xuyh0120.win/lantian"
|
||||||
"https://cache.garnix.io"
|
"https://cache.garnix.io"
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -6,27 +6,29 @@
|
|||||||
description = "elars";
|
description = "elars";
|
||||||
initialPassword = "1111";
|
initialPassword = "1111";
|
||||||
extraGroups = [
|
extraGroups = [
|
||||||
"networkmanager" "wheel" "docker" "plugdev"
|
"networkmanager"
|
||||||
"video" "audio" "lp" "scanner" "libvirtd"
|
"wheel"
|
||||||
|
"docker"
|
||||||
|
"plugdev"
|
||||||
|
"video"
|
||||||
|
"audio"
|
||||||
|
"lp"
|
||||||
|
"scanner"
|
||||||
|
"libvirtd"
|
||||||
];
|
];
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.nh = {
|
programs.nh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
clean.enable = true;
|
clean.enable = true;
|
||||||
clean.extraArgs = "--keep-since 4d --keep 3";
|
clean.extraArgs = "--keep-since 4d --keep 3";
|
||||||
flake = "/home/elars/copland";
|
flake = "/home/elars/copland";
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
autosuggestions.enable = true;
|
autosuggestions.enable = true;
|
||||||
syntaxHighlighting.enable = true;
|
syntaxHighlighting.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.firefox.enable = true;
|
programs.firefox.enable = true;
|
||||||
|
|
||||||
# security.sudo.wheelNeedsPassword = false;
|
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user