From 6c6fb3db4bb4957e32333d4f2574a81dd9ea043c Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Tue, 23 Nov 2021 23:01:54 +0100 Subject: [PATCH 1/8] auto optimise nix --- common/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/common/common.nix b/common/common.nix index a812f73..f7bd3e3 100644 --- a/common/common.nix +++ b/common/common.nix @@ -59,6 +59,7 @@ dates = "weekly"; options = "--delete-older-than 7d"; }; + nix.autoOptimiseStore = true; environment.shellAliases = { nix-generations = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system"; From 4bbb6d0e203f60b239570b87eee54bd9dcf4751c Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Tue, 23 Nov 2021 23:09:40 +0100 Subject: [PATCH 2/8] add a version file --- common/common.nix | 2 +- home-manager/common.nix | 2 +- version.nix | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 version.nix diff --git a/common/common.nix b/common/common.nix index f7bd3e3..a1fe580 100644 --- a/common/common.nix +++ b/common/common.nix @@ -77,7 +77,7 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "21.05"; # Did you read the comment? + system.stateVersion = import ../version.nix; } diff --git a/home-manager/common.nix b/home-manager/common.nix index de16c6b..1333545 100644 --- a/home-manager/common.nix +++ b/home-manager/common.nix @@ -14,7 +14,7 @@ # You can update Home Manager without changing this value. See # the Home Manager release notes for a list of state version # changes in each release. - home.stateVersion = "21.05"; + home.stateVersion = import ../version.nix; # Let Home Manager install and manage itself. programs.home-manager.enable = true; diff --git a/version.nix b/version.nix new file mode 100644 index 0000000..4fbd8a3 --- /dev/null +++ b/version.nix @@ -0,0 +1 @@ +"21.05" From 4af84849ac334c0c6114cc8d7cc3d1a7ae4d6a3b Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Wed, 24 Nov 2021 09:46:16 +0100 Subject: [PATCH 3/8] format with nixpkgs-fmt --- common/desktop.nix | 2 +- home-manager/desktop.nix | 2 +- home-manager/ubuntu.nix | 2 +- home-manager/work-wsl.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/desktop.nix b/common/desktop.nix index cdba40e..05ee539 100644 --- a/common/desktop.nix +++ b/common/desktop.nix @@ -6,7 +6,7 @@ { imports = [ - ./common.nix + ./common.nix ]; networking = { diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix index af915e7..45c7f95 100644 --- a/home-manager/desktop.nix +++ b/home-manager/desktop.nix @@ -1,4 +1,4 @@ -{config, pkgs, ...}: +{ config, pkgs, ... }: { imports = [ ./common.nix diff --git a/home-manager/ubuntu.nix b/home-manager/ubuntu.nix index c04bcd3..16db02c 100644 --- a/home-manager/ubuntu.nix +++ b/home-manager/ubuntu.nix @@ -1,4 +1,4 @@ -{config, pkgs, ...}: +{ config, pkgs, ... }: { imports = [ ./common.nix diff --git a/home-manager/work-wsl.nix b/home-manager/work-wsl.nix index 4f965ae..1b14963 100644 --- a/home-manager/work-wsl.nix +++ b/home-manager/work-wsl.nix @@ -1,4 +1,4 @@ -{config, pkgs, ...}: +{ config, pkgs, ... }: { imports = [ ./common.nix From 7924c2b27f0af391d82df23c0451d863fe9e0ced Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Wed, 24 Nov 2021 09:46:59 +0100 Subject: [PATCH 4/8] add nixpkgs-fmt --- common/cli-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/common/cli-packages.nix b/common/cli-packages.nix index 36a5d99..8fac2f3 100644 --- a/common/cli-packages.nix +++ b/common/cli-packages.nix @@ -11,6 +11,7 @@ htop killall ncdu + nixpkgs-fmt ranger tree vim From 8b1a6366a4728727f53ab426065f2dca9e4832dd Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Wed, 24 Nov 2021 20:20:59 +0100 Subject: [PATCH 5/8] add droidcam and remmin --- common/desktop.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/desktop.nix b/common/desktop.nix index cdba40e..9583e72 100644 --- a/common/desktop.nix +++ b/common/desktop.nix @@ -46,12 +46,13 @@ hardware.steam-hardware.enable = true; # enable lockscreen - programs.xss-lock = { enable = true; lockerCommand = "i3lock -c 000000"; }; + programs.droidcam.enable = true; + environment.variables = { ZWEILI_ENVIRONMENT = "desktop"; }; @@ -70,6 +71,7 @@ networkmanager-openvpn nitrogen pavucontrol + remmina rofi source-code-pro terminator From 68fe002bae841eeb71a4647dbe997c604768659e Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Wed, 24 Nov 2021 20:24:32 +0100 Subject: [PATCH 6/8] add photography software digikam shotwell Rapid Photo Downloader --- common/desktop.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/desktop.nix b/common/desktop.nix index 153445b..afb609f 100644 --- a/common/desktop.nix +++ b/common/desktop.nix @@ -60,6 +60,7 @@ environment.systemPackages = with pkgs; [ arc-theme celluloid + digikam evince firefox gimp @@ -71,8 +72,10 @@ networkmanager-openvpn nitrogen pavucontrol + rapid-photo-downloader remmina rofi + shotwell source-code-pro terminator ]; From 4ea7b79832bb03b78119f54b37856cf42f2d1759 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Wed, 24 Nov 2021 20:32:12 +0100 Subject: [PATCH 7/8] add calibre --- common/desktop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/common/desktop.nix b/common/desktop.nix index afb609f..7643fba 100644 --- a/common/desktop.nix +++ b/common/desktop.nix @@ -59,6 +59,7 @@ environment.systemPackages = with pkgs; [ arc-theme + calibre celluloid digikam evince From f851ed1ebaece3a8099b7bfec1b40890ae0d068f Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Wed, 24 Nov 2021 20:39:18 +0100 Subject: [PATCH 8/8] add mosh --- common/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/common/common.nix b/common/common.nix index a1fe580..8aacf8a 100644 --- a/common/common.nix +++ b/common/common.nix @@ -29,6 +29,7 @@ enableRedistributableFirmware = true; }; + programs.mosh.enable = true; services = { openssh.enable = true; };