diff --git a/backup/bspwm.nix b/backup/bspwm.nix index 81ab99a..74f0df9 100644 --- a/backup/bspwm.nix +++ b/backup/bspwm.nix @@ -39,6 +39,7 @@ in libinput.enable = true; updateDbusEnvironment = true; }; + udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; }; environment.systemPackages = with unstable.pkgs; [ diff --git a/configs/browser.nix b/configs/browser.nix new file mode 100644 index 0000000..b88ea6d --- /dev/null +++ b/configs/browser.nix @@ -0,0 +1,13 @@ +{ config, pkgs, lib, ... }: +let + unstable = import { config.allowUnfree = true; }; +in +{ + environment.systemPackages = with unstable.pkgs; [ + brave + chromium + firefox + librewolf + tor-browser-bundle-bin + ]; +} diff --git a/configs/user-gui-applications.nix b/configs/games.nix similarity index 64% rename from configs/user-gui-applications.nix rename to configs/games.nix index 9b0e30f..989e6fe 100644 --- a/configs/user-gui-applications.nix +++ b/configs/games.nix @@ -1,11 +1,7 @@ { config, pkgs, lib, ... }: - let unstable = import { config.allowUnfree = true; - config.permittedInsecurePackages = [ - "electron-12.2.3" - ]; config.packageOverrides = pkgs: { steam = pkgs.steam.override { extraPkgs = pkgs: with unstable.pkgs; [ @@ -31,30 +27,9 @@ in }; environment.systemPackages = with unstable.pkgs; [ - brave - catfish - chromium - czkawka # fslint before - discord - espeak-ng - firefox - handbrake - insomnia - libreoffice - librewolf lutris - meld - nextcloud-client - pinta - signal-desktop - solaar - remmina - spotify - tor-browser-bundle-bin - virtmanager vulkan-tools wine winetricks - ]; } diff --git a/configs/gnome.nix b/configs/gnome.nix index edc98df..388eb37 100644 --- a/configs/gnome.nix +++ b/configs/gnome.nix @@ -31,6 +31,7 @@ whitesur-gtk-theme whitesur-icon-theme moka-icon-theme + pantheon.elementary-icon-theme ]; environment.gnome.excludePackages = (with pkgs; [ gnome-tour ]) @@ -45,6 +46,7 @@ hitori # sudoku game atomix # puzzle game ]); + services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; # services.gpg-agent.pinentryFlavor = lib.mkDefault "gnome3"; diff --git a/configs/gui.nix b/configs/gui.nix index 5f3755c..3ee4068 100644 --- a/configs/gui.nix +++ b/configs/gui.nix @@ -20,7 +20,6 @@ in glxinfo gparted libsecret - # openconnect gnome.simple-scan ]; @@ -76,7 +75,6 @@ in services = { mullvad-vpn.enable = true; gvfs.enable = true; - # udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; etesync-dav = { enable = true; apiUrl = "https://etesync.szczepan.ski/"; diff --git a/configs/libvirt.nix b/configs/libvirt.nix index 5601c64..04e2766 100644 --- a/configs/libvirt.nix +++ b/configs/libvirt.nix @@ -9,5 +9,5 @@ spiceUSBRedirection.enable = true; }; - environment.systemPackages = with pkgs; [ proot ]; + environment.systemPackages = with pkgs; [ proot virtiofsd ]; } diff --git a/configs/pantheon.nix b/configs/pantheon.nix index 3941217..b7aa300 100644 --- a/configs/pantheon.nix +++ b/configs/pantheon.nix @@ -61,7 +61,7 @@ gnome.gnome-system-monitor indicator-application-gtk3 monitor - ulauncher + gnome.eog ]; environment.pantheon.excludePackages = with pkgs.pantheon; [ diff --git a/configs/user-gui.nix b/configs/user-gui.nix index 9831909..40cbf9a 100644 --- a/configs/user-gui.nix +++ b/configs/user-gui.nix @@ -7,21 +7,29 @@ in { imports = [ ]; + environment.systemPackages = with unstable.pkgs; [ + catfish + czkawka # fslint before + discord + espeak-ng + handbrake + insomnia + libreoffice + meld + nextcloud-client + pinta + signal-desktop + solaar + remmina + spotify + baobab + keepassxc + ponymix + grsync + virtmanager + ]; + home-manager.users.alex = { pkgs, ... }: { - home = { - packages = with unstable.pkgs; [ - baobab - # barrier - keepassxc - ponymix - # mullvad-vpn - # dracula-theme - # deadbeef - grsync - ]; - }; - - services = { syncthing = { enable = true; }; }; programs = { @@ -30,7 +38,6 @@ in package = unstable.pkgs.vscode; }; - mpv = { enable = true; config = { diff --git a/configs/user.nix b/configs/user.nix index 573be98..4d7c326 100644 --- a/configs/user.nix +++ b/configs/user.nix @@ -71,13 +71,6 @@ in tealdeer unrar yt-dlp - - gnumake - pkg-config - libftdi - libusb1 - gcc - coreboot-toolchain.arm ]; sessionPath = [ "$HOME/.npm-packages" "$HOME/.bin" ]; file = { @@ -183,11 +176,6 @@ in }; tmux = { enable = true; }; - - # exa = { - # enable = true; - # enableAliases = true; - # }; }; # services.vscode-server.enable = true; diff --git a/configs/wireguard.nix b/configs/wireguard.nix new file mode 100644 index 0000000..824247c --- /dev/null +++ b/configs/wireguard.nix @@ -0,0 +1,10 @@ +{ + wireguard-vps-public = "gXG2XaFJZq3/MDva1vbaicRs9z9XfAR2wPLHmg4hRlI="; + wireguard-desktop-public = "yQH91i1Kqxet5iGi3nFMgu7h68Oie6eHOQJHMkhLmWs="; + wireguard-framework-public = "plnKdyh11Z3779LpHQmfU69z7LfCfDATLSxphhcj/3U="; + wireguard-mini-public = "C9dfZUwmKLVpjeXVNkoVyMSXfogdqEK3yMgClpeYzHg="; + wireguard-mbp-public = "GQZ + lfEFQxTl5K5O623tlvWjTzBEeG0gSdvVA61H1z4="; + wireguard-raspberrypi-public = "AB0k5pgI0fsnncNN3GkexWWbA8q/is9JaKY3x8jw4kY="; + wireguard-vps2-public = "fzWLlrK4RqbgBpjQLLwKxGI92aidpZUksjZ6FIrFmEE="; + wireguard-vps3-public = "qfE7vQ+XavOMKgSYxa/me40auoEV3ip/vbiSzjMKgXc="; +} diff --git a/machine/framework.nix b/machine/framework.nix index b1f09c1..da618bb 100644 --- a/machine/framework.nix +++ b/machine/framework.nix @@ -1,21 +1,25 @@ { config, pkgs, lib, ... }: -let secrets = import ../configs/secrets.nix; +let + unstable = import {}; + secrets = import ../configs/secrets.nix; + wireguard = import ../configs/wireguard.nix; in { - imports = - [ - - /etc/nixos/hardware-configuration.nix - ../configs/gui.nix - ../configs/docker.nix - ../configs/libvirt.nix - ../configs/common.nix - ../configs/user.nix - ../configs/user-gui.nix - ../configs/user-gui-applications.nix - ../configs/pantheon.nix - - ]; + imports = [ + + + /etc/nixos/hardware-configuration.nix + ../configs/gui.nix + ../configs/docker.nix + ../configs/libvirt.nix + ../configs/common.nix + ../configs/games.nix + ../configs/browser.nix + ../configs/user.nix + ../configs/user-gui.nix + ../configs/gnome.nix + /home/alex/Workspace/fw-fanctrl-nix/service.nix + ]; boot = { initrd.systemd.enable = true; @@ -37,6 +41,7 @@ in # gcc.tune = "alderlake"; # system = "x86_64-linux"; # }; + nix.settings.system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-alderlake" ]; # programs.nix-ld.enable = true; @@ -48,7 +53,7 @@ in privateKey = secrets.wireguard-framework-private; peers = [{ - publicKey = secrets.wireguard-vps-public; + publicKey = wireguard.wireguard-vps-public; presharedKey = secrets.wireguard-preshared; allowedIPs = [ "10.100.0.0/24" ]; endpoint = "szczepan.ski:51820"; @@ -82,6 +87,8 @@ in # rtkit is optional but recommended services = { power-profiles-daemon.enable = true; + fw-fanctrl.enable = true; + thermald.enable = true; pipewire = { enable = true; alsa.enable = true; @@ -99,9 +106,21 @@ in DefaultTimeoutStopSec=10s ''; - environment.systemPackages = with pkgs; [ - intel-gpu-tools - ]; + programs.kdeconnect.enable = true; + environment.systemPackages = + with unstable.pkgs; [ + cinnamon.warpinator + psensor + gnumake + pkg-config + libftdi + libusb1 + gcc + # coreboot-toolchain.arm + intel-gpu-tools + msr-tools + (import ("/home/alex/Workspace/fw-ectool/default.nix")) + ]; # Set up deep sleep + hibernation swapDevices = [