Compare commits

...

4 commits

Author SHA1 Message Date
f739338b4d flake.lock: Update
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=c3f7c9bbb52b9ad3d24ccfcc5c552ed16c9985a5' (2024-10-12)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=01c2ff34ddcb5995409c33c2b549e93b98b56d6b' (2024-10-14)
• Updated input 'lix':
    'fbf7a8b440.tar.gz?narHash=sha256-xcLDHLBRA1ZVO26f/Kdl7xBVnwjBemeWokQnjicO7GM%3D&rev=fbf7a8b4405610368c6d2bd12ff369fefa94f7a7' (2024-10-14)
  → 'f6077314fa.tar.gz?narHash=sha256-vUBgL8zJBDyj2serxdEVbNqe6pBN4YgWwhtg3XP8mpQ%3D&rev=f6077314fa6aff862758095bb55fe844e9162a1d' (2024-10-15)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259' (2024-10-07)
  → 'github:nix-community/nix-index-database/5c54c33aa04df5dd4b0984b7eb861d1981009b22' (2024-10-13)
• Updated input 'nixos-wsl':
    'github:nix-community/NixOS-WSL/0fc8d9bb51cc46b31d950513df6d088905c8fe55' (2024-10-10)
  → 'github:nix-community/NixOS-WSL/66bbd8fb32b6bb513ec093323081747945bb5f08' (2024-10-14)
• Updated input 'nixos-wsl/nixpkgs':
    'github:NixOS/nixpkgs/ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6' (2024-10-06)
  → 'github:NixOS/nixpkgs/a3f9ad65a0bf298ed5847629a57808b97e6e8077' (2024-10-12)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/c0e494b695437b5175b2ea97352f1cf0f27110a4' (2024-10-10)
  → 'github:nix-community/nixpkgs-wayland/44c733d42a34f37e798356bdfa03d240b7029844' (2024-10-15)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/6c4cf448d33ce86bcc06c6d50bcecc33666105ee' (2024-10-06)
  → 'github:nix-community/lib-aggregate/8921856c37862428741a29cfd4c98c4893ca407d' (2024-10-13)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/b61309c3c1b6013d36299bc8285612865b3b9e4c' (2024-10-06)
  → 'github:nix-community/nixpkgs.lib/16340f605f4e8e5cf07fd74dcbe692eee2d4f51b' (2024-10-13)
• Updated input 'roc':
    'github:roc-lang/roc/bf3ac95a8c4e34e817abb97a6deda64d2a288f68' (2024-10-12)
  → 'github:roc-lang/roc/35359a5b37c11a2a0f78826159e29d57a639f54a' (2024-10-15)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/84fb32055dcf0bda2967cdd463465059af3d91d1' (2024-10-11)
  → 'github:mitchellh/zig-overlay/5ac92b761d82da9234331db0cf03dba231f59f50' (2024-10-15)
• Updated input 'zls':
    'github:zigtools/zls/6ae67e89267440380f63544312b9113c0a895882' (2024-10-09)
  → 'github:zigtools/zls/66f0f90ec5468fbea1f7b65451eff5ca70d8f305' (2024-10-12)
2024-10-15 14:10:20 +00:00
dc5728ab46
remove nixd flake 2024-10-15 09:07:53 -05:00
f294a49400
switch back to dev lix 2024-10-15 09:07:12 -05:00
77b3f42d5d
todo 2024-10-13 18:15:37 -05:00
4 changed files with 62 additions and 163 deletions

View file

@ -133,24 +133,6 @@
} }
}, },
"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",
@ -172,21 +154,6 @@
"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"
@ -396,11 +363,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1728742719, "lastModified": 1728930677,
"narHash": "sha256-t9xlU0hrWSrQenblkg0Mq1wBx4I6A2IdgoVT3/kAx2I=", "narHash": "sha256-s0Nyh9m1u+xfnaELM3XRtJPUUyjyHS8kwhNYXFucUXM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "c3f7c9bbb52b9ad3d24ccfcc5c552ed16c9985a5", "rev": "01c2ff34ddcb5995409c33c2b549e93b98b56d6b",
"revCount": 5331, "revCount": 5343,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -556,14 +523,14 @@
"lib-aggregate": { "lib-aggregate": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1728216729, "lastModified": 1728821524,
"narHash": "sha256-HsisE2yMld0LckvQ3v/00bXFg11E5Q2XI8taPUewDPA=", "narHash": "sha256-Tc4g0n0WxGLLUJYJwrhSE3/l05xUcREEx9y+R4Gi4RA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "6c4cf448d33ce86bcc06c6d50bcecc33666105ee", "rev": "8921856c37862428741a29cfd4c98c4893ca407d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -575,36 +542,38 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723503926, "lastModified": 1728951119,
"narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=", "narHash": "sha256-vUBgL8zJBDyj2serxdEVbNqe6pBN4YgWwhtg3XP8mpQ=",
"rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2", "rev": "f6077314fa6aff862758095bb55fe844e9162a1d",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f6077314fa6aff862758095bb55fe844e9162a1d.tar.gz?rev=f6077314fa6aff862758095bb55fe844e9162a1d"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz" "url": "https://git.lix.systems/lix-project/lix/archive/main.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": 1723510904, "lastModified": 1727752861,
"narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=", "narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=",
"rev": "622a2253a071a1fb97a4d3c8103a91114acc1140", "rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d.tar.gz?rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
} }
}, },
"nim2nix": { "nim2nix": {
@ -668,10 +637,10 @@
}, },
"nix-eval-jobs": { "nix-eval-jobs": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts",
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1728593025, "lastModified": 1728593025,
@ -716,11 +685,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728263287, "lastModified": 1728790083,
"narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -729,30 +698,6 @@
"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": [
@ -785,11 +730,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1728588346, "lastModified": 1728905507,
"narHash": "sha256-P1j+Nf+pzxPYK2Qe7lF2yB0vR3YvW8Td5sD0ZvrKIq8=", "narHash": "sha256-wQ/K5S3GbgInO3Rtl1NPVHzwBCNmZA++NNQWSQCZqCU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "0fc8d9bb51cc46b31d950513df6d088905c8fe55", "rev": "66bbd8fb32b6bb513ec093323081747945bb5f08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -816,29 +761,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "lastModified": 1728781282,
"lastModified": 1714253743, "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
"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": {
"lastModified": 1728176478,
"narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -871,11 +798,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1728596228, "lastModified": 1728980710,
"narHash": "sha256-6H3j/C1xWlhoLK2ybZSl6gW7xUgMeNuw8CBEkio3RX0=", "narHash": "sha256-kaXt3Jkhnsb7BpTBo5qzDfMUegMKKTJSls/5rNMGOC8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "c0e494b695437b5175b2ea97352f1cf0f27110a4", "rev": "44c733d42a34f37e798356bdfa03d240b7029844",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -902,11 +829,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1728193676, "lastModified": 1728740863,
"narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1051,11 +978,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1728747278, "lastModified": 1729000405,
"narHash": "sha256-2yERT018sZwWLUWd8URFSObyL0jV1AcyVq23O4fXhVQ=", "narHash": "sha256-9Q/o6bO8PsPFCTb1cEXP/V4WE0cT/gxXEBjB+LXd8FQ=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "bf3ac95a8c4e34e817abb97a6deda64d2a288f68", "rev": "35359a5b37c11a2a0f78826159e29d57a639f54a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1070,10 +997,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",
@ -1229,27 +1156,6 @@
} }
}, },
"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",
@ -1363,11 +1269,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728606533, "lastModified": 1728994306,
"narHash": "sha256-ydcaiL6IHUqJSgnElZOZsbF2dMWdck0mlt8/iEPQrvg=", "narHash": "sha256-Uzy++RBLeBctc3Bngnl4T8VB2cboCWX5dcPCg1frpp8=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "84fb32055dcf0bda2967cdd463465059af3d91d1", "rev": "5ac92b761d82da9234331db0cf03dba231f59f50",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1388,11 +1294,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728483147, "lastModified": 1728753797,
"narHash": "sha256-WWLzEZm9E6aBxoJqahYw4wCwUYV1+ndwGz1gwv87Wzc=", "narHash": "sha256-VRqZE/2pItRwHdAMNvVJC9zy8FpROMQ3whps4m8tea8=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "6ae67e89267440380f63544312b9113c0a895882", "rev": "66f0f90ec5468fbea1f7b65451eff5ca70d8f305",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -9,24 +9,15 @@
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/2.91.0.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/main.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";
@ -42,7 +33,6 @@
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,12 +43,11 @@ 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,15 +7,19 @@
## 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`,