balsoft/nixos-config
1
0
Fork 0
Code Issues Releases Wiki Activity

Update nixpkgs, switch to gnome apps (because kioslave something something)

Browse Source
This commit is contained in:
Alexander Bantyev 2020-12-24 23:19:46 +03:00
parent 4c164e62f9
commit 433ce601c7
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
14 changed files with 41 additions and 474 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@ -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": {

28
modules/applications.nix
View File

@ -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;

2
modules/applications/emacs/default.nix
View File

@ -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";
})

12
modules/applications/packages.nix
View File

@ -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
]));
]);
}

2
modules/default.nix
View File

@ -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

2
modules/packages.nix
View File

@ -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; };

6
modules/services.nix
View File

@ -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;

20
modules/workspace/gnome3.nix Normal file
View File

@ -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;
};
};
}

25
modules/workspace/kde/default.nix
View File

@ -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" ];
};
}

23
modules/workspace/kde/qt5ct.conf
View File

@ -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

351
modules/workspace/kde/user-places.xbel
View File

@ -1,351 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xbel>
<xbel xmlns:kdepriv="http://www.kde.org/kdepriv" xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks" xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info">
<bookmark href="file:///home/balsoft">
<title>Home</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="user-home"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1539244233/0</ID>
<isSystemItem>true</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/balsoft/cloud/Google Drive">
<title>Google Drive</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="google-drive"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1540478729/2</ID>
<isSystemItem>false</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/balsoft/cloud/Yandex Disk/">
<title>Yandex Disk</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="yandex-disk"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1554507064/0</ID>
<isSystemItem>false</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="remote:/">
<title>Network</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="network-workgroup"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1539244233/2</ID>
<isSystemItem>true</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="file:///">
<title>Root</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-red"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1539244233/3</ID>
<isSystemItem>true</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="trash:/">
<title>Trash</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="user-trash-full"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1539244233/4</ID>
<isSystemItem>true</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/balsoft/Downloads">
<title>Downloads</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-downloads"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1539244233/1</ID>
<isSystemItem>true</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/balsoft/Documents/">
<title>Documents</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-documents-symbolic"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1540414173/0</ID>
<isSystemItem>false</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<info>
<metadata owner="http://www.kde.org">
<GroupState-Places-IsHidden>false</GroupState-Places-IsHidden>
<GroupState-Remote-IsHidden>false</GroupState-Remote-IsHidden>
<GroupState-Devices-IsHidden>false</GroupState-Devices-IsHidden>
<GroupState-RemovableDevices-IsHidden>false</GroupState-RemovableDevices-IsHidden>
<withBaloo>true</withBaloo>
<GroupState-SearchFor-IsHidden>false</GroupState-SearchFor-IsHidden>
<GroupState-RecentlySaved-IsHidden>false</GroupState-RecentlySaved-IsHidden>
</metadata>
</info>
<bookmark href="timeline:/today">
<title>Today</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="go-jump-today"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1539244233/5</ID>
<isSystemItem>true</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="timeline:/yesterday">
<title>Yesterday</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="view-calendar-day"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1539244233/6</ID>
<isSystemItem>true</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="search:/documents">
<title>Documents</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-text"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1539244233/7</ID>
<isSystemItem>true</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="search:/images">
<title>Images</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-images"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1539244233/8</ID>
<isSystemItem>true</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="search:/audio">
<title>Audio Files</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-sound"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1539244233/9</ID>
<isSystemItem>true</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="search:/videos">
<title>Videos</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-videos"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1539244233/10</ID>
<isSystemItem>true</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="">
<title>Project Folder</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-favorites"/>
</metadata>
<metadata owner="http://www.kde.org">
<OnlyInApp>kdenlive</OnlyInApp>
</metadata>
</info>
</bookmark>
<separator href="file:///">
<info>
<metadata owner="http://www.kde.org">
<UDI>/org/freedesktop/UDisks2/block_devices/sda2</UDI>
<isSystemItem>true</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="drive-harddisk-root"/>
</metadata>
</info>
<title>Linux filesystem</title>
</separator>
<bookmark href="file:///home/balsoft/Videos/">
<title>Videos</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-videos-symbolic"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1540409511/0</ID>
<isSystemItem>false</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/balsoft/Pictures">
<title>Pictures</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-pictures-symbolic"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1540409539/1</ID>
<isSystemItem>false</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/balsoft/projects">
<title>projects</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="user-bookmarks-symbolic"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1540463794/11</ID>
<isSystemItem>false</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="timeline:/calendar/">
<title>Calendar</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="view-calendar-timeline"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1540478496/0</ID>
<isSystemItem>false</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="fish://asus-laptop">
<title>ASUS</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="laptop"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1540585036/0</ID>
<isSystemItem>false</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="fish://hp-laptop">
<title>HP</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="laptop"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1540585062/1</ID>
<isSystemItem>false</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="fish://prestigio-laptop">
<title>Prestigio</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="laptop"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1540585084/2</ID>
<isSystemItem>false</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="fish://lenovo-workstation">
<title>Lenovo</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="computer"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1540585120/3</ID>
<isSystemItem>false</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="fish://amd-workstation">
<title>AMD</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="computer"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1540585120/3</ID>
<isSystemItem>false</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="fish://192.168.1.1">
<title>Router</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="network-server-symbolic"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1540585202/4</ID>
<isSystemItem>false</isSystemItem>
<IsHidden>false</IsHidden>
</metadata>
</info>
</bookmark>
</xbel>

31
modules/workspace/rclone.nix
View File

@ -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";
}
];
};
}

7
modules/workspace/sway/default.nix
View File

@ -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

BIN
secret.nix
View File

Binary file not shown.