diff --git a/flake.lock b/flake.lock index 21792d9..229238a 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1605635123, - "narHash": "sha256-8bROJh1fshk+TaFcIfU9enDcN6/1+uiOKgBgk6rSJMk=", + "lastModified": 1610405518, + "narHash": "sha256-91braqJ1KpeKhVnwkPf8j9+o9UGCKrpQsUlhd/YNZIM=", "owner": "rycee", "repo": "home-manager", - "rev": "7b6ebf2785cfc9dd6fc2b101cbbb2152eb68d45c", + "rev": "65d0e2d241519e010251aca29cf5d3a71fd84f2f", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1604012111, - "narHash": "sha256-B2b5mBDts5b0ROiT1fHGvDB1hVTDtw2RCR9trnr97qc=", + "lastModified": 1610470274, + "narHash": "sha256-CtTfjqs5M9n2YWmuwsivaesz/JPSbflB30NiNWfFu6Q=", "owner": "balsoft", "repo": "lambda-launcher", - "rev": "4fc0223c6540172dc11f687e14473f932b6e1d9f", + "rev": "3e553f0676a98f3fb00c626563ead378aed2b8ea", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1606026386, - "narHash": "sha256-ra8yZQsD8vBb+u35lGlA0KJyJfXxaZs6gjtKuS7qqkM=", + "lastModified": 1610452587, + "narHash": "sha256-2WYSBb7NxNJ6YTTVB6B1WLn6J/S9zMX2A6cmD3U3/Ug=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e286f0cf3bcffd5c0f006bb1831563d63b281fb2", + "rev": "5322c1f7d77a99b3f44130a029db42e40c22a399", "type": "github" }, "original": { @@ -246,11 +246,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1608755064, - "narHash": "sha256-nx/o32ipf2YH8WTff7uYwWOwTI+Vtrr49mgxEPdK5bw=", + "lastModified": 1610340740, + "narHash": "sha256-TT2r/p9c4BazAogXOUgY8SPPzn7JaktL8AmzVy60HZM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "57a787c9fa91f149c86a1ce83d57e07cfa589e07", + "rev": "a67cfc0cdc10f218f2b9e0b153d1c31d5e96dded", "type": "github" }, "original": { @@ -331,11 +331,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1608815402, - "narHash": "sha256-oBgd7ZjGho0ivROpc9bIAqN+AbD70HBVWMz36LefK2E=", + "lastModified": 1610453489, + "narHash": "sha256-zpg0CI2AtLlFlqxF351sp117zRlfmqDM7uz+0sTxm1I=", "owner": "balsoft", "repo": "simple-osd-daemons", - "rev": "dd5883f58c7e49d2b00bd186dfb54afe0dc8fa8a", + "rev": "776d2ec91214e8b1d4a9f320c5c44e9f2110f05f", "type": "github" }, "original": { diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix index bdd4cc0..2529cfe 100644 --- a/modules/applications/packages.nix +++ b/modules/applications/packages.nix @@ -5,6 +5,7 @@ wget curl unrar + neochat ] ++ lib.optionals config.deviceSpecific.goodMachine ([ steamcmd steam @@ -18,7 +19,6 @@ spectral # Audio/Video vlc - cantata lxqt.pavucontrol-qt # Tools zip @@ -31,9 +31,7 @@ gnumeric gcalcli breeze-icons - kde-cli-tools xdg_utils - git-crypt inputs.yt-utilities.defaultPackage.x86_64-linux lambda-launcher nix-patch diff --git a/modules/applications/spectral.nix b/modules/applications/spectral.nix deleted file mode 100644 index 7d5fc8d..0000000 --- a/modules/applications/spectral.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs, config, lib, ... }: -with import ../../support.nix { inherit lib config; }; { - nixpkgs.overlays = [ - (self: super: { - spectral = super.spectral.overrideAttrs (oldAttrs: { - prePatch = '' - sed -i \ - -e s/#303030/${config.themes.colors.bg}/ \ - -e s/#009DC2/${config.themes.colors.alt}/ \ - -e s/#673AB7/${config.themes.colors.alt}/ \ - -e s/#4285F4/${config.themes.colors.gray}/ \ - -e s/#242424/${config.themes.colors.bg}/ \ - -e 's/"#ff2b00", "#ff5500", "#ff8000", "#ffaa00", "#ffd500", "#ffff00", "#d4ff00", "#aaff00", "#80ff00", "#55ff00", "#2bff00", "#00ff00", "#00ff2b", "#00ff55", "#00ff80", "#00ffaa", "#00ffd5", "#00ffff", "#00d4ff", "#00aaff", "#007fff", "#0055ff", "#002bff", "#0000ff", "#2a00ff", "#5500ff", "#7f00ff", "#aa00ff", "#d400ff", "#ff00ff", "#ff00d4", "#ff00aa", "#ff0080", "#ff0055", "#ff002b", "#ff0000"/"${config.themes.colors.alt}"/' \ - $(find . -name "*.qml") - ''; - }); - }) - ]; -} diff --git a/modules/default.nix b/modules/default.nix index a68c815..4791ba2 100755 --- a/modules/default.nix +++ b/modules/default.nix @@ -9,7 +9,6 @@ device: ./applications/okular.nix ./applications/yt-utilities.nix ./applications/firefox.nix - ./applications/spectral.nix ./workspace/sway ./workspace/i3blocks ./workspace/zsh.nix @@ -22,7 +21,6 @@ device: ./workspace/fonts.nix ./workspace/light.nix ./workspace/mako.nix - ./workspace/mopidy.nix ./workspace/xresources.nix ./themes.nix ./applications.nix diff --git a/modules/packages.nix b/modules/packages.nix index fb6aa54..3e21cb9 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -24,15 +24,7 @@ in { # inherit (old) mautrix-telegram; - lambda-launcher = let - pkgs' = - inputs.lambda-launcher.inputs.nixpkgs.legacyPackages.x86_64-linux.extend (_: _: { - inherit (pkgs) glibc stdenv glibc-locales; - }); - in pkgs'.callPackage "${inputs.lambda-launcher}/wrapper.nix" { - lambda-launcher-unwrapped = - pkgs'.haskellPackages.callPackage "${inputs.lambda-launcher}/lambda-launcher.nix" { }; - }; + lambda-launcher = inputs.lambda-launcher.defaultPackage.x86_64-linux; simple-osd = inputs.simple-osd-daemons.packages.x86_64-linux; @@ -50,7 +42,6 @@ in { nixpkgs.config = { allowUnfree = true; android_sdk.accept_license = true; - firefox.enablePlasmaBrowserIntegration = true; }; environment.etc.nixpkgs.source = inputs.nixpkgs; nix = rec { diff --git a/modules/services.nix b/modules/services.nix index f0f29e1..d6f3d2c 100644 --- a/modules/services.nix +++ b/modules/services.nix @@ -21,7 +21,7 @@ enable = true; client.enable = true; torsocks.enable = true; - client.socksListenAddressFaster = "127.0.0.1:9063"; + settings.SOCKSPort = [ 9050 ]; }; services.privoxy = { diff --git a/modules/users.nix b/modules/users.nix index b2515ff..64a2698 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -42,7 +42,7 @@ ACTION=="remove", ATTRS{idVendor}=="1050", RUN+="${pkgs.systemd}/bin/loginctl lock-sessions" ''; - services.mingetty.autologinUser = "balsoft"; + services.getty.autologinUser = "balsoft"; environment.loginShellInit = '' [[ "$(tty)" == /dev/tty? ]] && sudo /run/current-system/sw/bin/lock this diff --git a/modules/workspace/mako.nix b/modules/workspace/mako.nix index 8831690..9e23b82 100644 --- a/modules/workspace/mako.nix +++ b/modules/workspace/mako.nix @@ -1,16 +1,18 @@ -{ pkgs, config, ...}: -{ - home-manager.users.balsoft.programs.mako = { - enable = true; - layer = "overlay"; - font = "IBM Plex 13"; - width = 500; - height = 80; - defaultTimeout = 10000; - maxVisible = 10; - backgroundColor = config.themes.colors.bg; - textColor = config.themes.colors.fg; - borderColor = config.themes.colors.blue; - progressColor = "over ${config.themes.colors.green}"; +{ pkgs, config, ... }: { + home-manager.users.balsoft = { + wayland.windowManager.sway.config.startup = [{ command = "mako"; }]; + programs.mako = { + enable = true; + layer = "overlay"; + font = "IBM Plex 13"; + width = 500; + height = 80; + defaultTimeout = 10000; + maxVisible = 10; + backgroundColor = config.themes.colors.bg; + textColor = config.themes.colors.fg; + borderColor = config.themes.colors.blue; + progressColor = "over ${config.themes.colors.green}"; + }; }; } diff --git a/modules/workspace/misc.nix b/modules/workspace/misc.nix index b330d0c..bf7e9e0 100644 --- a/modules/workspace/misc.nix +++ b/modules/workspace/misc.nix @@ -2,7 +2,6 @@ programs.sway.enable = true; users.users.balsoft.extraGroups = [ "sway" ]; systemd.coredump.enable = true; - programs.ssh.askPassword = "${pkgs.plasma5.ksshaskpass}/bin/ksshaskpass"; environment.sessionVariables = { EDITOR = config.defaultApplications.editor.cmd; VISUAL = config.defaultApplications.editor.cmd; diff --git a/modules/workspace/mopidy.nix b/modules/workspace/mopidy.nix deleted file mode 100644 index c478607..0000000 --- a/modules/workspace/mopidy.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs, config, lib, ... }: -{ - services.mopidy = { - enable = true; - extensionPackages = with pkgs; [ mopidy-mpd mopidy-youtube ]; - configuration = '' - [youtube] - enabled = true - [mpd] - hostname = 0.0.0.0 - port = 6600 - [audio] - output = pulsesink server=127.0.0.1 - ''; - }; - - systemd.services.mopidy = { - after = [ "network-online.target" ]; - }; - -} diff --git a/modules/workspace/sway/default.nix b/modules/workspace/sway/default.nix index 896efbd..e324144 100755 --- a/modules/workspace/sway/default.nix +++ b/modules/workspace/sway/default.nix @@ -26,7 +26,7 @@ in { { app_id = "org.kde.trojita"; } { title = ".*.Geary*"; } { title = "balsoft : weechat.*"; } - { title = "Spectral"; } + { title = "Neochat"; } { title = "Slack"; } ]; "ﱘ" = [{ app_id = "cantata"; }]; @@ -85,11 +85,9 @@ in { command = "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"; } - { command = "${pkgs.spectral}/bin/spectral"; } + { command = "${pkgs.neochat}/bin/neochat"; } { command = "${pkgs.xorg.xrdb}/bin/xrdb -merge ~/.Xresources"; } - { command = "${pkgs.cantata}/bin/cantata"; } - { command = "swayidle -w before-sleep '${lock_fork}' lock '${lock_fork}' unlock 'pkill -9 swaylock'";