Compare commits

...

3 commits

Author SHA1 Message Date
6817cea882
Fixes asahi config 2024-09-02 11:51:33 -07:00
2f9855722a
flake.lock: Update
Flake lock file updates:

• Updated input 'fenix':
    'github:nix-community/fenix/24d83329e95a3bc48cbe9f3cd23813c210a25ea6' (2024-05-05)
  → 'github:nix-community/fenix/0774f58cf1025bbb713971deecc7f07c856be6ed' (2024-09-02)
• Updated input 'fenix/nixpkgs':
    'github:nixos/nixpkgs/e9be42459999a253a9f92559b1f5b72e1b44c13d' (2024-05-03)
  → 'github:nixos/nixpkgs/12228ff1752d7b7624a54e9c1af4b222b3c1073b' (2024-08-31)
• Updated input 'fenix/rust-analyzer-src':
    'github:rust-lang/rust-analyzer/1a5bb27c018c947dab01ab70ffe1d267b0481a17' (2024-05-03)
  → 'github:rust-lang/rust-analyzer/779d9eee2ea403da447278a7007c9627c8878856' (2024-09-01)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e' (2024-05-02)
  → 'github:hercules-ci/flake-parts/567b938d64d4b4112ee253b9274472dc3a346eb6' (2024-09-01)
• Updated input 'flake-parts/nixpkgs-lib':
    '50eb7ecf4c.tar.gz?narHash=sha256-QBx10%2Bk6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94%3D' (2024-05-02)
  → '356624c120.tar.gz?narHash=sha256-Ss8QWLXdr2JCBPcYChJhz4xJm%2Bh/xjl4G0c0XlP6a74%3D' (2024-09-01)
• Updated input 'home-manager':
    'github:nix-community/home-manager/3dfe05aa9b5646995ace887931fa60269a039777' (2024-05-05)
  → 'github:nix-community/home-manager/471e3eb0a114265bcd62d11d58ba8d3421ee68eb' (2024-09-01)
• Updated input 'hyprland':
    'github:hyprwm/Hyprland/cddeec47a1fc0e70d8598fd10c29cd0e9489999f' (2024-05-05)
  → 'github:hyprwm/Hyprland/6934e7aa2b300bc4565855a4092fb34de8a9a8d2' (2024-09-01)
• Added input 'hyprland/aquamarine':
    'github:hyprwm/aquamarine/f8a687dd29ff019657498f1bd14da2fbbf0e604b' (2024-09-01)
• Added input 'hyprland/aquamarine/hyprutils':
    follows 'hyprland/hyprutils'
• Added input 'hyprland/aquamarine/hyprwayland-scanner':
    follows 'hyprland/hyprwayland-scanner'
• Added input 'hyprland/aquamarine/nixpkgs':
    follows 'hyprland/nixpkgs'
• Added input 'hyprland/aquamarine/systems':
    follows 'hyprland/systems'
• Updated input 'hyprland/hyprcursor':
    'github:hyprwm/hyprcursor/cab4746180f210a3c1dd3d53e45c510e309e90e1' (2024-04-20)
  → 'github:hyprwm/hyprcursor/912d56025f03d41b1ad29510c423757b4379eb1c' (2024-08-02)
• Updated input 'hyprland/hyprlang':
    'github:hyprwm/hyprlang/78fcaa27ae9e1d782faa3ff06c8ea55ddce63706' (2024-04-14)
  → 'github:hyprwm/hyprlang/c12ab785ce1982f82594aff03b3104c598186ddd' (2024-09-01)
• Added input 'hyprland/hyprlang/hyprutils':
    follows 'hyprland/hyprutils'
• Added input 'hyprland/hyprutils':
    'github:hyprwm/hyprutils/8976e3f6a5357da953a09511d0c7f6a890fb6ec2' (2024-08-29)
• Added input 'hyprland/hyprutils/nixpkgs':
    follows 'hyprland/nixpkgs'
• Added input 'hyprland/hyprutils/systems':
    follows 'hyprland/systems'
• Updated input 'hyprland/hyprwayland-scanner':
    'github:hyprwm/hyprwayland-scanner/1270ebaa539e56d61b708c24b072b09cbbd3a828' (2024-05-03)
  → 'github:hyprwm/hyprwayland-scanner/a048a6cb015340bd82f97c1f40a4b595ca85cc30' (2024-07-18)
• Updated input 'hyprland/nixpkgs':
    'github:NixOS/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994' (2024-04-27)
  → 'github:NixOS/nixpkgs/12228ff1752d7b7624a54e9c1af4b222b3c1073b' (2024-08-31)
• Updated input 'hyprland/xdph':
    'github:hyprwm/xdg-desktop-portal-hyprland/0fe840441e43da12cd7865ed9aa8cdc35a8da85a' (2024-04-25)
  → 'github:hyprwm/xdg-desktop-portal-hyprland/2425e8f541525fa7409d9f26a8ffaf92a3767251' (2024-09-01)
• Updated input 'hyprland/xdph/hyprland-protocols':
    'github:hyprwm/hyprland-protocols/e06482e0e611130cd1929f75e8c1cf679e57d161' (2024-05-05)
  → 'github:hyprwm/hyprland-protocols/5a11232266bf1a1f5952d5b179c3f4b2facaaa84' (2024-07-18)
• Updated input 'nix-github-actions':
    'github:nix-community/nix-github-actions/5163432afc817cf8bd1f031418d1869e4c9d5547' (2023-12-29)
  → 'github:nix-community/nix-github-actions/622f829f5fe69310a866c8a6cd07e747c44ef820' (2024-07-04)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/a362555e9dbd4ecff3bb98969bbdb8f79fe87f10' (2024-05-05)
  → 'github:nix-community/nix-index-database/32058e9138248874773630c846563b1a78ee7a5b' (2024-09-01)
• Updated input 'nixd':
    'github:nix-community/nixd/af6bb716038eecf5bad0ead6ed14a4c1e5b74c13' (2024-05-02)
  → 'github:nix-community/nixd/f6ca74330b49c45f50cead6d0ac0469f8f830f88' (2024-08-22)
• Added input 'nixd/treefmt-nix':
    'github:numtide/treefmt-nix/768acdb06968e53aa1ee8de207fd955335c754b7' (2024-07-30)
• Added input 'nixd/treefmt-nix/nixpkgs':
    follows 'nixd/nixpkgs'
• Updated input 'nixos-apple-silicon':
    'github:tpwrules/nixos-apple-silicon/4fac534b775aa0c40611257fa19ab8ab3243f4dc' (2024-04-28)
  → 'github:tpwrules/nixos-apple-silicon/8a665fee82901878edaeb8ee120296a979db2dd2' (2024-07-31)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/e9be42459999a253a9f92559b1f5b72e1b44c13d' (2024-05-03)
  → 'github:nixos/nixpkgs/12228ff1752d7b7624a54e9c1af4b222b3c1073b' (2024-08-31)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/2849da033884f54822af194400f8dff435ada242' (2024-04-30)
  → 'github:cachix/pre-commit-hooks.nix/4509ca64f1084e73bc7a721b20c669a8d4c5ebe6' (2024-08-28)
• Removed input 'pre-commit-hooks/flake-utils'
• Removed input 'pre-commit-hooks/flake-utils/systems'
• Updated input 'pre-commit-hooks/nixpkgs-stable':
    'github:NixOS/nixpkgs/614b4613980a522ba49f0d194531beddbb7220d3' (2024-03-17)
  → 'github:NixOS/nixpkgs/194846768975b7ad2c4988bdb82572c00222c0d7' (2024-07-07)
• Updated input 'stylix':
    'github:danth/stylix/43d23b1609b87f6a4100db2a09bd118c52c78766' (2024-05-01)
  → 'github:danth/stylix/ef81ad9e85e60420cc83d4642619c14b57139d33' (2024-09-02)
• Updated input 'stylix/base16-helix':
    'github:tinted-theming/base16-helix/dbe1480d99fe80f08df7970e471fac24c05f2ddb' (2023-10-08)
  → 'github:tinted-theming/base16-helix/34f41987bec14c0f3f6b2155c19787b1f6489625' (2024-07-12)
• Updated input 'stylix/base16-vim':
    'github:chriskempson/base16-vim/3be3cd82cd31acfcab9a41bad853d9c68d30478d' (2022-09-20)
  → 'github:tinted-theming/base16-vim/6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d' (2024-05-19)
• Added input 'stylix/flake-utils':
    'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
• Added input 'stylix/flake-utils/systems':
    follows 'stylix/systems'
• Updated input 'stylix/gnome-shell':
    'github:GNOME/gnome-shell/a7c169c6c29cf02a4c392fa0acbbc5f5072823e7' (2023-10-31)
  → 'github:GNOME/gnome-shell/0d0aadf013f78a7f7f1dc984d0d812971864b934' (2024-04-21)
• Updated input 'stylix/home-manager':
    'github:nix-community/home-manager/820be197ccf3adaad9a8856ef255c13b6cc561a6' (2024-03-31)
  → 'github:nix-community/home-manager/c2cd2a52e02f1dfa1c88f95abeb89298d46023be' (2024-08-23)
• Added input 'stylix/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
2024-09-02 09:04:58 -07:00
e41a5e1a0c
Compatibility updates 2024-09-02 08:51:21 -07:00
11 changed files with 276 additions and 121 deletions

View file

@ -4,6 +4,7 @@
globals,
...
}: {
stylix.enable = true;
stylix.image = globals.wallpapers.current;
stylix.polarity = "dark";
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-hard.yaml";
@ -33,7 +34,7 @@
settings.trusted-users = ["root" "willem"];
};
programs.bash.enableCompletion = true;
programs.bash.completion.enable = true;
programs.bash.interactiveShellInit = ''
export PS1=$'\n'"\e[0mbash: \e[34;1m\w"$'\n'"\e[32m\\$\e[0m "
'';

284
flake.lock generated
View file

@ -1,5 +1,38 @@
{
"nodes": {
"aquamarine": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1725199881,
"narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "aquamarine",
"type": "github"
}
},
"base16": {
"inputs": {
"fromYaml": "fromYaml"
@ -53,11 +86,11 @@
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1696727917,
"narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=",
"lastModified": 1720809814,
"narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb",
"rev": "34f41987bec14c0f3f6b2155c19787b1f6489625",
"type": "github"
},
"original": {
@ -101,15 +134,15 @@
"base16-vim": {
"flake": false,
"locked": {
"lastModified": 1663659192,
"narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=",
"owner": "chriskempson",
"lastModified": 1716150083,
"narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
"owner": "tinted-theming",
"repo": "base16-vim",
"rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d",
"rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
"type": "github"
},
"original": {
"owner": "chriskempson",
"owner": "tinted-theming",
"repo": "base16-vim",
"type": "github"
}
@ -121,11 +154,11 @@
]
},
"locked": {
"lastModified": 1714935286,
"narHash": "sha256-Gd5/Kn3GbWToLvnN1r/KIZnH37qUZOihL0Xb5IjxBFc=",
"lastModified": 1722316816,
"narHash": "sha256-oXIrAmljFsdruZncUU/ytN6hlEZtSq0lIwrw0v0k5dk=",
"owner": "willemml",
"repo": "nix-darwin",
"rev": "5580a38a45f5610ae1a9b2730da6bd6813203111",
"rev": "9b7720ed700b3d27b538bcd12c6febe8785408b1",
"type": "github"
},
"original": {
@ -141,11 +174,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1714890282,
"narHash": "sha256-0dRK2ChvkhWrLM6H3d4r+rXP/UDxTJ6Vkdr22uGb1H0=",
"lastModified": 1725258763,
"narHash": "sha256-7s5RfYlTljWnKGkK4hOMJCJ0sNQoLYjMxezX3Vijy/0=",
"owner": "nix-community",
"repo": "fenix",
"rev": "24d83329e95a3bc48cbe9f3cd23813c210a25ea6",
"rev": "0774f58cf1025bbb713971deecc7f07c856be6ed",
"type": "github"
},
"original": {
@ -206,11 +239,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1714641030,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"lastModified": 1725234343,
"narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
"type": "github"
},
"original": {
@ -236,7 +269,10 @@
},
"flake-utils": {
"inputs": {
"systems": "systems_2"
"systems": [
"stylix",
"systems"
]
},
"locked": {
"lastModified": 1710146030,
@ -292,16 +328,16 @@
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1698794309,
"narHash": "sha256-/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=",
"lastModified": 1713702291,
"narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "a7c169c6c29cf02a4c392fa0acbbc5f5072823e7",
"rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "45.1",
"ref": "46.1",
"repo": "gnome-shell",
"type": "github"
}
@ -313,11 +349,11 @@
]
},
"locked": {
"lastModified": 1714931954,
"narHash": "sha256-QXpLmgmisNK2Zgpnu9DiO9ScrKJuJ4zmiMTNpObVIuk=",
"lastModified": 1725180166,
"narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3dfe05aa9b5646995ace887931fa60269a039777",
"rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
"type": "github"
},
"original": {
@ -334,11 +370,11 @@
]
},
"locked": {
"lastModified": 1711915616,
"narHash": "sha256-co6LoFA+j6BZEeJNSR8nZ4oOort5qYPskjrDHBaJgmo=",
"lastModified": 1724435763,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "820be197ccf3adaad9a8856ef255c13b6cc561a6",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github"
},
"original": {
@ -363,11 +399,11 @@
]
},
"locked": {
"lastModified": 1713612213,
"narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
"lastModified": 1722623071,
"narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
"rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
"type": "github"
},
"original": {
@ -378,25 +414,29 @@
},
"hyprland": {
"inputs": {
"aquamarine": "aquamarine",
"hyprcursor": "hyprcursor",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_2",
"systems": "systems",
"xdph": "xdph"
},
"locked": {
"lastModified": 1714933694,
"narHash": "sha256-sua/1gAfZ2lz3kxFyH6Hg/xu1eTkXOORlhXa21PaLJc=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "cddeec47a1fc0e70d8598fd10c29cd0e9489999f",
"type": "github"
"lastModified": 1725219211,
"narHash": "sha256-17WA01XfBTuH1CJdGje3095K/7RUUL6lwQHEFq9t2Go=",
"ref": "refs/heads/main",
"rev": "6934e7aa2b300bc4565855a4092fb34de8a9a8d2",
"revCount": 5178,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
}
},
"hyprland-protocols": {
@ -413,11 +453,11 @@
]
},
"locked": {
"lastModified": 1714869498,
"narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
"lastModified": 1721326555,
"narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
"rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
"type": "github"
},
"original": {
@ -427,6 +467,35 @@
}
},
"hyprlang": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1725188252,
"narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "c12ab785ce1982f82594aff03b3104c598186ddd",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
"hyprland",
@ -438,16 +507,16 @@
]
},
"locked": {
"lastModified": 1713121246,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"lastModified": 1724966483,
"narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"repo": "hyprutils",
"rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"repo": "hyprutils",
"type": "github"
}
},
@ -463,11 +532,11 @@
]
},
"locked": {
"lastModified": 1714755542,
"narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=",
"lastModified": 1721324119,
"narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828",
"rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
"type": "github"
},
"original": {
@ -483,11 +552,11 @@
]
},
"locked": {
"lastModified": 1703863825,
"narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=",
"lastModified": 1720066371,
"narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "5163432afc817cf8bd1f031418d1869e4c9d5547",
"rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
"type": "github"
},
"original": {
@ -503,11 +572,11 @@
]
},
"locked": {
"lastModified": 1714878592,
"narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=",
"lastModified": 1725161148,
"narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10",
"rev": "32058e9138248874773630c846563b1a78ee7a5b",
"type": "github"
},
"original": {
@ -524,14 +593,15 @@
"flake-root": "flake-root",
"nixpkgs": [
"nixpkgs"
]
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1714622771,
"narHash": "sha256-fZs0u4ep+RH7U69Jo/GAjwd1iSVFSByeAOju8ucsPx8=",
"lastModified": 1724296831,
"narHash": "sha256-+X9cc5fNEUtp6e+EZ2d9tjfPiXVcqkddEz1T/C9H5sc=",
"owner": "nix-community",
"repo": "nixd",
"rev": "af6bb716038eecf5bad0ead6ed14a4c1e5b74c13",
"rev": "f6ca74330b49c45f50cead6d0ac0469f8f830f88",
"type": "github"
},
"original": {
@ -549,11 +619,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1714264490,
"narHash": "sha256-5hKsAO7ZLwOLCXeI5+jDmDr7t4zBezk0xidVWghoBB0=",
"lastModified": 1722469787,
"narHash": "sha256-P20oAmbgXHl1E77TXPXiAj1Ntycc1mf7fZMI7X13VYw=",
"owner": "tpwrules",
"repo": "nixos-apple-silicon",
"rev": "4fac534b775aa0c40611257fa19ab8ab3243f4dc",
"rev": "8a665fee82901878edaeb8ee120296a979db2dd2",
"type": "github"
},
"original": {
@ -564,11 +634,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1714763106,
"narHash": "sha256-DrDHo74uTycfpAF+/qxZAMlP/Cpe04BVioJb6fdI0YY=",
"lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e9be42459999a253a9f92559b1f5b72e1b44c13d",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"type": "github"
},
"original": {
@ -580,39 +650,39 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1714640452,
"narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
"lastModified": 1725233747,
"narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1710695816,
"narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
"lastModified": 1720386169,
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "614b4613980a522ba49f0d194531beddbb7220d3",
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"type": "github"
},
"original": {
@ -624,24 +694,23 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1714763106,
"narHash": "sha256-DrDHo74uTycfpAF+/qxZAMlP/Cpe04BVioJb6fdI0YY=",
"lastModified": 1725089620,
"narHash": "sha256-H+M2+CjQhGH/HUOG+Gx+Ggj8JeHpOtBKVj+Tn4nkpP0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e9be42459999a253a9f92559b1f5b72e1b44c13d",
"rev": "7d0d974fc21f02dfeed7ef098d8faf0195162949",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"rev": "7d0d974fc21f02dfeed7ef098d8faf0195162949",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils",
"gitignore": "gitignore",
"nixpkgs": [
"nixpkgs"
@ -649,11 +718,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1714478972,
"narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
"lastModified": 1724857454,
"narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "2849da033884f54822af194400f8dff435ada242",
"rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
"type": "github"
},
"original": {
@ -681,11 +750,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1714757194,
"narHash": "sha256-5PuPbEIUfXrW3u3wZqct22hcoc3K6XOhV3iEIp/wZTg=",
"lastModified": 1725191098,
"narHash": "sha256-YH0kH5CSOnAuPUB1BUzUqvnKiv5SgDhfMNjrkki9Ahk=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "1a5bb27c018c947dab01ab70ffe1d267b0481a17",
"rev": "779d9eee2ea403da447278a7007c9627c8878856",
"type": "github"
},
"original": {
@ -721,18 +790,20 @@
"base16-tmux": "base16-tmux",
"base16-vim": "base16-vim",
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_2",
"nixpkgs": [
"nixpkgs"
]
],
"systems": "systems_2"
},
"locked": {
"lastModified": 1714555012,
"narHash": "sha256-WVUrm3TGVj6c8g5aG20OjJRHMvUtAZjpHQgukDhyOT8=",
"lastModified": 1725290973,
"narHash": "sha256-+jwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo=",
"owner": "danth",
"repo": "stylix",
"rev": "43d23b1609b87f6a4100db2a09bd118c52c78766",
"rev": "ef81ad9e85e60420cc83d4642619c14b57139d33",
"type": "github"
},
"original": {
@ -771,6 +842,27 @@
"type": "github"
}
},
"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"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
@ -788,11 +880,11 @@
]
},
"locked": {
"lastModified": 1714060055,
"narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=",
"lastModified": 1725203932,
"narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a",
"rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251",
"type": "github"
},
"original": {

View file

@ -2,9 +2,10 @@
description = "Willem's Nix configurations";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs?rev=7d0d974fc21f02dfeed7ef098d8faf0195162949";
darwin.url = "github:willemml/nix-darwin?ref=feat/networking.hosts";
#darwin.url = "git+file:///Users/willem/dev/nix-darwin";
darwin.inputs.nixpkgs.follows = "nixpkgs";
fenix.url = "github:nix-community/fenix";
@ -14,7 +15,11 @@
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
hyprland.url = "github:hyprwm/Hyprland";
hyprland = {
type = "git";
url = "https://github.com/hyprwm/Hyprland";
submodules = true;
};
nix-github-actions.inputs.nixpkgs.follows = "nixpkgs";
nix-github-actions.url = "github:nix-community/nix-github-actions";

View file

@ -13,6 +13,8 @@
inputs.nix-index-database.hmModules.nix-index
];
stylix.enable = true;
home = {
username = globals.username;

View file

@ -5,5 +5,6 @@
nerdfonts
ubuntu_font_family
noto-fonts-cjk-sans
noto-fonts
];
}

View file

@ -1,5 +1,6 @@
{
config,
inputs,
pkgs,
lib,
globals,
@ -27,9 +28,9 @@ in {
polkit-kde-agent
qt6.qtwayland
qt6ct
xdg-desktop-portal-hyprland
xdg-desktop-portal
rofi-wayland
xdg-desktop-portal
inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
]
++ (
if pkgs.stdenv.isAarch64
@ -37,6 +38,31 @@ in {
else [firefox discord]
);
# home.pointerCursor = {
# gtk.enable = true;
# package = pkgs.bibata-cursors;
# name = "Bibata-Modern-Classic";
# size = 24;
# };
# gtk = {
# enable = true;
# theme = {
# package = pkgs.flat-remix-gtk;
# name = "Flat-Remix-GTK-Grey-Darkest";
# };
# iconTheme = {
# package = pkgs.adwaita-icon-theme;
# name = "Adwaita";
# };
# font = {
# name = "Sans";
# size = 12;
# package = pkgs.dejavu_fonts;
# };
# };
# notifications daemon
services.mako.enable = true;
@ -44,6 +70,8 @@ in {
enable = true;
settings = {
cursor.no_hardware_cursors = true;
debug.disable_logs = false;
decoration = {
rounding = 10;
@ -100,7 +128,7 @@ in {
bind = let
bright = "${pkgs.brightnessctl}/bin/brightnessctl";
in [
"$mod, SPACE, exec, rofi -modes \"ssh,drun,window\" -show drun"
"$mod, SPACE, exec, rofi -modes \"ssh,drun,window\" -log ~/rofi.log -show drun"
"ALT, SPACE, exec, rofi -show window"
# swaylock on suspend
@ -178,10 +206,10 @@ in {
};
};
"device:synaptics-tm3053-003" = {
accel_profile = "adaptive";
sensitivity = 0.3;
};
# "device:synaptics-tm3053-003" = {
# accel_profile = "adaptive";
# sensitivity = 0.3;
# };
gestures = {
workspace_swipe = true;

View file

@ -19,7 +19,7 @@
alacritty = {
enable = true;
settings = {
font.normal.style = lib.mkForce "Book";
#font.normal.style = lib.mkForce "Book";
window = {
decorations = "None";
};

View file

@ -33,7 +33,6 @@
hardware.asahi = {
withRust = true;
addEdgeKernelConfig = true;
useExperimentalGPUDriver = true;
experimentalGPUInstallMode = "replace";
};
@ -51,7 +50,7 @@
'';
};
hardware.opengl.enable = true;
hardware.graphics.enable = true;
networking.hostName = "voyager";
}

View file

@ -18,6 +18,27 @@
hardware.enableRedistributableFirmware = lib.mkDefault true;
stylix = {
fonts = rec {
serif = sansSerif;
sansSerif = {
package = pkgs.dejavu_fonts;
name = "DejaVu Sans";
};
monospace = {
package = pkgs.dejavu_fonts;
name = "DejaVu Sans Mono";
};
emoji = {
package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji";
};
};
};
networking = {
useDHCP = lib.mkDefault true;

View file

@ -37,16 +37,14 @@
synaptics.enable = false;
displayManager.lightdm.enable = false;
libinput = {
enable = true;
touchpad.tapping = true;
touchpad.naturalScrolling = true;
touchpad.scrollMethod = "twofinger";
touchpad.disableWhileTyping = true;
touchpad.clickMethod = "clickfinger";
};
};
sound.enable = true;
services.libinput = {
enable = true;
touchpad.tapping = true;
touchpad.naturalScrolling = true;
touchpad.scrollMethod = "twofinger";
touchpad.disableWhileTyping = true;
touchpad.clickMethod = "clickfinger";
};
}

View file

@ -2,14 +2,22 @@
inputs,
pkgs,
...
}: {
}: let
hyprpkgs = inputs.hyprland.packages.${pkgs.system};
in {
imports = [
./gui.nix
../modules/polkit.nix
];
programs.hyprland.enable = true;
programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland;
programs.hyprland.package = hyprpkgs.hyprland;
programs.hyprland.portalPackage = hyprpkgs.xdg-desktop-portal-hyprland;
xdg.portal = {
enable = true;
extraPortals = [hyprpkgs.xdg-desktop-portal-hyprland];
};
programs.waybar.enable = true;
programs.waybar.package = pkgs.waybar.overrideAttrs (oldAttrs: {