diff --git a/flake.lock b/flake.lock index 0604612..cc741bb 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1740339700, + "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739538383, - "narHash": "sha256-lc4FWHP4VWOKHBxD19/AQWmbsUCwdefMiJIdFa6KQuY=", + "lastModified": 1740494722, + "narHash": "sha256-Yl3bKdrUEwBJPMaukZobKvnQCygTgpQVN2bEXgOETMU=", "owner": "nix-community", "repo": "nur", - "rev": "35198d73b581574847341314fff8a99ba3d122bb", + "rev": "2f870320a423b88592fc6f4dffa6ece86eb06dc4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9eb3829..1faa32a 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ ./system/desktop.nix ./system/hardware/nova.nix ./system/gnome.nix - ./system/hyprland.nix + ./system/sway.nix ./system/steam.nix ./system/btrbk.nix ./system/yubikey.nix diff --git a/home/default.nix b/home/default.nix index 1630d0a..5db21a5 100644 --- a/home/default.nix +++ b/home/default.nix @@ -15,6 +15,7 @@ # text publishing libreoffice + jdk poppler_utils zotero @@ -43,6 +44,7 @@ ./slim-desktop.nix ./gnome ./firefox.nix + ./librewolf.nix ./tex.nix ./fonts.nix ]; diff --git a/home/librewolf.nix b/home/librewolf.nix new file mode 100644 index 0000000..3991dc1 --- /dev/null +++ b/home/librewolf.nix @@ -0,0 +1,5 @@ +{ config, pkgs, ... }: + +{ + programs.librewolf.enable = true; +} diff --git a/home/minimal.nix b/home/minimal.nix index 4a0c137..11d51ec 100644 --- a/home/minimal.nix +++ b/home/minimal.nix @@ -64,6 +64,6 @@ programs.bottom = { enable = true; - settings.flags.color = "default-light"; + settings.styles.theme = "default-light"; }; } diff --git a/home/r.nix b/home/r.nix index c215563..8c82e4b 100644 --- a/home/r.nix +++ b/home/r.nix @@ -50,6 +50,7 @@ languageserver magrittr mapproj + networkD3 openxlsx plotly progress diff --git a/home/slim-desktop.nix b/home/slim-desktop.nix index 419c414..4668a71 100644 --- a/home/slim-desktop.nix +++ b/home/slim-desktop.nix @@ -40,6 +40,8 @@ hunspellDicts.en_US hunspellDicts.th_TH hyphen + hyphenDicts.de_DE + hyphenDicts.en_US pandoc imagemagick ghostscript diff --git a/home/tex.nix b/home/tex.nix index 79537f9..33892ed 100644 --- a/home/tex.nix +++ b/home/tex.nix @@ -32,6 +32,7 @@ let nowidow pdfcol pdfpages + pdfx pgf qrcode scheme-medium @@ -51,6 +52,7 @@ let transparent was wrapfig + xmpincl xpatch xstring xtab diff --git a/system/sway.nix b/system/sway.nix new file mode 100644 index 0000000..609c87d --- /dev/null +++ b/system/sway.nix @@ -0,0 +1,20 @@ +{ config, pkgs, ... }: + +{ + programs.sway = { + enable = true; + wrapperFeatures.gtk = true; + }; + + programs.waybar.enable = true; + + services.gnome.gnome-keyring.enable = true; + + environment.systemPackages = with pkgs; [ + grim + slurp + wl-clipboard + swaynotificationcenter + tofi + ]; +}