diff --git a/flake.lock b/flake.lock index 436200b..b59b587 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -70,11 +70,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1743774811, - "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", + "lastModified": 1744642301, + "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", + "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "type": "github" }, "original": { @@ -84,22 +84,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -139,7 +123,6 @@ "inputs": { "nixpkgs-lib": [ "stylix", - "nur", "nixpkgs" ] }, @@ -175,27 +158,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": [ - "stylix", - "systems" - ] - }, - "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" - } - }, "fromYaml": { "flake": false, "locked": { @@ -263,100 +225,42 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } }, - "hm-cosmic": { - "inputs": { - "home-manager": "home-manager", - "home-manager-cosmic": "home-manager-cosmic" - }, - "locked": { - "lastModified": 1733104727, - "narHash": "sha256-2a4w7OxuncH/qh+eBou65v+Ow7ZH8CobfFId3ckSQdo=", - "owner": "tristanbeedell", - "repo": "hm-cosmic", - "rev": "8c7ae2855827101eff7e52dd320599a487c78936", - "type": "github" - }, - "original": { - "owner": "tristanbeedell", - "ref": "master", - "repo": "hm-cosmic", - "type": "github" - } - }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1733085484, - "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager-cosmic": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1733103810, - "narHash": "sha256-S1jGheeLQJPaY80+iFu7Iv4Az3BHmVlv8PxngnK8Aog=", - "owner": "tristanbeedell", - "repo": "home-manager", - "rev": "efa4d272f6c2b14d4a3b67b0b1e4b38ae46e5588", - "type": "github" - }, - "original": { - "owner": "tristanbeedell", - "ref": "cosmic", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745033012, - "narHash": "sha256-KjBMsjCzIOWgDqTZMYIriPFmHiQcCb2RhuDh5JF0VVc=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "ae84885d9b6b62dc58ccd300e9ab321a3fd9f9c7", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "stylix", @@ -364,15 +268,16 @@ ] }, "locked": { - "lastModified": 1743869639, - "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -391,23 +296,23 @@ ] }, "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "lastModified": 1737371634, + "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.6", + "ref": "v0.0.7", "repo": "ixx", "type": "github" } }, "musnix": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1741303672, @@ -423,91 +328,7 @@ "type": "github" } }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1744974542, - "narHash": "sha256-Cut7jOutHRegoBokTz5/kaVs2efwfMgX7dl8lhO67D8=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "f8bfb2836ab9d4429fc6b2c7337357d8c0d8cc9c", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-24.05", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1740695751, "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", @@ -523,29 +344,28 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_2": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1747825515, + "narHash": "sha256-BWpMQymVI73QoKZdcVCxUCCK3GNvr/xa2Dc4DM1o2BE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "cd2812de55cf87df88a9e09bf3be1ce63d50c1a6", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-25.05", + "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { - "lastModified": 1744502386, - "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -555,17 +375,17 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", - "owner": "NixOS", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -577,25 +397,30 @@ "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch" + "nuschtosSearch": "nuschtosSearch", + "systems": "systems_2" }, "locked": { - "lastModified": 1744874965, - "narHash": "sha256-eOnMgAWsjqOhGRoY9smkKlNQcCz9R89mgiKwLrCIYBE=", + "lastModified": 1747592862, + "narHash": "sha256-XsDbrzQmpWZ1HS2WtmsiK6Gp0GK1WOkq6l0o9Ssqi6M=", "owner": "nix-community", "repo": "nixvim", - "rev": "500b56f023e0f095ffee2d4f79e58aa09e6b0719", + "rev": "6ef96cb478bfe4388472746f2b356467e83b7a88", "type": "github" }, "original": { "owner": "nix-community", + "ref": "nixos-25.05", "repo": "nixvim", "type": "github" } }, "nur": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": [ + "stylix", + "flake-parts" + ], "nixpkgs": [ "stylix", "nixpkgs" @@ -603,11 +428,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1743884191, - "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=", + "lastModified": 1746056780, + "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "owner": "nix-community", "repo": "NUR", - "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c", + "rev": "d476cd0972dd6242d76374fcc277e6735715c167", "type": "github" }, "original": { @@ -626,11 +451,11 @@ ] }, "locked": { - "lastModified": 1743683223, - "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=", + "lastModified": 1745046075, + "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", "owner": "NuschtOS", "repo": "search", - "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962", + "rev": "066afe8643274470f4a294442aadd988356a478f", "type": "github" }, "original": { @@ -641,51 +466,25 @@ }, "root": { "inputs": { - "hm-cosmic": "hm-cosmic", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "musnix": "musnix", - "nixos-cosmic": "nixos-cosmic", - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "sops-nix": "sops-nix", - "stylix": "stylix" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744943606, - "narHash": "sha256-VL4swGy4uBcHvX+UR5pMeNE9uQzXfA7B37lkwet1EmA=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ec22cd63500f4832d1f3432d2425e0b31b0361b1", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" + "stylix": "stylix", + "zen-browser": "zen-browser" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1744669848, - "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61154300d945f0b147b30d24ddcafa159148026a", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -701,14 +500,16 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_6", + "home-manager": "home-manager_2", + "nixpkgs": [ + "nixpkgs" + ], "nur": "nur", - "systems": "systems_2", + "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -716,15 +517,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1744910471, - "narHash": "sha256-HItOUMA2whFnPMJuyN2XHq9TZttgrgOAZcoUXsaD4Js=", + "lastModified": 1747905597, + "narHash": "sha256-2pnf8w4XNS1F/fGt0ZwKGEDdrPeW7fp6d33OBR0GepE=", "owner": "danth", "repo": "stylix", - "rev": "8d5cd725ad591890c0cd804bf68cc842b8afca51", + "rev": "7f26a7f3d04482ea4da2382a806f413c917ac20d", "type": "github" }, "original": { "owner": "danth", + "ref": "release-25.05", "repo": "stylix", "type": "github" } @@ -759,6 +561,21 @@ "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": { @@ -779,28 +596,27 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1742851696, - "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=", + "lastModified": 1744974599, + "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77", + "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", "type": "github" }, "original": { @@ -812,11 +628,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1743296873, - "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", + "lastModified": 1745111349, + "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", + "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "type": "github" }, "original": { @@ -862,6 +678,24 @@ "repo": "treefmt-nix", "type": "github" } + }, + "zen-browser": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1747886840, + "narHash": "sha256-onMR+v1i/Wf4MhaBtZ8N0ciRYOJITZDJrfZ4FxDmODw=", + "owner": "youwen5", + "repo": "zen-browser-flake", + "rev": "47237b74af73d19729fd5d851665b2ecdd775745", + "type": "github" + }, + "original": { + "owner": "youwen5", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ede8ff3..8632411 100644 --- a/flake.nix +++ b/flake.nix @@ -1,25 +1,24 @@ { description = "A flake using my config"; inputs = { - # nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs.url = "nixpkgs/nixos-25.05"; musnix.url = "github:musnix/musnix"; - nixpkgs.follows = "nixos-cosmic/nixpkgs"; - nixpkgs-stable.url = "nixpkgs/nixos-24.05"; home-manager = { - url = "github:nix-community/home-manager/master"; + url = "github:nix-community/home-manager/release-25.05"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + stylix = { + url = "github:danth/stylix/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; - hm-cosmic.url = "github:tristanbeedell/hm-cosmic/master"; - stylix.url = "github:danth/stylix"; sops-nix.url = "github:Mic92/sops-nix"; - nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - # inputs.nixpkgs.follows = "nixpkgs"; - }; nixvim = { - url = "github:nix-community/nixvim"; + url = "github:nix-community/nixvim/nixos-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; + zen-browser = { + url = "github:youwen5/zen-browser-flake"; + }; }; outputs = {nixvim, ...} @ inputs: let @@ -71,8 +70,7 @@ ./hardware/framework-13.nix ./nixos/workstation.nix ./nixos/modules/work.nix - ./nixos/programs/hyprland.nix - (import ./nixos/programs/auto-login.nix "hyprland") + ./nixos/programs/cosmic.nix ]; home-modules = [ ./home/programs/work.nix diff --git a/hardware/framework-13.nix b/hardware/framework-13.nix index 72e8c3a..b8ef1a9 100644 --- a/hardware/framework-13.nix +++ b/hardware/framework-13.nix @@ -1,44 +1,48 @@ -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/mapper/crypted"; - fsType = "btrfs"; - options = [ "subvol=@root" ]; - }; + fileSystems."/" = { + device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = ["subvol=@root"]; + }; boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/84ad0e15-0056-4d46-801d-7735c2c6a5f6"; - fileSystems."/home" = - { device = "/dev/mapper/crypted"; - fsType = "btrfs"; - options = [ "subvol=@home" ]; - }; + fileSystems."/home" = { + device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = ["subvol=@home"]; + }; - fileSystems."/nix" = - { device = "/dev/mapper/crypted"; - fsType = "btrfs"; - neededForBoot = true; - options = [ "subvol=@nix" "noatime" ]; - }; + fileSystems."/nix" = { + device = "/dev/mapper/crypted"; + fsType = "btrfs"; + neededForBoot = true; + options = ["subvol=@nix" "noatime"]; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-label/BOOT"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-label/BOOT"; + fsType = "vfat"; + }; - swapDevices = - [ { device = "/dev/disk/by-label/SWAP"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-label/SWAP";} + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -50,7 +54,6 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - networking.hostName = "framework-13"; system.stateVersion = "24.11"; # do not change @@ -76,13 +79,9 @@ } ]; - stylix.fonts.sizes = { applications = 12; desktop = 10; terminal = 15; }; - } - - diff --git a/home/default.nix b/home/default.nix index 3b09170..42e6273 100644 --- a/home/default.nix +++ b/home/default.nix @@ -33,6 +33,7 @@ usbutils du-dust htop + btop libsixel yt-dlp fastfetch diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index 54c2b04..5e7a14c 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{pkgs, inputs, user, ...}: { imports = [ ./mpv.nix ./vscode.nix @@ -14,21 +14,24 @@ # tools inkscape - libsForQt5.okular + kdePackages.okular gimp libreoffice dbeaver-bin zed-editor + insomnia # entertainment - libsForQt5.kasts + kdePackages.kasts shortwave - freetube youtube-music + transmission_4-gtk # other element-desktop bitwarden + + inputs.zen-browser.packages.x86_64-linux.default ]; programs.obs-studio = { @@ -41,6 +44,16 @@ xdg.mimeApps.defaultApplications = { "application/pdf" = "sioyek.desktop"; + "x-scheme-handler/http" = "zen.desktop"; + "x-scheme-handler/https" = "zen.desktop"; + "x-scheme-handler/chrome" = "zen.desktop"; + "text/html" = "zen.desktop"; + "application/x-extension-htm" = "zen.desktop"; + "application/x-extension-html" = "zen.desktop"; + "application/x-extension-shtml" = "zen.desktop"; + "application/xhtml+xml" = "zen.desktop"; + "application/x-extension-xhtml" = "zen.desktop"; + "application/x-extension-xht" = "zen.desktop"; }; programs.sioyek.enable = true; @@ -49,9 +62,9 @@ gtk = { enable = true; gtk3.bookmarks = [ - "file:///home/tristan/Documents" - "file:///home/tristan/Pictures/Screenshots" - "file:///home/tristan/Downloads" + "file:///$HOME/Documents" + "file:///$HOME/Pictures/Screenshots" + "file:///$HOME/Downloads" ]; }; @@ -59,4 +72,5 @@ enable = true; package = pkgs.brave; }; + } diff --git a/home/programs/mpd.nix b/home/programs/mpd.nix index ba20bc9..0086100 100644 --- a/home/programs/mpd.nix +++ b/home/programs/mpd.nix @@ -3,8 +3,7 @@ pkgs, config, ... -}: -let +}: let terminal = config.programs.terminal; termcmd = "${terminal}/bin/${terminal.pname}"; host = "alpine"; diff --git a/home/programs/work.nix b/home/programs/work.nix index c90572c..5830e43 100644 --- a/home/programs/work.nix +++ b/home/programs/work.nix @@ -62,7 +62,7 @@ in { programs.chromium = { extensions = [ - {id = "bfogiafebfohielmmehodmfbbebbbpei";} + {id = "bfogiafebfohielmmehodmfbbebbbpei";} ]; }; } diff --git a/home/programs/xr.nix b/home/programs/xr.nix index 89dd23d..15414d7 100644 --- a/home/programs/xr.nix +++ b/home/programs/xr.nix @@ -17,7 +17,7 @@ }; home.file.".config/openvr/openvrpaths.vrpath" = { text = builtins.toJSON { - "config" = [ + "config" = [ "${config.home.homeDirectory}/.local/share/Steam/config" ]; "external_drivers" = null; diff --git a/home/workstation.nix b/home/workstation.nix index 7b5b109..0ae98e5 100644 --- a/home/workstation.nix +++ b/home/workstation.nix @@ -2,7 +2,6 @@ config, pkgs, lib, - stable-pkgs, ... }: { imports = [ @@ -29,7 +28,6 @@ playerctl quickemu devenv - stable-pkgs.logseq ]; services.udiskie = { @@ -50,4 +48,5 @@ ''; services.gnome-keyring.enable = true; + services.hyprpaper.enable = lib.mkForce false; } diff --git a/lib/mkconf.nix b/lib/mkconf.nix index ebe62af..93f6100 100644 --- a/lib/mkconf.nix +++ b/lib/mkconf.nix @@ -9,15 +9,9 @@ home-modules ? [], }: let inherit (inputs) home-manager nixpkgs sops-nix nixvim; - stable-pkgs = import inputs.nixpkgs-stable { - inherit system; - config.permittedInsecurePackages = [ - "electron-27.3.11" - ]; - }; in nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs stable-pkgs user userFullname;}; + specialArgs = {inherit inputs user userFullname;}; inherit system; @@ -31,7 +25,7 @@ in useGlobalPkgs = true; useUserPackages = true; backupFileExtension = "bak"; - extraSpecialArgs = {inherit stable-pkgs;}; + extraSpecialArgs = {inherit inputs user;}; users.${user}.imports = home-modules ++ [ diff --git a/lib/nixvim.nix b/lib/nixvim.nix index 48ae658..e5cc8a4 100644 --- a/lib/nixvim.nix +++ b/lib/nixvim.nix @@ -10,6 +10,7 @@ ${cmd} end''; in { + performance.byteCompileLua.enable = true; colorschemes.base16 = { enable = true; colorscheme = "gruvbox-dark-hard"; @@ -50,17 +51,14 @@ in { highlight_command = { require("actions-preview.highlight").delta("${pkgs.delta}/bin/delta --no-gitconfig --side-by-side"), }, - telescope = { + telescope = { sorting_strategy = "ascending", - layout_strategy = "vertical", + layout_strategy = "horizontal", layout_config = { - width = 0.8, + width = 0.9, height = 0.9, prompt_position = "top", preview_cutoff = 20, - preview_height = function(_, _, max_lines) - return max_lines - 10 - end, }, }, } @@ -212,6 +210,16 @@ in { action = luaFunc "require('dapui').toggle()"; options.desc = "DAP UI Toggle"; } + { + key = "cd"; + action = "Trouble diagnostics toggle"; + options.desc = "toggle lsp diagnostics"; + } + { + key = "cs"; + action = "Trouble symbols toggle"; + options.desc = "toggle lsp symbols"; + } ]; autoCmd = [ @@ -239,6 +247,13 @@ in { vim.lsp.buf.format({async = false}) ''; } + { + event = "BufWritePre"; + pattern = "*.ts"; + callback = luaFunc '' + vim.lsp.buf.format() + ''; + } ]; plugins = { @@ -271,8 +286,12 @@ in { lsp = { enable = true; + inlayHints = true; servers = { ts_ls.enable = true; + eslint = { + enable = true; + }; nixd = { enable = true; settings = { @@ -291,6 +310,8 @@ in { "K" = "hover"; "cr" = "rename"; "" = "rename"; + "gd" = "definition"; + "gt" = "type_definition"; }; }; }; diff --git a/nixos/default.nix b/nixos/default.nix index 5dd3992..04cca58 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -30,10 +30,6 @@ in { }; networking.networkmanager.enable = true; - programs.nm-applet = { - enable = true; - indicator = true; - }; # fix nixos-containers networking.nat.enable = true; @@ -91,7 +87,6 @@ in { services.gvfs.enable = true; environment.systemPackages = with pkgs; [ - networkmanagerapplet tealdeer alsa-utils trash-cli diff --git a/nixos/programs/cosmic.nix b/nixos/programs/cosmic.nix index 3f1ccb9..6d3749e 100644 --- a/nixos/programs/cosmic.nix +++ b/nixos/programs/cosmic.nix @@ -3,18 +3,18 @@ config, ... }: { - imports = [ - inputs.nixos-cosmic.nixosModules.default - ]; - nix.settings = { - substituters = ["https://cosmic.cachix.org/"]; - trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="]; - }; + # imports = [ + # inputs.nixos-cosmic.nixosModules.default + # ]; + # nix.settings = { + # substituters = ["https://cosmic.cachix.org/"]; + # trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="]; + # }; services.desktopManager.cosmic.enable = true; services.displayManager.cosmic-greeter.enable = true; - services.system76-scheduler.enable = true; - home-manager.users.${config.user}.imports = [ - (inputs.hm-cosmic.homeManagerModules.cosmic) - ../../home/desktop/cosmic/. - ]; + # services.system76-scheduler.enable = true; + # home-manager.users.${config.user}.imports = [ + # (inputs.hm-cosmic.homeManagerModules.cosmic) + # ../../home/desktop/cosmic/. + # ]; } diff --git a/nixos/services/musnix.nix b/nixos/services/musnix.nix index 95cc14a..eeff1e2 100644 --- a/nixos/services/musnix.nix +++ b/nixos/services/musnix.nix @@ -1,4 +1,10 @@ -{ inputs, user, pkgs, lib, ... }: { +{ + inputs, + user, + pkgs, + lib, + ... +}: { imports = [inputs.musnix.nixosModules.musnix]; users.users.${user}.extraGroups = ["audio"]; musnix = { diff --git a/nixos/workstation.nix b/nixos/workstation.nix index a8da182..1d24a21 100644 --- a/nixos/workstation.nix +++ b/nixos/workstation.nix @@ -33,8 +33,7 @@ stylix = { enable = true; - image = ../images/nix-soft.png; - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; + image = "${pkgs.cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg"; polarity = "dark"; opacity = { terminal = 0.9; @@ -47,7 +46,6 @@ package = pkgs.vanilla-dmz; size = 24; }; - # autoEnable = true; targets = { qt.enable = true; grub = { @@ -70,4 +68,10 @@ home-manager.users.${config.user}.imports = [ ../home/workstation.nix ]; + + environment.systemPackages = [pkgs.networkmanagerapplet]; + programs.nm-applet = { + enable = true; + indicator = true; + }; }