diff --git a/common/goread.nix b/common/goread.nix index faaf3ecb..fff5befc 100644 --- a/common/goread.nix +++ b/common/goread.nix @@ -11,7 +11,7 @@ { name = "r/rust"; desc = "The rust subreddit"; - url = "https://www.reddit.com/r/rust/.rss"; + url = "https://old.reddit.com/r/rust/.rss"; } { name = "thesquareplanet"; @@ -24,7 +24,18 @@ url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC_iD0xppBwwsrM9DegC5cQQ"; } ]; - }]; + } + { + name = "Nix"; + desc = "Stuff related to the nix / nixos / nixlang"; + subscriptions = [ + { + name = "r/nixos"; + desc = "The nixos subreddit"; + url = "https://old.reddit.com/r/nixos/.rss"; + } + ]; + }]; }; }; }; diff --git a/common/home.nix b/common/home.nix index a04e67e9..f1142155 100644 --- a/common/home.nix +++ b/common/home.nix @@ -11,6 +11,7 @@ home.packages = with pkgs; [ + sd go p7zip picat @@ -50,6 +51,7 @@ (nerdfonts.override { fonts = [ "Hasklig" ]; }) pfetch-rs psst + abaddon ] ++ lib.optionals device.isLinux [ mpv catppuccinThemes.gtk @@ -108,6 +110,11 @@ enable = true; userName = "uttarayan21"; userEmail = "email@uttarayan.me"; + extraConfig = { + color.ui = true; + core.editor = "nvim"; + push.autoSetupRemote = true; + }; }; nix-index = { enable = true; @@ -222,7 +229,7 @@ email = "uttarayan21@gmail.com"; base_url = "https://pass.uttarayan.me"; pinentry = - if device.isMac then pkgs.pinentry_mac else pkgs.pinentry-qt; + if device.isMac then pkgs.pinentry_mac else pkgs.pinentry-gnome3; }; }; diff --git a/common/nvim.nix b/common/nvim.nix index 72f98290..7e62da5f 100644 --- a/common/nvim.nix +++ b/common/nvim.nix @@ -433,12 +433,11 @@ }) require"octo".setup({ - use_local_fs = false, -- use local files on right side of reviews - enable_builtin = false, -- shows a list of builtin actions when no action is provided + use_local_fs = false, + enable_builtin = false, default_remote = {"upstream", "origin"}; }) ''; - # builtins.readFile ./extraConfig.lua; package = pkgs.neovim-nightly; }; } diff --git a/linux/hyprland.nix b/linux/hyprland.nix index 6c85d631..f9134585 100644 --- a/linux/hyprland.nix +++ b/linux/hyprland.nix @@ -139,6 +139,10 @@ "$mainMod" = "SUPER"; "$mainModShift" = "SUPER_SHIFT"; + binde = [ + ",xf86audioraisevolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume raise" + ",xf86audiolowervolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume lower" + ]; bind = [ # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more "$mainMod, Return, exec, ${pkgs.foot}/bin/foot" @@ -154,8 +158,6 @@ # "$mainMod, a, exec, swaync-client -t" "$mainMod, Tab, cyclenext" # Audio - ",xf86audioraisevolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume raise" - ",xf86audiolowervolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume lower" ",xf86audiomute, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume mute-toggle" # ",xf86audioprev, exec, /home/fs0c131y/.cargo/bin/mctl prev" # ",xf86audionext, exec, /home/fs0c131y/.cargo/bin/mctl next"