Compare commits

..

No commits in common. "a29770fd01b506950ba14255a392674b9b44ceb8" and "6c1be6629b7056fc7a04c6a2158cf4aa15d651a6" have entirely different histories.

6 changed files with 49 additions and 46 deletions

79
flake.lock generated
View File

@ -43,11 +43,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753300020, "lastModified": 1751820494,
"narHash": "sha256-jRO3ELwG+FfYDBTDDhBJNjGuJjB4IgziuB1JWoz6l1A=", "narHash": "sha256-y8IGLpeJ/IvAiBaS17hkSC21WsCw2f4GHxg3GxvMTro=",
"owner": "cachix", "owner": "cachix",
"repo": "devenv", "repo": "devenv",
"rev": "90266818017f7a6885edc75eb4a13b68862675ea", "rev": "c5f01223c737cd749f994b772ae84445acd45a9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -125,11 +125,10 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750779888, "lastModified": 1749636823,
"narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "rev": "623c56286de5a3193aa38891a6991b28f9bab056",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -148,7 +147,6 @@
}, },
"locked": { "locked": {
"lastModified": 1709087332, "lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "gitignore.nix", "repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
@ -167,11 +165,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753373145, "lastModified": 1751824240,
"narHash": "sha256-UhuUj46dobD/POOdVNxKvAvP3luI2T0MZPm2IXl266Y=", "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "64796151f79e6f3834bfc55f07c5487708bb5b3f", "rev": "fd9e55f5fac45a26f6169310afca64d56b681935",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -191,10 +189,7 @@
"devenv", "devenv",
"git-hooks" "git-hooks"
], ],
"nixpkgs": [ "nixpkgs": "nixpkgs",
"devenv",
"nixpkgs"
],
"nixpkgs-23-11": [ "nixpkgs-23-11": [
"devenv" "devenv"
], ],
@ -203,11 +198,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752773918, "lastModified": 1750955511,
"narHash": "sha256-dOi/M6yNeuJlj88exI+7k154z+hAhFcuB8tZktiW7rg=", "narHash": "sha256-IDB/oh/P63ZTdhgSkey2LZHzeNhCdoKk+4j7AaPe1SE=",
"owner": "cachix", "owner": "cachix",
"repo": "nix", "repo": "nix",
"rev": "031c3cf42d2e9391eee373507d8c12e0f9606779", "rev": "afa41b08df4f67b8d77a8034b037ac28c71c77df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -224,11 +219,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752985182, "lastModified": 1751774635,
"narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=", "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c", "rev": "85686025ba6d18df31cc651a91d5adef63378978",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -239,11 +234,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1753250450, "lastModified": 1747179050,
"narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1751637120,
"narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -282,11 +293,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753335654, "lastModified": 1751686190,
"narHash": "sha256-XpegouCfuzYNECDpH0+J3UEdearlYhRkRgOZ97l16E8=", "narHash": "sha256-veNnb2UVyjugo9fIeGjisMGGn0TNae71p5D1YwwEAFs=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "f90bef2d994c88f075dbc2fcd81140e160351328", "rev": "87d99b866f9866db10b55c8b03632f0eecae52d8",
"revCount": 654, "revCount": 606,
"type": "git", "type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell" "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}, },
@ -300,7 +311,7 @@
"devenv": "devenv", "devenv": "devenv",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"pumo-system-info": "pumo-system-info", "pumo-system-info": "pumo-system-info",
"quickshell": "quickshell", "quickshell": "quickshell",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
@ -335,11 +346,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752544651, "lastModified": 1751606940,
"narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "2c8def626f54708a9c38a5861866660395bb3461", "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -370,11 +381,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752725859, "lastModified": 1751688498,
"narHash": "sha256-kjpmc7Y164ajPdscAZLFQTtzXP5sEE2dR30NuHe5lQY=", "narHash": "sha256-6kYe6ozYDvsHAxV1zbSxg0oRWF4TzTfOUUJsR6MJlYY=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "2276ddce91a949e0819d9e8c4b171c40ce770390", "rev": "b5d422dc2b28eb77a21fbdf60aca9a6e63d5a1ab",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -1,4 +1,5 @@
{ {
pkgs,
lib, lib,
config, config,
... ...

View File

@ -59,8 +59,8 @@ in {
monitor = monitor =
{ {
"tilo" = [ "tilo" = [
"DP-1, 3440x1440@144, 1080x550, 1" "DP-1, 3440x1440@144, 0x725, 1"
"DP-2, 2560x1080@60, 0x0, 1, transform, 1" "DP-3, 2560x1080@60, 3440x0, 1, transform, 3"
]; ];
"gampo" = []; "gampo" = [];
}."${cfg.host}"; }."${cfg.host}";

View File

@ -1,6 +1,6 @@
{inputs, ...}: { {inputs, ...}: {
imports = [ imports = [
inputs.nix-index-database.homeModules.nix-index inputs.nix-index-database.hmModules.nix-index
]; ];
programs.nix-index.enable = true; programs.nix-index.enable = true;

View File

@ -41,7 +41,6 @@ in {
ui = { ui = {
default-command = "st"; default-command = "st";
pager = ":builtin"; pager = ":builtin";
show-cryptographic-signatures = true;
inherit (cfg) editor; inherit (cfg) editor;
}; };
signing = mkIf cfg.signing.enable { signing = mkIf cfg.signing.enable {
@ -51,13 +50,6 @@ in {
backends."ssh.allowed-signers" = "~/.ssh/allowed_signers"; backends."ssh.allowed-signers" = "~/.ssh/allowed_signers";
backends."ssh.program" = "${pkgs.openssh}/bin/ssh-keygen"; backends."ssh.program" = "${pkgs.openssh}/bin/ssh-keygen";
}; };
aliases = {
l = ["log"];
lc = ["log" "-r" "(remote_bookmarks()..@)::"];
n = ["new"];
dm = ["desc" "-m"];
tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@-"];
};
}; };
}; };
} }

View File

@ -75,7 +75,6 @@ in {
atlauncher atlauncher
heroic heroic
modrinth-app modrinth-app
openmw
openttd-jgrpp openttd-jgrpp
moonlight-qt moonlight-qt