diff --git a/flake.lock b/flake.lock index 6edd3ac..ed90e4a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1664140963, - "narHash": "sha256-pFxDtOLduRFlol0Y4ShE+soRQX4kbhaCNBtDOvx7ykw=", + "lastModified": 1665870395, + "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", "owner": "ryantm", "repo": "agenix", - "rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0", + "rev": "a630400067c6d03c9b3e0455347dc8559db14288", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1662893183, - "narHash": "sha256-NyP/kJlV1Ai7os3gMqukKMdRSQ78GAjPCJkZDZtDdeo=", + "lastModified": 1665257885, + "narHash": "sha256-4PNnCRLomAd5OdN4UEbsVSm8eNuteZHKaUqRVvIBvN8=", "owner": "arkenfox", "repo": "user.js", - "rev": "3f09afdee07c5aea33f6dc4194e1425d6400a0d7", + "rev": "f4187632faef76df4de0cbb0cdc7199f22fadd76", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1664251341, - "narHash": "sha256-1f0KvK1VA8tGK7RVYZv17vSJ6URyt8fs81kRGfzPK3Q=", + "lastModified": 1665920565, + "narHash": "sha256-0z3Ibp4aJdwU3t0KjECJUjQoReqoZj3MILmcyN4lZu0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "550ce5667fee8f74aa20ad6456720ed84ebdd241", + "rev": "33ce8dabfd3dc4968bae24126766e60d67b39dbb", "type": "github" }, "original": { @@ -212,11 +212,11 @@ "forgit-git": { "flake": false, "locked": { - "lastModified": 1663431390, - "narHash": "sha256-dz7HNm9+dgb2ibomdrYdtSUC+ksrYdRR5RjBxSmc9eI=", + "lastModified": 1665756353, + "narHash": "sha256-NKL4c4k9Nath8NQ3sWUTGUzp517jRX4v0qVaKMJSMrw=", "owner": "wfxr", "repo": "forgit", - "rev": "49579b2d1f620db6a71d070b40416c1af8a32168", + "rev": "2872548075e63bc83a0b960e2813b16571998563", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1664273942, - "narHash": "sha256-PFQR1UJQs7a7eaH5YoCZky5dmxR5cjaKRK+MpPbR7YE=", + "lastModified": 1665863351, + "narHash": "sha256-u8YWmHBTXWvQPBfKOrPWFVjvqhJ+5hUk3/29eR7APko=", "owner": "nix-community", "repo": "home-manager", - "rev": "1f5ef2bb419a327fae28a83b50fab50959132c24", + "rev": "2ecb3ea990cf737cfb42d8cd805fa86347c1afaf", "type": "github" }, "original": { @@ -250,15 +250,14 @@ "inputs": { "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks", - "utils": "utils_3" + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1665340940, - "narHash": "sha256-6IIBGkD4spWRvMTEXRxWa31IerfVc1SSTruggY/lNR4=", + "lastModified": 1665343480, + "narHash": "sha256-mMaZFrDDiBcHDe8+lA87P3iMPea+RGfik5/E4Dyzk8U=", "ref": "refs/heads/main", - "rev": "17159cf269ce194703bc04671bb6d2378d124959", - "revCount": 3, + "rev": "24a7cfb8c2fef1873275dbdf7c8ad562c22083de", + "revCount": 5, "type": "git", "url": "https://git.sr.ht/~moritzboehme/howdy" }, @@ -269,11 +268,11 @@ }, "master": { "locked": { - "lastModified": 1664278750, - "narHash": "sha256-frpTZQ+QMS7Xwi3fQSYdUTKd5e4YnrrDcS4WT+fdpfI=", + "lastModified": 1665915750, + "narHash": "sha256-KfuxHgwccTW/BmPbZFzC5KjrqWTjPj5Ev6Yscm0FP1w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff346a442d1e5ec81b24c312c06fd134bcc9c088", + "rev": "e569855125fa58194f26577b4e3761e88216eab3", "type": "github" }, "original": { @@ -322,11 +321,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1664235386, - "narHash": "sha256-hlkYFCJ9VKZPRW50vtpHHq4h1PJrptD5BbdLOEp4Lyc=", + "lastModified": 1665830552, + "narHash": "sha256-qel2bZ9TqfW8WzWCWdjuCy4bVFhhGsEeqFv/bj1ka2s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ea4a87537cfdc83eebcd1804a5ec51057018784f", + "rev": "26b7e6ab6a864c3e7e077bcb27a49f0480b9894a", "type": "github" }, "original": { @@ -381,11 +380,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1663082609, - "narHash": "sha256-lmCCIu4dj59qbzkGKHQtolhpIEQMeAd2XUbXVPqgPYo=", + "lastModified": 1665584211, + "narHash": "sha256-Qc9zn43UjLpP823BP416hAsoaXugwWw+nKPVqsNhqdY=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "60cad1a326df17a8c6cf2bb23436609fdd83024e", + "rev": "94b0f300dd9a23d4e851aa2a947a1511d3410e2d", "type": "github" }, "original": { @@ -410,16 +409,16 @@ "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks_2", "stable": "stable", - "utils": "utils_4" + "utils": "utils_3" } }, "stable": { "locked": { - "lastModified": 1664178928, - "narHash": "sha256-+WVCZH/3Ifef4Da9N1tkGnmfX0QwtkJQz013QuImu10=", + "lastModified": 1665763903, + "narHash": "sha256-znGWY4x688cZ3Ii01qLnhl+mSKpQ9iCufGxfdV6oBOc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b542cc75fa03a3a29350d4c3b69739e946268a93", + "rev": "78a37aa630faa41944060a966607d4f1128ea94b", "type": "github" }, "original": { @@ -460,27 +459,6 @@ } }, "utils_3": { - "inputs": { - "flake-utils": [ - "howdy", - "flake-utils" - ] - }, - "locked": { - "lastModified": 1657226504, - "narHash": "sha256-GIYNjuq4mJlFgqKsZ+YrgzWm0IpA4axA3MCrdKYj7gs=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a", - "type": "github" - }, - "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "type": "github" - } - }, - "utils_4": { "inputs": { "flake-utils": "flake-utils_4" }, diff --git a/modules/profiles/work.nix b/modules/profiles/work.nix index ca635b5..e60aa28 100644 --- a/modules/profiles/work.nix +++ b/modules/profiles/work.nix @@ -14,17 +14,18 @@ with lib; { }; programs = { - gnome.enable = true; code.enable = true; firefox.enable = true; - spotify.enable = true; - thunar.enable = true; - zathura.enable = true; git.identity.email = "moritz.boehme@l.de"; + gnome.enable = true; python = { enable = true; versions = [ "python310" "python38" ]; + packages = [ ]; }; + spotify.enable = true; + thunar.enable = true; + zathura.enable = true; }; services = { @@ -35,6 +36,7 @@ with lib; { }; environment.systemPackages = with pkgs; [ + chromium fprintd gnumake jetbrains.pycharm-professional @@ -42,6 +44,7 @@ with lib; { libreoffice logseq pavucontrol + poetry slack vlc ]; diff --git a/modules/programs/gnome.nix b/modules/programs/gnome.nix index f60df75..89b89a0 100644 --- a/modules/programs/gnome.nix +++ b/modules/programs/gnome.nix @@ -7,6 +7,8 @@ with lib; let cfg = config.my.programs.gnome; + + extensions = with pkgs.gnomeExtensions; [ tray-icons-reloaded gsconnect ]; in { options.my.programs.gnome.enable = mkEnableOption "gnome"; @@ -32,6 +34,10 @@ in enable = true; desktopManager.gnome.enable = true; }; - environment.systemPackages = with pkgs.gnomeExtensions; [ tray-icons-reloaded gsconnect ]; + environment.systemPackages = extensions; + home-manager.users.moritz.dconf.settings = { + "org/gnome/shell".enabled-extensions = map (p: p.extensionUuid or p.uuid) extensions; + "org/gnome/desktop/interface".enable-hot-corners = false; + }; }; } diff --git a/modules/virtualisation/podman.nix b/modules/virtualisation/podman.nix index f3fdf35..5ab1558 100644 --- a/modules/virtualisation/podman.nix +++ b/modules/virtualisation/podman.nix @@ -15,6 +15,7 @@ in virtualisation.podman = { enable = true; dockerCompat = true; + defaultNetwork.dnsname.enable = true; }; }; }