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

Compare commits

base: geoffrey:2951e81a774ecc9d8b85e3d26f138eddd85a8b82
Branches Tags
geoffrey:main
geoffrey:push-yqlvnukzxvnn
geoffrey:mopidy
geoffrey:flakes
geoffrey:bg_nored
geoffrey:nix
geoffrey:prenix
geoffrey:crash2
...
compare: geoffrey:1fb9a149a50801b439142c1e0c61b4b16c15f7b6
Branches Tags
geoffrey:main
geoffrey:push-yqlvnukzxvnn
geoffrey:mopidy
geoffrey:flakes
geoffrey:bg_nored
geoffrey:nix
geoffrey:prenix
geoffrey:crash2

4 commits
2951e81a77 ... 1fb9a149a5

Author SHA1 Message Date
Geoffrey Frogeye 1fb9a149a5
NixOS 24.11: Remove remaining warnings 2024-12-03 23:07:56 +01:00
Geoffrey Frogeye 495b9cb2e1
Remove pirate usage of Nix 
Apparently Nix 2.24 doesn't like dirty git repos
("lock file contains unlocked input") and makes it known by failing,
which tipped me that I wasn't using Lix everywhere.
 2024-12-03 22:45:13 +01:00
Geoffrey Frogeye f9d943ef63
NixOS 24.11: Some warnings removed 
The lualine ones I'll have to see if it changes the way I want.
 2024-12-03 19:50:55 +01:00
Geoffrey Frogeye b9bd255a55
NixOS 24.11 builds 2024-12-02 23:54:26 +01:00
13 changed files with 407 additions and 263 deletions
Show stats Expand all files Collapse all files

10
curacao/hardware.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, nixos-hardware, unixpkgs, ... }: { pkgs, lib, nixos-hardware, ... }:
let let
displays = { displays = {
embedded = { embedded = {
@ -63,14 +63,6 @@ in
# TODO Display 2 doesn't work anymore? # TODO Display 2 doesn't work anymore?
}; };
}; };
nixpkgs.overlays = [
(self: super: {
displaylink = (import unixpkgs {
inherit (super) system;
config.allowUnfree = true;
}).displaylink;
})
];
services = { services = {
autorandr = { autorandr = {
profiles = { profiles = {

413
flake.lock
View file

@ -5,11 +5,11 @@
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
}, },
"locked": { "locked": {
"lastModified": 1708890466, "lastModified": 1732200724,
"narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "base16.nix", "repo": "base16.nix",
"rev": "665b3c6748534eb766c777298721cece9453fdae", "rev": "153d52373b0fb2d343592871009a286ec8837aec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -34,30 +34,14 @@
"type": "github" "type": "github"
} }
}, },
"base16-foot": {
"flake": false,
"locked": {
"lastModified": 1696725948,
"narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
"owner": "tinted-theming",
"repo": "base16-foot",
"rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-foot",
"type": "github"
}
},
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696727917, "lastModified": 1725860795,
"narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -66,50 +50,18 @@
"type": "github" "type": "github"
} }
}, },
"base16-kitty": {
"flake": false,
"locked": {
"lastModified": 1665001328,
"narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
"owner": "kdrag0n",
"repo": "base16-kitty",
"rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
"type": "github"
},
"original": {
"owner": "kdrag0n",
"repo": "base16-kitty",
"type": "github"
}
},
"base16-tmux": {
"flake": false,
"locked": {
"lastModified": 1696725902,
"narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
"owner": "tinted-theming",
"repo": "base16-tmux",
"rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-tmux",
"type": "github"
}
},
"base16-vim": { "base16-vim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1663659192, "lastModified": 1731949548,
"narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=",
"owner": "chriskempson", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "chriskempson", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"type": "github" "type": "github"
} }
@ -142,11 +94,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730190761, "lastModified": 1733168902,
"narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "3979285062d6781525cded0f6c4ff92e71376b55", "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,22 +136,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -208,11 +144,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727826117, "lastModified": 1730504689,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,11 +162,50 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1731533236,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": [
"stylix",
"systems"
]
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,11 +217,11 @@
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1689549921, "lastModified": 1731966426,
"narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "fromYaml", "repo": "fromYaml",
"rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", "rev": "106af9e2f715e2d828df706c386a685698f3223b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -257,7 +232,10 @@
}, },
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": [
"nixvim",
"flake-compat"
],
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@ -269,11 +247,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729104314, "lastModified": 1732021966,
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -328,16 +306,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1733050161,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "home-manager", "id": "home-manager",
"ref": "release-24.05", "ref": "release-24.11",
"type": "indirect" "type": "indirect"
} }
}, },
@ -349,16 +327,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1732466619,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "f3111f62a23451114433888902a55cf0692b408d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -371,11 +349,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714981474, "lastModified": 1733085484,
"narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -384,6 +362,50 @@
"type": "github" "type": "github"
} }
}, },
"ixx": {
"inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729958008,
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.0.6",
"repo": "ixx",
"type": "github"
}
},
"labellenixpkgs": {
"locked": {
"lastModified": 1732691756,
"narHash": "sha256-/XYtpmaMUhgxebN6dJKOcy70Gf50nf+RHfQhZgbjNYc=",
"owner": "FabianRig",
"repo": "nixpkgs",
"rev": "3da636775e87fe45fe5bbe79dafb2d8ea36648ec",
"type": "github"
},
"original": {
"owner": "FabianRig",
"ref": "update-labelle-1.3.2",
"repo": "nixpkgs",
"type": "github"
}
},
"nix-darwin": { "nix-darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -392,11 +414,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729826725, "lastModified": 1732603785,
"narHash": "sha256-w3WNlYxqWYsuzm/jgFPyhncduoDNjot28aC8j39TW0U=", "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "7840909b00fbd5a183008a6eb251ea307fe4a76e", "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -460,11 +482,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1730161780, "lastModified": 1733139194,
"narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=", "narHash": "sha256-PVQW9ovo0CJbhuhCsrhFJGGdD1euwUornspKpBIgdok=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8", "rev": "c6c90887f84c02ce9ebf33b95ca79ef45007bf88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -474,16 +496,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1730137625, "lastModified": 1732981179,
"narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"type": "indirect" "type": "indirect"
} }
}, },
@ -530,19 +552,20 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1729945968, "lastModified": 1733005332,
"narHash": "sha256-4u+nbBSMuXWGCtXxUPPEflRm54+y/HLIbhIep9do8Ew=", "narHash": "sha256-sd+YV24AjFfqlx9G8fAf6A3wXORRIDBMk7QtGKF+jLY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "c05ac01070425ed0797b1ff678dc690c333cea74", "rev": "c500a3ffe18d8e7c7146dce26d7828b3dacd2320",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixvim", "repo": "nixvim",
"type": "github" "type": "github"
} }
@ -587,11 +610,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1730300129, "lastModified": 1733174134,
"narHash": "sha256-QZm3ZsHn/75VsGg7ScPGfdByqBPFIQHmbpjT37iQp2g=", "narHash": "sha256-sc8NtwVHu4zsHgSlmH3pWPH7yIpd7HHLpteetQRcP3w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "656dcf946af3e368dd872fe525439518d8423080", "rev": "927ae4b218c59b6f351d2bb90d4606b271bf19d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -600,16 +623,56 @@
"type": "github" "type": "github"
} }
}, },
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_2",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1731936508,
"narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
"owner": "NuschtOS",
"repo": "search",
"rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"onixpkgs": {
"locked": {
"lastModified": 1730137625,
"narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
"type": "github"
},
"original": {
"id": "nixpkgs",
"rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
"type": "indirect"
}
},
"root": { "root": {
"inputs": { "inputs": {
"disko": "disko", "disko": "disko",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"labellenixpkgs": "labellenixpkgs",
"nix-on-droid": "nix-on-droid", "nix-on-droid": "nix-on-droid",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixvim": "nixvim", "nixvim": "nixvim",
"nur": "nur", "nur": "nur",
"onixpkgs": "onixpkgs",
"stylix": "stylix", "stylix": "stylix",
"unixpkgs": "unixpkgs" "unixpkgs": "unixpkgs"
} }
@ -634,30 +697,32 @@
"inputs": { "inputs": {
"base16": "base16", "base16": "base16",
"base16-fish": "base16-fish", "base16-fish": "base16-fish",
"base16-foot": "base16-foot",
"base16-helix": "base16-helix", "base16-helix": "base16-helix",
"base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_3", "home-manager": "home-manager_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"systems": "systems_3",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1718122552, "lastModified": 1732993760,
"narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", "narHash": "sha256-t1J6wgzGjvvGNfdd0ei8HnZf9sTw+SpvCNAX0i6Qgwc=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", "rev": "d13ffb381c83b6139b9d67feff7addf18f8408fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "danth", "owner": "danth",
"ref": "release-24.05",
"repo": "stylix", "repo": "stylix",
"rev": "d13ffb381c83b6139b9d67feff7addf18f8408fe",
"type": "github" "type": "github"
} }
}, },
@ -676,6 +741,86 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-foot": {
"flake": false,
"locked": {
"lastModified": 1726913040,
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
}
},
"tinted-kitty": {
"flake": false,
"locked": {
"lastModified": 1716423189,
"narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
"owner": "tinted-theming",
"repo": "tinted-kitty",
"rev": "eb39e141db14baef052893285df9f266df041ff8",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-kitty",
"rev": "eb39e141db14baef052893285df9f266df041ff8",
"type": "github"
}
},
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1729501581,
"narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-tmux",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -684,11 +829,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729613947, "lastModified": 1732894027,
"narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=", "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "aac86347fb5063960eccb19493e0cadcdb4205ca", "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -699,11 +844,11 @@
}, },
"unixpkgs": { "unixpkgs": {
"locked": { "locked": {
"lastModified": 1730298926, "lastModified": 1733173776,
"narHash": "sha256-ao1BYrrOB8SGdvOul6hGJYqp/QqEJTwZRViRXFvNnTQ=", "narHash": "sha256-Ike5NZMsPWm2rfDBTxPqqHWjmDQ3tx3NzE+O0L1ITb8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "838f2f70e0e44d957009bf5a4fc0aa9c931b680e", "rev": "0c492272828b2377428128d8e2c582cabfe42be1",
"type": "github" "type": "github"
}, },
"original": { "original": {

24
flake.nix
View file

@ -3,8 +3,10 @@
inputs = { inputs = {
# Packages # Packages
nixpkgs.url = "nixpkgs/nixos-24.05"; nixpkgs.url = "nixpkgs/nixos-24.11";
onixpkgs.url = "nixpkgs/64b80bfb316b57cdb8919a9110ef63393d74382a";
unixpkgs.url = "nixpkgs/master"; unixpkgs.url = "nixpkgs/master";
labellenixpkgs.url = "github:FabianRig/nixpkgs/update-labelle-1.3.2"; # Current 24.11 version doesn't match dependencies
# OS # OS
disko = { disko = {
url = "disko"; url = "disko";
@ -13,21 +15,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"; # No 24.05 yet url = "github:nix-community/nix-on-droid"; # No 24.11 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-24.05"; url = "home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix = { stylix = {
url = "github:danth/stylix/release-24.05"; url = "github:danth/stylix/d13ffb381c83b6139b9d67feff7addf18f8408fe"; # No 24.11 yet
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixvim = { nixvim = {
url = "github:nix-community/nixvim/nixos-24.05"; url = "github:nix-community/nixvim/nixos-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
@ -76,9 +78,15 @@
}; };
flakeTools = { self }: flake-utils.lib.eachDefaultSystem (system: flakeTools = { self }: flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = import nixpkgs (nixpkgsConfig // { pkgs = import nixpkgs
inherit system; (nixpkgsConfig // {
}); inherit system;
# We do an overlay here so nixos-rebuild and other use lix.
# We don't do an overlay for the whole system because lix is not binary compatible.
overlays = [
(self: super: { nix = super.lix; })
];
});
in in
{ {
apps = { apps = {

7
hm/common.nix
View file

@ -1,4 +1,7 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, labellenixpkgs, ... }:
let
labellepkgs = import labellenixpkgs { inherit (pkgs) system; };
in
{ {
frogeye.hooks.lock = '' frogeye.hooks.lock = ''
${pkgs.coreutils}/bin/rm -rf "/tmp/cached_pass_$UID" ${pkgs.coreutils}/bin/rm -rf "/tmp/cached_pass_$UID"
@ -191,7 +194,7 @@
usbutils usbutils
dmidecode dmidecode
lshw lshw
labelle # Label printer labellepkgs.labelle # Label printer
# Locker # Locker
(pkgs.writeShellApplication { (pkgs.writeShellApplication {

4
hm/dev/common.nix
View file

@ -64,11 +64,11 @@
ansiblels.enable = config.frogeye.dev.ansible; # Ansible ansiblels.enable = config.frogeye.dev.ansible; # Ansible
bashls.enable = true; # Bash bashls.enable = true; # Bash
jsonls.enable = true; # JSON jsonls.enable = true; # JSON
lua-ls.enable = true; # Lua (for Neovim debugging) lua_ls.enable = true; # Lua (for Neovim debugging)
perlpls.enable = config.frogeye.dev.perl; # Perl perlpls.enable = config.frogeye.dev.perl; # Perl
phpactor.enable = config.frogeye.dev.php; # PHP phpactor.enable = config.frogeye.dev.php; # PHP
# Nix # Nix
nil-ls = { nil_ls = {
enable = true; enable = true;
settings = { settings = {
formatting.command = [ "nixpkgs-fmt" ]; formatting.command = [ "nixpkgs-fmt" ];

11
hm/extra/default.nix
View file

@ -1,4 +1,7 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, onixpkgs, ... }:
let
opkgs = import onixpkgs { inherit (pkgs) system; };
in
{ {
config = lib.mkIf config.frogeye.extra { config = lib.mkIf config.frogeye.extra {
programs = { programs = {
@ -21,7 +24,7 @@
# Communication # Communication
signal-desktop signal-desktop
(pkgs.callPackage ./whisperx.nix {}) # Transcribe voice messages (opkgs.callPackage ./whisperx.nix { }) # Transcribe voice messages
# downloading # downloading
# transmission TODO Collision if both transmissions are active? # transmission TODO Collision if both transmissions are active?
@ -51,8 +54,8 @@
krita krita
# downloading # downloading
transmission-qt transmission_4-qt
# wine only makes sense on x86_64 # wine only makes sense on x86_64
] ++ lib.optionals pkgs.stdenv.isx86_64 [ ] ++ lib.optionals pkgs.stdenv.isx86_64 [
wine wine
# TODO wine-gecko wine-mono lib32-libpulse (?) # TODO wine-gecko wine-mono lib32-libpulse (?)

5
hm/git/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, unixpkgs, ... }: { pkgs, lib, config, ... }:
let let
cfg = config.programs.git; cfg = config.programs.git;
in in
@ -82,9 +82,6 @@ in
}; };
jujutsu = { jujutsu = {
enable = true; enable = true;
package = (import unixpkgs {
inherit (pkgs) system;
}).jujutsu;
# Current version doesn't have the "none" signing backend # Current version doesn't have the "none" signing backend
settings = { settings = {
git = { git = {

2
hm/scripts/replayGain
View file

@ -3,7 +3,7 @@
#! nix-shell -p python3 python3Packages.coloredlogs r128gain #! nix-shell -p python3 python3Packages.coloredlogs r128gain
# TODO r128gain is not maintainted anymore # TODO r128gain is not maintainted anymore
# 24.05 rsgain replaces it, does the same job as I do with albums # rsgain replaces it, does the same job as I do with albums
# Normalisation is done at the default of each program, # Normalisation is done at the default of each program,
# which is usually -89.0 dB # which is usually -89.0 dB

13
hm/vim/code.nix
View file

@ -53,19 +53,20 @@ in
# Catches attention when cursor changed position # Catches attention when cursor changed position
specs = { specs = {
enable = true; enable = true;
min_jump = 5; settings = {
fader = { builtin = "pulse_fader"; }; min_jump = 5;
resizer = { builtin = "shrink_resizer"; }; popup.fader = "require('specs').pulse_fader";
};
}; };
# Treesitter # Treesitter
treesitter = { treesitter = {
# Allows for better syntax highlighting # Allows for better syntax highlighting
enable = true; enable = true;
incrementalSelection = { settings = {
enable = true; incremental_selection.enable = true;
# indent = true; # Not very working last time I tried apparently
}; };
# indent = true; # Not very working last time I tried apparently
}; };
indent-blankline.enable = true; # Show indent guides indent-blankline.enable = true; # Show indent guides
rainbow-delimiters.enable = true; # Randomly colore paired brackets rainbow-delimiters.enable = true; # Randomly colore paired brackets

172
hm/vim/decoration.nix
View file

@ -1,4 +1,7 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, nixvimLib, ... }:
let
nv = nixvimLib.nixvim;
in
{ {
config = { config = {
programs = { programs = {
@ -51,100 +54,94 @@
normal_ina = { fg = base02; bg = base01; }; normal_ina = { fg = base02; bg = base01; };
inverted_ina = { fg = base00; bg = base02; }; inverted_ina = { fg = base00; bg = base02; };
in in
rec { {
enable = true; enable = true;
inactiveSections = sections; settings = rec {
sections = { inactive_sections = sections;
lualine_a = [{ sections = {
name = ''string.format('%d', vim.fn.line('$'))''; lualine_a = [
}]; (nv.listToUnkeyedAttrs [ "string.format('%d', vim.fn.line('$'))" ])
lualine_b = [ ];
"mode" lualine_b = [ "mode" ];
]; lualine_c = [
lualine_c = [{ ((nv.listToUnkeyedAttrs [ "filename" ]) // {
name = "filename"; color = nv.mkRaw ''
color = { function(section)
__raw = '' return { fg = vim.bo.modified and '${base08}' or '${normal.fg}' }
function(section) end
return { fg = vim.bo.modified and '${base08}' or '${normal.fg}' } '';
end path = 1; # Relative path
''; symbols = {
}; modified = "●";
extraConfig = { newfile = "󰻭";
path = 1; # Relative path readonly = "󰏯";
symbols = { unnamed = "󱀶";
modified = "●"; };
newfile = "󰻭"; })
readonly = "󰏯"; "location"
unnamed = "󱀶"; ];
}; lualine_x = [
}; ((nv.listToUnkeyedAttrs [ ''(next(vim.lsp.buf_get_clients()) == nil) and "󰒲 " or ""'' ]) // {
} separator = { left = ""; right = ""; };
"location"]; })
lualine_x = [{ ] ++ (lib.mapAttrsToList
name = ''(next(vim.lsp.buf_get_clients()) == nil) and "󰒲 " or ""''; (diag_name: diag_color: ((nv.listToUnkeyedAttrs [ "diagnostics" ]) // {
extraConfig.separator = { left = ""; right = ""; };
}] ++ (lib.mapAttrsToList
(diag_name: diag_color: {
name = "diagnostics";
extraConfig = {
color.bg = diag_color; color.bg = diag_color;
colored = false; colored = false;
separator = { left = ""; right = ""; }; separator = { left = ""; right = ""; };
sections = [ diag_name ]; sections = [ diag_name ];
}; }))
{
error = base08;
warn = base0A;
hint = base0C;
info = base0B;
});
lualine_y = [
((nv.listToUnkeyedAttrs [ "diff" ]) // {
diff_color = {
added.fg = base0B;
modified.fg = base0A;
removed.fg = base08;
};
symbols = {
added = " ";
modified = " ";
removed = " ";
};
})
"branch"
];
lualine_z = [
"filetype"
"fileformat"
"encoding"
];
};
options.theme = (lib.mapAttrs
(mode_name: mode_color: {
a = inverted;
b = inverted // { bg = mode_color; gui = "bold"; };
c = normal;
x = inverted;
y = normal;
z = inverted // { bg = mode_color; };
}) })
{ {
error = base08; normal = base0D;
warn = base0A; insert = base0B;
hint = base0C; visual = base0F;
info = base0B; replace = base08;
}); command = base0E;
lualine_y = [{ }) // {
name = "diff"; inactive = {
extraConfig = { a = inverted_ina;
diff_color = { b = normal_ina // { bg = base00; gui = "bold"; };
added.fg = base0B; c = normal_ina;
modified.fg = base0A; x = inverted_ina;
removed.fg = base08; y = normal_ina;
}; z = normal_ina // { bg = base00; };
symbols = {
added = " ";
modified = " ";
removed = " ";
};
}; };
}
"branch"];
lualine_z = [
"filetype"
"fileformat"
"encoding"
];
};
theme = (lib.mapAttrs
(mode_name: mode_color: {
a = inverted;
b = inverted // { bg = mode_color; gui = "bold"; };
c = normal;
x = inverted;
y = normal;
z = inverted // { bg = mode_color; };
})
{
normal = base0D;
insert = base0B;
visual = base0F;
replace = base08;
command = base0E;
}) // {
inactive = {
a = inverted_ina;
b = normal_ina // { bg = base00; gui = "bold"; };
c = normal_ina;
x = inverted_ina;
y = normal_ina;
z = normal_ina // { bg = base00; };
}; };
}; };
}; };
@ -153,6 +150,7 @@
enable = true; enable = true;
settings.max_lines = 5; settings.max_lines = 5;
}; };
web-devicons.enable = true; # TODO Check out plugins.mini.enable
}; };
}; };
}; };

5
hm/vim/default.nix
View file

@ -79,7 +79,7 @@
# Or at least something to live_grep the curent word. # Or at least something to live_grep the curent word.
# Surrounding pairs # Surrounding pairs
surround.enable = true; # Change surrounding pairs (e.g. brackets, quotes) vim-surround.enable = true; # Change surrounding pairs (e.g. brackets, quotes)
undotree.enable = true; # Navigate edition history undotree.enable = true; # Navigate edition history
@ -110,8 +110,7 @@
''; '';
userCommands = { userCommands = {
Reload = { command = "source ${config.xdg.configHome}/nvim/init.lua"; force = false; }; Reload = { command = "source ${config.xdg.configHome}/nvim/init.lua"; };
# 24.05 force=false was for https://github.com/nix-community/nixvim/issues/954
}; };
keymaps = [ keymaps = [

2
os/cuda/default.nix
View file

@ -22,8 +22,6 @@
ctranslate2 = (pkgs_uf.ctranslate2.override { ctranslate2 = (pkgs_uf.ctranslate2.override {
withCUDA = true; withCUDA = true;
withCuDNN = true; withCuDNN = true;
stdenv = pkgs.gcc12Stdenv; # 24.11 Remove, as nvcc and gcc versions align again
# Takes more than 16 GiB RAM to compile with the above, but fine if not
}); });
}) })
]; ];

2
os/gaming/default.nix
View file

@ -3,7 +3,7 @@
config = lib.mkIf config.frogeye.gaming config = lib.mkIf config.frogeye.gaming
{ {
programs.steam.enable = true; programs.steam.enable = true;
hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses hardware.graphics.enable32Bit = true; # Needed by Steam
services = { services = {
udev.packages = [ pkgs.python3Packages.ds4drv ]; udev.packages = [ pkgs.python3Packages.ds4drv ];
xserver.config = '' xserver.config = ''