Compare commits

...

6 commits

Author SHA1 Message Date
79ea7180b4 apply for rest of files 2025-04-19 16:58:18 +02:00
4aade0d59e disable ozon envvar, switch sddm to wl 2025-04-19 16:58:02 +02:00
1be7a94f46 remove nextpnr for now 2025-04-19 14:51:52 +02:00
b1748f5b25 flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/72526a5f7cde2ef9075637802a1e2a8d2d658f70?narHash=sha256-IJksPW32V9gid9vDxoloJMRk%2BYGjxq5drFHBFeBkKU8%3D' (2025-04-17)
  → 'github:nix-community/home-manager/ae84885d9b6b62dc58ccd300e9ab321a3fd9f9c7?narHash=sha256-KjBMsjCzIOWgDqTZMYIriPFmHiQcCb2RhuDh5JF0VVc%3D' (2025-04-19)
• Updated input 'jovian-nixos':
    'github:Jovian-Experiments/Jovian-NixOS/36186806e1dc4c0e370d0080f9b838ff8b1d20a2?narHash=sha256-SOBI89WTS8qqrjysrE0%2BVsePe5JoOxtbnmFroJbHiAo%3D' (2025-04-17)
  → 'github:Jovian-Experiments/Jovian-NixOS/c7ff1a4578eb11ef84288941aa23e385b6fde635?narHash=sha256-/A/xjRjJY9CGcgOHQ5kTxV7VIJxac86i6NQ5CejMzZc%3D' (2025-04-19)
• Updated input 'jovian-nixos/nixpkgs':
    'github:NixOS/nixpkgs/2c8d3f48d33929642c1c12cd243df4cc7d2ce434?narHash=sha256-F7n4%2BKOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE%3D' (2025-04-02)
  → 'github:NixOS/nixpkgs/b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef?narHash=sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU%3D' (2025-04-17)
• Updated input 'nix-alien':
    'github:thiagokokada/nix-alien/9b92bd3b3d54e02aa0b1881af435802567c2dca9?narHash=sha256-UGq8nYSq/feyP0bUjd88jHXA7wJMaSPbtRByp7ZOD30%3D' (2025-04-15)
  → 'github:thiagokokada/nix-alien/5970d8560eb0f454ffac11fe01c9a0dc3fd83ca9?narHash=sha256-Y2wj9kIRpBK2nxGHPyvjWSMxKXHL%2B0WchLdsAfY3pRg%3D' (2025-04-19)
• Updated input 'nix-alien/nixpkgs':
    'github:NixOS/nixpkgs/2631b0b7abcea6e640ce31cd78ea58910d31e650?narHash=sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR%2BXhw3kr/3Xd0GPTM%3D' (2025-04-12)
  → 'github:NixOS/nixpkgs/b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef?narHash=sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU%3D' (2025-04-17)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/2631b0b7abcea6e640ce31cd78ea58910d31e650?narHash=sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR%2BXhw3kr/3Xd0GPTM%3D' (2025-04-12)
  → 'github:NixOS/nixpkgs/b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef?narHash=sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU%3D' (2025-04-17)
• Updated input 'nixpkgs-update':
    'github:ryantm/nixpkgs-update/30ca7d55d05bfc99bfb04521ba09c26ccbec8625?narHash=sha256-eKl1y0COzmaD5tPw8MgmEBSsH46t4jmPbneulCLgG3M%3D' (2025-03-24)
  → 'github:ryantm/nixpkgs-update/363f92cdbbf57bb13eec95c22c2b068d45fa2cea?narHash=sha256-7%2B1uOBYxsuebyRQWBJxbLeDbCSjIdIuXbxx/x8puB6o%3D' (2025-04-19)
2025-04-19 14:06:46 +02:00
8ebe924f20 flake.lock: Update
Flake lock file updates:

• Updated input 'jovian-nixos':
    'github:Jovian-Experiments/Jovian-NixOS/10d3614023e2fb15e5e7089235e9958b9aa71a6c?narHash=sha256-yV6OhBUj3Ag1l9gdf7eObkAoli35SUxDtFvC8JbsVrk%3D' (2025-04-10)
  → 'github:Jovian-Experiments/Jovian-NixOS/1dd888cc60079910fba27eb43b959b633e3b466c?narHash=sha256-3Q3%2BH8YeuRRGXZqL0FgWAcPg2bX416M6NX/VpLGRw%2Bc%3D' (2025-04-12)
2025-04-12 14:52:08 +02:00
91e671d9f1 flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/a4d8020820a85b47f842eae76ad083b0ec2a886a?narHash=sha256-9a4V1wQXS8hXZtc7mRtz0qINkGW%2BC99aDrmXY6oYBFg%3D' (2025-04-07)
  → 'github:nix-community/home-manager/b74b22bb6167e8dff083ec6988c98798bf8954d3?narHash=sha256-qYhUgA98mhq1QK13r9qVY%2BsG1ri6FBgyp%2BGApX6wS20%3D' (2025-04-11)
• Updated input 'jovian-nixos':
    'github:Jovian-Experiments/Jovian-NixOS/96a7fbb4a892696ff89d3d42fc743ab5d6714222?narHash=sha256-jAr345BODeDluX6DfO3TdY7pB77olVOcYFYjxz6rPxo%3D' (2025-04-05)
  → 'github:Jovian-Experiments/Jovian-NixOS/10d3614023e2fb15e5e7089235e9958b9aa71a6c?narHash=sha256-yV6OhBUj3Ag1l9gdf7eObkAoli35SUxDtFvC8JbsVrk%3D' (2025-04-10)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/42a1c966be226125b48c384171c44c651c236c22?narHash=sha256-rpqepOZ8Eo1zg%2BKJeWoq1HAOgoMCDloqv5r2EAa9TSA%3D' (2025-04-05)
  → 'github:NixOS/nixpkgs/f675531bc7e6657c10a18b565cfebd8aa9e24c14?narHash=sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U%3D' (2025-04-09)
2025-04-12 03:47:37 +02:00
7 changed files with 36 additions and 29 deletions
configs
thilo-laptop
thilo-pc
flake.lockflake.nix
home-manager
nixos

View file

@ -35,6 +35,8 @@
services = {
xserver.enable = true;
displayManager.sddm.enable = true;
displayManager.sddm.wayland.enable = true;
displayManager.defaultSession = "plasma";
desktopManager.plasma6.enable = true;
xserver.xkb = {
layout = "de";

View file

@ -45,6 +45,8 @@
services = {
xserver.enable = true;
displayManager.sddm.enable = true;
displayManager.sddm.wayland.enable = true;
displayManager.defaultSession = "plasma";
desktopManager.plasma6.enable = true;
xserver.xkb = {
layout = "us";
@ -154,6 +156,9 @@
libdrm
mesa
libxkbcommon
python3Packages.pyqt6
zstd
]);
};

48
flake.lock generated
View file

@ -37,11 +37,11 @@
]
},
"locked": {
"lastModified": 1743781299,
"narHash": "sha256-wLz6pjEVMXAb8EGDbXtyW98GQ8vm9cEyKhZTf/TTu24=",
"lastModified": 1745033012,
"narHash": "sha256-KjBMsjCzIOWgDqTZMYIriPFmHiQcCb2RhuDh5JF0VVc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a802defb16dcdcc7fd0ff5a2d7be913ce2fe79e7",
"rev": "ae84885d9b6b62dc58ccd300e9ab321a3fd9f9c7",
"type": "github"
},
"original": {
@ -56,11 +56,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1743660830,
"narHash": "sha256-ezJqPIuB25iMJeugwHKWnB1DjMvrdpkrPxE3TCULjGk=",
"lastModified": 1745044299,
"narHash": "sha256-/A/xjRjJY9CGcgOHQ5kTxV7VIJxac86i6NQ5CejMzZc=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "c7ade1c8fe2bdb70d38b3b9a97b874dcaf33b755",
"rev": "c7ff1a4578eb11ef84288941aa23e385b6fde635",
"type": "github"
},
"original": {
@ -99,11 +99,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1742038403,
"narHash": "sha256-mzZdujmFWC+wHRvm0tKUlXL0LLz3YI3EDUCnFCtzgxY=",
"lastModified": 1745058368,
"narHash": "sha256-Y2wj9kIRpBK2nxGHPyvjWSMxKXHL+0WchLdsAfY3pRg=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "876d83ac35fc52145674282f87898824182edc48",
"rev": "5970d8560eb0f454ffac11fe01c9a0dc3fd83ca9",
"type": "github"
},
"original": {
@ -142,11 +142,11 @@
]
},
"locked": {
"lastModified": 1741619381,
"narHash": "sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE=",
"lastModified": 1744518957,
"narHash": "sha256-RLBSWQfTL0v+7uyskC5kP6slLK1jvIuhaAh8QvB75m4=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "66537fb185462ba9b07f4e6f2d54894a1b2d04ab",
"rev": "4fc9ea78c962904f4ea11046f3db37c62e8a02fd",
"type": "github"
},
"original": {
@ -178,11 +178,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1743583204,
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
"lastModified": 1744932701,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github"
},
"original": {
@ -200,11 +200,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1742857708,
"narHash": "sha256-eKl1y0COzmaD5tPw8MgmEBSsH46t4jmPbneulCLgG3M=",
"lastModified": 1745030056,
"narHash": "sha256-7+1uOBYxsuebyRQWBJxbLeDbCSjIdIuXbxx/x8puB6o=",
"owner": "ryantm",
"repo": "nixpkgs-update",
"rev": "30ca7d55d05bfc99bfb04521ba09c26ccbec8625",
"rev": "363f92cdbbf57bb13eec95c22c2b068d45fa2cea",
"type": "github"
},
"original": {
@ -215,11 +215,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1741851582,
"narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
"lastModified": 1744932701,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github"
},
"original": {
@ -231,11 +231,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1743583204,
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
"lastModified": 1744932701,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github"
},
"original": {

View file

@ -26,14 +26,14 @@
"https://nix-community.cachix.org"
"https://nixpkgs-update.cachix.org"
"https://devenv.cachix.org"
"https://cache.garnix.io"
#"https://cache.garnix.io"
];
trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"nixpkgs-update.cachix.org-1:6y6Z2JdoL3APdu6/+Iy8eZX2ajf09e4EE9SnxSML1W8="
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
# "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
];
};

View file

@ -76,7 +76,7 @@ in
# FPGA stuff
yosys
nextpnr
# nextpnr
icestorm
icebreaker
@ -115,6 +115,7 @@ in
dbeaver-bin
onlyoffice-bin
spotify
spicetify-cli
discord
(lutris.override {
extraLibraries = _: [ adwaita-icon-theme ];

View file

@ -25,7 +25,6 @@ in
"nix"
"uv"
];
nix_arguments = "--builders \"\"";
};
git.repos = [ configPath ];
firmware = {

View file

@ -77,7 +77,7 @@ in
podman.enable = true;
};
environment.sessionVariables.NIXOS_OZONE_WL = "1";
# environment.sessionVariables.NIXOS_OZONE_WL = "1";
programs = {
steam = {