diff --git a/flake.lock b/flake.lock index 86f0968..50a7f39 100644 --- a/flake.lock +++ b/flake.lock @@ -59,11 +59,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1760703920, - "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", + "lastModified": 1776754714, + "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "d646af9b7d14bff08824538164af99d0c521b185", + "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", "type": "github" }, "original": { @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1776613567, - "narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=", + "lastModified": 1777713215, + "narHash": "sha256-8GzXDOXckDWwST8TY5DbwYFjdvQLlP7K9CLSVx6iTTo=", "owner": "nix-community", "repo": "disko", - "rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d", + "rev": "63b4e7e6cf75307c1d26ac3762b886b5b0247267", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1775176642, - "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", + "lastModified": 1776136500, + "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "179704030c5286c729b5b0522037d1d51341022c", + "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7", "type": "github" }, "original": { @@ -299,11 +299,11 @@ ] }, "locked": { - "lastModified": 1777004352, - "narHash": "sha256-SV+9PgNwZ8jHVCjK6YaCBzaheLSW7cDnm5DpOYrD8Vw=", + "lastModified": 1777913624, + "narHash": "sha256-4MwfrGuqjsnEORQbM3cmkmG/9cWhDV63dTDguDj4FXw=", "owner": "nix-community", "repo": "home-manager", - "rev": "6012cf1fed3eba66115f3fd117b9be6bd2a15b2f", + "rev": "a89686d115e970e200eb2caa7603f3673050e00c", "type": "github" }, "original": { @@ -453,11 +453,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1776548001, - "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", + "lastModified": 1777578337, + "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", + "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", "type": "github" }, "original": { @@ -469,11 +469,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-Gk2T0tDDDAs319hp/ak+bAIUG5bPMvnNEjPV8CS86Fg=", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "lastModified": 1777578337, + "narHash": "sha256-fN6ynMvcdwPDB09LpWJNO5ogu+HFydrBWXJywoI/NNg=", + "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre980183.4bd9165a9165/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre990025.15f4ee454b1d/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -482,11 +482,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1776877367, - "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", + "lastModified": 1777578337, + "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", + "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", "type": "github" }, "original": { @@ -504,11 +504,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1776888984, - "narHash": "sha256-Up2F/eoMuPUsZnPVYdH5TMHe1TBP2Ue1QuWd0vWZoxY=", + "lastModified": 1777859147, + "narHash": "sha256-0vCgxdwrxBkHmqNgJtUMGCFwSV5a6AgYdKAgBCtFFPM=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "2c1808f9f8937fc0b82c54af513f7620fec56d71", + "rev": "6b48834dd6c3913d211476ab2f964f3fb100675e", "type": "github" }, "original": { @@ -527,11 +527,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1776585574, - "narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=", + "lastModified": 1777773024, + "narHash": "sha256-pLU+KB84A0Jei/vTD6pOS4Ovkmq3QDfPQHg1MlKsRqM=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add", + "rev": "d3e26ccd9eecde9139be00caf5dc2d4260fb31ee", "type": "github" }, "original": { @@ -552,11 +552,11 @@ ] }, "locked": { - "lastModified": 1775228139, - "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", + "lastModified": 1777598946, + "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=", "owner": "nix-community", "repo": "NUR", - "rev": "601971b9c89e0304561977f2c28fa25e73aa7132", + "rev": "5d55af01c0f86be583931fe99207fc56c14134b3", "type": "github" }, "original": { @@ -572,11 +572,11 @@ ] }, "locked": { - "lastModified": 1777019459, - "narHash": "sha256-/JPmIuzUuNjxgYEnm56KqDIMpQbPN4hzTlOsMTMahok=", + "lastModified": 1777871389, + "narHash": "sha256-gU+VGpwGJ2vvg0mtYqVvj5u+2LteuHlpokH6JSAtueY=", "owner": "outfoxxed", "repo": "quickshell", - "rev": "e162429b6fa4443a0b45e19a867277dcc25d506b", + "rev": "59e9c47b0eb48a9e4bcf9631fa062ee939bd2e83", "type": "github" }, "original": { @@ -608,11 +608,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1776894239, - "narHash": "sha256-Nse4cQgvcAcxTOevHGDvvQyJ9znCAkKFJxHEVEuHNOM=", + "lastModified": 1777789800, + "narHash": "sha256-XHCvLGu/bEEZRzXVKFu1i+2YB102Nr00n8e7xrzsfVs=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "de18e77f3c18dc568ca600ba8d72727b7829c798", + "rev": "d0e921cc48aab6137d203a3eab19601dc2bdc0c3", "type": "github" }, "original": { @@ -641,11 +641,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1776893932, - "narHash": "sha256-AFD5cf9eNqXq1brHS63xeZy2xKZMgG9J86XJ9I2eLn8=", + "lastModified": 1777835090, + "narHash": "sha256-VLH8zPweblCOvpnQXp4fVs7f6Q79YhXF5XFKlOrvIFk=", "owner": "nix-community", "repo": "stylix", - "rev": "84971726c7ef0bb3669a5443e151cc226e65c518", + "rev": "7989a1054b01153212dede6005abfd1576b8328c", "type": "github" }, "original": { @@ -748,11 +748,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1772661346, - "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", + "lastModified": 1777041405, + "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=", "owner": "tinted-theming", "repo": "schemes", - "rev": "13b5b0c299982bb361039601e2d72587d6846294", + "rev": "5f868b3a338b6904c47f3833b9c411be641983a8", "type": "github" }, "original": { @@ -764,11 +764,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1772934010, - "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", + "lastModified": 1777169200, + "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", + "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac", "type": "github" }, "original": { @@ -780,11 +780,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1772909925, - "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", + "lastModified": 1777463218, + "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", + "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae", "type": "github" }, "original": { @@ -859,11 +859,11 @@ ] }, "locked": { - "lastModified": 1777008980, - "narHash": "sha256-pVZgqx3xbyFs0CnVlPLsizHL+S8vK1JcHQ1WVw/X+NI=", + "lastModified": 1777913180, + "narHash": "sha256-LjaD9lXsw3xb3Me/sWQNL3BMHavcA6KZus7kEkixkbk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "269ed2e95863c99ce067672813767661612e402b", + "rev": "c17d06897a6883bfa6617880116d3e618aa9bae9", "type": "github" }, "original": { diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 7ceee89..992d7b5 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,17 +1,21 @@ # 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") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; # 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 diff --git a/hosts/kittykat/configuration.nix b/hosts/kittykat/configuration.nix index 07c171d..7c25679 100644 --- a/hosts/kittykat/configuration.nix +++ b/hosts/kittykat/configuration.nix @@ -22,7 +22,13 @@ fastfetch kitty ]; - + services.openssh = { + settings = { + AllowTcpForwarding = true; + X11Forwarding = true; + GatewayPorts = "yes"; + }; + }; programs.bash.interactiveShellInit = '' PS1="\[\e[38;5;177m\]\u\[\e[0m\]@\[\e[38;5;220m\]\h\[\e[0m\] \[\e[38;5;33m\]\w\[\e[0m\] \$ " ''; diff --git a/hosts/kittykat/traefik.nix b/hosts/kittykat/traefik.nix index a9d375e..1bd813a 100644 --- a/hosts/kittykat/traefik.nix +++ b/hosts/kittykat/traefik.nix @@ -1,7 +1,7 @@ {config, ...}: { networking.firewall = { enable = true; - allowedTCPPorts = [80 443]; + allowedTCPPorts = [80 443 25565 25567]; }; networking.firewall.extraInputRules = '' tcp dport 2053 drop diff --git a/hosts/virgil/configuration.nix b/hosts/virgil/configuration.nix index f91a3c3..644b1fa 100644 --- a/hosts/virgil/configuration.nix +++ b/hosts/virgil/configuration.nix @@ -22,6 +22,26 @@ xwayland.enable = true; }; + programs.obs-studio = { + enable = true; + + # optional Nvidia hardware acceleration + package = ( + pkgs.obs-studio.override { + cudaSupport = true; + } + ); + + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-backgroundremoval + obs-pipewire-audio-capture + obs-vaapi #optional AMD hardware acceleration + obs-gstreamer + obs-vkcapture + ]; + }; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; networking.hostName = "virgil"; diff --git a/modules/home-manager/cli/shell.nix b/modules/home-manager/cli/shell.nix index f07cfb1..0b5d6e7 100644 --- a/modules/home-manager/cli/shell.nix +++ b/modules/home-manager/cli/shell.nix @@ -22,6 +22,90 @@ user.email = "tulg@protonmail.ch"; }; }; - + programs.fastfetch = { + enable = true; + settings = { + display = { + separator = "  "; + }; + modules = [ + { + type = "os"; + key = " OS"; + keyColor = "yellow"; + } + { + type = "kernel"; + key = "│ ├"; + keyColor = "yellow"; + } + { + type = "packages"; + key = "│ ├󰏖"; + keyColor = "yellow"; + } + { + type = "shell"; + key = "│ └"; + keyColor = "yellow"; + } + { + type = "wm"; + key = " wm"; + keyColor = "blue"; + } + { + type = "lm"; + key = "│ ├󰧨"; + keyColor = "blue"; + } + { + type = "terminal"; + key = "│ └"; + keyColor = "blue"; + } + { + type = "host"; + key = " HOST"; + keyColor = "green"; + } + { + type = "cpu"; + key = "│ ├"; + keyColor = "green"; + } + { + type = "gpu"; + key = "│ ├󰍛"; + keyColor = "green"; + } + { + type = "disk"; + key = "│ ├"; + keyColor = "green"; + } + { + type = "memory"; + key = "│ ├󰑭"; + keyColor = "green"; + } + { + type = "swap"; + key = "│ ├󰓡"; + keyColor = "green"; + } + { + type = "uptime"; + key = "│ ├󰅐"; + keyColor = "green"; + } + { + type = "display"; + key = "│ └󰍹"; + keyColor = "green"; + } + ]; + }; + }; programs.zsh.enable = true; } diff --git a/modules/home-manager/desktop/vscode.nix b/modules/home-manager/desktop/vscode.nix index 861ad33..6e1c008 100644 --- a/modules/home-manager/desktop/vscode.nix +++ b/modules/home-manager/desktop/vscode.nix @@ -10,7 +10,13 @@ pkgs.vscode-extensions.jnoortheen.nix-ide pkgs.vscode-extensions.leonardssh.vscord ]; - profiles.tulg.userSettings = { + userSettings = { + "nix.formatterPath" = "alejandra"; + "nix.extraOptions" = '' + experimental-features = nix-command flakes + ''; + "nix.enableLanguageServer" = true; + "nix.serverPath" = "nixd"; }; }; } diff --git a/modules/home-manager/pkgs.nix b/modules/home-manager/pkgs.nix index 1c9c566..9011297 100644 --- a/modules/home-manager/pkgs.nix +++ b/modules/home-manager/pkgs.nix @@ -12,7 +12,7 @@ restic rose-pine-gtk-theme alejandra - lutris + prismlauncher arc-theme cliphist @@ -21,7 +21,7 @@ vulkan-tools pkgs.looking-glass-client tmux - fastfetch + btop nicotine-plus strawberry @@ -43,7 +43,7 @@ feh kitty librewolf - fluffychat + element-desktop piper libratbag diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix index 3c2a99b..04cca80 100644 --- a/modules/nixos/common.nix +++ b/modules/nixos/common.nix @@ -12,6 +12,7 @@ moonlight-qt amdgpu_top rclone + crosspipe ]; nixpkgs.config.allowUnfree = true; nix.settings.experimental-features = ["nix-command" "flakes"]; diff --git a/modules/nixos/gaming.nix b/modules/nixos/gaming.nix index 1184e54..6fb0f06 100644 --- a/modules/nixos/gaming.nix +++ b/modules/nixos/gaming.nix @@ -11,6 +11,5 @@ }; environment.systemPackages = with pkgs; [ protonup-ng - pkgs.lutris ]; }