Nebucatnetzer/nixos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git.2li.ch:Nebucatnetzer/nixos

Browse Source
This commit is contained in:
Andreas Zweili 2023-03-01 13:26:15 +01:00
commit 75211033cc
9 changed files with 115 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
flake.lock
View File

@ -8,11 +8,11 @@
]
},
"locked": {
"lastModified": 1676910639,
"narHash": "sha256-YvZ2lQiUZrv5PCQ0nC/fn/0OT2ag8spCIOQx0COnFZ0=",
"lastModified": 1677453742,
"narHash": "sha256-/DNOThcCGz21Met/aMhm7NGqughtpxQzrlAqTuq+YZQ=",
"owner": "ryantm",
"repo": "agenix",
"rev": "5f66c8aa774d8d488cba1cdc4f0c954d2a14e3a1",
"rev": "4828951d9d05accd244bf8c24706f046b485aceb",
"type": "github"
},
"original": {
@ -51,11 +51,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1676257154,
"narHash": "sha256-eW3jymNLpdxS5fkp9NWKyNtgL0Gqtgg1vCTofKXDF1g=",
"lastModified": 1677284824,
"narHash": "sha256-I3gDxmGjyXdtOR5S8sIeCO8pT+5OR69f/g5EVoQUdsY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2cb27c79117a2a75ff3416c3199a2dc57af6a527",
"rev": "29280978234b73423f4eb708cbb999295f76b42a",
"type": "github"
},
"original": {
@ -67,11 +67,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1676924492,
"narHash": "sha256-78278eyP55JRFe7UCpmFwdkrTY6H2arzTpVeteWo8kM=",
"lastModified": 1677440795,
"narHash": "sha256-Kmjr95L42iioTItuA6nKCaObAXQvgRTPmj+62dx5OZg=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "d24ea777c57b69c6b143cf11d83184ef71b0dbbf",
"rev": "2a483ad9cd2d931ab52cd5f897c447beb8328bed",
"type": "github"
},
"original": {
@ -82,11 +82,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1676895851,
"narHash": "sha256-xdhBKw2el790G+88tZYpRWlP9VjQC9OLR5Jx84VPe08=",
"lastModified": 1677341534,
"narHash": "sha256-zqaJuOTnKzg5AubC4rzzJ/IS5kU5n4U7vxosv1Fv8Ug=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e19f25b587f15871d26442cfa1abe4418a815d7d",
"rev": "7076110064c09f0b3942f609f2134c1358ef2e50",
"type": "github"
},
"original": {
@ -114,11 +114,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1676885936,
"narHash": "sha256-ZRKb6zBfTvdCOXI7nGC1L9UWSU5ay2ltxg+f5UIzBOU=",
"lastModified": 1677407201,
"narHash": "sha256-3blwdI9o1BAprkvlByHvtEm5HAIRn/XPjtcfiunpY7s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b69883faca9542d135fa6bab7928ff1b233c167f",
"rev": "7f5639fa3b68054ca0b062866dc62b22c3f11505",
"type": "github"
},
"original": {

2
modules/desktop/default.nix
View File

@ -5,7 +5,7 @@
(import "${custom.inputs.self}/modules/droidcam" { inherit custom; })
(import "${custom.inputs.self}/modules/email" { inherit custom; })
(import "${custom.inputs.self}/modules/eog" { inherit custom; })
"${custom.inputs.self}/modules/gnome"
(import "${custom.inputs.self}/modules/gnome" { inherit custom; })
"${custom.inputs.self}/modules/hunspell"
(import "${custom.inputs.self}/modules/libimobiledevice" { inherit custom; })
(import "${custom.inputs.self}/modules/nix-direnv" { inherit custom; })

9
modules/gnome/default.nix
View File

@ -1,6 +1,6 @@
{ pkgs, ... }: {
{ custom }: { pkgs, ... }:
{
services.switcherooControl.enable = true;
services.touchegg.enable = true;
services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
services.xserver.desktopManager.gnome.enable = true;
environment = {
@ -9,7 +9,6 @@
gnomeExtensions.appindicator
gnomeExtensions.gtk-title-bar
gnomeExtensions.switcheroo
gnomeExtensions.x11-gestures
];
gnome.excludePackages = (with pkgs; [
gnome-console
@ -34,4 +33,8 @@
yelp
]);
};
services.touchegg.enable = true;
home-manager.users.${custom.username} = {
home.file.".config/touchegg/touchegg.conf".source = ./touchegg.conf;
};
}

83
modules/gnome/touchegg.conf Normal file
View File

@ -0,0 +1,83 @@
<touchégg>
<settings>
<property name="animation_delay">150</property>
<property name="action_execute_threshold">20</property>
<property name="color">auto</property>
<property name="borderColor">auto</property>
</settings>
<!--
Configuration for every application.
-->
<application name="All">
<gesture type="SWIPE" fingers="3" direction="DOWN">
<action type="SHOW_DESKTOP">
<animate>true</animate>
</action>
</gesture>
<gesture type="SWIPE" fingers="3" direction="UP">
<action type="SEND_KEYS">
<repeat>false</repeat>
<modifiers>Super_L</modifiers>
<keys>Tab</keys>
<on>begin</on>
</action>
</gesture>
<gesture type="SWIPE" fingers="3" direction="LEFT">
<action type="CHANGE_DESKTOP">
<direction>next</direction>
<animate>true</animate>
<animationPosition>right</animationPosition>
</action>
</gesture>
<gesture type="SWIPE" fingers="3" direction="RIGHT">
<action type="CHANGE_DESKTOP">
<direction>previous</direction>
<animate>true</animate>
<animationPosition>left</animationPosition>
</action>
</gesture>
<gesture type="SWIPE" fingers="4" direction="DOWN">
<action type="MINIMIZE_WINDOW">
<animate>true</animate>
</action>
</gesture>
<gesture type="SWIPE" fingers="4" direction="UP">
<action type="MAXIMIZE_RESTORE_WINDOW">
<animate>true</animate>
</action>
</gesture>
<gesture type="SWIPE" fingers="4" direction="LEFT">
<action type="TILE_WINDOW">
<direction>left</direction>
<animate>true</animate>
</action>
</gesture>
<gesture type="SWIPE" fingers="4" direction="RIGHT">
<action type="TILE_WINDOW">
<direction>right</direction>
<animate>true</animate>
</action>
</gesture>
<gesture type="TAP" fingers="2">
<action type="MOUSE_CLICK">
<button>3</button>
<on>begin</on>
</action>
</gesture>
<gesture type="TAP" fingers="3">
<action type="MOUSE_CLICK">
<button>2</button>
<on>begin</on>
</action>
</gesture>
</application>
</touchégg>

2
modules/grav/default.nix
View File

@ -3,7 +3,7 @@
virtualisation.oci-containers = {
backend = "docker";
containers."grav" = {
image = "lscr.io/linuxserver/grav:latest";
image = "lscr.io/linuxserver/grav:1.7.39";
autoStart = true;
environment = {
TZ = "Europe/Zurich";

2
modules/heimdall/default.nix
View File

@ -3,7 +3,7 @@
virtualisation.oci-containers = {
backend = "docker";
containers."heimdall" = {
image = "linuxserver/heimdall";
image = "linuxserver/heimdall:2.5.5";
autoStart = true;
environment = {
TZ = "Europe/Zurich";

2
modules/plex/default.nix
View File

@ -19,7 +19,7 @@
backend = "docker";
containers."plex" = {
autoStart = true;
image = "lscr.io/linuxserver/plex";
image = "lscr.io/linuxserver/plex:1.31.0";
environment = {
TZ = " Europe/Zurich ";
PUID = "1000";

3
modules/rss-bridge/default.nix
View File

@ -6,7 +6,8 @@ in
virtualisation.oci-containers = {
backend = "docker";
containers."rss-bridge" = {
image = "rssbridge/rss-bridge:latest";
# https://hub.docker.com/r/rssbridge/rss-bridge/tags
image = "rssbridge/rss-bridge@sha256:c1ae55f116fed0706473f4d6025944a7f0cac1591478f10df86aa963865a5bde";
autoStart = true;
ports = [
"8082:80"

8
modules/ttrss-postgres/default.nix
View File

@ -9,6 +9,8 @@ let
TTRSS_SESSION_COOKIE_LIFETIME = "604800";
TTRSS_PLUGINS = "af_comics, af_readability, auth_internal, hotkeys_swap_jk, nginx_xaccel";
};
# https://github.com/Nebucatnetzer/tt-rss-aarch64/pkgs/container/tt-rss-aarch64%2Fttrss-fpm-pgsql-static/versions
ttrssImage = "ghcr.io/nebucatnetzer/tt-rss-aarch64/ttrss-fpm-pgsql-static@sha256:1ab138d81f5d719c30d813d10aa30987ac3db3a2d8c5f81ddfbba3a0b0cd9279";
ttrssService = "${config.virtualisation.oci-containers.backend}-ttrss";
backupService = "${config.virtualisation.oci-containers.backend}-backup";
updaterService = "${config.virtualisation.oci-containers.backend}-updater";
@ -37,7 +39,7 @@ in
virtualisation.oci-containers = {
backend = "docker";
containers."ttrss" = {
image = "ghcr.io/nebucatnetzer/tt-rss-aarch64/ttrss-fpm-pgsql-static";
image = ttrssImage;
autoStart = true;
environment = ttrssEnvironment;
environmentFiles = [ config.age.secrets.ttrssEnv.path ];
@ -51,7 +53,7 @@ in
extraOptions = [ "--add-host=host.docker.internal:host-gateway" ];
};
containers."backup" = {
image = "ghcr.io/nebucatnetzer/tt-rss-aarch64/ttrss-fpm-pgsql-static";
image = ttrssImage;
autoStart = true;
environment = ttrssEnvironment;
environmentFiles = [ config.age.secrets.ttrssEnv.path ];
@ -64,7 +66,7 @@ in
extraOptions = [ "--add-host=host.docker.internal:host-gateway" ];
};
containers."updater" = {
image = "ghcr.io/nebucatnetzer/tt-rss-aarch64/ttrss-fpm-pgsql-static";
image = ttrssImage;
autoStart = true;
environment = ttrssEnvironment;
environmentFiles = [ config.age.secrets.ttrssEnv.path ];