Compare commits
No commits in common. "6364d8afa0902e0c7939eea139a6385db6fbe05a" and "4fed3712b00ba05d04320fd1b597ba12324a1014" have entirely different histories.
6364d8afa0
...
4fed3712b0
305
flake.lock
305
flake.lock
|
|
@ -67,14 +67,35 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"devshell": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixvim",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1735644329,
|
||||||
|
"narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "devshell",
|
||||||
|
"rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "devshell",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"firefox-gnome-theme": {
|
"firefox-gnome-theme": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741628778,
|
"lastModified": 1736899990,
|
||||||
"narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=",
|
"narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=",
|
||||||
"owner": "rafaelmardojai",
|
"owner": "rafaelmardojai",
|
||||||
"repo": "firefox-gnome-theme",
|
"repo": "firefox-gnome-theme",
|
||||||
"rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80",
|
"rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -116,6 +137,21 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_3": {
|
"flake-compat_3": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1733328505,
|
||||||
|
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||||
|
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
||||||
|
"revCount": 69,
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-compat_4": {
|
||||||
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733328505,
|
"lastModified": 1733328505,
|
||||||
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||||
|
|
@ -138,11 +174,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741352980,
|
"lastModified": 1738453229,
|
||||||
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
|
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
|
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -172,28 +208,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-parts_3": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": [
|
|
||||||
"stylix",
|
|
||||||
"nur",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1733312601,
|
|
||||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
|
|
@ -270,21 +284,47 @@
|
||||||
"git-hooks": {
|
"git-hooks": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": [
|
"flake-compat": [
|
||||||
"stylix",
|
"nixvim",
|
||||||
"flake-compat"
|
"flake-compat"
|
||||||
],
|
],
|
||||||
"gitignore": "gitignore",
|
"gitignore": "gitignore",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixvim",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1737465171,
|
||||||
|
"narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
|
||||||
|
"owner": "cachix",
|
||||||
|
"repo": "git-hooks.nix",
|
||||||
|
"rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "cachix",
|
||||||
|
"repo": "git-hooks.nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"git-hooks_2": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": [
|
||||||
|
"stylix",
|
||||||
|
"flake-compat"
|
||||||
|
],
|
||||||
|
"gitignore": "gitignore_2",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"stylix",
|
"stylix",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741379162,
|
"lastModified": 1735882644,
|
||||||
"narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
|
"narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
|
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -294,6 +334,28 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"gitignore": {
|
"gitignore": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixvim",
|
||||||
|
"git-hooks",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1709087332,
|
||||||
|
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "gitignore.nix",
|
||||||
|
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "gitignore.nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"gitignore_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"stylix",
|
"stylix",
|
||||||
|
|
@ -339,11 +401,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742701794,
|
"lastModified": 1739790043,
|
||||||
"narHash": "sha256-bJIFFa6/4vBGoNmCwjO5TCIbiveV2BRxVLqHcxk5jXw=",
|
"narHash": "sha256-4gK4zdNDQ4PyGFs7B6zp9iPIBy9E+bVJiZ0XAmncvgQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "9172a6f956f7e0f7810861b9b1146f1c43d9abcb",
|
"rev": "c1ea92cdfb85bd7b0995b550581d9fd1c3370bf9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -353,6 +415,27 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager_2": {
|
"home-manager_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixvim",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1738878603,
|
||||||
|
"narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"rev": "433799271274c9f2ab520a49527ebfe2992dcfbd",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"home-manager_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"stylix",
|
"stylix",
|
||||||
|
|
@ -360,11 +443,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741635347,
|
"lastModified": 1737630279,
|
||||||
"narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=",
|
"narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "7fb8678716c158642ac42f9ff7a18c0800fea551",
|
"rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -401,6 +484,27 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nix-darwin": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixvim",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1738743987,
|
||||||
|
"narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=",
|
||||||
|
"owner": "lnl7",
|
||||||
|
"repo": "nix-darwin",
|
||||||
|
"rev": "ae406c04577ff9a64087018c79b4fdc02468c87c",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "lnl7",
|
||||||
|
"repo": "nix-darwin",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nix-matlab": {
|
"nix-matlab": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
|
|
@ -409,11 +513,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742655717,
|
"lastModified": 1739718118,
|
||||||
"narHash": "sha256-p1815USOcTj+kPSw2XkK8eWG19NZXpCST9vYDVnQ144=",
|
"narHash": "sha256-ZRO+3o8g3gjgA0gIfp08ygy++IhQsmfU7afxnJwEV6o=",
|
||||||
"owner": "doronbehar",
|
"owner": "doronbehar",
|
||||||
"repo": "nix-matlab",
|
"repo": "nix-matlab",
|
||||||
"rev": "ddc7d6354cf54880c6d0748fdf7ad370a748f562",
|
"rev": "b0a43e3c5cac996d646596a338e38632936d96bc",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -429,11 +533,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742641703,
|
"lastModified": 1740267801,
|
||||||
"narHash": "sha256-hoN8blvJco8OSZmPj8izwQaQUdydVi+5FO4/nWd1MNU=",
|
"narHash": "sha256-ckbjP4UON7juVdSsYDpu9vFGRtdS2JvUDRHKq0SQwuA=",
|
||||||
"owner": "lilyinstarlight",
|
"owner": "lilyinstarlight",
|
||||||
"repo": "nixos-cosmic",
|
"repo": "nixos-cosmic",
|
||||||
"rev": "216557e6cd229dbe7d73a497c227824a3c579cd7",
|
"rev": "80952def5b97be37f69a9774163911b47980623a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -444,11 +548,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742422364,
|
"lastModified": 1739866667,
|
||||||
"narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
|
"narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
|
"rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -460,11 +564,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742512142,
|
"lastModified": 1739923778,
|
||||||
"narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=",
|
"narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "7105ae3957700a9646cc4b766f5815b23ed0c682",
|
"rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -476,11 +580,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742606399,
|
"lastModified": 1739698114,
|
||||||
"narHash": "sha256-NAxwF5cjgh8o5aylhePXWNQETCWYaTpNvdO2bMfINpQ=",
|
"narHash": "sha256-8S9n69Dnpg8DhfFlP0YvMGmSOY2X4kImGSPWXYNpaHM=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0740f6f238767d4caf9afe774d3e88105766dfc6",
|
"rev": "b1b43d32be000928cc71250ed77f4a0a5f2bc23a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -492,11 +596,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742578646,
|
"lastModified": 1738797219,
|
||||||
"narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=",
|
"narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "94c4dbe77c0740ebba36c173672ca15a7926c993",
|
"rev": "1da52dd49a127ad74486b135898da2cef8c62665",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -508,11 +612,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741513245,
|
"lastModified": 1736798957,
|
||||||
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
|
"narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
|
"rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -524,16 +628,22 @@
|
||||||
},
|
},
|
||||||
"nixvim": {
|
"nixvim": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"devshell": "devshell",
|
||||||
|
"flake-compat": "flake-compat_3",
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
|
"git-hooks": "git-hooks",
|
||||||
|
"home-manager": "home-manager_2",
|
||||||
|
"nix-darwin": "nix-darwin",
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": "nixpkgs_3",
|
||||||
"nuschtosSearch": "nuschtosSearch"
|
"nuschtosSearch": "nuschtosSearch",
|
||||||
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742645604,
|
"lastModified": 1739751913,
|
||||||
"narHash": "sha256-4LB/Gx1p/ml79xZfgTvOYvMXXnj5vrFfDYcWIndgXP0=",
|
"narHash": "sha256-H72wNdLOl9CzfimXjDdKWnV0Mr8lpVF4m3HZ2m+fuck=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "3d84c137eab329ec1a6d4c4b0a067bfa8eea0bb5",
|
"rev": "3a66c8a33001d8bd79388c6b15eb1039f43f4192",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -548,37 +658,14 @@
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"treefmt-nix": "treefmt-nix"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1742725572,
|
|
||||||
"narHash": "sha256-Lu1kVuH7MzOrCqR4K7XiXd5B8iCTSFzWQW/QfmHnoeI=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "NUR",
|
|
||||||
"rev": "ddb77c54f257566ff34a0ba8c758a7b3cc0d76bf",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "NUR",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nur_2": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-parts": "flake-parts_3",
|
|
||||||
"nixpkgs": [
|
|
||||||
"stylix",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"treefmt-nix": "treefmt-nix_2"
|
"treefmt-nix": "treefmt-nix_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741693509,
|
"lastModified": 1739792859,
|
||||||
"narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=",
|
"narHash": "sha256-Em/PKyBgW5xWjEE7u2P+aAeH3TrQpPyHJdYY5zHvv64=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "5479646b2574837f1899da78bdf9a48b75a9fb27",
|
"rev": "2320814fdba2500856c915569f39cc90ea562685",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -597,11 +684,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741886583,
|
"lastModified": 1738508923,
|
||||||
"narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=",
|
"narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"repo": "search",
|
"repo": "search",
|
||||||
"rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467",
|
"rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -629,13 +716,12 @@
|
||||||
"base16-helix": "base16-helix",
|
"base16-helix": "base16-helix",
|
||||||
"base16-vim": "base16-vim",
|
"base16-vim": "base16-vim",
|
||||||
"firefox-gnome-theme": "firefox-gnome-theme",
|
"firefox-gnome-theme": "firefox-gnome-theme",
|
||||||
"flake-compat": "flake-compat_3",
|
"flake-compat": "flake-compat_4",
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_3",
|
||||||
"git-hooks": "git-hooks",
|
"git-hooks": "git-hooks_2",
|
||||||
"gnome-shell": "gnome-shell",
|
"gnome-shell": "gnome-shell",
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_3",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_4",
|
||||||
"nur": "nur_2",
|
|
||||||
"systems": "systems_3",
|
"systems": "systems_3",
|
||||||
"tinted-foot": "tinted-foot",
|
"tinted-foot": "tinted-foot",
|
||||||
"tinted-kitty": "tinted-kitty",
|
"tinted-kitty": "tinted-kitty",
|
||||||
|
|
@ -644,11 +730,11 @@
|
||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742591463,
|
"lastModified": 1739375014,
|
||||||
"narHash": "sha256-CguaHULcm4RuIGN+i4u80dYZujFgZaeOTiShFxCwFhw=",
|
"narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "113643f332e1f70d90991722f8c4e5a0ace6fd06",
|
"rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -739,11 +825,11 @@
|
||||||
"tinted-schemes": {
|
"tinted-schemes": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741468895,
|
"lastModified": 1737565458,
|
||||||
"narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=",
|
"narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "schemes",
|
"repo": "schemes",
|
||||||
"rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991",
|
"rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -755,11 +841,11 @@
|
||||||
"tinted-tmux": {
|
"tinted-tmux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740877430,
|
"lastModified": 1735737224,
|
||||||
"narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=",
|
"narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "tinted-tmux",
|
"repo": "tinted-tmux",
|
||||||
"rev": "d48ee86394cbe45b112ba23ab63e33656090edb4",
|
"rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -787,16 +873,16 @@
|
||||||
"treefmt-nix": {
|
"treefmt-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nur",
|
"nixvim",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733222881,
|
"lastModified": 1738680491,
|
||||||
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
|
"narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
|
"rev": "64dbb922d51a42c0ced6a7668ca008dded61c483",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -808,7 +894,6 @@
|
||||||
"treefmt-nix_2": {
|
"treefmt-nix_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"stylix",
|
|
||||||
"nur",
|
"nur",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,6 @@
|
||||||
bluetooth.enable = true;
|
bluetooth.enable = true;
|
||||||
power-saving.enable = false;
|
power-saving.enable = false;
|
||||||
networkmanager.enable = true;
|
networkmanager.enable = true;
|
||||||
grdp.enable = true;
|
|
||||||
printing.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Hardware configuration
|
# Hardware configuration
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,6 @@ in
|
||||||
networking.firewall.enable = true;
|
networking.firewall.enable = true;
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
services.libinput.enable = true;
|
services.libinput.enable = true;
|
||||||
services.upower.enable = true; # For battery percentage in gnome
|
|
||||||
modules.unfree.enable = true;
|
modules.unfree.enable = true;
|
||||||
modules.unfree.allowedPackages = [
|
modules.unfree.allowedPackages = [
|
||||||
"nvidia-x11"
|
"nvidia-x11"
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@ with lib;
|
||||||
./brightnessctl/default.nix
|
./brightnessctl/default.nix
|
||||||
./fontconfig/default.nix
|
./fontconfig/default.nix
|
||||||
./graphics/default.nix
|
./graphics/default.nix
|
||||||
./grdp/default.nix
|
|
||||||
./greeter/greetd/default.nix
|
./greeter/greetd/default.nix
|
||||||
./greeter/greetd/nixgreety.nix
|
./greeter/greetd/nixgreety.nix
|
||||||
./greeter/greetd/tuigreet.nix
|
./greeter/greetd/tuigreet.nix
|
||||||
|
|
@ -26,7 +25,6 @@ with lib;
|
||||||
./neovim/default.nix
|
./neovim/default.nix
|
||||||
./networkmanager/default.nix
|
./networkmanager/default.nix
|
||||||
./power-saving/default.nix
|
./power-saving/default.nix
|
||||||
./printing/default.nix
|
|
||||||
./sound/pipewire.nix
|
./sound/pipewire.nix
|
||||||
./users/default.nix
|
./users/default.nix
|
||||||
./unfree/default.nix
|
./unfree/default.nix
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
powerManagement.finegrained = false;
|
powerManagement.finegrained = false;
|
||||||
open = false;
|
open = false;
|
||||||
nvidiaSettings = true;
|
nvidiaSettings = true;
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||||
prime = {
|
prime = {
|
||||||
intelBusId = "PCI:0:2:0";
|
intelBusId = "PCI:0:2:0";
|
||||||
nvidiaBusId = "PCI:1:0:0";
|
nvidiaBusId = "PCI:1:0:0";
|
||||||
|
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
{ config, lib, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
{
|
|
||||||
options.modules.grdp = {
|
|
||||||
enable = mkEnableOption "grdp";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf config.modules.grdp.enable {
|
|
||||||
services.gnome.gnome-remote-desktop.enable = true;
|
|
||||||
systemd.services."gnome-remote-desktop".wantedBy = [ "graphical.target" ];
|
|
||||||
networking.firewall = {
|
|
||||||
allowedTCPPorts = [ 3389 ];
|
|
||||||
allowedUDPPorts = [ 3389 ];
|
|
||||||
};
|
|
||||||
# programs.dconf.profiles.user.databases = [
|
|
||||||
# {
|
|
||||||
# settings = with lib.gvariant; {
|
|
||||||
# "org/gnome/desktop/remote-desktop/rdp" = {
|
|
||||||
# enable = true;
|
|
||||||
# view-only = false;
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
# }
|
|
||||||
# ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -20,10 +20,6 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
wifi.powersave = true;
|
wifi.powersave = true;
|
||||||
};
|
};
|
||||||
firewall = {
|
|
||||||
# Fix for wireguard
|
|
||||||
checkReversePath = false;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
{
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
let
|
|
||||||
cfg = config.modules.printing;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options.modules.printing = {
|
|
||||||
enable = mkEnableOption "printing";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
services.printing = {
|
|
||||||
enable = true;
|
|
||||||
# drivers = with pkgs; [];
|
|
||||||
};
|
|
||||||
services.avahi = {
|
|
||||||
enable = true;
|
|
||||||
nssmdns4 = true;
|
|
||||||
openFirewall = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -19,7 +19,6 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
alsa.enable = true;
|
alsa.enable = true;
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
jack.enable = true;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ pkgs.stdenv.mkDerivation rec {
|
||||||
|
|
||||||
src = pkgs.fetchurl {
|
src = pkgs.fetchurl {
|
||||||
url = "mirror://sourceforge/wqy/${pname}-${version}.tar.gz";
|
url = "mirror://sourceforge/wqy/${pname}-${version}.tar.gz";
|
||||||
|
# hash = "sha256-r2Vf7ftJCqu7jOc2AqCKaoR/r8eNw2P/OQGqbDOEyl0=";
|
||||||
hash = "sha256-0uvwkRUbvJ0remTnlP8dElRjaBVd6iukNYBTE/CTO7s=";
|
hash = "sha256-0uvwkRUbvJ0remTnlP8dElRjaBVd6iukNYBTE/CTO7s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -46,10 +46,11 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
profiles.nixos = {
|
profiles.nixos = {
|
||||||
search.default = "ddg";
|
search.default = "DuckDuckGo";
|
||||||
|
|
||||||
extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
|
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||||
ublock-origin
|
ublock-origin
|
||||||
|
# tridactyl # TODO: Add toggle for this extension?
|
||||||
];
|
];
|
||||||
|
|
||||||
# Theming
|
# Theming
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ in
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
pulsemixer
|
pulsemixer
|
||||||
playerctl
|
playerctl
|
||||||
networkmanagerapplet # TODO: Move
|
wpa_supplicant_gui # TODO: Move
|
||||||
];
|
];
|
||||||
|
|
||||||
modules.desktop.reloadScript = ''
|
modules.desktop.reloadScript = ''
|
||||||
|
|
@ -43,7 +43,6 @@ in
|
||||||
"mpris"
|
"mpris"
|
||||||
];
|
];
|
||||||
modules-right = [
|
modules-right = [
|
||||||
"tray"
|
|
||||||
"bluetooth"
|
"bluetooth"
|
||||||
"network"
|
"network"
|
||||||
"pulseaudio"
|
"pulseaudio"
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ in
|
||||||
options.desktop.theming.background = {
|
options.desktop.theming.background = {
|
||||||
path = mkOption {
|
path = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
|
# default = "minimal/a_cat_in_a_cup.png";
|
||||||
default = "minimal/a_flower_on_a_dark_background.png";
|
default = "minimal/a_flower_on_a_dark_background.png";
|
||||||
description = "Path to the background image.";
|
description = "Path to the background image.";
|
||||||
};
|
};
|
||||||
|
|
@ -107,7 +108,7 @@ in
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
services.wpaperd = {
|
programs.wpaperd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.default = {
|
settings.default = {
|
||||||
path = "${background-themed}/";
|
path = "${background-themed}/";
|
||||||
|
|
|
||||||
|
|
@ -273,18 +273,16 @@ in
|
||||||
|
|
||||||
# Configure gtk theme
|
# Configure gtk theme
|
||||||
gtk =
|
gtk =
|
||||||
let
|
# disableCSD = ''
|
||||||
disableCSD = ''
|
# headerbar.default-decoration {
|
||||||
headerbar.default-decoration {
|
# margin-bottom: 50px;
|
||||||
margin-bottom: 50px;
|
# margin-top: -100px;
|
||||||
margin-top: -100px;
|
# }
|
||||||
}
|
# window.csd,
|
||||||
window.csd,
|
# window.csd decoration {
|
||||||
window.csd decoration {
|
# box-shadow: none;
|
||||||
box-shadow: none;
|
# }
|
||||||
}
|
# '';
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
|
@ -293,9 +291,6 @@ in
|
||||||
package = pkgs.gnome-themes-extra;
|
package = pkgs.gnome-themes-extra;
|
||||||
};
|
};
|
||||||
|
|
||||||
# TODO: Toggles
|
|
||||||
gtk3.extraCss = disableCSD;
|
|
||||||
gtk4.extraCss = disableCSD;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# TODO: This should just straight up not be here
|
# TODO: This should just straight up not be here
|
||||||
|
|
@ -329,10 +324,7 @@ in
|
||||||
foot.enable = true;
|
foot.enable = true;
|
||||||
nixvim.enable = true;
|
nixvim.enable = true;
|
||||||
qutebrowser.enable = true;
|
qutebrowser.enable = true;
|
||||||
vscode = {
|
vscode.enable = true;
|
||||||
enable = true;
|
|
||||||
profileNames = [ "NixOS" ];
|
|
||||||
};
|
|
||||||
zathura.enable = true;
|
zathura.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,17 +33,14 @@ in
|
||||||
|
|
||||||
# VSCode configuration
|
# VSCode configuration
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
profiles.default = {
|
extensions = with pkgs.vscode-extensions; [
|
||||||
extensions = with pkgs.vscode-extensions; [
|
ms-vscode.cpptools
|
||||||
ms-vscode.cpptools
|
ms-vscode.cmake-tools
|
||||||
ms-vscode.cmake-tools
|
ms-vscode.cpptools-extension-pack
|
||||||
ms-vscode.cpptools-extension-pack
|
];
|
||||||
];
|
|
||||||
|
|
||||||
userSettings = {
|
userSettings = {
|
||||||
# TODO: Add setting to set the compiler, it currently needs to be set for each workspace individually
|
# "C_Cpp.clang_format_fallbackStyle" = "{ BasedOnStyle: Google, IndentWidth: 4 }";
|
||||||
# "C_Cpp.clang_format_fallbackStyle" = "{ BasedOnStyle: Google, IndentWidth: 4 }";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,16 +23,14 @@ in
|
||||||
|
|
||||||
# VSCode configuration
|
# VSCode configuration
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
profiles.default = {
|
extensions = with pkgs.vscode-extensions; [
|
||||||
extensions = with pkgs.vscode-extensions; [
|
haskell.haskell
|
||||||
haskell.haskell
|
justusadam.language-haskell
|
||||||
justusadam.language-haskell
|
];
|
||||||
];
|
|
||||||
|
|
||||||
userSettings = {
|
userSettings = {
|
||||||
"[haskell]" = { };
|
"[haskell]" = { };
|
||||||
# "haskell.formattingProvider" = "fourmolu";
|
# "haskell.formattingProvider" = "fourmolu";
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,13 +23,11 @@ in
|
||||||
|
|
||||||
# VSCode configuration
|
# VSCode configuration
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
profiles.default = {
|
extensions = with pkgs.vscode-extensions; [
|
||||||
extensions = with pkgs.vscode-extensions; [
|
bradlc.vscode-tailwindcss
|
||||||
bradlc.vscode-tailwindcss
|
];
|
||||||
];
|
|
||||||
|
|
||||||
userSettings = { };
|
userSettings = { };
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Neovim configuration
|
# Neovim configuration
|
||||||
|
|
|
||||||
|
|
@ -28,14 +28,12 @@ in
|
||||||
|
|
||||||
# VSCode configuration
|
# VSCode configuration
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
profiles.default = {
|
extensions = with pkgs.vscode-extensions; [
|
||||||
extensions = with pkgs.vscode-extensions; [
|
ms-toolsai.jupyter
|
||||||
ms-toolsai.jupyter
|
ms-toolsai.jupyter-renderers
|
||||||
ms-toolsai.jupyter-renderers
|
];
|
||||||
];
|
|
||||||
|
|
||||||
userSettings = { };
|
userSettings = { };
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Neovim configuration
|
# Neovim configuration
|
||||||
|
|
|
||||||
|
|
@ -32,20 +32,18 @@ in
|
||||||
|
|
||||||
# VSCode configuration
|
# VSCode configuration
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
profiles.default = {
|
extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide ];
|
||||||
extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide ];
|
|
||||||
|
|
||||||
userSettings = {
|
userSettings = {
|
||||||
"[nix]" = {
|
"[nix]" = {
|
||||||
"editor.tabSize" = 2;
|
"editor.tabSize" = 2;
|
||||||
};
|
};
|
||||||
"nix.enableLanguageServer" = true;
|
"nix.enableLanguageServer" = true;
|
||||||
"nix.serverPath" = "nixd";
|
"nix.serverPath" = "nixd";
|
||||||
"nix.serverSettings" = {
|
"nix.serverSettings" = {
|
||||||
nixd = {
|
nixd = {
|
||||||
formatting = {
|
formatting = {
|
||||||
command = [ "nixfmt" ];
|
command = [ "nixfmt" ];
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -34,19 +34,17 @@ in
|
||||||
|
|
||||||
# VSCode configuration
|
# VSCode configuration
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
profiles.default = {
|
extensions = with pkgs.vscode-extensions; [
|
||||||
extensions = with pkgs.vscode-extensions; [
|
ms-python.python
|
||||||
ms-python.python
|
ms-python.debugpy
|
||||||
ms-python.debugpy
|
ms-python.vscode-pylance
|
||||||
ms-python.vscode-pylance
|
ms-python.black-formatter
|
||||||
ms-python.black-formatter
|
];
|
||||||
];
|
|
||||||
|
|
||||||
userSettings = {
|
userSettings = {
|
||||||
"python.defaultInterpreterPath" = "\${env:PYTHONINTERPRETER}";
|
"python.defaultInterpreterPath" = "\${env:PYTHONINTERPRETER}";
|
||||||
"[python]" = {
|
"[python]" = {
|
||||||
"editor.defaultFormatter" = "ms-python.black-formatter";
|
"editor.defaultFormatter" = "ms-python.black-formatter";
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -31,21 +31,19 @@ in
|
||||||
|
|
||||||
# VSCode configuration
|
# VSCode configuration
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
profiles.default = {
|
extensions = with pkgs.vscode-extensions; [
|
||||||
extensions = with pkgs.vscode-extensions; [
|
rust-lang.rust-analyzer
|
||||||
rust-lang.rust-analyzer
|
vadimcn.vscode-lldb
|
||||||
vadimcn.vscode-lldb
|
tamasfe.even-better-toml
|
||||||
tamasfe.even-better-toml
|
serayuzgur.crates
|
||||||
serayuzgur.crates
|
];
|
||||||
];
|
|
||||||
|
|
||||||
userSettings = {
|
userSettings = {
|
||||||
"[rust]" = {
|
"[rust]" = {
|
||||||
"editor.inlayHints.enabled" = "off";
|
"editor.inlayHints.enabled" = "off";
|
||||||
};
|
|
||||||
"rust-analyzer.check.command" = "clippy";
|
|
||||||
"rust-analyzer.showUnlinkedFileNotification" = false;
|
|
||||||
};
|
};
|
||||||
|
"rust-analyzer.check.command" = "clippy";
|
||||||
|
"rust-analyzer.showUnlinkedFileNotification" = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,12 +29,10 @@ in
|
||||||
|
|
||||||
# VSCode configuration
|
# VSCode configuration
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
profiles.default = {
|
extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide ];
|
||||||
extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide ];
|
|
||||||
|
|
||||||
userSettings = {
|
userSettings = {
|
||||||
"[tex]" = { };
|
"[tex]" = { };
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,13 +27,11 @@ in
|
||||||
|
|
||||||
# VSCode configuration
|
# VSCode configuration
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
profiles.default = {
|
extensions = with pkgs.vscode-extensions; [
|
||||||
extensions = with pkgs.vscode-extensions; [
|
ms-azuretools.vscode-docker
|
||||||
ms-azuretools.vscode-docker
|
];
|
||||||
];
|
|
||||||
|
|
||||||
userSettings = {
|
userSettings = {
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
{
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
{
|
|
||||||
options.modules.flatpak = {
|
|
||||||
enable = mkEnableOption "flatpak";
|
|
||||||
remotes = mkOption {
|
|
||||||
type = types.attrsOf types.str;
|
|
||||||
default = {
|
|
||||||
flathub = "https://dl.flathub.org/repo/flathub.flatpakrepo";
|
|
||||||
flathub-beta = "https://dl.flathub.org/beta-repo/flathub-beta.flatpakrepo";
|
|
||||||
};
|
|
||||||
description = "A set of flatpak repositories to add.";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf config.modules.flatpak.enable {
|
|
||||||
services.flatpak.enableModule = true;
|
|
||||||
services.flatpak.remotes = config.modules.flatpak.remotes;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
{
|
|
||||||
flatpak = {
|
|
||||||
# services.flatpak.enable = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -26,22 +26,22 @@ in
|
||||||
|
|
||||||
# TODO: Remove exception once no longer required by es-de
|
# TODO: Remove exception once no longer required by es-de
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
nixpkgs.config.permittedInsecurePackages = [
|
||||||
"freeimage-3.18.0-unstable-2024-04-18"
|
"freeimage-unstable-2021-11-01"
|
||||||
];
|
];
|
||||||
|
|
||||||
# TODO: Remove once emulationstation-de fixes the issue
|
# TODO: Remove once emulationstation-de fixes the issue
|
||||||
# TODO: If not fixed, at least pin the specific commit properly
|
# TODO: If not fixed, at least pin the specific commit properly
|
||||||
# nixpkgs.overlays =
|
nixpkgs.overlays =
|
||||||
# let
|
let
|
||||||
# pkgs-stable = import (fetchTarball {
|
pkgs-stable = import (fetchTarball {
|
||||||
# url = "https://github.com/NixOS/nixpkgs/archive/nixos-24.11.tar.gz";
|
url = "https://github.com/NixOS/nixpkgs/archive/nixos-24.11.tar.gz";
|
||||||
# sha256 = "1wr1xzkw7v8biqqjcr867gbpqf3kibkgly36lcnhw0glvkr1i986";
|
sha256 = "1wr1xzkw7v8biqqjcr867gbpqf3kibkgly36lcnhw0glvkr1i986";
|
||||||
# }) { inherit system; };
|
}) { inherit system; };
|
||||||
# in
|
in
|
||||||
# [
|
[
|
||||||
# (final: prev: {
|
(final: prev: {
|
||||||
# libgit2 = pkgs-stable.libgit2;
|
libgit2 = pkgs-stable.libgit2;
|
||||||
# })
|
})
|
||||||
# ];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
{ lib, config, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./eloquent.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
options.modules.languagetool = {
|
|
||||||
enable = mkEnableOption "languagetool";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf config.modules.languagetool.enable {
|
|
||||||
modules.eloquent.enable = mkDefault true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
{ lib, config, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
{
|
|
||||||
options.modules.eloquent = {
|
|
||||||
enable = mkEnableOption "eloquent";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf config.modules.eloquent.enable {
|
|
||||||
modules.flatpak.enable = true;
|
|
||||||
|
|
||||||
services.flatpak.packages = [
|
|
||||||
"flathub:app/re.sonny.Eloquent//stable"
|
|
||||||
"flathub:app/org.kde.kdenlive//stable"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -37,65 +37,63 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
mutableExtensionsDir = false;
|
mutableExtensionsDir = false;
|
||||||
profiles.default = {
|
extensions = with pkgs.vscode-extensions; [
|
||||||
extensions = with pkgs.vscode-extensions; [
|
eamodio.gitlens
|
||||||
eamodio.gitlens
|
ms-vscode.hexeditor
|
||||||
ms-vscode.hexeditor
|
mkhl.direnv
|
||||||
mkhl.direnv
|
usernamehw.errorlens
|
||||||
usernamehw.errorlens
|
gruntfuggly.todo-tree
|
||||||
gruntfuggly.todo-tree
|
github.copilot
|
||||||
github.copilot
|
github.copilot-chat
|
||||||
github.copilot-chat
|
tomoki1207.pdf
|
||||||
tomoki1207.pdf
|
ms-vsliveshare.vsliveshare
|
||||||
ms-vsliveshare.vsliveshare
|
];
|
||||||
];
|
|
||||||
|
|
||||||
userSettings =
|
userSettings =
|
||||||
let
|
let
|
||||||
font-family = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'";
|
font-family = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'";
|
||||||
# TODO: Move the conversion factor to theme settings
|
# TODO: Move the conversion factor to theme settings
|
||||||
font-size = mkForce cfg.codeFont.recommendedSize; # Convert pt to px
|
font-size = mkForce cfg.codeFont.recommendedSize; # Convert pt to px
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# Font setup
|
# Font setup
|
||||||
"editor.fontFamily" = font-family;
|
"editor.fontFamily" = font-family;
|
||||||
"editor.inlayHints.fontFamily" = font-family;
|
"editor.inlayHints.fontFamily" = font-family;
|
||||||
"editor.inlineSuggest.fontFamily" = font-family;
|
"editor.inlineSuggest.fontFamily" = font-family;
|
||||||
"editor.fontSize" = font-size;
|
"editor.fontSize" = font-size;
|
||||||
"editor.fontLigatures" = true;
|
"editor.fontLigatures" = true;
|
||||||
"terminal.integrated.fontFamily" = font-family;
|
"terminal.integrated.fontFamily" = font-family;
|
||||||
"terminal.integrated.fontSize" = font-size;
|
"terminal.integrated.fontSize" = font-size;
|
||||||
"chat.editor.fontFamily" = font-family; # TODO: Change this font to the standard UI font
|
"chat.editor.fontFamily" = font-family; # TODO: Change this font to the standard UI font
|
||||||
"chat.editor.fontSize" = font-size;
|
"chat.editor.fontSize" = font-size;
|
||||||
"debug.console.fontFamily" = font-family;
|
"debug.console.fontFamily" = font-family;
|
||||||
"debug.console.fontSize" = font-size;
|
"debug.console.fontSize" = font-size;
|
||||||
"scm.inputFontFamily" = font-family; # TODO: Change this font to the standard UI font
|
"scm.inputFontFamily" = font-family; # TODO: Change this font to the standard UI font
|
||||||
"scm.inputFontSize" = font-size;
|
"scm.inputFontSize" = font-size;
|
||||||
"markdown.preview.fontFamily" = mkForce theme.fonts.sansSerif.name; # TODO: Change this font to the standard UI font
|
"markdown.preview.fontFamily" = mkForce theme.fonts.sansSerif.name; # TODO: Change this font to the standard UI font
|
||||||
"markdown.preview.fontSize" = mkForce theme.fonts.sansSerif.recommendedSize;
|
"markdown.preview.fontSize" = mkForce theme.fonts.sansSerif.recommendedSize;
|
||||||
|
|
||||||
# Formatting
|
# Formatting
|
||||||
"editor.formatOnSave" = true;
|
"editor.formatOnSave" = true;
|
||||||
"editor.tabSize" = 4;
|
"editor.tabSize" = 4;
|
||||||
|
|
||||||
# Layout
|
# Layout
|
||||||
"window.menuBarVisibility" = "hidden";
|
"window.menuBarVisibility" = "hidden";
|
||||||
|
|
||||||
# Git settings
|
# Git settings
|
||||||
"git.autofetch" = true;
|
"git.autofetch" = true;
|
||||||
"git.enableSmartCommit" = false;
|
"git.enableSmartCommit" = false;
|
||||||
"git.suggestSmartCommit" = false;
|
"git.suggestSmartCommit" = false;
|
||||||
|
|
||||||
# Disable update notifications
|
# Disable update notifications
|
||||||
"update.mode" = "none";
|
"update.mode" = "none";
|
||||||
|
|
||||||
# TODO: Move to direnv module
|
# TODO: Move to direnv module
|
||||||
# Ignore direnv folder
|
# Ignore direnv folder
|
||||||
"files.exclude" = {
|
"files.exclude" = {
|
||||||
".direnv" = true;
|
".direnv" = true;
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
200
users/jan.nix
200
users/jan.nix
|
|
@ -186,112 +186,112 @@
|
||||||
# ];
|
# ];
|
||||||
# };
|
# };
|
||||||
# };
|
# };
|
||||||
gnome = {
|
# gnome = {
|
||||||
name = "Gnome";
|
# name = "Gnome";
|
||||||
type = "custom";
|
# type = "custom";
|
||||||
config = { };
|
# config = { };
|
||||||
extraConfig = {
|
# extraConfig = {
|
||||||
programs = {
|
# programs = {
|
||||||
gnome-shell.enable = true;
|
# gnome-shell.enable = true;
|
||||||
};
|
# };
|
||||||
desktop = {
|
# desktop = {
|
||||||
initScript = ''
|
# initScript = ''
|
||||||
${pkgs.gnome-session}/bin/gnome-session
|
# ${pkgs.gnome-session}/bin/gnome-session
|
||||||
'';
|
# '';
|
||||||
session = {
|
# session = {
|
||||||
type = "wayland";
|
# type = "wayland";
|
||||||
desktop = "GNOME";
|
# desktop = "GNOME";
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
|
|
||||||
# TODO: Remove everything below, it is here out of convenience and should be elsewhere
|
# # TODO: Remove everything below, it is here out of convenience and should be elsewhere
|
||||||
xdg.portal = {
|
# xdg.portal = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
|
|
||||||
config.common.default = [
|
# config.common.default = [
|
||||||
"gnome"
|
# "gnome"
|
||||||
"gtk"
|
# "gtk"
|
||||||
];
|
# ];
|
||||||
|
|
||||||
extraPortals = with pkgs; [
|
# extraPortals = with pkgs; [
|
||||||
xdg-desktop-portal-gnome
|
# xdg-desktop-portal-gnome
|
||||||
xdg-desktop-portal-gtk
|
# xdg-desktop-portal-gtk
|
||||||
];
|
# ];
|
||||||
};
|
# };
|
||||||
home.packages = [
|
# home.packages = [
|
||||||
# Core utilities
|
# # Core utilities
|
||||||
pkgs.baobab
|
# pkgs.baobab
|
||||||
pkgs.epiphany
|
# pkgs.epiphany
|
||||||
pkgs.gnome-text-editor
|
# pkgs.gnome-text-editor
|
||||||
pkgs.gnome-calculator
|
# pkgs.gnome-calculator
|
||||||
pkgs.gnome-calendar
|
# pkgs.gnome-calendar
|
||||||
pkgs.gnome-characters
|
# pkgs.gnome-characters
|
||||||
pkgs.gnome-clocks
|
# pkgs.gnome-clocks
|
||||||
pkgs.gnome-console
|
# pkgs.gnome-console
|
||||||
pkgs.gnome-contacts
|
# pkgs.gnome-contacts
|
||||||
pkgs.gnome-font-viewer
|
# pkgs.gnome-font-viewer
|
||||||
pkgs.gnome-logs
|
# pkgs.gnome-logs
|
||||||
pkgs.gnome-maps
|
# pkgs.gnome-maps
|
||||||
pkgs.gnome-music
|
# pkgs.gnome-music
|
||||||
pkgs.gnome-system-monitor
|
# pkgs.gnome-system-monitor
|
||||||
pkgs.gnome-weather
|
# pkgs.gnome-weather
|
||||||
pkgs.loupe
|
# pkgs.loupe
|
||||||
pkgs.nautilus
|
# pkgs.nautilus
|
||||||
pkgs.gnome-connections
|
# pkgs.gnome-connections
|
||||||
pkgs.simple-scan
|
# pkgs.simple-scan
|
||||||
pkgs.snapshot
|
# pkgs.snapshot
|
||||||
pkgs.totem
|
# pkgs.totem
|
||||||
pkgs.yelp
|
# pkgs.yelp
|
||||||
|
|
||||||
# Optional packages
|
# # Optional packages
|
||||||
pkgs.adwaita-icon-theme
|
# pkgs.adwaita-icon-theme
|
||||||
pkgs.gnome-backgrounds
|
# pkgs.gnome-backgrounds
|
||||||
pkgs.gnome-bluetooth
|
# pkgs.gnome-bluetooth
|
||||||
pkgs.gnome-color-manager
|
# pkgs.gnome-color-manager
|
||||||
pkgs.gnome-control-center
|
# pkgs.gnome-control-center
|
||||||
pkgs.gnome-shell-extensions
|
# pkgs.gnome-shell-extensions
|
||||||
pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
|
# pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
|
||||||
pkgs.gnome-user-docs
|
# pkgs.gnome-user-docs
|
||||||
pkgs.glib # for gsettings program
|
# pkgs.glib # for gsettings program
|
||||||
pkgs.gnome-menus
|
# pkgs.gnome-menus
|
||||||
pkgs.gtk3.out # for gtk-launch program
|
# pkgs.gtk3.out # for gtk-launch program
|
||||||
pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
|
# pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
|
||||||
pkgs.xdg-user-dirs-gtk # Used to create the default bookmarks
|
# pkgs.xdg-user-dirs-gtk # Used to create the default bookmarks
|
||||||
|
|
||||||
# Games
|
# # Games
|
||||||
pkgs.aisleriot
|
# pkgs.aisleriot
|
||||||
pkgs.atomix
|
# pkgs.atomix
|
||||||
pkgs.five-or-more
|
# pkgs.five-or-more
|
||||||
pkgs.four-in-a-row
|
# pkgs.four-in-a-row
|
||||||
pkgs.gnome-2048
|
# pkgs.gnome-2048
|
||||||
pkgs.gnome-chess
|
# pkgs.gnome-chess
|
||||||
pkgs.gnome-klotski
|
# pkgs.gnome-klotski
|
||||||
pkgs.gnome-mahjongg
|
# pkgs.gnome-mahjongg
|
||||||
pkgs.gnome-mines
|
# pkgs.gnome-mines
|
||||||
pkgs.gnome-nibbles
|
# pkgs.gnome-nibbles
|
||||||
pkgs.gnome-robots
|
# pkgs.gnome-robots
|
||||||
pkgs.gnome-sudoku
|
# pkgs.gnome-sudoku
|
||||||
pkgs.gnome-taquin
|
# pkgs.gnome-taquin
|
||||||
pkgs.gnome-tetravex
|
# pkgs.gnome-tetravex
|
||||||
pkgs.hitori
|
# pkgs.hitori
|
||||||
pkgs.iagno
|
# pkgs.iagno
|
||||||
pkgs.lightsoff
|
# pkgs.lightsoff
|
||||||
pkgs.quadrapassel
|
# pkgs.quadrapassel
|
||||||
pkgs.swell-foop
|
# pkgs.swell-foop
|
||||||
pkgs.tali
|
# pkgs.tali
|
||||||
|
|
||||||
# Fonts
|
# # Fonts
|
||||||
pkgs.cantarell-fonts
|
# pkgs.cantarell-fonts
|
||||||
pkgs.dejavu_fonts
|
# pkgs.dejavu_fonts
|
||||||
pkgs.source-code-pro # Default monospace font in 3.32
|
# pkgs.source-code-pro # Default monospace font in 3.32
|
||||||
pkgs.source-sans
|
# pkgs.source-sans
|
||||||
|
|
||||||
# Other stuff
|
# # Other stuff
|
||||||
pkgs.gnome-session
|
# pkgs.gnome-session
|
||||||
# pkgs.gnome-session.sessions
|
# # pkgs.gnome-session.sessions
|
||||||
];
|
# ];
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enabled modules
|
# Enabled modules
|
||||||
|
|
@ -313,7 +313,7 @@
|
||||||
# Gaming
|
# Gaming
|
||||||
steam.enable = true;
|
steam.enable = true;
|
||||||
modrinth.enable = true;
|
modrinth.enable = true;
|
||||||
# es-de.enable = true; # TODO: Fix, again
|
es-de.enable = true;
|
||||||
retroarch.enable = true;
|
retroarch.enable = true;
|
||||||
ryujinx.enable = true;
|
ryujinx.enable = true;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue