diff --git a/configs/sternchen/configuration.nix b/configs/sternchen/configuration.nix index 3e649e4..e11cc42 100644 --- a/configs/sternchen/configuration.nix +++ b/configs/sternchen/configuration.nix @@ -6,7 +6,7 @@ ./hardware-configuration.nix ./packages.nix - #./syncthing.nix + ./syncthing.nix ./tinc.nix ]; @@ -49,6 +49,7 @@ hardware.opengl = { enable = true; extraPackages = [ pkgs.vaapiIntel ]; + driSupoort = true; driSupport32Bit = true; }; nixpkgs.config.packageOverrides = pkgs: { @@ -59,6 +60,7 @@ services.xserver.desktopManager.pantheon.enable = true; services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.xfce.enable = true; + services.xserver.desktopManager.gnome3.enable = false; # stuff # ----- diff --git a/configs/sternchen/packages.nix b/configs/sternchen/packages.nix index 026f5e0..59872e7 100644 --- a/configs/sternchen/packages.nix +++ b/configs/sternchen/packages.nix @@ -16,6 +16,7 @@ in { firefox google-chrome tor-browser-bundle-bin + #(tor-browser-bundle-bin.overrideAttrs (old: { # #version = "10.0.13"; # src = pkgs.fetchurl { diff --git a/configs/sternchen/syncthing.nix b/configs/sternchen/syncthing.nix index 23cf351..0316095 100644 --- a/configs/sternchen/syncthing.nix +++ b/configs/sternchen/syncthing.nix @@ -1,77 +1,12 @@ { config, pkgs, lib, ... }: { services.syncthing = { + guiAddress = "localhost:8384"; enable = true; - openDefaultPorts = false; - user = "palo"; - dataDir = "/home/palo/.syncthing"; - configDir = "/home/palo/.syncthing"; - declarative = { - cert = toString ; - key = toString ; - overrideFolders = true; - folders = { - - # on encrypted drive - # ------------------ - private = { - enable = true; - path = "/home/palo/private"; - }; - desktop = { - enable = true; - path = "/home/palo/desktop"; - }; - finance = { - enable = true; - path = "/home/palo/finance"; - }; - fotos = { - enable = true; - path = "/home/palo/fotos"; - }; - samples = { - enable = true; - path = "/home/palo/samples"; - }; - zettlr = { - enable = true; - path = "/home/palo/zettlr"; - }; - programs = { - enable = true; - path = "/home/palo/programs"; - }; - - # no need to be encrypted - # ----------------------- - books = { - enable = true; - path = "/home/palo/books"; - }; - music-library = { - enable = true; - path = "/home/palo/music-library"; - }; - music-projects = { - enable = true; - path = "/home/palo/music-projects"; - }; - smartphone-folder = { - enable = true; - path = "/home/palo/smartphone-folder"; - }; - processing = { - enable = true; - path = "/home/palo/sketchbook"; - }; - - }; - }; + openDefaultPorts = true; + user = "tina"; + dataDir = "/home/tina/.syncthing"; + configDir = "/home/tina/.syncthing"; }; - system.permown."/home/palo/music-library" = { - owner = "palo"; - group = "users"; - }; } diff --git a/configs/sterni/configuration.nix b/configs/sterni/configuration.nix index 67b8b54..d74fcac 100644 --- a/configs/sterni/configuration.nix +++ b/configs/sterni/configuration.nix @@ -72,6 +72,7 @@ hardware.opengl = { enable = true; extraPackages = [ pkgs.vaapiIntel ]; + driSupport = true; driSupport32Bit = true; }; nixpkgs.config.packageOverrides = pkgs: { diff --git a/configs/sterni/packages.nix b/configs/sterni/packages.nix index 291dee0..7ea57c1 100644 --- a/configs/sterni/packages.nix +++ b/configs/sterni/packages.nix @@ -7,6 +7,8 @@ in { environment.systemPackages = with pkgs; [ + tor-browser-bundle-bin + # bluetooth gui blueberry diff --git a/system/all/syncthing.nix b/system/all/syncthing.nix index 1d1542b..688e094 100644 --- a/system/all/syncthing.nix +++ b/system/all/syncthing.nix @@ -2,7 +2,7 @@ with lib; { services.syncthing = { - guiAddress = "${config.networking.hostName}.private:8384"; + guiAddress = lib.mkDefault "${config.networking.hostName}.private:8384"; declarative = { overrideDevices = true; devices = let diff --git a/system/desktop/home-manager/xmonad/Main.hs b/system/desktop/home-manager/xmonad/Main.hs index 1dc9a34..3789a40 100644 --- a/system/desktop/home-manager/xmonad/Main.hs +++ b/system/desktop/home-manager/xmonad/Main.hs @@ -394,6 +394,7 @@ myManageHook :: Query (Endo WindowSet) myManageHook = composeAll [ className =? "Gimp" --> doFloat + , className =? "zettlr" --> doFloat , title =? "fzfmenu" --> doCenterFloat , resource =? "copyq" --> doShift "-copyq" , scratchpadManageHook diff --git a/system/desktop/packages.nix b/system/desktop/packages.nix index febbc84..7ecf862 100644 --- a/system/desktop/packages.nix +++ b/system/desktop/packages.nix @@ -153,6 +153,7 @@ in { in [ zettlr + zim weight