From 54988b2d849abb344be6925832a5416700686fe1 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Thu, 8 Aug 2024 22:27:26 +0200 Subject: [PATCH 1/6] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'homepage': 'https://git.dadada.li/dadada/dadada.li.git?narHash=sha256-PdJ1RA11vx3tM09YYAv3qAlKzENCZZITefHv6KbYhcY%3D' → 'https://git.dadada.li/dadada/dadada.li.git?narHash=sha256-/ir2S0iPNVw5btUtMpmeMy9gKGe/CC7KPrZiK1SFpEQ%3D' --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 43efbdb..605b1a8 100644 --- a/flake.lock +++ b/flake.lock @@ -146,7 +146,7 @@ "homepage": { "flake": false, "locked": { - "narHash": "sha256-0bBtcABZHBgodfmNPNXpp8Tr3SH7Hufx18xfiSb8cWo=", + "narHash": "sha256-/ir2S0iPNVw5btUtMpmeMy9gKGe/CC7KPrZiK1SFpEQ=", "type": "file", "url": "https://git.dadada.li/dadada/dadada.li.git" }, @@ -157,11 +157,11 @@ }, "nixlib": { "locked": { - "lastModified": 1722128034, - "narHash": "sha256-L8rwzYPsLo/TYtydPJoQyYOfetuiyQYnTWYcyB8UE/s=", + "lastModified": 1722732880, + "narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "d15f6f6021693898fcd2c6a9bb13707383da9bbc", + "rev": "8bebd4c74f368aacb047f0141db09ec6b339733c", "type": "github" }, "original": { @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1722214420, - "narHash": "sha256-qfHC1p5hcErGcE672/KhBkyWYloekQpqIxtcbcUVYkA=", + "lastModified": 1723078345, + "narHash": "sha256-HSxOQEKNZXiJe9aWnckTTCThOhcRCabwHa32IduDKLk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "75cbb2a5e19c18840d105a72d036c6c92fc46c5d", + "rev": "d6c5d29f58acc10ea82afff1de2b28f038f572bd", "type": "github" }, "original": { @@ -209,11 +209,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722621932, - "narHash": "sha256-Uz5xeHsH7+qZVncZwfzGd+CTjxd0mwaP7Q/pbs7OB5c=", + "lastModified": 1723070956, + "narHash": "sha256-bFOTvmkJ2c1ku+E0gvqmNEF2D1PSmujDFLofKAMF/pM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "15ed5d4537fd46399513bb040bf98415c825281b", + "rev": "7cec143201c32c4937f2c153af4a9f28a3d9bec1", "type": "github" }, "original": { @@ -225,11 +225,11 @@ }, "nixpkgs-full": { "locked": { - "lastModified": 1722519197, - "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=", + "lastModified": 1722869614, + "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b", + "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", "type": "github" }, "original": { From 879370e4a8d5f1434bff83befd0aff53fc789722 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Tue, 13 Aug 2024 17:33:29 +0200 Subject: [PATCH 2/6] fix: nar hash of homepage --- flake.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 605b1a8..00fcf56 100644 --- a/flake.lock +++ b/flake.lock @@ -146,7 +146,7 @@ "homepage": { "flake": false, "locked": { - "narHash": "sha256-/ir2S0iPNVw5btUtMpmeMy9gKGe/CC7KPrZiK1SFpEQ=", + "narHash": "sha256-A6ottqpZYc3iLJvFg+DP2RNl9ypeskUeWyfdyyjpMZw=", "type": "file", "url": "https://git.dadada.li/dadada/dadada.li.git" }, From 5c9eec85a150b634865f8c9e76a97f1c2ca6b55f Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Tue, 13 Aug 2024 17:33:48 +0200 Subject: [PATCH 3/6] feat: add switcher extension to gnome shell --- home/dconf.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/home/dconf.nix b/home/dconf.nix index 645827a..b75fb2d 100644 --- a/home/dconf.nix +++ b/home/dconf.nix @@ -1,6 +1,10 @@ -{ lib, ... }: +{ lib, pkgs, ... }: with lib.hm.gvariant; { + home.packages = [ + pkgs.gnomeExtensions.switcher + ]; + dconf.settings = with lib.hm.gvariant; { "org/gnome/shell" = { favorite-apps = [ @@ -14,7 +18,10 @@ with lib.hm.gvariant; "org/gnome/shell" = { disable-user-extensions = false; - enabled-extensions = [ "system-monitor@gnome-shell-extensions.gcampax.github.com" ]; + enabled-extensions = [ + "system-monitor@gnome-shell-extensions.gcampax.github.com" + "switcher@landau.fi" + ]; }; "org/gnome/desktop/calendar" = { From e809610a63f7b559b1999a497cd3d6a93035134b Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Tue, 13 Aug 2024 17:34:10 +0200 Subject: [PATCH 4/6] feat: install krita and solvespace --- home/pkgs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/pkgs.nix b/home/pkgs.nix index 76c8353..ec1deb5 100644 --- a/home/pkgs.nix +++ b/home/pkgs.nix @@ -68,6 +68,7 @@ with pkgs; [ kcachegrind keepassxc kubetail + krita ldns liboping # oping, ping multiple hosts at once libreoffice @@ -117,6 +118,7 @@ with pkgs; [ skim # fzf in Rust slurp socat + solvespace spotify sqlite sshfs-fuse From b4889eec64e2fb69e333d965c6215f990be3e381 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Tue, 13 Aug 2024 17:35:33 +0200 Subject: [PATCH 5/6] chore: update flake inputs --- flake.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 00fcf56..29d1dc6 100644 --- a/flake.lock +++ b/flake.lock @@ -146,7 +146,7 @@ "homepage": { "flake": false, "locked": { - "narHash": "sha256-A6ottqpZYc3iLJvFg+DP2RNl9ypeskUeWyfdyyjpMZw=", + "narHash": "sha256-d72V/oM66V48FbKzXx1Waj09c8VJUg+lbzFHRye40eQ=", "type": "file", "url": "https://git.dadada.li/dadada/dadada.li.git" }, @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1723078345, - "narHash": "sha256-HSxOQEKNZXiJe9aWnckTTCThOhcRCabwHa32IduDKLk=", + "lastModified": 1723444610, + "narHash": "sha256-WzhuUR2ZwafNzBh0VAbk3+320xd2sNWdZdjZa0S9ydY=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d6c5d29f58acc10ea82afff1de2b28f038f572bd", + "rev": "a220fc3a6e144f12f0c3dc3e4d01d44c2e6b0b85", "type": "github" }, "original": { @@ -193,11 +193,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1722332872, - "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", + "lastModified": 1723310128, + "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "14c333162ba53c02853add87a0000cbd7aa230c2", + "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", "type": "github" }, "original": { @@ -209,11 +209,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723070956, - "narHash": "sha256-bFOTvmkJ2c1ku+E0gvqmNEF2D1PSmujDFLofKAMF/pM=", + "lastModified": 1723540975, + "narHash": "sha256-rxpxOz2VSqgmwI7g7FGVAoye5bxwO1MSpnELY5bsITw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7cec143201c32c4937f2c153af4a9f28a3d9bec1", + "rev": "fb81cec9eda2a6b5365ad723995f0329d9e356fd", "type": "github" }, "original": { @@ -225,11 +225,11 @@ }, "nixpkgs-full": { "locked": { - "lastModified": 1722869614, - "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", + "lastModified": 1723400035, + "narHash": "sha256-WoKZDlBEdMhP+hjquBAh0BhUJbcH2+U8g2mHOr1mv8I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", + "rev": "a731b45590a5169542990c36ffcde6cebd9a3356", "type": "github" }, "original": { @@ -277,11 +277,11 @@ ] }, "locked": { - "lastModified": 1722330636, - "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", + "lastModified": 1723454642, + "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", + "rev": "349de7bc435bdff37785c2466f054ed1766173be", "type": "github" }, "original": { From 16e42c3177c3ad60f6996f0176e64a327faa7ce1 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Fri, 16 Aug 2024 15:21:06 +0200 Subject: [PATCH 6/6] fix: gitea urls --- flake.lock | 40 +++++++++++++++++-------------- flake.nix | 2 +- nixos/modules/profiles/server.nix | 2 +- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 29d1dc6..cd1f21a 100644 --- a/flake.lock +++ b/flake.lock @@ -146,22 +146,26 @@ "homepage": { "flake": false, "locked": { - "narHash": "sha256-d72V/oM66V48FbKzXx1Waj09c8VJUg+lbzFHRye40eQ=", - "type": "file", + "lastModified": 1714328013, + "narHash": "sha256-nA/7hKv8qz2+ru84rXiMa52+gyvyIhLWP9tJB6Q/DLQ=", + "ref": "refs/heads/main", + "rev": "b971b5905b38be19b4fa4e7d99a70df0aebfba28", + "revCount": 31, + "type": "git", "url": "https://git.dadada.li/dadada/dadada.li.git" }, "original": { - "type": "file", + "type": "git", "url": "https://git.dadada.li/dadada/dadada.li.git" } }, "nixlib": { "locked": { - "lastModified": 1722732880, - "narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=", + "lastModified": 1723337705, + "narHash": "sha256-znSU0DeNDPt7+LMAfFkvKloMaeQ6yl/U5SqV/ktl1vA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "8bebd4c74f368aacb047f0141db09ec6b339733c", + "rev": "ace7856d327b618d3777e31b1f224b3ab57ed71a", "type": "github" }, "original": { @@ -178,11 +182,11 @@ ] }, "locked": { - "lastModified": 1723444610, - "narHash": "sha256-WzhuUR2ZwafNzBh0VAbk3+320xd2sNWdZdjZa0S9ydY=", + "lastModified": 1723683171, + "narHash": "sha256-hQMQQHOVVkiCO5hmbjI3EVimWFIkRNkGIGUhyIQ0mQ0=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "a220fc3a6e144f12f0c3dc3e4d01d44c2e6b0b85", + "rev": "1cb3dc2f3af215ea40911de8fd0942c1ff3fb673", "type": "github" }, "original": { @@ -209,11 +213,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723540975, - "narHash": "sha256-rxpxOz2VSqgmwI7g7FGVAoye5bxwO1MSpnELY5bsITw=", + "lastModified": 1723746470, + "narHash": "sha256-xOWtLQpYetDWPlOvAo04as/ocpGTm1W556zfA24Vdh4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb81cec9eda2a6b5365ad723995f0329d9e356fd", + "rev": "9bbda8b76be48dd59d352199d06c24d61b94206a", "type": "github" }, "original": { @@ -225,11 +229,11 @@ }, "nixpkgs-full": { "locked": { - "lastModified": 1723400035, - "narHash": "sha256-WoKZDlBEdMhP+hjquBAh0BhUJbcH2+U8g2mHOr1mv8I=", + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a731b45590a5169542990c36ffcde6cebd9a3356", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", "type": "github" }, "original": { @@ -277,11 +281,11 @@ ] }, "locked": { - "lastModified": 1723454642, - "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", + "lastModified": 1723808491, + "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "349de7bc435bdff37785c2466f054ed1766173be", + "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b2d98be..c1836b5 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; homepage = { - url = "https://git.dadada.li/dadada/dadada.li.git"; + url = "git+https://git.dadada.li/dadada/dadada.li.git"; flake = false; }; agenix = { diff --git a/nixos/modules/profiles/server.nix b/nixos/modules/profiles/server.nix index 925f20e..e5b6d4c 100644 --- a/nixos/modules/profiles/server.nix +++ b/nixos/modules/profiles/server.nix @@ -24,7 +24,7 @@ with lib; { system.autoUpgrade = { enable = true; - flake = "https://git.dadada.li/dadada/nix-config.git#${config.networking.hostName}"; + flake = "git+https://git.dadada.li/dadada/nix-config.git#${config.networking.hostName}"; allowReboot = mkDefault false; randomizedDelaySec = "45min"; };