Update inputs and config

This commit is contained in:
Fabian Hauser 2024-09-26 15:23:01 +03:00
parent eb8437814c
commit 2a6d8527bf
3 changed files with 25 additions and 31 deletions

43
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"catppuccin": { "catppuccin": {
"locked": { "locked": {
"lastModified": 1724469296, "lastModified": 1726952185,
"narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=", "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb", "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -204,11 +204,11 @@
"unionmount": "unionmount_2" "unionmount": "unionmount_2"
}, },
"locked": { "locked": {
"lastModified": 1725314969, "lastModified": 1727131729,
"narHash": "sha256-5ur6rsukYxP3yTfLz1YCd1jxWWGMRWT4K7OJA+25mRA=", "narHash": "sha256-jZmKq9XLM+rWz3kAq8p3cPm1r768s+Y9lrZdEXEwXxQ=",
"owner": "srid", "owner": "srid",
"repo": "emanote", "repo": "emanote",
"rev": "0e61263fadead77a7ffbcd1eeedf64ac60049a80", "rev": "40607a267c4c78b6a5a513b2c9b620faf1b6c201",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -269,11 +269,10 @@
] ]
}, },
"locked": { "locked": {
"dirtyRev": "18db2b965924207f14d3e5da2512f95f1464cf03-dirty",
"dirtyShortRev": "18db2b9-dirty",
"lastModified": 1670075202, "lastModified": 1670075202,
"narHash": "sha256-LX//k01Y+eyDeBtlgWUwEDUn0eoNst6+rmiXP8x9Q/U=", "narHash": "sha256-NY1i1boNgAKTbD3g1byHap79eVWUk2ZQuSqYkmM+/o0=",
"ref": "18db2b965924207f14d3e5da2512f95f1464cf03",
"rev": "18db2b965924207f14d3e5da2512f95f1464cf03",
"revCount": 3,
"type": "git", "type": "git",
"url": "file:///etc/nixos/fcc-unlock" "url": "file:///etc/nixos/fcc-unlock"
}, },
@ -494,11 +493,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725180166, "lastModified": 1727346017,
"narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", "narHash": "sha256-z7OCFXXxIseJhEHiCkkUOkYxD9jtLU8Kf5Q9WC0SjJ8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", "rev": "c124568e1054a62c20fbe036155cc99237633327",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -554,11 +553,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1724878143, "lastModified": 1727040444,
"narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -631,11 +630,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1725103162, "lastModified": 1727122398,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -647,11 +646,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1725103162, "lastModified": 1727122398,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,7 +1,10 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.packages = [ pkgs.git-absorb ]; home.packages = with pkgs; [
git-absorb
git-trim
];
programs.git = { programs.git = {
enable = true; enable = true;
package = pkgs.gitAndTools.gitFull; package = pkgs.gitAndTools.gitFull;

View file

@ -150,14 +150,6 @@ rec {
Environment = lib.mkForce "PATH=${config.home.profileDirectory}/bin XDG_CURRENT_DESKTOP=Unity"; Environment = lib.mkForce "PATH=${config.home.profileDirectory}/bin XDG_CURRENT_DESKTOP=Unity";
}; };
}; };
systemd.user.services.owncloud-client = adhereTheSwayTarget // {
# For trayicon to work:
Unit.After = lib.mkForce [ "waybar.service" ];
Service = {
ExecStartPre = "${pkgs.coreutils}/bin/sleep 3";
Environment = lib.mkForce "PATH=${config.home.profileDirectory}/bin XDG_CURRENT_DESKTOP=Unity";
};
};
systemd.user.services.pasystray = adhereTheSwayTarget; systemd.user.services.pasystray = adhereTheSwayTarget;
gtk = { gtk = {