Compare commits

..

No commits in common. "dc5728ab4652c20a0f70e3c62d361da6ef30f1a5" and "3baf7fea3dcd290967cb0204ad9ca14f53af3eae" have entirely different histories.

4 changed files with 132 additions and 31 deletions

View file

@ -133,6 +133,24 @@
} }
}, },
"flake-parts": { "flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1714606777,
"narHash": "sha256-bMkNmAXLj8iyTvxaaD/StcLSadbj1chPcJOjtuVnLmA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "4d34ce6412bc450b1d4208c953dc97c7fc764f1a",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nixpkgs-wayland", "nixpkgs-wayland",
@ -154,6 +172,21 @@
"type": "github" "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"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
@ -523,7 +556,7 @@
"lib-aggregate": { "lib-aggregate": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1728216729, "lastModified": 1728216729,
@ -542,38 +575,36 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1728943608, "lastModified": 1723503926,
"narHash": "sha256-xcLDHLBRA1ZVO26f/Kdl7xBVnwjBemeWokQnjicO7GM=", "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
"rev": "fbf7a8b4405610368c6d2bd12ff369fefa94f7a7", "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fbf7a8b4405610368c6d2bd12ff369fefa94f7a7.tar.gz?rev=fbf7a8b4405610368c6d2bd12ff369fefa94f7a7" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
} }
}, },
"lix-module": { "lix-module": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": [ "lix": "lix",
"lix"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1727752861, "lastModified": 1723510904,
"narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=", "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
"rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d", "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d.tar.gz?rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
} }
}, },
"nim2nix": { "nim2nix": {
@ -637,10 +668,10 @@
}, },
"nix-eval-jobs": { "nix-eval-jobs": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts_2",
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1728593025, "lastModified": 1728593025,
@ -698,6 +729,30 @@
"type": "github" "type": "github"
} }
}, },
"nixd": {
"inputs": {
"flake-parts": "flake-parts",
"flake-root": "flake-root",
"nixpkgs": [
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1727483986,
"narHash": "sha256-8F97zAu+icDC9ZYS7m+Y58oZQ7R3gVuXMvzAfgkVmJo=",
"owner": "nix-community",
"repo": "nixd",
"rev": "05ff3db3d1da26eafd5f58c7104e4f9ff6630894",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "2.4.0",
"repo": "nixd",
"type": "github"
}
},
"nixgl": { "nixgl": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -760,6 +815,24 @@
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib_2": {
"locked": { "locked": {
"lastModified": 1728176478, "lastModified": 1728176478,
"narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=",
@ -997,10 +1070,10 @@
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-contrib": "hyprland-contrib", "hyprland-contrib": "hyprland-contrib",
"hyprman": "hyprman", "hyprman": "hyprman",
"lix": "lix",
"lix-module": "lix-module", "lix-module": "lix-module",
"nim2nix": "nim2nix", "nim2nix": "nim2nix",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixd": "nixd",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
@ -1156,6 +1229,27 @@
} }
}, },
"treefmt-nix": { "treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixd",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722330636,
"narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "768acdb06968e53aa1ee8de207fd955335c754b7",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-wayland", "nixpkgs-wayland",

View file

@ -9,15 +9,24 @@
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
nixos-wsl.url = "github:nix-community/NixOS-WSL"; nixos-wsl.url = "github:nix-community/NixOS-WSL";
nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.url = "github:nix-community/nix-index-database";
# pipe support added
nixd.url = "github:nix-community/nixd/2.4.0";
# ??
# error: path '/nix/store/9ryh7avijc1yn8jaa099zbfyhynxmd0a-lix-2.92.0-dev-pre20241009-9865eba-doc' does not exist in the store
# lix = {
# url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
# flake = false;
# };
# lix-module = {
# url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
# inputs.nixpkgs.follows = "nixpkgs";
# inputs.lix.follows = "lix";
# };
lix = {
url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
flake = false;
};
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.lix.follows = "lix";
}; };
hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1"; hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
@ -33,6 +42,7 @@
hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git"; hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git";
utils.url = "git+https://git.dayl.in/daylin/utils.git"; utils.url = "git+https://git.dayl.in/daylin/utils.git";
nixd.inputs.nixpkgs.follows = "nixpkgs";
nim2nix.inputs.nixpkgs.follows = "nixpkgs"; nim2nix.inputs.nixpkgs.follows = "nixpkgs";
hyprman.inputs.nixpkgs.follows = "nixpkgs"; hyprman.inputs.nixpkgs.follows = "nixpkgs";
f1multiviewer.inputs.nixpkgs.follows = "nixpkgs"; f1multiviewer.inputs.nixpkgs.follows = "nixpkgs";

View file

@ -43,11 +43,12 @@ in
# environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath; # environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath;
environment.systemPackages = [ environment.systemPackages = [
pkgs.nixd # pkgs.nixd
pkgs.nixfmt-rfc-style pkgs.nixfmt-rfc-style
pkgs.nix-output-monitor pkgs.nix-output-monitor
self.packages.${pkgs.system}.default self.packages.${pkgs.system}.default
(flake.pkg "nixd")
]; ];
programs.nix-index-database.comma = enabled; programs.nix-index-database.comma = enabled;

10
todo.md
View file

@ -7,19 +7,15 @@
## software ## software
- [ ] check if there are multiple version of mako?
- [ ] lid closed does not engage hyprlock?
> check the logind conf in Nixos
- [ ] include langservers for enabled languages? - [ ] include langservers for enabled languages?
- [ ] wezterm is broken...something to do with fonts? - [ ] wezterm is broken...something to do with fonts?
I tried used the nix flake and that didn't help I tried used the nix flake and that didn't help
[tracking issue](https://github.com/wez/wezterm/issues/5990) [tracking issue](https://github.com/wez/wezterm/issues/5990)
### Window Manager
- [ ] install more of the software as systemd services?
- [ ] lid closed does not engage hyprlock?
- [ ] check if there are multiple version of mako?
> check the logind conf in Nixos
## hardware ## hardware
- [ ] monitor the presence of these kernel messages on `othalan`, - [ ] monitor the presence of these kernel messages on `othalan`,