diff --git a/configuration.nix b/configuration.nix index 46489b8..d045cc2 100644 --- a/configuration.nix +++ b/configuration.nix @@ -32,7 +32,7 @@ # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; + i18n.defaultLocale = "en_CA.UTF-8"; console = { font = "Lat2-Terminus16"; keyMap = "us"; diff --git a/home.nix b/home.nix index cb8c31a..0825709 100644 --- a/home.nix +++ b/home.nix @@ -16,17 +16,15 @@ home.username = "nat"; home.homeDirectory = "/home/nat"; + home.packages = with pkgs; [ - julia-mono audacity beluga bitwarden - brightnessctl clifm darktable gimp godot - grim hledger inkscape libreoffice @@ -35,11 +33,32 @@ picard prismlauncher signal-desktop - slurp + texliveFull vlc xournalpp + ] ++ [ + julia-mono + noto-fonts + redhat-official-fonts + overpass + rubik + roboto + openmoji-black + openmoji-color + ]; + fonts.fontconfig = { + enable = true; + defaultFonts = { + sansSerif = [ "Rubik" "Noto Sans" "DejaVu Sans" ]; + serif = [ "Noto Serif" "DejaVu Serif" ]; + monospace = [ "Noto Mono" ]; + emoji = [ "OpenMoji" ]; + }; + }; + + services.blueman-applet.enable = true; services.copyq.enable = true; services.playerctld.enable = true; diff --git a/sway/sway.nix b/sway/sway.nix index 258485c..022d6d5 100644 --- a/sway/sway.nix +++ b/sway/sway.nix @@ -8,6 +8,10 @@ let in { + + home.packages = with pkgs; + [ grim slurp wl-clipboard brightnessctl ]; + wayland.windowManager.sway = { enable = true; config = { @@ -23,7 +27,9 @@ in { menu = "${pkgs.lib.getExe config.programs.rofi.package} -modes \"drun,run\" -show-icons -show drun"; - keybindings = lib.mkOptionDefault ({ + keybindings = let + screenshotPath ="pictures/Screenshots/screenshot`date +%Y%m%d%H%M%S`.png"; + in lib.mkOptionDefault ({ # volume XF86AudioRaiseVolume = "exec bash ${chvol} sink 5"; XF86AudioLowerVolume = "exec bash ${chvol} sink -5"; @@ -42,10 +48,16 @@ in { # Lock "${mod}+Shift+l" = "exec swaylock -f"; + # Screenshots + "${mod}+Shift+s" = "exec grim -g \"`slurp`\" - | wl-copy && wl-paste > ${screenshotPath}"; + }); }; + + # GODOT IS A PAIN + # extraConfig = "for_window [app_id=\"godot\"] border none"; };