kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Kropatz/dotfiles

Browse Source
This commit is contained in:
Kopatz
2023-12-06 11:34:35 +01:00
parent 0028033ba0 3cafabb952
commit 8d27283335
8 changed files with 65 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock generated
View File

@@ -138,11 +138,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1701250978,
"narHash": "sha256-ohu3cz4edjpGxs2qUTgbs0WrnewOX4crnUJNEB6Jox4=",
"lastModified": 1701656485,
"narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "8772491ed75f150f02552c60694e1beff9f46013",
"rev": "fa194fc484fd7270ab324bb985593f71102e84d1",
"type": "github"
},
"original": {
@@ -161,11 +161,11 @@
]
},
"locked": {
"lastModified": 1701387264,
"narHash": "sha256-uGZycEJqOZSYvpmoFuyDrboe5e1t0F/HB9r7HsWgssc=",
"lastModified": 1701722881,
"narHash": "sha256-Wim+dqT6W6nTdifu/jmToIzD7eCQaCEhDqDp5kexyfM=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "1a50ab3fe98934d8f109f05528874c9ab324707b",
"rev": "5ee4fa3515de7b5609e6d161b800d91328a7a143",
"type": "github"
},
"original": {
@@ -192,11 +192,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1701253981,
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
"lastModified": 1701436327,
"narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
"rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
"type": "github"
},
"original": {
@@ -223,11 +223,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1701263465,
"narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=",
"lastModified": 1701539137,
"narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3",
"rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d",
"type": "github"
},
"original": {

2
flake.nix
View File

@@ -98,10 +98,12 @@
./users/kopatz.nix
./modules/graphical/plasma.nix
./modules/graphical/hyprland.nix
./modules/graphical/emulators.nix
./modules/graphical/shared.nix
./modules/hardware/nvidia.nix
./modules/hardware/ssd.nix
./modules/hardware/firmware.nix
#./modules/hardware/scheduler.nix
# use latest kernel
./modules/kernel.nix
./modules/nix/settings.nix

7
modules/graphical/emulators.nix Normal file
View File

@@ -0,0 +1,7 @@
{ config, pkgs, inputs, ... }:
{
environment.systemPackages = with pkgs; [
snes9x
];
}

25
modules/graphical/hyprland.nix
View File

@@ -26,6 +26,7 @@ in
# Hint electron apps to use wayland
NIXOS_OZONE_WL = "1";
WLR_NO_HARDWARE_CURSORS="1";
#WLR_DRM_NO_ATOMIC="1";
WLR_DRM_DEVICES = "/dev/dri/card0";
};
@@ -93,15 +94,16 @@ in
};
general = {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
# See https://wiki.hyprland.org/Configuring/Variables
gaps_in = 5;
gaps_out = 20;
gaps_out = 5;
border_size = 2;
"col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
"col.inactive_border" = "rgba(595959aa)";
layout = "dwindle";
#allow_tearing = true;
};
decoration = {
@@ -120,7 +122,7 @@ in
};
animations = {
enabled = false;
enabled = true;
# Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
@@ -131,7 +133,9 @@ in
#animation = border, 1, 10, default
#animation = borderangle, 1, 8, default
#animation = fade, 1, 7, default
#animation = workspaces, 1, 6, default
animation = [
"workspaces, 0"
];
};
dwindle = {
@@ -169,18 +173,21 @@ in
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
bind = let
rofi = "${pkgs.rofi-wayland}/bin/rofi";
kitty = "${pkgs.kitty}/bin/kitty";
konsole = "${pkgs.konsole}/bin/konsole";
thunar = "${pkgs.xfce.thunar}/bin/thunar";
wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
grim = "${pkgs.grim}/bin/grim";
slurp = "${pkgs.slurp}/bin/slurp";
swww = "${pkgs.swww}/bin/swww";
in [
"$mainMod, Q, exec, ${kitty}"
"$mainMod, Q, exec, ${konsole}"
"$mainMod, C, killactive"
"$mainMod, M, exit,"
"$mainMod, E, exec, ${thunar}"
"$mainMod, V, togglefloating"
"$mainMod, S, exec, ${rofi} -show drun -show-icons"
"$mainMod, I, exec, ${rofi} -show drun -show-icons"
"$mainMod, S, exec, cat ~/songs | shuf -n 1 | sed \"s/^/b\.p /g\" | ${wl-copy}"
"$mainMod, R, exec, ${swww} img $(ls -d ~/Nextcloud/dinge/Bg/* | shuf -n 1)"
" , Print, exec, ${grim} -g \"$(${slurp} -d)\" - | ${wl-copy}"
"ALT, SPACE, exec, ${rofi} -show combi"
"$mainMod, P, pseudo" # dwindle
@@ -244,11 +251,13 @@ in
"noborder,class:^(jetbrains-.*)$,title:^( )$,floating:1"
#! Disable window flicker when autocomplete or tooltips appear
"nofocus,class:^(jetbrains-.*)$,title:^(win.*)$,floating:1"
#"immediate, class:^(Risk.*)$"
];
exec-once = [
"${pkgs.swww}/bin/swww init; sleep 1;"
"${pkgs.swww} img $(ls -d ~/Nextcloud/dinge/Bg/* | shuf -n 1)"
"${pkgs.networkmanagerapplet}/bin/nm-applet --indicator &"
"${pkgs.waybar}/bin/waybar &"
"${pkgs.dunst}/bin/dunst &"
@@ -669,11 +678,11 @@ in
patchedWaybar
dunst
swww
kitty
rofi-wayland
libnotify
networkmanagerapplet
wayland
wl-clipboard
#qt5.qtwayland
#qt6.qmake
#qt6.qtwayland

5
modules/graphical/shared.nix
View File

@@ -40,8 +40,6 @@ in
# List packages installed in system profile. To search, run:
# $ nix search wget
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
wget
nixos-option
kate
@@ -77,6 +75,9 @@ in
glxinfo
vulkan-tools
anki
obs-studio
mpv
ffmpeg
];
#environment.sessionVariables = {

7
modules/hardware/scheduler.nix Normal file
View File

@@ -0,0 +1,7 @@
{
services.system76-scheduler = {
enable = true;
};
hardware.system76.enableAll = true;
}

15
modules/virt-manager.nix
View File

@@ -1,6 +1,19 @@
{ pkgs, ... }:
{
virtualisation.libvirtd.enable = true;
programs.dconf.enable = true; # virt-manager requires dconf to remember settings
environment.systemPackages = with pkgs; [ virt-manager virtiofsd ];
virtualisation = {
libvirtd = {
enable = true;
qemu = {
package = pkgs.qemu_kvm;
swtpm.enable = true;
ovmf.enable = true;
ovmf.packages = [ pkgs.OVMFFull.fd ];
};
};
spiceUSBRedirection.enable = true;
};
services.spice-vdagentd.enable = true;
}

3
systems/pc/configuration.nix
View File

@@ -20,6 +20,9 @@
networking.networkmanager.enable = true;
boot.initrd.systemd.network.wait-online.enable = false;
systemd.network.wait-online.enable = false;
nix.settings.trusted-substituters = [ "https://ai.cachix.org" ];
nix.settings.trusted-public-keys = [ "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc=" ];
#disable firewall when doing ipv6 vm stuff
networking.firewall.enable = lib.mkForce false;