forked from poz/niksos
finally switched :D
This commit is contained in:
parent
ef623d1a14
commit
cced77b014
8 changed files with 121 additions and 40 deletions
|
@ -90,6 +90,11 @@
|
|||
swaylock
|
||||
trash-cli
|
||||
bibata-cursors
|
||||
swww
|
||||
opentabletdriver
|
||||
networkmanagerapplet
|
||||
wl-clipboard
|
||||
wlsunset
|
||||
];
|
||||
|
||||
stateVersion = lib.mkDefault "23.11";
|
||||
|
|
|
@ -8,16 +8,35 @@
|
|||
gtk = {
|
||||
enable = true;
|
||||
theme = {
|
||||
name = "Catppuccin-Mocha";
|
||||
name = "Catppuccin-Mocha-Standard-Green-dark";
|
||||
package = pkgs.catppuccin-gtk.override {
|
||||
size = "standard";
|
||||
accents = [ "green" ];
|
||||
variant = "mocha";
|
||||
tweaks = [ "normal" ];
|
||||
};
|
||||
};
|
||||
iconTheme = {
|
||||
name = "Papirus-Dark";
|
||||
package = pkgs.catppuccin-papirus-folders.override {
|
||||
accent = "green";
|
||||
flavor = "mocha";
|
||||
};
|
||||
};
|
||||
};
|
||||
home.sessionVariables = {
|
||||
home = {
|
||||
sessionVariables = {
|
||||
GTK_THEME = "${config.gtk.theme.name}";
|
||||
|
||||
GTK_USE_PORTAL = "1";
|
||||
};
|
||||
pointerCursor = {
|
||||
package = pkgs.bibata-cursors;
|
||||
name = "Bibata-Modern-Classic";
|
||||
size = 24;
|
||||
gtk.enable = true;
|
||||
x11.enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -14,9 +14,9 @@
|
|||
];
|
||||
extraConfig = ''
|
||||
#laptop
|
||||
#monitor=eDP-1,2560@1440@165,0x0,1
|
||||
monitor=eDP-1,2560@1440@165,0x0,1
|
||||
#second monitor
|
||||
#monitor=HDMI-A-1,2560x1440@144,2560x0,1
|
||||
monitor=HDMI-A-1,2560x1440@144,2560x0,1
|
||||
|
||||
workspace = 1, monitor: eDP-1, default:true
|
||||
workspace = 2, monitor: eDP-1
|
||||
|
@ -29,16 +29,20 @@
|
|||
workspace = 9, monitor: eDP-1
|
||||
workspace = 10, monitor: eDP-1
|
||||
|
||||
#workspace = 11, monitor: HDMI-A-1, default:true
|
||||
#workspace = 12, monitor: HDMI-A-1
|
||||
#workspace = 13, monitor: HDMI-A-1
|
||||
#workspace = 14, monitor: HDMI-A-1
|
||||
#workspace = 15, monitor: HDMI-A-1
|
||||
#workspace = 16, monitor: HDMI-A-1
|
||||
#workspace = 17, monitor: HDMI-A-1
|
||||
#workspace = 18, monitor: HDMI-A-1
|
||||
#workspace = 19, monitor: HDMI-A-1
|
||||
#workspace = 20, monitor: HDMI-A-1
|
||||
workspace = 11, monitor: HDMI-A-1, default:true
|
||||
workspace = 12, monitor: HDMI-A-1
|
||||
workspace = 13, monitor: HDMI-A-1
|
||||
workspace = 14, monitor: HDMI-A-1
|
||||
workspace = 15, monitor: HDMI-A-1
|
||||
workspace = 16, monitor: HDMI-A-1
|
||||
workspace = 17, monitor: HDMI-A-1
|
||||
workspace = 18, monitor: HDMI-A-1
|
||||
workspace = 19, monitor: HDMI-A-1
|
||||
workspace = 20, monitor: HDMI-A-1
|
||||
|
||||
workspace = special:btop, allpseudo
|
||||
workspace = special:amdgpu_top, allpseudo
|
||||
workspace = special:helvum, allpseudo
|
||||
|
||||
input {
|
||||
kb_layout=pl
|
||||
|
@ -183,6 +187,7 @@
|
|||
# https://github.com/n3oney/shadower
|
||||
bind = SUPER, S, exec, grimblast save area - | shadower | tee "$(xdg-user-dir PICTURES)/Screenshots/$(date +'screenshot-%Y%m%d%H%M%S.png')" | wl-copy && notify-send "Screenshot taken"
|
||||
bind = SUPERSHIFT, S, exec, grimblast save area - | swappy -f - -o - | shadower | tee "$(xdg-user-dir PICTURES)/Screenshots/$(date +'screenshot-%Y%m%d%H%M%S.png')" | wl-copy && notify-send "Screenshot taken"
|
||||
bind = SUPERCONTROL, S, exec, grimblast save area - | tee "$(xdg-user-dir PICTURES)/Screenshots/$(date +'screenshot-%Y%m%d%H%M%S.png')" | wl-copy && notify-send "Screenshot taken"
|
||||
bind = SUPERSHIFT, R, exec, hyprctl reload
|
||||
bind = SUPER, P, pin
|
||||
bind = , XF86Launch1, exec, rog-control-center
|
||||
|
@ -201,6 +206,12 @@
|
|||
bind = SUPER, G, togglegroup
|
||||
binde = SUPERSHIFT, G, changegroupactive, f
|
||||
bind = SUPERCONTROL, R, exec, replay-sorcery save
|
||||
bind = SUPERCONTROL, X, exec, /usr/lib/xdg-desktop-portal-hyprland -r
|
||||
bind = SUPERSHIFT, X, exec, hyprctl kill
|
||||
bind = SUPER, B, togglespecialworkspace, btop
|
||||
bind = SUPER, A, togglespecialworkspace, amdgpu_top
|
||||
bind = SUPER, V, togglespecialworkspace, helvum
|
||||
|
||||
|
||||
bindm = SUPER, mouse:272, movewindow
|
||||
bindm = SUPER, mouse:273, resizewindow
|
||||
|
@ -230,8 +241,7 @@
|
|||
exec-once=swww img -o HDMI-A-1 ~/catppuccin-wall1.png
|
||||
|
||||
exec-once=rog-control-center
|
||||
exec-once=mullvad-vpn
|
||||
exec-once=gammastep-indicator
|
||||
exec-once=wlsunset -S 06:00 -s 20:00
|
||||
|
||||
exec-once=sleep 1 && keepassxc
|
||||
|
||||
|
@ -245,7 +255,7 @@
|
|||
|
||||
exec-once=$HOME/.local/share/hyprload/hyprload.sh
|
||||
|
||||
exec-once=fcitx5 -d
|
||||
#exec-once=fcitx5 -d
|
||||
|
||||
exec-once=systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
|
||||
exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=$XDG_CURRENT_DESKTOP
|
||||
|
|
|
@ -8,11 +8,12 @@
|
|||
config = {
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme = "qtct";
|
||||
#platformTheme = "qtct";
|
||||
style = {
|
||||
name = "Catppuccin-Mocha-Dark";
|
||||
package = pkgs.catppuccin-kde.override {
|
||||
flavour = "mocha";
|
||||
accents = [ "green" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -28,6 +29,7 @@
|
|||
|
||||
sessionVariables = {
|
||||
QT_STYLE_OVERRIDE = "kvantum";
|
||||
QT_AUTO_SCREEN_SCALE_FACTOR = "1";
|
||||
QT_QPA_PLATFORM = "wayland;xcb";
|
||||
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
|
||||
DISABLE_QT_COMPAT = "0";
|
||||
|
@ -36,12 +38,12 @@
|
|||
|
||||
xdg.configFile = {
|
||||
"Kvantum/catppuccin/catppuccin.kvconfig".source = builtins.fetchurl {
|
||||
url = "https://raw.githubusercontent.com/catppuccin/Kvantum/main/src/Catppuccin-Mocha-Blue/Catppuccin-Mocha-Blue.kvconfig";
|
||||
sha256 = "1f8xicnc5696g0a7wak749hf85ynfq16jyf4jjg4dad56y4csm6s";
|
||||
url = "https://raw.githubusercontent.com/catppuccin/Kvantum/main/src/Catppuccin-Mocha-Green/Catppuccin-Mocha-Green.kvconfig";
|
||||
sha256 = "16ry4k09nf5w1gyawwz2ny14zn6infqk40l35lqlg30lhgbdmr5f";
|
||||
};
|
||||
"Kvantum/catppuccin/catppuccin.svg".source = builtins.fetchurl {
|
||||
url = "https://raw.githubusercontent.com/catppuccin/Kvantum/main/src/Catppuccin-Mocha-Blue/Catppuccin-Mocha-Blue.svg";
|
||||
sha256 = "0vys09k1jj8hv4ra4qvnrhwxhn48c2gxbxmagb3dyg7kywh49wvg";
|
||||
url = "https://raw.githubusercontent.com/catppuccin/Kvantum/main/src/Catppuccin-Mocha-Green/Catppuccin-Mocha-Green.svg";
|
||||
sha256 = "1djh625qag34rjsp7y67nzbi9nbmiwgq63ydfizsh65n3fyfakf1";
|
||||
};
|
||||
"Kvantum/kvantum.kvconfig".text = ''
|
||||
[General]
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
settings.mainBar = {
|
||||
gtk-layer-shell = true;
|
||||
layer = "top";
|
||||
modules-left = [ "custom/launcher" "custom/xwayland" "tray" "hyprland/workspaces" ];
|
||||
modules-left = [ "custom/launcher" "custom/xwayland" "tray" "wlr/workspaces" ];
|
||||
modules-center = [ "hyprland/window" ];
|
||||
modules-right = [ "custom/dnd" "backlight" "cava" "pulseaudio" "clock" "battery" "custom/power" ];
|
||||
|
||||
|
@ -26,9 +26,9 @@
|
|||
};
|
||||
on-click = "pactl set-sink-mute @DEFAULT_SINK@ toggle";
|
||||
};
|
||||
"hyprland/workspaces" = {
|
||||
sort-by-name = false;
|
||||
sort-by-coordinates = true;
|
||||
"wlr/workspaces" = {
|
||||
sort-by-name = true;
|
||||
sort-by-coordinates = false;
|
||||
on-click = "activate";
|
||||
on-scroll = "~/Scripts/cycle_workspace.sh 1";
|
||||
active-only = false;
|
||||
|
|
|
@ -17,8 +17,8 @@ in
|
|||
{
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
boot.loader.grub.enable = true;
|
||||
boot.loader.grub.device = "/dev/sda";
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
|
@ -127,6 +127,13 @@ in
|
|||
};
|
||||
};
|
||||
};
|
||||
blueman.enable = true;
|
||||
mullvad-vpn.enable = true;
|
||||
};
|
||||
|
||||
hardware = {
|
||||
opentabletdriver.enable = true;
|
||||
bluetooth.enable = true;
|
||||
};
|
||||
|
||||
system.stateVersion = "23.11";
|
||||
|
|
35
hosts/niks/hardware-configuration-hp.nix
Normal file
35
hosts/niks/hardware-configuration-hp.nix
Normal file
|
@ -0,0 +1,35 @@
|
|||
# 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")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/06e2185a-93c7-4f1e-9b5d-a2305d5dcfe0";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/47726615-99a2-4d3d-b6bd-71427c0f2a30"; }
|
||||
];
|
||||
|
||||
# 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
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
|
@ -8,28 +8,31 @@
|
|||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/06e2185a-93c7-4f1e-9b5d-a2305d5dcfe0";
|
||||
fsType = "ext4";
|
||||
{ device = "/dev/disk/by-uuid/427c555e-be1c-480c-99c1-dd50ff68b89d";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/47726615-99a2-4d3d-b6bd-71427c0f2a30"; }
|
||||
];
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/52D3-DEAB";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
# 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
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue