outfoxxed/nixnew
1
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: outfoxxed:a9698856a917093ea7cbe0d54011bac909f5a085
Branches Tags
outfoxxed:master
..
compare: outfoxxed:2c7ad44af955ba622148c0d4b4155c1a9b9b946a
Branches Tags
outfoxxed:master

No commits in common. "a9698856a917093ea7cbe0d54011bac909f5a085" and "2c7ad44af955ba622148c0d4b4155c1a9b9b946a" have entirely different histories.
a9698856a9 ... 2c7ad44af9

13 changed files with 76 additions and 271 deletions
Show stats Expand all files Collapse all files

298
flake.lock
View file

@ -11,11 +11,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1693439040, "lastModified": 1688772518,
"narHash": "sha256-t2nOxBcP0Q/XJt6Ild4v0hJ49OSl9F3nE1cdIT4xsDg=", "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "174604795d316b75777e28185c3a4918bc69b399", "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -35,11 +35,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1696043078, "lastModified": 1691722951,
"narHash": "sha256-0zPC5BR/6JyX6HponF9rQPhpQBDyMZMpGIBWOIvvX8E=", "narHash": "sha256-V6ERc3gVbITjNDljQsfFRz/s68717aPjK+e94uZbLvQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "db6c96d74eb0e60e7e344e81a56b33390e33474d", "rev": "f6a346762491a4655c3b43da5f2f154b57237a44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -64,72 +64,10 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nixpak",
"nixpkgs"
]
},
"locked": {
"lastModified": 1693611461,
"narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"nixpak",
"hercules-ci-effects",
"hercules-ci-agent",
"nixpkgs"
]
},
"locked": {
"lastModified": 1688466019,
"narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": { "locked": {
"lastModified": 1689068808, "lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
@ -144,64 +82,21 @@
"type": "github" "type": "github"
} }
}, },
"haskell-flake": { "flake-utils_2": {
"locked": {
"lastModified": 1684780604,
"narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
"owner": "srid",
"repo": "haskell-flake",
"rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
"type": "github"
},
"original": {
"owner": "srid",
"ref": "0.3.0",
"repo": "haskell-flake",
"type": "github"
}
},
"hercules-ci-agent": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "systems": "systems_2"
"haskell-flake": "haskell-flake",
"nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1688568579, "lastModified": 1687709756,
"narHash": "sha256-ON0M56wtY/TIIGPkXDlJboAmuYwc73Hi8X9iJGtxOhM=", "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
"owner": "hercules-ci", "owner": "numtide",
"repo": "hercules-ci-agent", "repo": "flake-utils",
"rev": "367dd8cd649b57009a6502e878005a1e54ad78c5", "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "hercules-ci-agent", "owner": "numtide",
"type": "indirect" "repo": "flake-utils",
}
},
"hercules-ci-effects": {
"inputs": {
"flake-parts": [
"nixpak",
"flake-parts"
],
"hercules-ci-agent": "hercules-ci-agent",
"nixpkgs": [
"nixpak",
"nixpkgs"
]
},
"locked": {
"lastModified": 1695684520,
"narHash": "sha256-yORqGB0i1OtEf9MOCCT2BIbOd8txPZn216CM+ylMmhY=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "91fae5824f5f1199f61693c6590b4a89abaed9d7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"type": "github" "type": "github"
} }
}, },
@ -212,11 +107,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695984718, "lastModified": 1691672736,
"narHash": "sha256-LQwKgaaaFOkIcxarf0xQXeDJFwZ5BZWcgmPeo3xp2CM=", "narHash": "sha256-HNPA/dKHerA0p4OsToEcW/DtTSXBcK5gFRsy/yPgV/Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4f02e35f9d150573e1a710afa338846c2f6d850c", "rev": "6e1eff9aac0e8d84bda7f2d60ba6108eea9b7e79",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -231,16 +126,15 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_2",
"wlroots": "wlroots", "wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1696036148, "lastModified": 1691697694,
"narHash": "sha256-7KCxZLMEQhjQXZVqVPZCxUR3lE+Z5heU7MmQjEtFFqU=", "narHash": "sha256-Z4zAxYxEJ0/3S5DAvxNAdvkZlwpDSvUJ1jFxtU1wkzY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "86e8ed038f5b195cdf2548bc469f8f8bbc0caca8", "rev": "e4e8ae8f885104bb948afa24f1cd9fc3bdb450e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -256,11 +150,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695455226, "lastModified": 1691652733,
"narHash": "sha256-9apatfi9j8qhy4acbrZXVehNNeyOkcr+sPYCw03zUhg=", "narHash": "sha256-BxUPTu/fIGe6DKMJclP0URrAVHWXfh9wSe1tSRinKdc=",
"owner": "outfoxxed", "owner": "outfoxxed",
"repo": "hy3", "repo": "hy3",
"rev": "158dff894ec38d4a5616ec03b68c5ae6beaf785a", "rev": "febcd88794ab2c4204e4c3785b9dea208b508bb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -274,18 +168,14 @@
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
],
"systems": [
"hyprland",
"systems"
] ]
}, },
"locked": { "locked": {
"lastModified": 1691753796, "lastModified": 1684265364,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -301,11 +191,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694600309, "lastModified": 1691060455,
"narHash": "sha256-d9LcB+D0bfMu+8UhnUVJ/DX5OVTX6o5dIntdVqEeQDA=", "narHash": "sha256-V5ulB9CkGh1ghiC4BKvRdoYKZzpaiOKzAOUmJIFkgM0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprpaper", "repo": "Hyprpaper",
"rev": "e5a18a171d5d6e7c6b9ffdfb9e86fb09055964a1", "rev": "e498c438b1e16dcf32ecb3030b20b83f7ed9ff6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -341,11 +231,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695668783, "lastModified": 1691611150,
"narHash": "sha256-pXVei5KZMxALQ8ibx0oqbfh5N/FI3VzJHodDNAh41xE=", "narHash": "sha256-0Jx7RQ236n6O9NIx8iUvGFVo3JRuiypWU5JIUh9Mj/M=",
"owner": "JakeStanger", "owner": "JakeStanger",
"repo": "ironbar", "repo": "ironbar",
"rev": "0c0163cfa1a8c0286edf231507026dd6f5798644", "rev": "b649525a2cb43fdd673f04e0dee879d22925a821",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -359,11 +249,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1692351612, "lastModified": 1690373729,
"narHash": "sha256-KTGonidcdaLadRnv9KFgwSMh1ZbXoR/OBmPjeNMhFwU=", "narHash": "sha256-e136hTT7LqQ2QjOTZQMW+jnsevWwBpMj78u6FRUsH9I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "78789c30d64dea2396c9da516bbcc8db3a475207", "rev": "d9a33d69a9c421d64c8d925428864e93be895dcc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -372,35 +262,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpak": {
"inputs": {
"flake-parts": "flake-parts",
"hercules-ci-effects": "hercules-ci-effects",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1695869087,
"narHash": "sha256-SEuiLtiBo0emK+S3QEgNRcmGAmc3bbGIWgSM/RJzvs0=",
"owner": "nixpak",
"repo": "nixpak",
"rev": "da958fa2298e3fe1eb386071377ef9731ee26c4b",
"type": "github"
},
"original": {
"owner": "nixpak",
"repo": "nixpak",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1693355128, "lastModified": 1690833316,
"narHash": "sha256-+ZoAny3ZxLcfMaUoLVgL9Ywb/57wP+EtsdNGuXUJrwg=", "narHash": "sha256-+YU+/pTJmVKNW12R07/SJiTn7PQk90xwCI4D2PfLRPs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a63a64b593dcf2fe05f7c5d666eb395950f36bc9", "rev": "9418167277f665de6f4a29f414d438cf39c55b9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -410,11 +278,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1695825837, "lastModified": 1691592289,
"narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", "narHash": "sha256-Lqpw7lrXlLkYra33tp57ms8tZ0StWhbcl80vk4D90F8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", "rev": "9034b46dc4c7596a87ab837bb8a07ef2d887e8c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -426,27 +294,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1688322751, "lastModified": 1691654369,
"narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=", "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0fbe93c5a7cac99f90b60bdf5f149383daaa615f", "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1695830400,
"narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -457,11 +309,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1696042552, "lastModified": 1691725539,
"narHash": "sha256-/n20VRUYywPiV5MS9eUoFMbuvX8m0gM3pHdKHW8Ah64=", "narHash": "sha256-7TvXi9pUaZXiGZW0eH+JMcbFfBPvDgx03UuaHhIBPoI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "33b3ce67676a10b875dc58d187120b47e61b90a3", "rev": "12503f38212124d5ce66bba48a5534ad6d61a1b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -480,8 +332,7 @@
"hyprpaper": "hyprpaper", "hyprpaper": "hyprpaper",
"impurity": "impurity", "impurity": "impurity",
"ironbar": "ironbar", "ironbar": "ironbar",
"nixpak": "nixpak", "nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_3",
"nur": "nur", "nur": "nur",
"rust-overlay": "rust-overlay_2", "rust-overlay": "rust-overlay_2",
"stable": "stable" "stable": "stable"
@ -501,11 +352,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691374719, "lastModified": 1688351637,
"narHash": "sha256-HCodqnx1Mi2vN4f3hjRPc7+lSQy18vRn8xWW68GeQOg=", "narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "b520a3889b24aaf909e287d19d406862ced9ffc9", "rev": "f9b92316727af9e6c7fee4a761242f7f46880329",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -524,11 +375,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1696039808, "lastModified": 1691719735,
"narHash": "sha256-7TbAr9LskWG6ISPhUdyp6zHboT7FsFrME5QsWKybPTA=", "narHash": "sha256-GhPn5EIhGt7aFwgC6RELZJC7mUIol9O0k7Dsf2Hu0AM=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "a4c3c904ab29e04a20d3a6da6626d66030385773", "rev": "ac9d8b2e9acc153145e6fa3c78f9ba458ae517bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -539,11 +390,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1695825837, "lastModified": 1691592289,
"narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", "narHash": "sha256-Lqpw7lrXlLkYra33tp57ms8tZ0StWhbcl80vk4D90F8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", "rev": "9034b46dc4c7596a87ab837bb8a07ef2d887e8c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -568,21 +419,6 @@
} }
}, },
"systems_2": { "systems_2": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_3": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -601,18 +437,18 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1695919988, "lastModified": 1691073628,
"narHash": "sha256-4RBgIZHaVqH0m1POnfzYRzwCWxifIKH4xQ0kCn2LGkA=", "narHash": "sha256-LlxE3o3UzRY7APYVLGNKM30DBMcDifCRIQiMVSbYLIc=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "c2aa7fd965cb7ee8bed24f4122b720aca8f0fc1e", "rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "c2aa7fd965cb7ee8bed24f4122b720aca8f0fc1e", "rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5",
"type": "gitlab" "type": "gitlab"
} }
}, },
@ -625,18 +461,14 @@
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
],
"systems": [
"hyprland",
"systems"
] ]
}, },
"locked": { "locked": {
"lastModified": 1694628480, "lastModified": 1691082525,
"narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=", "narHash": "sha256-C5AO0KnyAFJaCkOn+5nJfWm0kyiPn/Awh0lKTjhgr7Y=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2", "rev": "42747d267ab4345c4ceb78cd4a4fe99f072d80fc",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -11,11 +11,6 @@
impurity.url = "github:outfoxxed/impurity.nix"; impurity.url = "github:outfoxxed/impurity.nix";
nixpak = {
url = "github:nixpak/nixpak";
inputs.nixpkgs.follows = "nixpkgs";
};
emacs-overlay = { emacs-overlay = {
url = "github:nix-community/emacs-overlay"; url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

3
modules/core/default.nix
View file

@ -29,21 +29,18 @@
# this binds the nixpkgs registry to the one in `flake.nix`. # this binds the nixpkgs registry to the one in `flake.nix`.
registry = { registry = {
nixpkgs.flake = inputs.nixpkgs; nixpkgs.flake = inputs.nixpkgs;
stable.flake = inputs.stable;
}; };
# the nix path is used to discover channels for the old nix commands. # the nix path is used to discover channels for the old nix commands.
# this binds the nix path to the channels following `flake.nix` declared below. # this binds the nix path to the channels following `flake.nix` declared below.
nixPath = [ nixPath = [
"nixpkgs=/etc/nix/inputs/nixpkgs" "nixpkgs=/etc/nix/inputs/nixpkgs"
"stable=/etc/nix/inputs/stable"
]; ];
}; };
# add entries for `nixPath` above. # add entries for `nixPath` above.
environment.etc = { environment.etc = {
"nix/inputs/nixpkgs".source = inputs.nixpkgs.outPath; "nix/inputs/nixpkgs".source = inputs.nixpkgs.outPath;
"nix/inputs/stable".source = inputs.stable.outPath;
}; };
# allow processes to request scheduling priority # allow processes to request scheduling priority

3
modules/emacs/default.nix
View file

@ -41,7 +41,7 @@
custom-emacs = custom-emacs =
with newpkgs; with newpkgs;
((emacsPackagesFor (emacs29-pgtk.override { withNativeCompilation = true; })).emacsWithPackages (epkgs: with epkgs; [ ((emacsPackagesFor (emacs-pgtk.override { withNativeCompilation = true; })).emacsWithPackages (epkgs: with epkgs; [
avy avy
better-jumper better-jumper
company company
@ -56,7 +56,6 @@
flycheck flycheck
frames-only-mode frames-only-mode
fussy fussy
groovy-mode
just-mode just-mode
kotlin-mode kotlin-mode
lsp-mode lsp-mode

1
modules/hyprland/default.nix
View file

@ -2,7 +2,6 @@
inherit (inputs) hyprland hyprpaper hyprland-hy3; inherit (inputs) hyprland hyprpaper hyprland-hy3;
wrapper = pkgs.writeShellScriptBin "hyprland" '' wrapper = pkgs.writeShellScriptBin "hyprland" ''
${builtins.readFile ./session.sh}
${config.hyprland-session.prerun} ${config.hyprland-session.prerun}
${hyprland.packages.${system}.default}/bin/Hyprland $@ ${hyprland.packages.${system}.default}/bin/Hyprland $@
''; '';

16
modules/hyprland/hyprland.conf
View file

@ -1,5 +1,3 @@
exec = systemctl start --user emacs.service && emacsclient -e "(setenv \"HYPRLAND_INSTANCE_SIGNATURE\" \"$HYPRLAND_INSTANCE_SIGNATURE\")"
general { general {
gaps_in = 3 gaps_in = 3
gaps_out = 5 gaps_out = 5
@ -63,6 +61,7 @@ gestures {
misc { misc {
no_direct_scanout = false no_direct_scanout = false
suppress_portal_warnings = true
} }
binds { binds {
@ -124,7 +123,7 @@ bind = $mod, a, hy3:changefocus, raise
bind = $mod+SHIFT, a, hy3:changefocus, lower bind = $mod+SHIFT, a, hy3:changefocus, lower
bind = $mod, e, hy3:expand, expand bind = $mod, e, hy3:expand, expand
bind = $mod+SHIFT, e, hy3:expand, base bind = $mod+SHIFT, e, hy3:expand, base
bind = $mod, r, hy3:changegroup, opposite bind = $mod, r, togglesplit
bindm = $mod, mouse:272, movewindow bindm = $mod, mouse:272, movewindow
bindm = $mod, mouse:273, resizewindow bindm = $mod, mouse:273, resizewindow
@ -137,8 +136,6 @@ bind = ,XF86AudioStop, exec, playerctl -a stop
bind = ,XF86AudioNext, exec, playerctl next bind = ,XF86AudioNext, exec, playerctl next
bind = ,XF86AudioPrev, exec, playerctl previous bind = ,XF86AudioPrev, exec, playerctl previous
bind = $mod+SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy
bind = $mod, h, hy3:movefocus, l bind = $mod, h, hy3:movefocus, l
bind = $mod, j, hy3:movefocus, d bind = $mod, j, hy3:movefocus, d
bind = $mod, k, hy3:movefocus, u bind = $mod, k, hy3:movefocus, u
@ -166,15 +163,6 @@ bind = $mod+SHIFT, down, hy3:movewindow, d, once
bind = $mod+SHIFT, up, hy3:movewindow, u, once bind = $mod+SHIFT, up, hy3:movewindow, u, once
bind = $mod+SHIFT, right, hy3:movewindow, r, once bind = $mod+SHIFT, right, hy3:movewindow, r, once
bind = $mod+CONTROL+SHIFT, h, hy3:movewindow, l, once, visible
bind = $mod+CONTROL+SHIFT, j, hy3:movewindow, d, once, visible
bind = $mod+CONTROL+SHIFT, k, hy3:movewindow, u, once, visible
bind = $mod+CONTROL+SHIFT, l, hy3:movewindow, r, once, visible
bind = $mod+CONTROL+SHIFT, left, hy3:movewindow, l, once, visible
bind = $mod+CONTROL+SHIFT, down, hy3:movewindow, d, once, visible
bind = $mod+CONTROL+SHIFT, up, hy3:movewindow, u, once, visible
bind = $mod+CONTROL+SHIFT, right, hy3:movewindow, r, once, visible
bind = $mod, 1, workspace, 01 bind = $mod, 1, workspace, 01
bind = $mod, 2, workspace, 02 bind = $mod, 2, workspace, 02
bind = $mod, 3, workspace, 03 bind = $mod, 3, workspace, 03

2
modules/hyprland/session.sh
View file

@ -34,4 +34,4 @@ dbus-update-activation-environment --systemd MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE
# QT_PLUGIN_PATH=<qt5ct>/lib/qt-ver/plugins + breeze will correctly set the theme. # QT_PLUGIN_PATH=<qt5ct>/lib/qt-ver/plugins + breeze will correctly set the theme.
# HOWEVER it won't find thumbnailers. For now the easiest way to deal with this, though definitely not # HOWEVER it won't find thumbnailers. For now the easiest way to deal with this, though definitely not
# the right one, is to just throw $PATH into dbus. # the right one, is to just throw $PATH into dbus.
dbus-update-activation-environment --systemd PATH @dbusenv@ --systemd PATH

5
modules/system.nix
View file

@ -1,4 +1,4 @@
{ lib, pkgs, config, ... }: { { pkgs, ... }: {
imports = [ imports = [
./core ./core
./theme ./theme
@ -43,7 +43,4 @@
# removable disks in file manager # removable disks in file manager
services.udisks2.enable = true; services.udisks2.enable = true;
programs.adb.enable = true;
users.users.${config.main-user}.extraGroups = [ "adbusers" ];
} }

1
modules/user/dev-support.nix
View file

@ -3,7 +3,6 @@
rust-analyzer rust-analyzer
clang-tools_16 clang-tools_16
jdt-language-server jdt-language-server
kotlin-language-server
bear bear
gdb gdb

2
modules/user/general.nix
View file

@ -100,7 +100,7 @@
ripgrep ripgrep
qbittorrent qbittorrent
signal-desktop signal-desktop
anki-bin anki
libsForQt5.kwallet libsForQt5.kwallet
libsForQt5.kwalletmanager libsForQt5.kwalletmanager

7
modules/user/modules/firefox/default.nix
View file

@ -46,7 +46,7 @@ in {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = pkgs.firefox-devedition.overrideAttrs (pkg: let package = pkgs.firefox.overrideAttrs (pkg: let
imEntry = pkg.desktopItem.override (entry: { imEntry = pkg.desktopItem.override (entry: {
name = "discord-firefox"; name = "discord-firefox";
desktopName = "IMs (Firefox)"; desktopName = "IMs (Firefox)";
@ -66,10 +66,9 @@ in {
name = "BaseFF"; name = "BaseFF";
userChrome = builtins.readFile ./sideberry_chrome.css; userChrome = builtins.readFile ./sideberry_chrome.css;
}; };
dev-edition-default = { default = {
id = 0; id = 0;
name = "dev-edition-default"; name = "Default";
path = "default";
userChrome = '' userChrome = ''
${builtins.readFile ./sideberry_chrome.css} ${builtins.readFile ./sideberry_chrome.css}
${builtins.readFile ./sideberry_hide_ext_button.css} ${builtins.readFile ./sideberry_hide_ext_button.css}

2
modules/user/modules/firefox/sideberry_chrome.css
View file

@ -36,7 +36,7 @@ See the above repository for updates as well as full license text. */
/* The border controlling sidebar width will be removed so you'll need to modify these values to change width */ /* The border controlling sidebar width will be removed so you'll need to modify these values to change width */
#sidebar-box { #sidebar-box {
--uc-sidebar-width: 40px; --uc-sidebar-width: 47px;
--uc-sidebar-hover-width: 232px; --uc-sidebar-hover-width: 232px;
--uc-autohide-sidebar-delay: 050ms; /* Wait 0.6s before hiding sidebar */ --uc-autohide-sidebar-delay: 050ms; /* Wait 0.6s before hiding sidebar */
position: relative; position: relative;

2
modules/user/modules/firefox/sideberry_settings.json
View file

File diff suppressed because one or more lines are too long