Compare commits
1 commit
78d4ee01fd
...
61753f5c58
| Author | SHA1 | Date | |
|---|---|---|---|
| 61753f5c58 |
19 changed files with 399 additions and 118 deletions
323
flake.lock
generated
323
flake.lock
generated
|
|
@ -122,11 +122,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1740648034,
|
||||
"narHash": "sha256-pDAnvLZOIGjf0A92m+uxZxbIvcbT4wo4LmMCemA0Zi8=",
|
||||
"lastModified": 1740561392,
|
||||
"narHash": "sha256-UKbTtTv+OBB/kgV3wgCRor57fxShWAsvVqqF2X69KSY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "1d3a6e22ae1e938a2fd284b67ea9eb4d0ce044af",
|
||||
"rev": "213d27a8b579113ffe399ee672d84519464b11e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -204,6 +204,66 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"lix-eval-jobs",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730504689,
|
||||
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_3": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1701473968,
|
||||
"narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_4": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixThePlanet",
|
||||
"hercules-ci-effects",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1696343447,
|
||||
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "flake-parts",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
|
|
@ -338,6 +398,25 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hercules-ci-effects": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_4",
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1701009247,
|
||||
"narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "hercules-ci-effects",
|
||||
"rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "hercules-ci-effects",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -387,11 +466,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1740624780,
|
||||
"narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=",
|
||||
"lastModified": 1740579671,
|
||||
"narHash": "sha256-Dwt/3KknOQ4bgFG5YjqDT7oWRy27rPpDjAi2P0ok1zw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6",
|
||||
"rev": "53c587d263f94aaf6a281745923c76bbec62bcf3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -464,11 +543,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1740647693,
|
||||
"narHash": "sha256-pYxhtDAOmlbP4XqgjIvbpi7CFtX8USH6DlRybS2Jxu4=",
|
||||
"lastModified": 1740581674,
|
||||
"narHash": "sha256-GIShtZgCf6iavYT2wBOMz7Oc4CA7RAArx4zKN7pp/XQ=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "03ade5e6d75cb7705900cf696505b836fc831be0",
|
||||
"revCount": 17515,
|
||||
"rev": "ee49ed56c36d4ad1293c9a3abf3487d94be9aabc",
|
||||
"revCount": 17502,
|
||||
"type": "git",
|
||||
"url": "https://git@git.lix.systems/lix-project/lix"
|
||||
},
|
||||
|
|
@ -477,6 +556,32 @@
|
|||
"url": "https://git@git.lix.systems/lix-project/lix"
|
||||
}
|
||||
},
|
||||
"lix-eval-jobs": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"lix": [
|
||||
"lix"
|
||||
],
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738177393,
|
||||
"narHash": "sha256-4QuOiATcAfeR7JZpANpHVuU1hBhRK9SaDaIemKsI9sE=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "f2086413bac0bf7b3ab6ce0847e8367f911db835",
|
||||
"revCount": 624,
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/nix-eval-jobs"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/nix-eval-jobs"
|
||||
}
|
||||
},
|
||||
"lix-module": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
|
|
@ -544,6 +649,27 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-github-actions": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"lix-eval-jobs",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731952509,
|
||||
"narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-github-actions",
|
||||
"rev": "7b5f051df789b6b20d259924d349a9ba3319b226",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-github-actions",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-on-droid": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager_2",
|
||||
|
|
@ -567,13 +693,52 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixDarwin": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1740452771,
|
||||
"narHash": "sha256-/tI1vFJ7/dXJqUmI+s0EV1F0DPe6dZvT444mrLUkrlU=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "42be12b510253d750138ec90c66decc282298b44",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixThePlanet": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_3",
|
||||
"hercules-ci-effects": "hercules-ci-effects",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"osx-kvm": "osx-kvm"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739955541,
|
||||
"narHash": "sha256-X7BvCkW6QQFOmjBgrpdayOR+pv7gz7a/0wl/p+mTxt4=",
|
||||
"owner": "MatthewCroughan",
|
||||
"repo": "NixThePlanet",
|
||||
"rev": "c9d159dc2e0049e7b250a767a3a01def52c3412b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "MatthewCroughan",
|
||||
"repo": "NixThePlanet",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixosHardware": {
|
||||
"locked": {
|
||||
"lastModified": 1740646007,
|
||||
"narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=",
|
||||
"lastModified": 1740387674,
|
||||
"narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49",
|
||||
"rev": "d58f642ddb23320965b27beb0beba7236e9117b5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -642,6 +807,24 @@
|
|||
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib_2": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"lastModified": 1701253981,
|
||||
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"dir": "lib",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1740463929,
|
||||
|
|
@ -674,6 +857,20 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_10": {
|
||||
"locked": {
|
||||
"lastModified": 1682134069,
|
||||
"narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fd901ef4bf93499374c5af385b2943f5801c0833",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1736012469,
|
||||
|
|
@ -739,11 +936,27 @@
|
|||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1740560979,
|
||||
"narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
|
||||
"lastModified": 1736241350,
|
||||
"narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5135c59491985879812717f4c9fea69604e7f26f",
|
||||
"rev": "8c9fd3e564728e90829ee7dbac6edc972971cd0f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1697723726,
|
||||
"narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -753,18 +966,36 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1682134069,
|
||||
"narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
|
||||
"owner": "NixOS",
|
||||
"lastModified": 1703255338,
|
||||
"narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fd901ef4bf93499374c5af385b2943f5801c0833",
|
||||
"rev": "6df37dc6a77654682fe9f071c62b4242b5342e04",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1740367490,
|
||||
"narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nmd": {
|
||||
|
|
@ -805,6 +1036,22 @@
|
|||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"osx-kvm": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1701316418,
|
||||
"narHash": "sha256-Sk8LYhFovoMX1ln7DWYArJQphW2a4h8Xg7/ZEZXwZv4=",
|
||||
"owner": "kholia",
|
||||
"repo": "OSX-KVM",
|
||||
"rev": "09daff670a7eb9ff616073df329586c5995623a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "kholia",
|
||||
"repo": "OSX-KVM",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks-nix": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
|
|
@ -886,12 +1133,15 @@
|
|||
"impermanence": "impermanence",
|
||||
"lanzaboote": "lanzaboote",
|
||||
"lix": "lix",
|
||||
"lix-eval-jobs": "lix-eval-jobs",
|
||||
"lix-module": "lix-module",
|
||||
"mobile-nixos": "mobile-nixos",
|
||||
"nix-on-droid": "nix-on-droid",
|
||||
"nixDarwin": "nixDarwin",
|
||||
"nixThePlanet": "nixThePlanet",
|
||||
"nixosHardware": "nixosHardware",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"treefmt-nix": "treefmt-nix",
|
||||
"nixpkgs": "nixpkgs_9",
|
||||
"treefmt-nix": "treefmt-nix_2",
|
||||
"vscode-server": "vscode-server"
|
||||
}
|
||||
},
|
||||
|
|
@ -1000,6 +1250,27 @@
|
|||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"lix-eval-jobs",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732292307,
|
||||
"narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "705df92694af7093dfbb27109ce16d828a79155f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
|
|
@ -1022,7 +1293,7 @@
|
|||
"vscode-server": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
"nixpkgs": "nixpkgs_10"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729422940,
|
||||
|
|
|
|||
|
|
@ -28,6 +28,10 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
dream2nix.url = "github:nix-community/dream2nix";
|
||||
nixThePlanet.url = "github:MatthewCroughan/NixThePlanet"; # not following nixpkgs on purpose
|
||||
nixDarwin = {
|
||||
url = "github:LnL7/nix-darwin";
|
||||
};
|
||||
nix-on-droid.url = "github:nix-community/nix-on-droid";
|
||||
lix = {
|
||||
url = "git+https://git@git.lix.systems/lix-project/lix"; # FIXME update
|
||||
|
|
@ -38,6 +42,11 @@
|
|||
inputs.lix.follows = "lix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
lix-eval-jobs = {
|
||||
url = "git+https://git.lix.systems/lix-project/nix-eval-jobs";
|
||||
inputs.lix.follows = "lix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
mobile-nixos = {
|
||||
url = "github:NixOS/mobile-nixos";
|
||||
flake = false;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,6 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = [
|
||||
(pkgs.discord.override {
|
||||
withOpenASAR = true;
|
||||
withVencord = true;
|
||||
})
|
||||
];
|
||||
home.packages = [ pkgs.discord ];
|
||||
home.file.".config/discord/settings.json".text = builtins.toJSON {
|
||||
SKIP_HOST_UPDATE = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ in
|
|||
kdePackages.qtwayland
|
||||
copilot-node-server
|
||||
math-preview
|
||||
emacs-lsp-booster
|
||||
]
|
||||
++ (with hunspellDicts; [
|
||||
en_US-large
|
||||
|
|
|
|||
|
|
@ -37,10 +37,6 @@
|
|||
(consult-eglot-embark-mode)
|
||||
)
|
||||
|
||||
(use-package eglot-booster
|
||||
:after eglot
|
||||
:config (eglot-booster-mode))
|
||||
|
||||
(use-package emacs
|
||||
:bind (("<mouse-4>" . scroll-down-line)
|
||||
("<mouse-5>" . scroll-up-line)
|
||||
|
|
|
|||
|
|
@ -33,12 +33,6 @@ in
|
|||
|
||||
credential.helper = "manager";
|
||||
credential.credentialStore = "cache";
|
||||
|
||||
core = {
|
||||
fsmonitor = true;
|
||||
untrackedcache = true;
|
||||
};
|
||||
fetch.writeCommitGraph = true;
|
||||
};
|
||||
|
||||
userName = config.name;
|
||||
|
|
|
|||
|
|
@ -351,13 +351,11 @@ binds {
|
|||
Mod+B { spawn "firefox"; }
|
||||
Mod+RETURN { spawn "emacsclient" "-c" "--eval" "(ccr/start-eshell)"; }
|
||||
Mod+M { spawn "emacsclient" "-c" "--eval" "(notmuch-search \"tag:new\")"; }
|
||||
// Mod+G { spawn "emacsclient" "-c" "--eval" "(switch-to-buffer (gptel \"*ChatGPT*\"))" "-F" "((name . \"GPTel - Emacs\") (width . $NIRI_GPTEL_COLS) (height . $NIRI_GPTEL_ROWS))'"; }
|
||||
Mod+G { spawn "run-floating-gptel"; }
|
||||
Mod+G { spawn "emacsclient" "-c" "--eval" "(switch-to-buffer (gptel \"*ChatGPT*\"))" "-F" "((name . \"GPTel - Emacs\") (width . 150) (height . 60))'"; }
|
||||
Mod+Shift+C { spawn "emacsclient" "-c" "--eval" "(org-roam-dailies-capture-today)"; }
|
||||
Mod+Alt+L { spawn "swaylock"; }
|
||||
Mod+Space { spawn "rofi" "-show" "menu" "-modi" "menu:rofi-power-menu"; }
|
||||
// Mod+Ctrl+b { spawn "foot" "--title='bTop'" "-W" "$NIRI_BTOP_COLSx$NIRI_BTOP_ROWS" "btop";}
|
||||
Mod+Ctrl+b { spawn "run-floating-btop"; }
|
||||
Mod+Ctrl+b { spawn "foot" "--title='bTop'" "-W" "210x60" "btop";}
|
||||
|
||||
// Example volume keys mappings for PipeWire & WirePlumber.
|
||||
// The allow-when-locked=true property makes them work even when the session is locked.
|
||||
|
|
|
|||
|
|
@ -2,52 +2,13 @@
|
|||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
hostname,
|
||||
...
|
||||
}:
|
||||
let
|
||||
niriVars =
|
||||
{
|
||||
picard = {
|
||||
floating-gptel = {
|
||||
rows = "60";
|
||||
cols = "150";
|
||||
};
|
||||
floating-btop = {
|
||||
rows = "210";
|
||||
cols = "60";
|
||||
};
|
||||
};
|
||||
kirk = {
|
||||
floating-gptel = {
|
||||
rows = "40";
|
||||
cols = "140";
|
||||
};
|
||||
floating-btop = {
|
||||
rows = "40";
|
||||
cols = "140";
|
||||
};
|
||||
};
|
||||
}
|
||||
."${hostname}" or niriVars.kirk;
|
||||
run-floating-gptel =
|
||||
with niriVars.floating-gptel;
|
||||
pkgs.writeScriptBin "run-floating-gptel" ''
|
||||
emacsclient -c --eval '(switch-to-buffer (gptel "*GptEl*"))' -F '((name . "GPTel - Emacs") (width . ${cols}) (height . ${rows}))'
|
||||
'';
|
||||
run-floating-btop =
|
||||
with niriVars.floating-btop;
|
||||
pkgs.writeScriptBin "run-floating-btop" ''
|
||||
foot --title='bTop' -W ${rows}x${cols} btop
|
||||
'';
|
||||
in
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
niri
|
||||
waypaper
|
||||
xwayland-satellite
|
||||
run-floating-gptel
|
||||
run-floating-btop
|
||||
];
|
||||
systemd.user.targets.niri-session = {
|
||||
Unit = {
|
||||
|
|
@ -83,7 +44,7 @@ in
|
|||
theme =
|
||||
let
|
||||
inherit (config.lib.formats.rasi) mkLiteral;
|
||||
cfg = config.catppuccin.fzf;
|
||||
cfg = config.programs.fzf.catppuccin;
|
||||
palette = (lib.importJSON "${config.catppuccin.sources.palette}/palette.json").${cfg.flavor}.colors;
|
||||
selectColor = color: palette.${color}.hex;
|
||||
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@
|
|||
};
|
||||
extraModules = [
|
||||
inputs.disko.nixosModules.disko
|
||||
inputs.nixThePlanet.nixosModules.macos-ventura
|
||||
inputs.lix-module.nixosModules.default
|
||||
inputs.lanzaboote.nixosModules.lanzaboote
|
||||
inputs.catppuccin.nixosModules.catppuccin
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@
|
|||
"niri"
|
||||
"udiskie"
|
||||
"xdg"
|
||||
"spotify"
|
||||
"lutris"
|
||||
"wine"
|
||||
"cura"
|
||||
|
|
|
|||
|
|
@ -274,10 +274,11 @@ in
|
|||
extraHmModules = config.extraHmModules;
|
||||
in
|
||||
[
|
||||
config.homeManager.nixosModules.home-manager
|
||||
config.homeManager.nixosModule
|
||||
(
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
|
|
|
|||
|
|
@ -35,12 +35,13 @@
|
|||
"hass-poweroff"
|
||||
"forgejo-runners"
|
||||
"teamviewer"
|
||||
# "macos-ventura"
|
||||
"macos-ventura"
|
||||
"sunshine"
|
||||
"mount-sisko"
|
||||
"adb"
|
||||
"prometheus-exporters"
|
||||
"promtail"
|
||||
"dump1090"
|
||||
]
|
||||
++ [ ./disko.nix ];
|
||||
|
||||
|
|
@ -116,21 +117,30 @@
|
|||
"i2c-dev" # needed?
|
||||
];
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/328909
|
||||
boot.extraModulePackages = [
|
||||
config.boot.kernelPackages.ddcci-driver
|
||||
(config.boot.kernelPackages.ddcci-driver.overrideAttrs (old: {
|
||||
patches = [ ];
|
||||
src = pkgs.fetchFromGitLab {
|
||||
owner = "${old.pname}-linux";
|
||||
repo = "${old.pname}-linux";
|
||||
rev = "7853cbfc28bc62e87db79f612568b25315397dd0";
|
||||
hash = "sha256-QImfvYzMqyrRGyrS6I7ERYmteaTijd8ZRnC6+bA9OyM=";
|
||||
};
|
||||
}))
|
||||
];
|
||||
|
||||
systemd.services.ddcci = {
|
||||
script = ''
|
||||
echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device
|
||||
'';
|
||||
wantedBy = [ "graphical.target" ];
|
||||
restartIfChanged = false;
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
};
|
||||
# systemd.services.ddcci = {
|
||||
# script = ''
|
||||
# echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device
|
||||
# '';
|
||||
# wantedBy = [ "graphical.target" ];
|
||||
# restartIfChanged = false;
|
||||
# serviceConfig = {
|
||||
# Type = "oneshot";
|
||||
# RemainAfterExit = true;
|
||||
# };
|
||||
# };
|
||||
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.systemd-boot = {
|
||||
|
|
|
|||
45
modules/dump1090/default.nix
Normal file
45
modules/dump1090/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
systemd.services.dump1090-fa = {
|
||||
description = "dump1090 ADS-B receiver (FlightAware customization)";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
SupplementaryGroups = "plugdev";
|
||||
ExecStart = lib.escapeShellArgs [
|
||||
(lib.getExe pkgs.dump1090)
|
||||
"--net"
|
||||
"--write-json"
|
||||
"%t/dump1090-fa"
|
||||
];
|
||||
RuntimeDirectory = "dump1090-fa";
|
||||
WorkingDirectory = "%t/dump1090-fa";
|
||||
RuntimeDirectoryMode = 755;
|
||||
};
|
||||
};
|
||||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
|
||||
virtualHosts."dump1090-fa" = {
|
||||
listen = [
|
||||
{
|
||||
addr = "0.0.0.0";
|
||||
port = 8080;
|
||||
}
|
||||
];
|
||||
locations = {
|
||||
"/".alias = "${pkgs.dump1090}/share/dump1090/";
|
||||
"/data/".alias = "/run/dump1090-fa/";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# TODO before upstreaming in nixpkgs
|
||||
# - add `meta.mainProgram` to dump1090
|
||||
# - rename dump1090 to dump1090-fa
|
||||
# - optionally create an alias for dump1090
|
||||
# - securing the systemd service (`systemd-analyze security dump1090-fa`)
|
||||
}
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
source = "${pkgs.nfs-utils.out}/bin/mount.nfs";
|
||||
};
|
||||
|
||||
fileSystems."/mnt/nas" = {
|
||||
fileSystems."/home/${config.ccr.username}/nas" = {
|
||||
device = "sisko.fleet:/hd";
|
||||
fsType = "nfs";
|
||||
options = [
|
||||
|
|
|
|||
|
|
@ -6,6 +6,18 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
(final: _: {
|
||||
nix-eval-jobs =
|
||||
(fleetFlake.inputs.lix-eval-jobs.packages.${final.system}.nix-eval-jobs.override {
|
||||
nix = final.nix;
|
||||
})
|
||||
// {
|
||||
nix = final.nix;
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
environment.systemPackages = [ pkgs.nix-fast-build ];
|
||||
|
||||
nix = {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
{
|
||||
services.pipewire.enable = true;
|
||||
|
||||
services.pulseaudio = {
|
||||
hardware.pulseaudio = {
|
||||
enable = false;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
xdg-desktop-portal-hyprland
|
||||
xdg-desktop-portal-gnome
|
||||
xdg-desktop-portal
|
||||
kdePackages.xdg-desktop-portal-kde
|
||||
xdg-desktop-portal-kde
|
||||
];
|
||||
extraPortals = with pkgs; [
|
||||
xdg-desktop-portal-wlr
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
xdg-desktop-portal-hyprland
|
||||
xdg-desktop-portal-gnome
|
||||
xdg-desktop-portal
|
||||
kdePackages.xdg-desktop-portal-kde
|
||||
xdg-desktop-portal-kde
|
||||
];
|
||||
xdgOpenUsePortal = true;
|
||||
wlr.enable = true;
|
||||
|
|
|
|||
|
|
@ -98,16 +98,6 @@ let
|
|||
};
|
||||
deps = [ ];
|
||||
};
|
||||
eglot-booster = buildEmacsPackage {
|
||||
name = "eglot-booster";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "jdtsmith";
|
||||
repo = "eglot-booster";
|
||||
rev = "e6daa6bcaf4aceee29c8a5a949b43eb1b89900ed";
|
||||
hash = "sha256-PLfaXELkdX5NZcSmR1s/kgmU16ODF8bn56nfTh9g6bs=";
|
||||
};
|
||||
deps = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
# *List* containing emacs packages from (M)ELPA
|
||||
|
|
|
|||
|
|
@ -15,9 +15,7 @@ let
|
|||
rev = "5a3281dee9f889afdeea7263558e7a715dcf5aab";
|
||||
hash = "sha256-UzpHAHpQx2MlmBNKm2turjeVmgp5zXKWm3nZbEo0mYE=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-oGpe+kBf6kBboyx/YfbQBt1vvjtXd1n2pOH6FNcbF8M=";
|
||||
cargoHash = "sha256-wPV+ZY34OMbBrjmhvwjljbwmcUiPdWNHFU3ac7aVbIQ=";
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace src/lib.rs \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue