Revert "sfeed moved to homelab"

This reverts commit 0197478c88887fe009af5c4bb0d7c6b3ce751593.

diff --git a/dotfiles/sfeed/sfeedrc b/dotfiles/sfeed/sfeedrc
index bef06886636b35974e9daaf7bb6487c755dbbe7d..e12c57757ea6219856dd4ce66fcab30aa14bffcb 100644 (file)
--- a/dotfiles/sfeed/sfeedrc
+++ b/dotfiles/sfeed/sfeedrc
@@ -1,4 +1,4 @@
-sfeedpath="/mnt/data/sfeed/feeds"
+sfeedpath="$HOME/.local/share/sfeed/feeds"
 
 # list of feeds to fetch:
 feeds() {

diff --git a/dotfiles/sxhkd/sxhkdrc b/dotfiles/sxhkd/sxhkdrc
index 06eda7d094e5c4bfb2d9297ef7c4f04c9c217d96..9400d3249cbe4f82a47cd9e6b97797374a10db9a 100644 (file)
--- a/dotfiles/sxhkd/sxhkdrc
+++ b/dotfiles/sxhkd/sxhkdrc
@@ -41,7 +41,7 @@ super + l
     @lockscreen@/bin/lock-screen
 
 super + f
-    @st@/bin/st -e @sfeed@/bin/sfeed_curses /mnt/data/sfeed/feeds/*
+    @st@/bin/st -e @sfeed@/bin/sfeed_curses ~/.local/share/sfeed/feeds/*
 
 super + m
     @st@/bin/st -e @rmpc@/bin/rmpc

diff --git a/hosts/icon/configuration.nix b/hosts/icon/configuration.nix
index 2d5de79c2d5a2c821e5ca8dd67a40172beffd1ed..f15fbf2af2587bf3a9173a210a30514916d398d4 100644 (file)
--- a/hosts/icon/configuration.nix
+++ b/hosts/icon/configuration.nix
@@ -153,31 +153,6 @@
     fsType = "ext4";
     options = ["defaults" "nofail"];
   };
-
-  # RSS sfeed
-
-  systemd.user.services."sfeed-update" = {
-    description = "Update sfeed RSS feeds";
-    path = with pkgs; [
-      curl
-      sfeed
-      coreutils
-    ];
-    serviceConfig = {
-      Type = "oneshot";
-      ExecStart = "${pkgs.sfeed}/bin/sfeed_update";
-    };
-  };
-
-  systemd.user.timers."sfeed-update" = {
-    description = "Run sfeed_update daily";
-    timerConfig = {
-      OnCalendar = "daily";
-      Persistent = true;
-    };
-    wantedBy = ["timers.target"];
-  };
-
   networking.hostName = "icon";
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
@@ -192,7 +167,6 @@
     nfs-utils
     btop
     nethogs
-    sfeed
   ];
 
   programs.git = {

diff --git a/hosts/nepsis/configuration.nix b/hosts/nepsis/configuration.nix
index 3ce34ad0eebc1d2e46c7606a3102b1b2e88d71f5..e82e7a36cd2c60cbe3a25ad3a5184948425c7496 100644 (file)
--- a/hosts/nepsis/configuration.nix
+++ b/hosts/nepsis/configuration.nix
@@ -127,7 +127,7 @@
   environment.sessionVariables = {
     BROWSER = "surf";
     SFEED_PLUMBER = "$BROWSER";
-    SFEED_URL_FILE = "/mnt/data/sfeed/sfeed_read_url_file";
+    SFEED_URL_FILE = "$HOME/.local/share/sfeed/sfeed_read_url_file";
   };
 
   # Some programs need SUID wrappers, can be configured further or are

diff --git a/x11.nix b/x11.nix
index 0e1c766da01b5acfb68dc457c5483e11c9ea4f99..743ffd0f79e3d850438a223b53a0d85f5c40ef3d 100644 (file)
--- a/x11.nix
+++ b/x11.nix
@@ -1,8 +1,5 @@
+{ config, pkgs, ... }:
 {
-  config,
-  pkgs,
-  ...
-}: {
   services.displayManager.ly = {
     enable = true;
     settings = {
@@ -14,6 +11,7 @@
       bigclock = "en";
       bigclock_seconds = true;
     };
+
   };
 
   services.dunst = {
@@ -29,9 +27,9 @@
     displayManager = {
       setupCommands = "";
       sessionCommands = ''
-        #!/bin/sh
-        ${pkgs.xrandr}/bin/xrandr --output DP-3 --primary --mode 2560x1440 --rate 180 --pos 0x0 --output DP-2 --mode 1920x1080 --rate 160 --pos 2560x360
-        ${pkgs.feh}/bin/feh --no-fehbg --bg-fill '/home/andrew/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg'
+                       #!/bin/sh
+                       ${pkgs.xrandr}/bin/xrandr --output DP-3 --primary --mode 2560x1440 --rate 180 --pos 0x0 --output DP-2 --mode 1920x1080 --rate 160 --pos 2560x360
+                       ${pkgs.feh}/bin/feh --no-fehbg --bg-fill '/home/andrew/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg'
       '';
     };
     xkb = {
@@ -101,19 +99,19 @@
 
     environment = {
       SFEED_PLUMBER = "surf";
-      SFEED_URL_FILE = "/mnt/data/sfeed/sfeed_read_url_file";
+      SFEED_URL_FILE = "/home/andrew/.local/share/sfeed/sfeed_read_url_file";
     };
 
     serviceConfig = {
       ExecStart = "${pkgs.sxhkd}/bin/sxhkd";
       Restart = "on-failure";
     };
-    wantedBy = ["graphical-session.target"];
+    wantedBy = [ "graphical-session.target" ];
   };
 
   systemd.user.services.slstatus = {
     description = "slstatus bar";
-    wantedBy = ["graphical-session.target"];
+    wantedBy = [ "graphical-session.target" ];
 
     path = with pkgs; [
       pamixer