geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

24.05: Buildable

Browse source
This commit is contained in:
Geoffrey Frogeye 2024-06-01 18:22:50 +02:00
parent fe33f30bce
commit 71385d9ba9
Signed by: geoffrey
GPG key ID: C72403E7F82E6AD8
13 changed files with 329 additions and 256 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

474
flake.lock
View file

@ -5,11 +5,11 @@
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
}, },
"locked": { "locked": {
"lastModified": 1689633990, "lastModified": 1708890466,
"narHash": "sha256-iwvQg2Vx0IIDWZaKo8Xmzxlv1YPHg+Kp/QSv8dRv0RY=", "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "base16.nix", "repo": "base16.nix",
"rev": "dddf2e1c04845d43c89a8e9e37d574519649a404", "rev": "665b3c6748534eb766c777298721cece9453fdae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,39 +18,6 @@
"type": "github" "type": "github"
} }
}, },
"base16-alacritty": {
"flake": false,
"locked": {
"lastModified": 1703982197,
"narHash": "sha256-TNxKbwdiUXGi4Z4chT72l3mt3GSvOcz6NZsUH8bQU/k=",
"owner": "aarowill",
"repo": "base16-alacritty",
"rev": "c95c200b3af739708455a03b5d185d3d2d263c6e",
"type": "github"
},
"original": {
"owner": "aarowill",
"repo": "base16-alacritty",
"type": "github"
}
},
"base16-alacritty-yaml": {
"flake": false,
"locked": {
"lastModified": 1674275109,
"narHash": "sha256-Adwx9yP70I6mJrjjODOgZJjt4OPPe8gJu7UuBboXO4M=",
"owner": "aarowill",
"repo": "base16-alacritty",
"rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7",
"type": "github"
},
"original": {
"owner": "aarowill",
"repo": "base16-alacritty",
"rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7",
"type": "github"
}
},
"base16-fish": { "base16-fish": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -147,6 +114,28 @@
"type": "github" "type": "github"
} }
}, },
"devshell": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1713532798,
"narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
"owner": "numtide",
"repo": "devshell",
"rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -154,11 +143,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715217706, "lastModified": 1717177033,
"narHash": "sha256-yEB5SEHc+o3WJpUPw455OdLy9A+gffvCJX8DZ7NCkuo=", "narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "8eb1b315eef89f3bdc5c9814d1b207c6d64f0046", "rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,6 +156,36 @@
} }
}, },
"flake-compat": { "flake-compat": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"revCount": 57,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@ -182,19 +201,39 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": { "flake-parts": {
"flake": false, "inputs": {
"nixpkgs-lib": [
"nixvim",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1715865404,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
"owner": "edolstra", "owner": "hercules-ci",
"repo": "flake-compat", "repo": "flake-parts",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "edolstra", "owner": "hercules-ci",
"repo": "flake-compat", "repo": "flake-parts",
"type": "github"
}
},
"flake-root": {
"locked": {
"lastModified": 1713493429,
"narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
"owner": "srid",
"repo": "flake-root",
"rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github" "type": "github"
} }
}, },
@ -252,24 +291,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": { "flakey-profile": {
"locked": { "locked": {
"lastModified": 1712898590, "lastModified": 1712898590,
@ -301,20 +322,47 @@
"type": "github" "type": "github"
} }
}, },
"gitignore": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2",
"gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"pre-commit-hooks", "nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1660459072, "lastModified": 1716213921,
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"nixvim",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "gitignore.nix", "repo": "gitignore.nix",
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,6 +371,23 @@
"type": "github" "type": "github"
} }
}, },
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1713702291,
"narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "46.1",
"repo": "gnome-shell",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -330,20 +395,41 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714043624, "lastModified": 1716736833,
"narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "home-manager", "id": "home-manager",
"ref": "release-23.11", "ref": "release-24.05",
"type": "indirect" "type": "indirect"
} }
}, },
"home-manager_2": { "home-manager_2": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1717052710,
"narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"stylix", "stylix",
@ -351,11 +437,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700847865, "lastModified": 1714981474,
"narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=", "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe", "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -407,6 +493,27 @@
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
} }
}, },
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1716993688,
"narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4",
"type": "github"
},
"original": {
"owner": "lnl7",
"repo": "nix-darwin",
"type": "github"
}
},
"nix-formatter-pack": { "nix-formatter-pack": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -417,11 +524,11 @@
"nmt": "nmt" "nmt": "nmt"
}, },
"locked": { "locked": {
"lastModified": 1666720474, "lastModified": 1705252799,
"narHash": "sha256-iWojjDS1D19zpeZXbBdjWb9MiKmVVFQCqtJmtTXgPx8=", "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=",
"owner": "Gerschtli", "owner": "Gerschtli",
"repo": "nix-formatter-pack", "repo": "nix-formatter-pack",
"rev": "14876cc8fe94a3d329964ecb073b4c988c7b61f5", "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -439,31 +546,31 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-docs": "nixpkgs-docs",
"nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
"nmd": "nmd_2" "nmd": "nmd_2"
}, },
"locked": { "locked": {
"lastModified": 1688144254, "lastModified": 1710434231,
"narHash": "sha256-8KL1l/7eP2Zm1aJjdVaSOk0W5kTnJo9kcgW03gqWuiI=", "narHash": "sha256-yrWnsG28518tbIapJWiluweHORuuIwAQrA8lga0Sqlw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-on-droid", "repo": "nix-on-droid",
"rev": "2301e01d48c90b60751005317de7a84a51a87eb6", "rev": "2d93311c4f3f300154d2085e4b4b1d550237da92",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.05",
"repo": "nix-on-droid", "repo": "nix-on-droid",
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1715148395, "lastModified": 1717248095,
"narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", "narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", "rev": "7b49d3967613d9aacac5b340ef158d493906ba79",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -473,70 +580,75 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1715106579, "lastModified": 1717144377,
"narHash": "sha256-gZMgKEGiK6YrwGBiccZ1gemiUwjsZ1Zv49KYOgmX2fY=", "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8be0d8a1ed4f96d99b09aa616e2afd47acc3da89", "rev": "805a384895c696f802a9bf5bf4720f37385df547",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-docs": {
"locked": {
"lastModified": 1705957679,
"narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-for-bootstrap": { "nixpkgs-for-bootstrap": {
"locked": { "locked": {
"lastModified": 1686921029, "lastModified": 1708105575,
"narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", "narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1685801374,
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "devshell": "devshell",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"flake-root": "flake-root",
"git-hooks": "git-hooks",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"pre-commit-hooks": "pre-commit-hooks" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1705700164, "lastModified": 1717255175,
"narHash": "sha256-YAWtzc+5KDOHDGz/NBB7ysIusXbYYKtsbDOsRhSWKYk=", "narHash": "sha256-MtsnAwzY2cmufUoFQvI/1mTzd3FKbZLCb8zF4jXkZLY=",
"owner": "GeoffreyFrogeye", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "2e5f7781fccba0472277cad5d383d10d50772234", "rev": "df3aa867137227bda9e44beab82a63443d700f18",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "GeoffreyFrogeye", "owner": "nix-community",
"ref": "frogeye-23.11",
"repo": "nixvim", "repo": "nixvim",
"type": "github" "type": "github"
} }
@ -558,19 +670,25 @@
} }
}, },
"nmd_2": { "nmd_2": {
"flake": false, "inputs": {
"nixpkgs": [
"nix-on-droid",
"nixpkgs-docs"
],
"scss-reset": "scss-reset"
},
"locked": { "locked": {
"lastModified": 1666190571, "lastModified": 1705050560,
"narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
"owner": "rycee", "owner": "~rycee",
"repo": "nmd", "repo": "nmd",
"rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
"type": "gitlab" "type": "sourcehut"
}, },
"original": { "original": {
"owner": "rycee", "owner": "~rycee",
"repo": "nmd", "repo": "nmd",
"type": "gitlab" "type": "sourcehut"
} }
}, },
"nmt": { "nmt": {
@ -591,11 +709,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1715283921, "lastModified": 1717249505,
"narHash": "sha256-QrSRlqvGibusEgrTjxKO+1gA1UZtJ81zq1srqQkB+Us=", "narHash": "sha256-dprfeFpLbxOl4T8Len1+oXoJdPEjPldnHTeJIf86WXU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "69781c45be9db020bec046adb4279bff946c1014", "rev": "f267ad8addc9f5dd2cce435a2200146e6efc800e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -604,31 +722,6 @@
"type": "github" "type": "github"
} }
}, },
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_4",
"gitignore": "gitignore",
"nixpkgs": [
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1700922917,
"narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"disko": "disko", "disko": "disko",
@ -641,38 +734,51 @@
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixvim": "nixvim", "nixvim": "nixvim",
"nur": "nur", "nur": "nur",
"stylix": "stylix", "stylix": "stylix"
"unixpkgs": "unixpkgs" }
},
"scss-reset": {
"flake": false,
"locked": {
"lastModified": 1631450058,
"narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=",
"owner": "andreymatin",
"repo": "scss-reset",
"rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91",
"type": "github"
},
"original": {
"owner": "andreymatin",
"repo": "scss-reset",
"type": "github"
} }
}, },
"stylix": { "stylix": {
"inputs": { "inputs": {
"base16": "base16", "base16": "base16",
"base16-alacritty": "base16-alacritty",
"base16-alacritty-yaml": "base16-alacritty-yaml",
"base16-fish": "base16-fish", "base16-fish": "base16-fish",
"base16-foot": "base16-foot", "base16-foot": "base16-foot",
"base16-helix": "base16-helix", "base16-helix": "base16-helix",
"base16-kitty": "base16-kitty", "base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux", "base16-tmux": "base16-tmux",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_3",
"home-manager": "home-manager_2", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1705668784, "lastModified": 1717212835,
"narHash": "sha256-U/1Qol9H5nb8FtWSXSiHY8T4Y7TOIo7NHuqe4uuiBec=", "narHash": "sha256-fSNsRokB3YaTmJOcSdDzKJOFWq/bQ/FCoMGpF12sF5c=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "a9e3ce064a778b386fb88fb152c02ae95aa2cbd2", "rev": "266db7f00cad4a465e0ce43d91798fda10716212",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "danth", "owner": "danth",
"ref": "release-23.11",
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"
} }
@ -722,34 +828,26 @@
"type": "github" "type": "github"
} }
}, },
"systems_4": { "treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1715940852,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
"owner": "nix-systems", "owner": "numtide",
"repo": "default", "repo": "treefmt-nix",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "numtide",
"repo": "default", "repo": "treefmt-nix",
"type": "github" "type": "github"
} }
},
"unixpkgs": {
"locked": {
"lastModified": 1715037484,
"narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ad7efee13e0d216bf29992311536fce1d3eefbef",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
} }
}, },
"root": "root", "root": "root",

30
flake.nix
View file

@ -2,21 +2,8 @@
description = "Geoffrey Frogeye's base configurations"; description = "Geoffrey Frogeye's base configurations";
inputs = { inputs = {
# Package manager
lix = {
url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
flake = false;
};
lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module?ref=fix-prefetch-npm-deps";
inputs = {
lix.follows = "lix";
nixpkgs.follows = "nixpkgs";
};
};
# Packages # Packages
nixpkgs.url = "nixpkgs/nixos-23.11"; nixpkgs.url = "nixpkgs/nixos-24.05";
unixpkgs.url = "nixpkgs";
# OS # OS
disko = { disko = {
url = "disko"; url = "disko";
@ -25,23 +12,21 @@
nixos-hardware.url = "nixos-hardware"; nixos-hardware.url = "nixos-hardware";
# NOD # NOD
nix-on-droid = { nix-on-droid = {
url = "github:nix-community/nix-on-droid/release-23.05"; # No 23.11 :( url = "github:nix-community/nix-on-droid"; # No 24.05 yet
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
}; };
# HM # HM
home-manager = { home-manager = {
url = "home-manager/release-23.11"; url = "home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix = { stylix = {
url = "github:danth/stylix/release-23.11"; url = "github:danth/stylix"; # No 24.05 yet
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixvim = { nixvim = {
url = "github:GeoffreyFrogeye/nixvim/frogeye-23.11"; url = "github:nix-community/nixvim"; # No 24.05 yet
# 24.05 Ensure merged: https://github.com/nix-community/nixvim/pull/953
# url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
@ -49,16 +34,13 @@
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
outputs = { self, nixpkgs, unixpkgs, disko, nix-on-droid, flake-utils, ... }@attrs: outputs = { self, nixpkgs, disko, nix-on-droid, flake-utils, ... }@attrs:
# Machine independant outputs # Machine independant outputs
let let
nixpkgsConfig = { nixpkgsConfig = {
config = { config = {
allowUnfree = true; allowUnfree = true;
}; };
overlays = [
(final: prev: { unstable = unixpkgs.legacyPackages.${prev.system}.pkgs; })
];
}; };
homeManagerConfig = { homeManagerConfig = {
sharedModules = [ self.homeManagerModules.dotfiles ]; sharedModules = [ self.homeManagerModules.dotfiles ];

5
hm/common.nix
View file

@ -7,10 +7,7 @@
home-manager.enable = true; home-manager.enable = true;
bat = { bat = {
enable = true; enable = true;
config = { config.style = "full";
theme = "base16";
style = "full";
};
}; };
bash.shellAliases = { bash.shellAliases = {
# Replacement commands # Replacement commands

2
hm/desktop/default.nix
View file

@ -137,7 +137,7 @@
freefilesync freefilesync
# misc # misc
gnome.gedit gedit
xfce.thunar xfce.thunar
nomacs nomacs
feh feh

2
hm/dev/common.nix
View file

@ -63,7 +63,7 @@
phpactor.enable = config.frogeye.dev.php; # PHP phpactor.enable = config.frogeye.dev.php; # PHP
nixd = { nixd = {
enable = true; enable = true;
settings.formatting.command = "nixpkgs-fmt"; settings.formatting.command = [ "nixpkgs-fmt" ];
}; };
# TODO Something for SQL. sqls is deprecated, sqlls is not in Nixpkgs. Probably needs a DB connection configured anyways? # TODO Something for SQL. sqls is deprecated, sqlls is not in Nixpkgs. Probably needs a DB connection configured anyways?
yamlls.enable = true; # YAML yamlls.enable = true; # YAML

2
hm/dev/prose.nix
View file

@ -29,7 +29,7 @@
plugins.none-ls = { plugins.none-ls = {
enable = true; enable = true;
sources = { sources = {
code_actions.ltrs.enable = true; # LanguageTool
diagnostics.ltrs.enable = true; diagnostics.ltrs.enable = true;
}; };
}; };

6
hm/gaming/default.nix
View file

@ -7,12 +7,12 @@
packages = with pkgs; [ packages = with pkgs; [
# gaming # gaming
dolphin-emu dolphin-emu
yuzu-mainline ryujinx
minecraft prismlauncher
# TODO factorio # TODO factorio
steam # Common pitfall: https://github.com/NixOS/nixpkgs/issues/86506#issuecomment-623746883 steam # Common pitfall: https://github.com/NixOS/nixpkgs/issues/86506#issuecomment-623746883
itch # itch # butler-15.21.0 is broken
(pkgs.python3Packages.ds4drv.overrideAttrs (old: { (pkgs.python3Packages.ds4drv.overrideAttrs (old: {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TheDrHax"; owner = "TheDrHax";

2
hm/gpg/default.nix
View file

@ -37,7 +37,7 @@
services.gpg-agent = rec { services.gpg-agent = rec {
enableBashIntegration = true; enableBashIntegration = true;
enableZshIntegration = true; enableZshIntegration = true;
pinentryFlavor = "gnome3"; pinentryPackage = pkgs.pinentry-gnome3;
# gnome3 is nicer, but requires gcr as a dbus package. # gnome3 is nicer, but requires gcr as a dbus package.
# Which is in my NixOS config, and on non-NixOS too. # Which is in my NixOS config, and on non-NixOS too.
# It will fall back to ncurses when running in non-graphics mode. # It will fall back to ncurses when running in non-graphics mode.

44
hm/vim/completion.nix
View file

@ -19,33 +19,29 @@
}; };
# Completion # Completion
nvim-cmp = { cmp = {
enable = true; enable = true;
mapping = { settings = {
# Proposed example, since there's no default mapping = {
"<C-Space>" = "cmp.mapping.complete()"; # Proposed example, since there's no default
"<C-d>" = "cmp.mapping.scroll_docs(-4)"; "<C-Space>" = "cmp.mapping.complete()";
"<C-e>" = "cmp.mapping.close()"; "<C-d>" = "cmp.mapping.scroll_docs(-4)";
"<C-f>" = "cmp.mapping.scroll_docs(4)"; "<C-e>" = "cmp.mapping.close()";
"<CR>" = "cmp.mapping.confirm({ select = true })"; "<C-f>" = "cmp.mapping.scroll_docs(4)";
"<S-Tab>" = { "<CR>" = "cmp.mapping.confirm({ select = true })";
action = "nvim_cmp_stab"; "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
modes = [ "i" "s" ]; "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
};
"<Tab>" = {
action = "nvim_cmp_tab";
modes = [ "i" "s" ];
}; };
sources = [
# Respective plugins will get installed automatically
{ name = "buffer"; }
{ name = "calc"; }
{ name = "nvim_lsp"; }
{ name = "path"; }
{ name = "luasnip"; }
];
snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
}; };
sources = [
# Respective plugins will get installed automatically
{ name = "buffer"; }
{ name = "calc"; }
{ name = "nvim_lsp"; }
{ name = "path"; }
{ name = "luasnip"; }
];
snippet.expand = "luasnip";
}; };
lspkind.enable = true; # Add icons to LSP completions lspkind.enable = true; # Add icons to LSP completions
}; };

4
hm/vim/default.nix
View file

@ -12,9 +12,7 @@
vim = "nvim"; vim = "nvim";
}; };
programs.nixvim = { programs.nixvim = {
# Required, otherwise light mode becomes a default dark theme. colorschemes.base16.setUpBar = false; # We want the custom theme for lualine, probably
colorschemes.base16.colorscheme = "solarized-${config.stylix.polarity}";
options = { options = {
ignorecase = true; ignorecase = true;
smartcase = true; smartcase = true;

2
hm/vim/lsp.nix
View file

@ -68,7 +68,7 @@
nvim-lightbulb = { nvim-lightbulb = {
# Shows a lightbulb whenever a codeAction is available under the cursor # Shows a lightbulb whenever a codeAction is available under the cursor
enable = true; enable = true;
autocmd.enabled = true; settings.autocmd.enabled = true;
}; };
}; };
}; };

9
os/common.nix
View file

@ -38,9 +38,12 @@
}; };
}; };
nix.settings = { nix = {
experimental-features = [ "nix-command" "flakes" ]; package = pkgs.lix;
warn-dirty = false; settings = {
experimental-features = [ "nix-command" "flakes" ];
warn-dirty = false;
};
}; };
programs = { programs = {

3
os/default.nix
View file

@ -1,4 +1,4 @@
{ disko, lix-module, ... }: { disko, ... }:
{ {
imports = [ imports = [
../options.nix ../options.nix
@ -13,7 +13,6 @@
disko.nixosModules.disko disko.nixosModules.disko
./gaming ./gaming
./geoffrey.nix ./geoffrey.nix
lix-module.nixosModules.default
./printing ./printing
./remote-builds ./remote-builds
./style ./style