winston/dotfiles
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

refactor(gtk): revert module & flatpak discord

Browse source
This commit is contained in:
winston 2023-07-04 21:19:36 +02:00
parent f451c23a64
commit 1dd8594626
Signed by: winston
GPG key ID: 3786770EDBC2B481
5 changed files with 66 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
flake.lock
View file

@ -196,11 +196,11 @@
"wezterm-src": "wezterm-src" "wezterm-src": "wezterm-src"
}, },
"locked": { "locked": {
"lastModified": 1688281534, "lastModified": 1688454338,
"narHash": "sha256-AOBSeLKmDyr2022DhX8dOxf/9brGPVicoTHb0LK7A/U=", "narHash": "sha256-n2yR1GB3tecKShuc5+xNuqIzaV98uGdBaVC4skU86pQ=",
"owner": "nekowinston", "owner": "nekowinston",
"repo": "nur", "repo": "nur",
"rev": "812e322dadb722be8bbe063cd9c2d7b3d16d4f28", "rev": "0d1549b6499842afb749a1a4d810ef4e89d1f46e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,11 +242,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1688348068, "lastModified": 1688434343,
"narHash": "sha256-zfqzsSrJP7C0zgZjIllLb6ZXi5vatDsizFHRL8XJ/Fk=", "narHash": "sha256-EsGumlCCCoBCIG+A5B3SZOx4b1IKaT4CKeO30S2K+Og=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "0d3490d9ab18d777a0d20c62f40efabfd6263111", "rev": "967d796e7d6252423f31e35f2e3220202b694903",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -291,11 +291,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1688221086, "lastModified": 1688403656,
"narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=", "narHash": "sha256-zmNai3dKWUCKpKubPWsEJ1Q7od96KebWVDJNCnk+fr0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825", "rev": "453da3c28f7a95374b73d1f3fd665dd40e6049e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -307,11 +307,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1688410025, "lastModified": 1688457350,
"narHash": "sha256-MU8IwFndC9aOBPRn4ssjF0a9xueE8Vy/skjHegbJbsI=", "narHash": "sha256-M+Vt3CKilvjY44vlodUmcj18nGAFJIMUN654NIgAUVw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "b944caccd70802b9589882544d61b11477b1bf4d", "rev": "a7780363dafaf0f4715ae0c3c37d2fe44601e019",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -459,11 +459,11 @@
"wezterm-src": { "wezterm-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1688050920, "lastModified": 1688415824,
"narHash": "sha256-X7Y37sfUUZBGa+NwGtTe4JYIwu7D3btZ0yhLkO4VHVg=", "narHash": "sha256-Ooa3QEgg4hLhIS+MOBDSfjcYNdl/81z4whgOYQDCeN0=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "f376468f461d668ef3748c82fa40eab5b955d677", "rev": "9459f64cce393a56b9be6deddc6a622332aff7c8",
"revCount": 7263, "revCount": 7268,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/wez/wezterm" "url": "https://github.com/wez/wezterm"

14
home/apps/gtk.nix
View file

@ -1,17 +1,8 @@
{ {
config, config,
lib,
pkgs, pkgs,
... ...
}: let }: rec {
cfg = config.dotfiles.gtk;
in
with lib; {
options.dotfiles.gtk = {
enable = mkEnableOption "GTK settings";
};
config = mkIf cfg.enable rec {
gtk = { gtk = {
enable = true; enable = true;
cursorTheme = { cursorTheme = {
@ -58,5 +49,4 @@ in
configFile."gtk-4.0/gtk.css".source = "${themeDir}/gtk-4.0/gtk.css"; configFile."gtk-4.0/gtk.css".source = "${themeDir}/gtk-4.0/gtk.css";
configFile."gtk-4.0/gtk-dark.css".source = "${themeDir}/gtk-4.0/gtk-dark.css"; configFile."gtk-4.0/gtk-dark.css".source = "${themeDir}/gtk-4.0/gtk-dark.css";
}; };
}; }
}

4
home/apps/media.nix
View file

@ -60,10 +60,6 @@ in {
mpd-mpris.enable = isLinux; mpd-mpris.enable = isLinux;
}; };
systemd.user.tmpfiles.rules = lib.mkIf isLinux [
"L %t/discord-ipc-0 - - - - app/com.discordapp.Discord/discord-ipc-0"
];
launchd.agents.mpd = { launchd.agents.mpd = {
enable = true; enable = true;
config = let config = let

2
home/apps/rice.nix
View file

@ -18,8 +18,6 @@
size = 12.0; size = 12.0;
}; };
in { in {
dotfiles.gtk.enable = isLinux;
programs.i3status-rust = lib.mkIf isLinux { programs.i3status-rust = lib.mkIf isLinux {
enable = true; enable = true;
bars.top = { bars.top = {

6
home/default.nix
View file

@ -28,10 +28,14 @@ in {
sops sops
] ]
++ lib.optionals isLinux [ ++ lib.optionals isLinux [
(discord.override {
withOpenASAR = true;
withTTS = true;
})
_1password-gui _1password-gui
kooha
jetbrains.goland jetbrains.goland
jetbrains.webstorm jetbrains.webstorm
kooha
]); ]);
sessionVariables = lib.mkIf isDarwin { sessionVariables = lib.mkIf isDarwin {
SSH_AUTH_SOCK = "${config.programs.gpg.homedir}/S.gpg-agent.ssh"; SSH_AUTH_SOCK = "${config.programs.gpg.homedir}/S.gpg-agent.ssh";