diff --git a/flake.lock b/flake.lock index 956e537..6b7f926 100644 --- a/flake.lock +++ b/flake.lock @@ -246,11 +246,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1605225031, - "narHash": "sha256-W+7blIrccTCTyQCCE4aGn1cFrGIuTinN96GxZrJiojs=", + "lastModified": 1608755064, + "narHash": "sha256-nx/o32ipf2YH8WTff7uYwWOwTI+Vtrr49mgxEPdK5bw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2deeb58f49480f468adca6b08291322de4dbce6b", + "rev": "57a787c9fa91f149c86a1ce83d57e07cfa589e07", "type": "github" }, "original": { diff --git a/modules/applications.nix b/modules/applications.nix index 1f6de59..323a638 100755 --- a/modules/applications.nix +++ b/modules/applications.nix @@ -11,13 +11,7 @@ with import ../support.nix { inherit lib config; }; { desktop = "alacritty"; }; editor = { - cmd = toString (pkgs.writeTextFile { - name = "emacsclient"; - text = '' - #!${pkgs.bash}/bin/bash - ${config.home-manager.users.balsoft.programs.emacs.finalPackage}/bin/emacsclient -s /run/user/1000/emacs/server -c $@''; - executable = true; - }); + cmd = "${config.home-manager.users.balsoft.programs.emacs.finalPackage}/bin/emacsclient -c $@"; desktop = "emacsclient"; }; browser = { @@ -25,20 +19,16 @@ with import ../support.nix { inherit lib config; }; { desktop = "firefox"; }; fm = { - cmd = "${pkgs.dolphin}/bin/dolphin"; - desktop = "dolphin"; + cmd = "${pkgs.gnome3.nautilus}/bin/nautilus"; + desktop = "org.gnome.Nautilus"; }; monitor = { - cmd = "${pkgs.ksysguard}/bin/ksysguard"; - desktop = "ksysguard"; - }; - torrent = { - cmd = "${pkgs.ktorrent}/bin/ktorrent"; - desktop = "ktorrent"; + cmd = "${pkgs.gnome3.gnome-system-monitor}/bin/gnome-system-monitor"; + desktop = "gnome-system-monitor"; }; archive = { - cmd = "${pkgs.ark}/bin/ark"; - desktop = "org.kde.ark"; + cmd = "${pkgs.gnome3.file-roller}/bin/file-roller"; + desktop = "org.gnome.FileRoller"; }; mail = { cmd = "${pkgs.sylpheed}/bin/sylpheed"; @@ -60,13 +50,11 @@ with import ../support.nix { inherit lib config; }; { builtins.mapAttrs (name: value: if value ? desktop then [ "${value.desktop}.desktop" ] else value) { "text/html" = browser; - "image/*" = { desktop = "org.kde.gwenview"; }; - "application/x-bittorrent" = torrent; + "image/*" = { desktop = "org.gnome.eog"; }; "application/zip" = archive; "application/rar" = archive; "application/7z" = archive; "application/*tar" = archive; - "application/x-kdenlive" = archive; "x-scheme-handler/http" = browser; "x-scheme-handler/https" = browser; "x-scheme-handler/about" = browser; diff --git a/modules/applications/emacs/default.nix b/modules/applications/emacs/default.nix index 61a4cd9..dbd2c2a 100644 --- a/modules/applications/emacs/default.nix +++ b/modules/applications/emacs/default.nix @@ -60,7 +60,7 @@ genericName = "Text editor"; desktopName = "Emacs client"; mimeType = "text/plain"; - exec = "emacsclient -s /tmp/emacs1000/server -c %F"; + exec = "emacsclient -c %F"; categories = "Development;TextEditor;Utility;"; icon = "emacs"; }) diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix index 312749e..308f6b0 100644 --- a/modules/applications/packages.nix +++ b/modules/applications/packages.nix @@ -39,15 +39,5 @@ pass-wayland papirus-icon-theme gnome3.simple-scan - ] ++ (with pkgs.kdeApplications; [ - ark - dolphin - dolphin-plugins - gwenview - kcachegrind - kcolorchooser - kolourpaint - okular - print-manager - ])); + ]); } diff --git a/modules/default.nix b/modules/default.nix index c49148b..1c79d30 100755 --- a/modules/default.nix +++ b/modules/default.nix @@ -14,6 +14,7 @@ device: ./workspace/i3blocks ./workspace/zsh.nix ./workspace/gtk.nix + ./workspace/gnome3.nix ./workspace/misc.nix ./workspace/kde ./workspace/ssh.nix @@ -23,7 +24,6 @@ device: ./workspace/mako.nix ./workspace/mopidy.nix ./workspace/gcalcli.nix - ./workspace/rclone.nix ./workspace/xresources.nix ./themes.nix ./applications.nix diff --git a/modules/packages.nix b/modules/packages.nix index 0a7d4b0..fb6aa54 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -9,7 +9,7 @@ let }); in { nixpkgs.overlays = [ - inputs.nix.overlay + # inputs.nix.overlay (self: super: rec { nix = super.nix // { meta = super.nix.meta // { platforms = lib.platforms.unix; }; diff --git a/modules/services.nix b/modules/services.nix index fc51f4c..f0f29e1 100644 --- a/modules/services.nix +++ b/modules/services.nix @@ -20,11 +20,15 @@ services.tor = { enable = true; client.enable = true; - client.privoxy.enable = true; torsocks.enable = true; client.socksListenAddressFaster = "127.0.0.1:9063"; }; + services.privoxy = { + enable = true; + enableTor = true; + }; + programs.mosh.enable = true; services.fwupd.enable = true; diff --git a/modules/workspace/gnome3.nix b/modules/workspace/gnome3.nix new file mode 100644 index 0000000..1248705 --- /dev/null +++ b/modules/workspace/gnome3.nix @@ -0,0 +1,20 @@ +{ config, pkgs, lib, ... }: { + services.gnome3 = { + core-os-services.enable = true; + core-utilities.enable = true; + sushi.enable = true; + tracker.enable = true; + tracker-miners.enable = true; + gnome-settings-daemon.enable = true; + glib-networking.enable = true; + }; + services.gvfs.enable = true; + home-manager.users.balsoft = { + xdg.configFile."gtk-3.0/bookmarks".text = builtins.concatStringsSep "\n" ([ + "file:///home/balsoft/projects" + ] ++ map (machine: "sftp://${machine}/home/balsoft ${machine}") (builtins.attrNames config.devices)); + xdg.userDirs = { + enable = true; + }; + }; +} diff --git a/modules/workspace/kde/default.nix b/modules/workspace/kde/default.nix index 91a5eac..93dfa71 100644 --- a/modules/workspace/kde/default.nix +++ b/modules/workspace/kde/default.nix @@ -1,26 +1,10 @@ { pkgs, lib, config, ... }: with import ../../../support.nix { inherit lib config; }; { xdg.portal.enable = true; - # services.flatpak.enable = true; - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ]; services.dbus.packages = [ - pkgs.plasma5.xdg-desktop-portal-kde - pkgs.flatpak pkgs.firefox pkgs.systemd pkgs.papirus-icon-theme - pkgs.kdeApplications.kdegraphics-thumbnailers - pkgs.kdeFrameworks.baloo - pkgs.kdeFrameworks.kio - pkgs.kdeApplications.kio-extras - pkgs.kdeApplications.dolphin-plugins - ]; - environment.systemPackages = [ - pkgs.kdeFrameworks.baloo - pkgs.kdeFrameworks.kio - pkgs.kdeApplications.kio-extras - pkgs.kdeApplications.kdegraphics-thumbnailers - pkgs.kdeApplications.dolphin-plugins ]; services.udev.packages = [ pkgs.libmtp @@ -146,13 +130,4 @@ with import ../../../support.nix { inherit lib config; }; { }; Icons = { Theme = "Papirus-Dark"; }; }; - home-manager.users.balsoft.home.activation."user-places.xbel" = { - data = '' - $DRY_RUN_CMD rm -f ~/.local/share/user-places.xbel - $DRY_RUN_CMD cp ${./user-places.xbel} ~/.local/share/user-places.xbel - $DRY_RUN_CMD chmod 777 ~/.local/share/user-places.xbel - ''; - before = [ ]; - after = [ "linkGeneration" ]; - }; } diff --git a/modules/workspace/kde/qt5ct.conf b/modules/workspace/kde/qt5ct.conf deleted file mode 100644 index 5456013..0000000 --- a/modules/workspace/kde/qt5ct.conf +++ /dev/null @@ -1,23 +0,0 @@ -[Appearance] -color_scheme_path=/home/balsoft/.nix-profile/share/qt5ct/colors/airy.conf -custom_palette=false -icon_theme=Papirus-Dark -standard_dialogs=kde -style=Breeze - -[Fonts] -fixed=@Variant(\0\0\0@\0\0\0\x16\0R\0o\0\x62\0o\0t\0o\0 \0M\0o\0n\0o@&\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) -general=@Variant(\0\0\0@\0\0\0\f\0R\0o\0\x62\0o\0t\0o@&\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) - -[Interface] -activate_item_on_single_click=0 -buttonbox_layout=0 -cursor_flash_time=1000 -dialog_buttons_have_icons=1 -double_click_interval=400 -gui_effects=@Invalid() -menus_have_icons=true -stylesheets=@Invalid() -toolbutton_style=4 -underline_shortcut=1 -wheel_scroll_lines=1 diff --git a/modules/workspace/kde/user-places.xbel b/modules/workspace/kde/user-places.xbel deleted file mode 100644 index e9ca4df..0000000 --- a/modules/workspace/kde/user-places.xbel +++ /dev/null @@ -1,351 +0,0 @@ - - - - - Home - - - - - - 1539244233/0 - true - false - - - - - Google Drive - - - - - - 1540478729/2 - false - false - - - - - Yandex Disk - - - - - - 1554507064/0 - false - false - - - - - Network - - - - - - 1539244233/2 - true - false - - - - - Root - - - - - - 1539244233/3 - true - false - - - - - Trash - - - - - - 1539244233/4 - true - false - - - - - Downloads - - - - - - 1539244233/1 - true - false - - - - - Documents - - - - - - 1540414173/0 - false - false - - - - - - false - false - false - false - true - false - false - - - - Today - - - - - - 1539244233/5 - true - false - - - - - Yesterday - - - - - - 1539244233/6 - true - false - - - - - Documents - - - - - - 1539244233/7 - true - false - - - - - Images - - - - - - 1539244233/8 - true - false - - - - - Audio Files - - - - - - 1539244233/9 - true - false - - - - - Videos - - - - - - 1539244233/10 - true - false - - - - - Project Folder - - - - - - kdenlive - - - - - - - /org/freedesktop/UDisks2/block_devices/sda2 - true - false - - - - - - Linux filesystem - - - Videos - - - - - - 1540409511/0 - false - false - - - - - Pictures - - - - - - 1540409539/1 - false - false - - - - - projects - - - - - - 1540463794/11 - false - false - - - - - Calendar - - - - - - 1540478496/0 - false - false - - - - - ASUS - - - - - - 1540585036/0 - false - false - - - - - HP - - - - - - 1540585062/1 - false - false - - - - - Prestigio - - - - - - 1540585084/2 - false - false - - - - - Lenovo - - - - - - 1540585120/3 - false - false - - - - - AMD - - - - - - 1540585120/3 - false - false - - - - - Router - - - - - - 1540585202/4 - false - false - - - - diff --git a/modules/workspace/rclone.nix b/modules/workspace/rclone.nix deleted file mode 100644 index b3b7e1e..0000000 --- a/modules/workspace/rclone.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ pkgs, config, lib, ... }: { - home-manager.users.balsoft = lib.mkIf (!isNull config.secrets.rclone) { - xdg.configFile."rclone/rclone.conf.home".text = config.secrets.rclone; - home.activation."rclone" = { - after = [ "linkGeneration" ]; - before = [ ]; - data = '' - cp ./.config/rclone/rclone.conf.home ./.config/rclone/rclone.conf - chmod 700 ./.config/rclone/rclone.conf - mkdir -p cloud; cd cloud - mkdir -p 'Google Drive' || true - mkdir -p 'Yandex Disk' || true - mkdir -p 'Dropbox' || true - ''; - }; - wayland.windowManager.sway.config.startup = [ - { - command = - "${pkgs.rclone}/bin/rclone mount google:/ '/home/balsoft/cloud/Google Drive' --daemon"; - } - { - command = - "${pkgs.rclone}/bin/rclone mount Yandex:/ '/home/balsoft/cloud/Yandex Disk' --daemon"; - } - { - command = - "${pkgs.rclone}/bin/rclone mount Dropbox:/ '/home/balsoft/cloud/Dropbox' --daemon"; - } - ]; - }; -} diff --git a/modules/workspace/sway/default.nix b/modules/workspace/sway/default.nix index 346633d..c85247f 100755 --- a/modules/workspace/sway/default.nix +++ b/modules/workspace/sway/default.nix @@ -78,7 +78,7 @@ in { ]; }; startup = [ - { command = "GTK_USE_PORTAL=1 ${apps.browser.cmd}"; } + { command = "${apps.browser.cmd}"; } { command = "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"; @@ -97,11 +97,6 @@ in { command = "swayidle -w before-sleep '${lock_fork}' lock '${lock_fork}' unlock 'pkill -9 swaylock'"; } - { - command = - "${pkgs.xdg-desktop-portal-kde}/libexec/xdg-desktop-portal-kde"; - } - { command = "${pkgs.xdg-desktop-portal}/libexec/xdg-desktop-portal"; } ]; keybindings = let diff --git a/secret.nix b/secret.nix index aa0ab4d..92408e0 100644 Binary files a/secret.nix and b/secret.nix differ