diff --git a/flake.nix b/flake.nix index cd1289f..d493922 100644 --- a/flake.nix +++ b/flake.nix @@ -70,7 +70,7 @@ modules = [ ./hosts/JWST/configuration.nix sops-nix.nixosModules.sops - # nixos-hardware.nixosModules.dell-xps-15-9520 + nixos-hardware.nixosModules.dell-xps-15-9520 nixos-hardware.nixosModules.common-gpu-nvidia-disable {nixpkgs.overlays = overlays;} home-manager.nixosModules.home-manager diff --git a/hosts/JWST/configuration.nix b/hosts/JWST/configuration.nix index ae7d5aa..405b7ab 100644 --- a/hosts/JWST/configuration.nix +++ b/hosts/JWST/configuration.nix @@ -3,7 +3,7 @@ # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). { # config, - # lib, + lib, pkgs, ... }: { @@ -63,14 +63,11 @@ # Enable sound. sound.enable = true; - # hardware.pulseaudio.enable = true; - # services.pipewire.audio.enable = true; - services.pipewire = { enable = true; - audio.enable = true; alsa.enable = true; pulse.enable = true; + jack.enable = true; }; xdg.portal = { @@ -100,13 +97,6 @@ description = "Aria Nolan"; }; - # programs.river.enable = true; - # programs.river.extraPackages = with pkgs; [ - # swaylock - # swayidle - # brightnessctl - # ]; - programs.sway.enable = true; programs.sway.wrapperFeatures.gtk = true; programs.sway.extraPackages = with pkgs; [ @@ -117,12 +107,18 @@ ]; programs.waybar.enable = true; - # programs.nm-applet.enable = true; + programs.steam.enable = true; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "steam-run" + ]; environment = { systemPackages = with pkgs; [ vim exfat + encfs ntfs3g ]; defaultPackages = with pkgs; [ diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix index b07ec1f..a9f9245 100644 --- a/users/tacocat/home.nix +++ b/users/tacocat/home.nix @@ -15,6 +15,7 @@ packages = with pkgs; [ rnote sops + neovim libreoffice notify-desktop texlive.combined.scheme-medium diff --git a/users/tacocat/programs/default.nix b/users/tacocat/programs/default.nix index f3a6d11..f20fc3a 100644 --- a/users/tacocat/programs/default.nix +++ b/users/tacocat/programs/default.nix @@ -4,6 +4,7 @@ ./git.nix ./taskwarrior.nix ./firefox.nix + ./vscode.nix # ./thunderbird.nix ]; diff --git a/users/tacocat/programs/vscode.nix b/users/tacocat/programs/vscode.nix new file mode 100644 index 0000000..0783102 --- /dev/null +++ b/users/tacocat/programs/vscode.nix @@ -0,0 +1,17 @@ +{pkgs, ...}: { + programs.vscode = { + enable = true; + package = pkgs.vscodium; + enableExtensionUpdateCheck = false; + enableUpdateCheck = false; + extensions = with pkgs.vscode-extensions; [ + ritwickdey.liveserver + asvetliakov.vscode-neovim + ]; + userSettings = { + "extensions.experimental.affinity" = { + "asvetliakov.vscode-neovim" = 1; + }; + }; + }; +} diff --git a/users/tacocat/wayland/sway/config b/users/tacocat/wayland/sway/config index 1b57364..fac13ea 100755 --- a/users/tacocat/wayland/sway/config +++ b/users/tacocat/wayland/sway/config @@ -252,7 +252,7 @@ bindsym $mod+r mode "resize" # } # Screenshot - bindsym Print exec IMG=~/Pictures/screenshots/$(date | sed "s/\s/-/g" | sed "s/--/-/g").png&&grim -g "$(slurp)" $IMG && cat $IMG | wl-copy && notify-desktop "Screenshot has been saved and copied to your clipboard" -a "grim" -u normal -t 2000 + bindsym Print exec IMG=~/Pictures/screenshots/$(date | sed "s/\s/-/g" | sed "s/--/-/g").png&&grim -g "$(slurp)" $IMG && cat $IMG | wl-copy # # Player @@ -263,9 +263,9 @@ bindsym $mod+r mode "resize" # Volume # - bindsym XF86AudioRaiseVolume exec pamixer -ui 2 && pamixer --get-volume > $SWAYSOCK.wob - bindsym XF86AudioLowerVolume exec pamixer -ud 2 && pamixer --get-volume > $SWAYSOCK.wob - bindsym XF86AudioMute exec pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob + bindsym XF86AudioRaiseVolume exec pamixer -ui 2 && pamixer --get-volume + bindsym XF86AudioLowerVolume exec pamixer -ud 2 && pamixer --get-volume + bindsym XF86AudioMute exec pamixer --toggle-mute && ( pamixer --get-mute && echo 0 ) || pamixer --get-volume # Bitwarden # @@ -273,8 +273,8 @@ bindsym $mod+r mode "resize" # Backlight # - # bindsym XF86MonBrightnessUp exec brightnessctl s +5% - # bindsym XF86MonBrightnessDown exec brightnessctl s 5%- + bindsym XF86MonBrightnessUp exec brightnessctl s +5% + bindsym XF86MonBrightnessDown exec brightnessctl s 5%- # # SwayFX