diff options
| -rw-r--r-- | configuration.nix | 14 | ||||
| -rw-r--r-- | hjem.nix | 10 | ||||
| -rw-r--r-- | overlays.nix | 3 | ||||
| -rw-r--r-- | scripts/surf_search.nix | 23 | ||||
| -rw-r--r-- | x11.nix | 65 |
5 files changed, 58 insertions, 57 deletions
diff --git a/configuration.nix b/configuration.nix index 5e130fd..6ea890e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -94,12 +94,11 @@ # programs here, NOT in environment.systemPackages ]; - environment.sessionVariables = { - BROWSER = "surf"; - SFEED_PLUMBER = "$BROWSER"; - SFEED_URL_FILE = "$HOME/.local/share/sfeed/sfeed_read_url_file"; - }; - + environment.sessionVariables = { + BROWSER = "surf"; + SFEED_PLUMBER = "$BROWSER"; + SFEED_URL_FILE = "$HOME/.local/share/sfeed/sfeed_read_url_file"; + }; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. @@ -111,6 +110,9 @@ # Services services.openssh.enable = true; + services.rsync = { + enable = true; + }; # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; @@ -20,8 +20,7 @@ ".config/surf/styles/default.css".source = ./dotfiles/surf/styles/default.css; ".config/surf/script.js".source = ./dotfiles/surf/script.js; - - ".sfeed/sfeedrc".source = ./dotfiles/sfeed/sfeedrc; + ".sfeed/sfeedrc".source = ./dotfiles/sfeed/sfeedrc; }; @@ -40,7 +39,11 @@ systemd.user.services."sfeed-update" = { description = "Update sfeed RSS feeds"; - path = with pkgs; [ curl sfeed coreutils]; + path = with pkgs; [ + curl + sfeed + coreutils + ]; serviceConfig = { Type = "oneshot"; ExecStart = "${pkgs.sfeed}/bin/sfeed_update"; @@ -56,5 +59,4 @@ wantedBy = [ "timers.target" ]; }; - } diff --git a/overlays.nix b/overlays.nix index 8f51940..7b7f25d 100644 --- a/overlays.nix +++ b/overlays.nix @@ -8,10 +8,9 @@ scrolling-title = import ./scripts/scrolling-title.nix { pkgs = prev; }; }) (final: prev: { - surf_search = import ./scripts/surf_search.nix { pkgs = prev; }; + surf_search = import ./scripts/surf_search.nix { pkgs = prev; }; }) - (final: prev: { slstatus = inputs.my-slstatus.packages.${pkgs.stdenv.hostPlatform.system}.default; }) diff --git a/scripts/surf_search.nix b/scripts/surf_search.nix index 233a121..e186bdb 100644 --- a/scripts/surf_search.nix +++ b/scripts/surf_search.nix @@ -2,16 +2,17 @@ pkgs.writeShellApplication { name = "surf_search"; runtimeInputs = with pkgs; [ - dmenu - xprop - gnused - coreutils + dmenu + xprop + gnused + coreutils ]; text = builtins.readFile ( - pkgs.replaceVars ../dotfiles/surf/surf.sh { - dmenu = pkgs.dmenu; - xprop = pkgs.xprop; - gnused = pkgs.gnused; - coreutils = pkgs.coreutils; - } - );} + pkgs.replaceVars ../dotfiles/surf/surf.sh { + dmenu = pkgs.dmenu; + xprop = pkgs.xprop; + gnused = pkgs.gnused; + coreutils = pkgs.coreutils; + } + ); +} @@ -51,7 +51,6 @@ enable = true; }; - hjem.users.andrew = { files = { ".config/sxhkd/sxhkdrc".text = builtins.readFile ( @@ -73,57 +72,55 @@ }; }; -systemd.user.services.sxhkd = { - description = "Simple X Hot Key Daemon (sxhkd)"; + systemd.user.services.sxhkd = { + description = "Simple X Hot Key Daemon (sxhkd)"; - path = with pkgs; [ - dmenu - st + path = with pkgs; [ + dmenu + st - pamixer + pamixer - maim - xdotool - xclip + maim + xdotool + xclip - lock-screen + lock-screen - sfeed + sfeed - rmpc - mpc + rmpc + mpc - surf - librewolf - surf_search - ]; + surf + librewolf + surf_search + ]; - environment = { - SFEED_PLUMBER = "surf"; + environment = { + SFEED_PLUMBER = "surf"; 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" ]; -}; - + }; + serviceConfig = { + ExecStart = "${pkgs.sxhkd}/bin/sxhkd"; + Restart = "on-failure"; + }; + wantedBy = [ "graphical-session.target" ]; + }; systemd.user.services.slstatus = { description = "slstatus bar"; wantedBy = [ "graphical-session.target" ]; - - path = with pkgs; [ - pamixer - scrolling-title + + path = with pkgs; [ + pamixer + scrolling-title ]; serviceConfig = { ExecStart = "${pkgs.slstatus}/bin/slstatus"; - + Restart = "always"; RestartSec = "1s"; }; |