diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index fcfdbc7..c16b826 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -356,8 +356,8 @@ colors: # - (macOS) /bin/bash --login # - (Linux/BSD) user login shell # - (Windows) powershell -shell: - program: fish +terminal.shell: + program: nu # args: # - --login diff --git a/flake.lock b/flake.lock index b2104b4..852965f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "advisory-db": { - "flake": false, - "locked": { - "lastModified": 1722017365, - "narHash": "sha256-9wYR5NZIgI+qzMDlJrUzevR31fvFQRgfjlYp50Xp3Ts=", - "owner": "rustsec", - "repo": "advisory-db", - "rev": "9d024c07ee8c18609b43436bc865abf46636e250", - "type": "github" - }, - "original": { - "owner": "rustsec", - "repo": "advisory-db", - "type": "github" - } - }, "ags": { "inputs": { "nixpkgs": [ @@ -24,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1725841979, - "narHash": "sha256-SXYqzpHPuXFR6w/cUKo3VN8XRn6XA2mGbdRXs9oLk6k=", + "lastModified": 1728326430, + "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=", "owner": "Aylur", "repo": "ags", - "rev": "aaef50bb2c80ef4b4a359329d72669a95e7c4796", + "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d", "type": "github" }, "original": { @@ -71,30 +55,14 @@ "type": "github" } }, - "base16-foot": { - "flake": false, - "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", - "owner": "tinted-theming", - "repo": "base16-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-foot", - "type": "github" - } - }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1720809814, - "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=", + "lastModified": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", "type": "github" }, "original": { @@ -103,38 +71,6 @@ "type": "github" } }, - "base16-kitty": { - "flake": false, - "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", - "owner": "kdrag0n", - "repo": "base16-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", - "type": "github" - }, - "original": { - "owner": "kdrag0n", - "repo": "base16-kitty", - "type": "github" - } - }, - "base16-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "base16-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-tmux", - "type": "github" - } - }, "base16-vim": { "flake": false, "locked": { @@ -167,27 +103,6 @@ "type": "gitlab" } }, - "crane": { - "inputs": { - "nixpkgs": [ - "radicle", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722907532, - "narHash": "sha256-i/j/dMZPR7uJoQPFTa6UCahLu8kMtozYuR83lIKMERM=", - "owner": "ipetkov", - "repo": "crane", - "rev": "d0c8f4ed8571c533b31c1d68e4ebc534b790cc5c", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "emacs": { "inputs": { "flake-utils": "flake-utils", @@ -197,11 +112,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1726046165, - "narHash": "sha256-ZppVrHiVnntCJsyjdfxEJKj8WAMrhQONj2iekFnMhpU=", + "lastModified": 1730193338, + "narHash": "sha256-DcZMhdIsi2FbHSUy5w1NpcYlOmLo2i8t2WvjboFfe7s=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "12e602219fc2ca3ca0f9a0fc9a7701853b7e3998", + "rev": "ccdc04185c596b78387aeabee053aad7e62060c4", "type": "github" }, "original": { @@ -219,11 +134,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1725366879, - "narHash": "sha256-q82u3/pcP5T++TMdDmaeDKYuCyky1Bo5BjHY1/NVHbY=", + "lastModified": 1728712190, + "narHash": "sha256-GxbKoS2TQNMeD4dbZn1IU+/BOiYGeVALHVAbZnFc3UU=", "owner": "elkowar", "repo": "eww", - "rev": "8661abf2bf07f5a809fc995233d93810cc1ac871", + "rev": "50ec181fc7ff2a68d6330e8897de2c5179575935", "type": "github" }, "original": { @@ -258,22 +173,38 @@ } }, "flake-compat": { - "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1709944340, + "narHash": "sha256-xr54XK0SjczlUxRo5YwodibUSlpivS9bqHt8BNyWVQA=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "baa7aa7bd0a570b3b9edd0b8da859fee3ffaa4d4", "type": "github" }, "original": { "owner": "edolstra", + "ref": "refs/pull/65/head", "repo": "flake-compat", "type": "github" } }, "flake-compat_2": { + "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_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -308,11 +239,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -326,11 +257,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -340,42 +271,6 @@ } }, "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { "inputs": { "systems": [ "stylix", @@ -436,11 +331,11 @@ ] }, "locked": { - "lastModified": 1726036828, - "narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a1671642826633586d12ac3158e463c7a50a112", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -471,57 +366,19 @@ "type": "github" } }, - "libre-presenter": { - "inputs": { - "flake-utils": "flake-utils_2", - "naersk": "naersk", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1721242107, - "narHash": "sha256-HZAEP6wfXYInAlb7oCoN9Mjoqyok08JySnLPaWR9DQU=", - "owner": "chriscochrun", - "repo": "lumina", - "rev": "bf9f65fade0b6bd6189e9afec15b706d9253e002", - "type": "gitlab" - }, - "original": { - "owner": "chriscochrun", - "repo": "lumina", - "type": "gitlab" - } - }, - "naersk": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1698420672, - "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=", - "owner": "nix-community", - "repo": "naersk", - "rev": "aeb58d5e8faead8980a807c840232697982d47b9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, "nix-bitcoin": { "inputs": { "extra-container": "extra-container", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1724684170, - "narHash": "sha256-4O04EoHn87zIpiogIRXSgkqRyOs7ygIAIO9dhjhpmGI=", + "lastModified": 1727247704, + "narHash": "sha256-Jl1CYXNIdJ4Ac0MK15e8+vflFOgPxZZNw24CKfLC6QY=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "31b79391cf96b64c3982038c8284e04345429dbd", + "rev": "a0d36d59248ac54f1b42a668326346a77640c7f5", "type": "github" }, "original": { @@ -531,13 +388,36 @@ "type": "github" } }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1730165759, + "narHash": "sha256-M1aa3NdhbILywC4jwPxrVlbgJPpJ+o8J/CWr0mJ1xIk=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "7d49f5a4e11b902c57072da56ea1e2229a602d53", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1725885300, - "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", + "lastModified": 1730161780, + "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", + "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8", "type": "github" }, "original": { @@ -549,14 +429,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 0, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", - "path": "/nix/store/j10523yhkcc34478azkgcl70yzcx6j2j-source", - "type": "path" + "lastModified": 1726969270, + "narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-22_11": { @@ -576,11 +460,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1725826545, - "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -591,6 +475,22 @@ } }, "nixpkgs-stable_2": { + "locked": { + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { "locked": { "lastModified": 1720535198, "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", @@ -608,11 +508,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1724395761, - "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", + "lastModified": 1726871744, + "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c", + "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", "type": "github" }, "original": { @@ -624,11 +524,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -639,38 +539,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1725983898, - "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1717952948, "narHash": "sha256-mJi4/gjiwQlSaxjA6AusXBN/6rQRaPCycR7bd8fydnQ=", @@ -684,7 +552,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A.tar.gz" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1669542132, "narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=", @@ -709,11 +577,11 @@ ] }, "locked": { - "lastModified": 1725914634, - "narHash": "sha256-U74hu15xSb6JNySMOwyJrsh4uk1DVa182bdHLeHdYMc=", + "lastModified": 1729710171, + "narHash": "sha256-2sVt2hbL+G0FzEESm/EZBewPOmNtZ6MTnYhsvHJW6Rs=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "60becd0e994e25b372c8d0500fc944396f6c1085", + "rev": "247a8e677b51f053ca89dcf67059e24f85e47391", "type": "github" }, "original": { @@ -725,7 +593,7 @@ "quickemu": { "inputs": { "flake-schemas": "flake-schemas", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1720106666, @@ -740,45 +608,19 @@ "url": "https://flakehub.com/f/quickemu-project/quickemu/4.9.6.tar.gz" } }, - "radicle": { - "inputs": { - "advisory-db": "advisory-db", - "crane": "crane", - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1725360130, - "narHash": "sha256-sb0GroWfZWC9YCGby88eiPnhFCdDA9EUhVpoyuAA+Mk=", - "ref": "refs/heads/master", - "rev": "d39ba83cfc7c7685548d18652fef039e25b19276", - "revCount": 2100, - "type": "git", - "url": "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git" - }, - "original": { - "type": "git", - "url": "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git" - } - }, "root": { "inputs": { "ags": "ags", "emacs": "emacs", "eww": "eww", "home-manager": "home-manager", - "libre-presenter": "libre-presenter", "nix-bitcoin": "nix-bitcoin", + "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable_3", "plasma-manager": "plasma-manager", "quickemu": "quickemu", - "radicle": "radicle", - "rust-overlay": "rust-overlay_3", "simple-nixos-mailserver": "simple-nixos-mailserver", "stylix": "stylix" } @@ -791,11 +633,11 @@ ] }, "locked": { - "lastModified": 1723688259, - "narHash": "sha256-WzeUR1MG9MnJnh9T7qcVe/v12qHvJvzdc3Z5HCeE2ns=", + "lastModified": 1725675754, + "narHash": "sha256-hXW3csqePOcF2e/PYnpXj72KEYyNj2HzTrVNmS/F7Ug=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6e75319846684326d900daff1e2e11338cc80d2b", + "rev": "8cc45e678e914a16c8e224c3237fb07cf21e5e54", "type": "github" }, "original": { @@ -807,36 +649,16 @@ "rust-overlay_2": { "inputs": { "nixpkgs": [ - "radicle", + "nixos-cosmic", "nixpkgs" ] }, "locked": { - "lastModified": 1722910815, - "narHash": "sha256-v6Vk/xlABhw2QzOa6xh3Jx/IvmlbKbOazFM+bDFQlWU=", + "lastModified": 1730082698, + "narHash": "sha256-xGP95+G2/esys6FpxrunwwfhirfGsFfPKBJ12MLV1Ps=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7df2ac544c203d21b63aac23bfaec7f9b919a733", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726021481, - "narHash": "sha256-4J4E+Fh+77XIYnq2RVtg+ENWXpu6t74P0jKN/f2RQmI=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "1c2c120246c51a644c20ba2a36a33d3bd4860d70", + "rev": "0d594a39c8f08d81246d06a56e1ccfc04782404f", "type": "github" }, "original": { @@ -848,7 +670,7 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_4", "nixpkgs-22_11": "nixpkgs-22_11", "utils": "utils" }, @@ -871,26 +693,26 @@ "inputs": { "base16": "base16", "base16-fish": "base16-fish", - "base16-foot": "base16-foot", "base16-helix": "base16-helix", - "base16-kitty": "base16-kitty", - "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_5", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6" + "systems": "systems_4", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1725290973, - "narHash": "sha256-+jwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo=", + "lastModified": 1729963473, + "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=", "owner": "danth", "repo": "stylix", - "rev": "ef81ad9e85e60420cc83d4642619c14b57139d33", + "rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b", "type": "github" }, "original": { @@ -959,33 +781,52 @@ "type": "github" } }, - "systems_5": { + "tinted-foot": { + "flake": false, "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", + "owner": "tinted-theming", + "repo": "tinted-foot", "type": "github" } }, - "systems_6": { + "tinted-kitty": { + "flake": false, "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 7409f57..2a4789b 100644 --- a/flake.nix +++ b/flake.nix @@ -21,21 +21,11 @@ quickemu = { url = "https://flakehub.com/f/quickemu-project/quickemu/4.9.6.tar.gz"; }; - # hyprland = { + # radicle = { # type = "git"; - # url = "https://github.com/hyprwm/Hyprland"; - # submodules = true; - # inputs.nixpkgs.follows = "nixpkgs-stable"; + # url = "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"; + # inputs.nixpkgs.follows = "nixpkgs"; # }; - # hyprland-plugins = { - # url = "github:hyprwm/hyprland-plugins"; - # inputs.hyprland.follows = "hyprland"; - # }; - radicle = { - type = "git"; - url = "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"; - inputs.nixpkgs.follows = "nixpkgs"; - }; eww = { url = "github:elkowar/eww"; inputs.nixpkgs.follows = "nixpkgs"; @@ -54,38 +44,28 @@ simple-nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.11"; }; - # anyrun = { - # url = "github:Kirottu/anyrun"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; - libre-presenter = { - url = "gitlab:chriscochrun/lumina"; - }; - # nixified-ai = { - # url = "github:nixified-ai/flake"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; - rust-overlay = { - url = "github:oxalica/rust-overlay"; + nixos-cosmic = { + url = "github:lilyinstarlight/nixos-cosmic"; inputs.nixpkgs.follows = "nixpkgs"; }; + # rust-overlay = { + # url = "github:oxalica/rust-overlay"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; }; - outputs = { nixpkgs, + outputs = inputs @ { nixpkgs, nixpkgs-stable, home-manager, plasma-manager, - # hyprland, + nixos-cosmic, quickemu, nixos-hardware, emacs, nix-bitcoin, - libre-presenter, eww, ags, - stylix, - radicle, - rust-overlay, ... }: + stylix, ... }: let system = "x86_64-linux"; username = "chris"; @@ -99,7 +79,7 @@ config = { allowUnfree = true; }; overlays = [ emacs.overlays.default - rust-overlay.overlays.default + # rust-overlay.overlays.default eww.overlays.default ]; }; @@ -107,23 +87,24 @@ lib = nixpkgs.lib; in { - devShell = pkgsForSystem.mkShell { - name = "devy"; - nativeBuildInputs = []; - buildInputs = with pkgsForSystem; [ - cargo - rustc - clippy - rustfmt - rust-analyzer - ]; - }; + # devShell = pkgsForSystem.mkShell { + # name = "devy"; + # nativeBuildInputs = []; + # buildInputs = with pkgsForSystem; [ + # cargo + # rustc + # clippy + # rustfmt + # rust-analyzer + # ]; + # }; nixosConfigurations = { syl = lib.nixosSystem { inherit system; pkgs = pkgsForSystem; specialArgs = { stable = stable; + inherit inputs; }; modules = [ ./systems/syl/configuration.nix @@ -131,6 +112,7 @@ # hyprland.nixosModules.default # stylix.nixosModules.stylix nixos-hardware.nixosModules.framework-11th-gen-intel + nixos-cosmic.nixosModules.default # libre-presenter.defaultPackage { home-manager.useGlobalPkgs = true; @@ -144,12 +126,13 @@ kaladin = lib.nixosSystem { inherit system; pkgs = pkgsForSystem; - + specialArgs = { inherit inputs; }; modules = [ ./systems/kaladin/configuration.nix home-manager.nixosModules.home-manager # hyprland.nixosModules.default # stylix.nixosModules.stylix + nixos-cosmic.nixosModules.default nixos-hardware.nixosModules.common-gpu-amd { home-manager.useGlobalPkgs = true; diff --git a/home/home.nix b/home/home.nix index 760eea3..51339fe 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1147,7 +1147,7 @@ end padding.y = 10; dynamic_padding = true; }; - shell.program = "nu"; + terminal.shell.program = "nu"; font = { normal = { family = "VictorMono Nerd Font"; diff --git a/modules/base.nix b/modules/base.nix index 0723a53..2d70014 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ pkgs, lib, config, inputs, ... }: with lib; { @@ -14,6 +14,7 @@ with lib; settings = { auto-optimise-store = true; }; + nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; }; # nixpkgs.config.allowUnFree = true; # pkgs.config.allowUnfree = true; diff --git a/modules/cachix/nix-community.nix b/modules/cachix/nix-community.nix index 7fc4c65..d9d227b 100644 --- a/modules/cachix/nix-community.nix +++ b/modules/cachix/nix-community.nix @@ -4,9 +4,11 @@ settings = { substituters = [ "https://nix-community.cachix.org" + "https://cosmic.cachix.org/" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; }; }; diff --git a/modules/desktop.nix b/modules/desktop.nix index c906687..d38dedb 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -1,24 +1,23 @@ { pkgs, lib, config, stable, ... }: -with lib; { # nix = { # package = pkgs.nixVersions.git; # }; - # This adds hyprland cache to cachix and relaxes sandbox nix.settings = { - substituters = ["https://hyprland.cachix.org"]; - trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + substituters = [ "https://hyprland.cachix.org" ]; + trusted-public-keys = + [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; sandbox = "relaxed"; }; - + # Use the systemd-boot EFI boot loader. boot = { kernelPackages = pkgs.linuxPackages_zen; - kernelParams = [ "mem_sleep_default=deep" "nvme.noacpi=1"]; + kernelParams = [ "mem_sleep_default=deep" "nvme.noacpi=1" ]; # initrd.kernelModules = [ "amdgpu" ]; }; @@ -72,24 +71,22 @@ with lib; # }; fonts.packages = with pkgs; [ - nerdfonts - noto-fonts - noto-fonts-cjk - noto-fonts-emoji - liberation_ttf - mplus-outline-fonts.githubRelease - dina-font - proggyfonts - ]; + nerdfonts + noto-fonts + noto-fonts-cjk-sans + noto-fonts-emoji + liberation_ttf + mplus-outline-fonts.githubRelease + dina-font + proggyfonts + ]; - hardware = { - keyboard.qmk.enable = true; - }; + hardware = { keyboard.qmk.enable = true; }; security.pam.services = { # sddm.enableKwallet = true; greetd.enableKwallet = true; - swaylock = {}; + swaylock = { }; }; # services.displayManager.sddm = { @@ -107,7 +104,8 @@ with lib; user = "chris"; }; default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'dbus-run-session Hyprland' -s /etc/greetd/environments"; + command = + "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'dbus-run-session Hyprland' -s /etc/greetd/environments"; user = "greeter"; }; plasma_session = { @@ -121,9 +119,7 @@ with lib; }; }; - programs.regreet = { - enable = true; - }; + programs.regreet = { enable = true; }; environment.etc."greetd/environments".text = '' hyprland @@ -153,6 +149,9 @@ with lib; extraPortals = [ pkgs.xdg-desktop-portal-kde ]; }; + # programs.cosmic = { + # }; + programs.hyprland = { enable = true; xwayland.enable = true; @@ -182,33 +181,33 @@ with lib; programs.dconf.enable = true; environment.variables = { - EDITOR = "emacsclient -t -a"; - VISUAL = "emacsclient -c -a"; - QT_LOGGING_RULES = "js=true; kwin_*.debug=true"; - # GTK_USE_PORTAL = "1"; - # Fixing Qt apps in other environments - # Thought I needed this but apparently they are working fine without it. - # QT_XCB_GL_INTEGRATION = "xcb_egl"; - # QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.qt5.qtbase.bin}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms"; - NIXOS_OZONE_WL = "1"; - _JAVA_AWT_WM_NONEREPARENTING = "1"; - # DISABLE_QT5_COMPAT = "0"; - GDK_BACKEND = "wayland"; - ANKI_WAYLAND = "1"; - WLR_DRM_NO_ATOMIC = "1"; - QT_AUTO_SCREEN_SCALE_FACTOR = "1"; - QT_QPA_PLATFORM = "wayland"; - # QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; - # QT_QPA_PLATFORMTHEME = "qt5ct"; - MOZ_ENABLE_WAYLAND = "1"; - MOZ_DBUS_REMOTE = "1"; - WLR_BACKEND = "vulkan"; - WLR_RENDERER = "vulkan"; - XDG_SESSION_TYPE = "wayland"; - # Remember that this causes issues in some games use "unset SDL_VIDEODRIVER &&" - SDL_VIDEODRIVER = "wayland"; - CLUTTER_BACKEND = "wayland"; - WLR_NO_HARDWARE_CURSORS = "1"; + EDITOR = "emacsclient -t -a"; + VISUAL = "emacsclient -c -a"; + QT_LOGGING_RULES = "js=true; kwin_*.debug=true"; + # GTK_USE_PORTAL = "1"; + # Fixing Qt apps in other environments + # Thought I needed this but apparently they are working fine without it. + # QT_XCB_GL_INTEGRATION = "xcb_egl"; + # QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.qt5.qtbase.bin}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms"; + NIXOS_OZONE_WL = "1"; + _JAVA_AWT_WM_NONEREPARENTING = "1"; + # DISABLE_QT5_COMPAT = "0"; + GDK_BACKEND = "wayland"; + ANKI_WAYLAND = "1"; + WLR_DRM_NO_ATOMIC = "1"; + QT_AUTO_SCREEN_SCALE_FACTOR = "1"; + QT_QPA_PLATFORM = "wayland"; + # QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + # QT_QPA_PLATFORMTHEME = "qt5ct"; + MOZ_ENABLE_WAYLAND = "1"; + MOZ_DBUS_REMOTE = "1"; + WLR_BACKEND = "vulkan"; + WLR_RENDERER = "vulkan"; + XDG_SESSION_TYPE = "wayland"; + # Remember that this causes issues in some games use "unset SDL_VIDEODRIVER &&" + SDL_VIDEODRIVER = "wayland"; + CLUTTER_BACKEND = "wayland"; + WLR_NO_HARDWARE_CURSORS = "1"; }; programs.partition-manager.enable = true; @@ -223,7 +222,8 @@ with lib; # Enable CUPS to print documents. services.printing.enable = true; - services.printing.drivers = [ pkgs.gutenprint pkgs.gutenprintBin pkgs.cnijfilter2 ]; + services.printing.drivers = + [ pkgs.gutenprint pkgs.gutenprintBin pkgs.cnijfilter2 ]; services.usbmuxd.enable = true; services.fstrim.enable = true; @@ -291,7 +291,5 @@ with lib; programs.adb.enable = true; services.udev.packages = [ pkgs.android-udev-rules ]; - services.esphome = { - enable = true; - }; + services.esphome = { enable = true; }; } diff --git a/modules/emacs.nix b/modules/emacs.nix index 7807718..ae483ab 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -1,183 +1,184 @@ { pkgs, lib, config, ... }: -with lib; + { services.emacs = { enable = true; - package = with pkgs; ((emacsPackagesFor pkgs.emacs-pgtk).emacsWithPackages - (epkgs: with epkgs; [ - vterm - melpaPackages.magit - pdf-tools - consult-eglot - org - bluetooth - melpaPackages.org-roam - melpaPackages.org-ql - melpaPackages.dired-sidebar - melpaPackages.lab - posframe - vertico-posframe - chatgpt-shell - denote - nushell-ts-mode - nushell-mode - hydra - pretty-hydra - # geiser-guile - # flymake-guile - # flycheck-guile - denote-refs - command-log-mode - all-the-icons - doom-modeline - doom-themes - ligature - rec-mode - melpaPackages.mini-echo - llm - rainbow-delimiters - smartparens - paredit - aggressive-indent - adaptive-wrap - which-key - exec-path-from-shell - no-littering - languagetool - rustic - melpaPackages.slint-mode - flycheck-clj-kondo - clojure-mode - cider - melpaPackages.evil - melpaPackages.evil-collection - melpaPackages.ellama - general - evil-escape - evil-surround - evil-org - org-super-agenda - websocket - org-roam-ui - org-present - org-modern - # (org-re-reveal.overrideAttrs (o: { - # src = pkgs.fetchgit { - # url = "https://gitlab.com/oer/org-re-reveal"; - # rev = "7c39d15b841c7a8d197a24c89e5fef5d54e271aa"; - # sha256 = "/1eXxIY8SqLLC10ekGs7G3o7U7MIA01mtsl2C6lo7us="; - # }; - # })) - # org-re-reveal - melpaPackages.org-re-reveal - # melpaPackages.org-re-reveal-ref - # melpaPackages.org-re-reveal-citeproc - org-web-tools - org-transclusion - # ox-reveal - ox-hugo - # oer-reveal - unicode-fonts - emojify - undo-tree - visual-fill-column - toc-org - pulsar - vertico - melpaPackages.consult - melpaPackages.marginalia - all-the-icons-completion - melpaPackages.embark - melpaPackages.embark-consult - corfu - jinx - eat - kind-icon - melpaPackages.orderless - melpaPackages.cape - devdocs - nano-theme - nano-modeline - nano-agenda - yasnippet - wgrep - tempel - tempel-collection - eglot-tempel - projectile - simple-httpd - avy - evil-avy - ace-link - ace-window - helpful - format-all - web-mode - php-mode - lua-mode - nix-mode - nix-update - cmake-mode - fennel-mode - yaml-mode - typescript-mode - docker - # docker-tramp - fish-mode - markdown-mode - qml-mode - csv-mode - restclient - ob-restclient - dart-mode - flutter - hover - direnv - all-the-icons-dired - dired-single - dired-rainbow - diredfl - dired-rsync - fd-dired - ledger-mode - org-msg - calfw - calfw-org - calfw-ical - org-caldav - org-wild-notifier - sly - nov - elfeed - elfeed-org - elfeed-protocol - bongo - empv - emms - transmission - hass - pass - password-store - password-store-otp - plz - elpaPackages.ement - mastodon - qrencode - just-mode - justl - gcmh - mu4e - use-package - esh-autosuggest - eshell-syntax-highlighting - melpaPackages.org-ai - melpaPackages.gptel - pkgs.ispell - pkgs.mu - pkgs.openjdk - pkgs.languagetool - pkgs.emacs-all-the-icons-fonts - ])); + package = with pkgs; + ((emacsPackagesFor pkgs.emacs-pgtk).emacsWithPackages (epkgs: + with epkgs; [ + vterm + melpaPackages.magit + pdf-tools + consult-eglot + org + bluetooth + melpaPackages.org-roam + melpaPackages.org-ql + melpaPackages.dired-sidebar + melpaPackages.lab + posframe + vertico-posframe + chatgpt-shell + denote + nushell-ts-mode + nushell-mode + hydra + pretty-hydra + # geiser-guile + # flymake-guile + # flycheck-guile + denote-refs + command-log-mode + all-the-icons + doom-modeline + doom-themes + ligature + rec-mode + melpaPackages.mini-echo + llm + rainbow-delimiters + smartparens + paredit + aggressive-indent + adaptive-wrap + which-key + exec-path-from-shell + no-littering + languagetool + rustic + melpaPackages.slint-mode + flycheck-clj-kondo + clojure-mode + cider + melpaPackages.evil + melpaPackages.evil-collection + melpaPackages.ellama + general + evil-escape + evil-surround + evil-org + org-super-agenda + websocket + org-roam-ui + org-present + org-modern + # (org-re-reveal.overrideAttrs (o: { + # src = pkgs.fetchgit { + # url = "https://gitlab.com/oer/org-re-reveal"; + # rev = "7c39d15b841c7a8d197a24c89e5fef5d54e271aa"; + # sha256 = "/1eXxIY8SqLLC10ekGs7G3o7U7MIA01mtsl2C6lo7us="; + # }; + # })) + # org-re-reveal + melpaPackages.org-re-reveal + # melpaPackages.org-re-reveal-ref + # melpaPackages.org-re-reveal-citeproc + org-web-tools + org-transclusion + # ox-reveal + ox-hugo + # oer-reveal + unicode-fonts + emojify + undo-tree + visual-fill-column + toc-org + pulsar + vertico + melpaPackages.consult + melpaPackages.marginalia + all-the-icons-completion + melpaPackages.embark + melpaPackages.embark-consult + corfu + jinx + eat + kind-icon + melpaPackages.orderless + melpaPackages.cape + devdocs + nano-theme + nano-modeline + nano-agenda + yasnippet + wgrep + tempel + tempel-collection + eglot-tempel + projectile + simple-httpd + avy + evil-avy + ace-link + ace-window + helpful + format-all + web-mode + php-mode + lua-mode + nix-mode + nix-update + cmake-mode + fennel-mode + yaml-mode + typescript-mode + # docker + # docker-tramp + fish-mode + markdown-mode + qml-mode + csv-mode + restclient + ob-restclient + dart-mode + flutter + hover + direnv + all-the-icons-dired + dired-single + dired-rainbow + diredfl + dired-rsync + fd-dired + ledger-mode + org-msg + calfw + calfw-org + calfw-ical + org-caldav + org-wild-notifier + sly + nov + elfeed + elfeed-org + elfeed-protocol + bongo + empv + emms + transmission + hass + pass + password-store + password-store-otp + plz + elpaPackages.ement + mastodon + qrencode + just-mode + justl + gcmh + mu4e + use-package + esh-autosuggest + eshell-syntax-highlighting + melpaPackages.org-ai + melpaPackages.gptel + pkgs.ispell + pkgs.mu + pkgs.openjdk + pkgs.languagetool + pkgs.emacs-all-the-icons-fonts + ])); defaultEditor = true; }; } diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 846bb33..60fc0c7 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -20,6 +20,7 @@ with lib; ifuse dash dolphin + vivaldi # guix # freecad # picard @@ -62,9 +63,11 @@ with lib; # wofi waybar tridactyl-native - eww + # eww scc tokei + nixd + nixfmt wlrctl wl-clipboard hyprpaper diff --git a/systems/syl/configuration.nix b/systems/syl/configuration.nix index a84188a..141a85f 100644 --- a/systems/syl/configuration.nix +++ b/systems/syl/configuration.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, callPackage, ... }: +{ lib, config, pkgs, callPackage, inputs, ... }: { imports =