diff --git a/flake.lock b/flake.lock index f20d18f..c461123 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759227262, - "narHash": "sha256-ibKJckw+KWH6n+pscOA7DWImanr988zKB7R2Z6ZEMLM=", + "lastModified": 1760176229, + "narHash": "sha256-Awrvmjo57VJHrVZCfGjPyf1NHFGopomoZiPUPT/3uls=", "owner": "Aylur", "repo": "ags", - "rev": "f68a0d03fbb94f4beacedd922ffaa0bf0f10397a", + "rev": "772f6ade645a1ca7ba06cb5845c479bbf4ac06f5", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1756474652, - "narHash": "sha256-iiBU6itpEqE0spXeNJ3uJTfioSyKYjt5bNepykpDXTE=", + "lastModified": 1759873585, + "narHash": "sha256-DsYbOkDXSl162XcQPxu4bknsevArxmWoqmL1qqcVNSI=", "owner": "aylur", "repo": "astal", - "rev": "20bd8318e4136fbd3d4eb2d64dbabc3acbc915dd", + "rev": "8d9ed4c624981156f52846ae58826f7c94f30546", "type": "github" }, "original": { @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1759711004, - "narHash": "sha256-B39NxeKCnK3DJlmJKIts6njcXcVVASLUChDNmRl4dxQ=", + "lastModified": 1761081701, + "narHash": "sha256-IwpfaKg5c/WWQiy8b5QGaVPMvoEQ2J6kpwRFdpVpBNQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "6f4021da5d2bb5ea7cb782ff413ecb7062066820", + "rev": "9b4a2a7c4fbd75b422f00794af02d6edb4d9d315", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1759711756, - "narHash": "sha256-gdX1IM8MT3vTqLSXLDc9HNg30EcHkAgUXeNh4UpcyYU=", + "lastModified": 1760950171, + "narHash": "sha256-E2ySTu/oK7cYBdAI3tlGP9zVjF4mZgWJ1OZInBCMb00=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "372ecde34b3af73ae523d4b055f5bcdab00b5ee6", + "rev": "f851a923137c0a54719412146fd63d24b3214e60", "type": "github" }, "original": { @@ -121,11 +121,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1759395653, - "narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=", + "lastModified": 1760940149, + "narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=", "owner": "YaLTeR", "repo": "niri", - "rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec", + "rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1759733170, + "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "8913c168d1c56dc49a7718685968f38752171c3b", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1759580034, - "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", + "lastModified": 1760862643, + "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", + "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -184,11 +184,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1759581380, - "narHash": "sha256-V8dGKYbxxrOVW6tQpoeQeJkCaumNkDYJB7zdyyTVHNo=", + "lastModified": 1761084826, + "narHash": "sha256-VwtI6ZeDS/8BC0l/5gScAdOxfhKV/NkGpM/1+u+SGmg=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "f9b1e2a96a9edb3d5557d4217d9f22d6a6308bbe", + "rev": "87877bf4c8a4f2b976a504ef500909064f050e5b", "type": "github" }, "original": { diff --git a/home/git/default.nix b/home/git/default.nix index 38ec7e0..f569454 100644 --- a/home/git/default.nix +++ b/home/git/default.nix @@ -1,9 +1,9 @@ { programs.git = { enable = true; - userName = "Pedro Correa"; ignores = ["*~" "*.swp"]; - extraConfig = { + settings = { + user.name = "Pedro Correa"; commit = { template = "~/.config/git/message"; verbose = true; @@ -36,12 +36,13 @@ tree = "log --graph --oneline"; }; }; + }; - delta = { - enable = true; - options = { - navigate = true; - }; + programs.delta = { + enable = true; + enableGitIntegration = true; + options = { + navigate = true; }; }; diff --git a/home/personal.nix b/home/personal.nix index 0884ea4..2c1a4a3 100644 --- a/home/personal.nix +++ b/home/personal.nix @@ -18,7 +18,7 @@ ]; programs.git = { - userEmail = "pedro8correa@gmail.com"; + settings.user.email = "pedro8correa@gmail.com"; signing = { key = "2748A6200C9EE0B4"; signByDefault = true; diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index b90ec68..c0658e3 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -49,14 +49,14 @@ }; services = { + # Enable the GNOME Desktop Environment. + displayManager.gdm.enable = true; + desktopManager.gnome.enable = true; + xserver = { # Enable the X11 windowing system. enable = true; - # Enable the GNOME Desktop Environment. - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; - # Configure keymap in X11 xkb = { layout = "us"; @@ -101,11 +101,11 @@ ollama.enable = true; open-webui.enable = true; + pulseaudio.enable = false; }; # Enable sound with pipewire. # sound.enable = true; - hardware.pulseaudio.enable = false; security.rtkit.enable = true; hardware.graphics.enable = true;